Update src/aibom_generator/api.py

src/aibom_generator/api.py

@@ -63,41 +63,28 @@ async def generate_form(
 
         generator = AIBOMGenerator()
 
+        # Generate the AI SBOM
         aibom = generator.generate_aibom(
             model_id=model_id,
             include_inference=include_inference,
             use_best_practices=use_best_practices
         )
+
+        # Obtain the enhancement report
         enhancement_report = generator.get_enhancement_report()
 
+        # Obtain completeness_score properly (assuming this method exists)
+        completeness_score = generator.get_completeness_score(aibom)
+
+        # Save AI SBOM JSON file
         filename = f"{model_id.replace('/', '_')}_aibom.json"
         filepath = os.path.join(OUTPUT_DIR, filename)
-
         with open(filepath, "w") as f:
             json.dump(aibom, f, indent=2)
 
         download_url = f"/output/{filename}"
 
-        download_script = f"""
-        <script>
-            function downloadJSON() {{
-                const a = document.createElement('a');
-                a.href = '{download_url}';
-                a.download = '{filename}';
-                document.body.appendChild(a);
-                a.click();
-                document.body.removeChild(a);
-            }}
-        </script>
-        """
-
-        completeness_score = None
-        if hasattr(generator, 'get_completeness_score'):
-            try:
-                completeness_score = generator.get_completeness_score(model_id)
-            except Exception as e:
-                logger.error(f"Completeness score error: {str(e)}")
-
+        # Pass all required fields to the template
         return templates.TemplateResponse(
             "result.html",
             {
@@ -106,12 +93,13 @@ async def generate_form(
                 "aibom": aibom,
                 "enhancement_report": enhancement_report,
                 "completeness_score": completeness_score,
-                "download_url": download_url,
-                "download_script": download_script
+                "download_url": download_url
             }
         )
+
     except Exception as e:
         logger.error(f"Error generating AI SBOM: {str(e)}")
         return templates.TemplateResponse(
-            "error.html", {"request": request, "error": str(e)}
+            "error.html", 
+            {"request": request, "error": str(e)}
         )