Update app.py

app.py

@@ -2106,17 +2106,14 @@ def create_sb3_archive(project_folder: Path, project_id: str) -> Path | None:
     Returns:
         Path: The path to the created .sb3 file, or None if an error occurred.
     """
-    # Use Path objects for consistency
     output_base_name = GEN_PROJECT_DIR / project_id
     zip_path = None
     sb3_path = None
     try:
-        # shutil.make_archive automatically adds .zip extension
         zip_path_str = shutil.make_archive(str(output_base_name), 'zip', root_dir=str(project_folder))
-        zip_path = Path(zip_path_str) # Convert back to Path object
+        zip_path = Path(zip_path_str)
         logger.info(f"Project folder zipped to: {zip_path}")
 
-        # 2. Rename the .zip file to .sb3
         sb3_path = GEN_PROJECT_DIR / f"{project_id}.sb3"
         os.rename(zip_path, sb3_path)
         logger.info(f"Renamed {zip_path} to {sb3_path}")
@@ -2124,7 +2121,6 @@ def create_sb3_archive(project_folder: Path, project_id: str) -> Path | None:
         return sb3_path
     except Exception as e:
         logger.error(f"Error creating SB3 archive for {project_id}: {e}", exc_info=True)
-        # Clean up any partial files if an error occurs
         if zip_path and zip_path.exists():
             os.remove(zip_path)
         if sb3_path and sb3_path.exists():
@@ -2142,13 +2138,13 @@ def download_sb3(project_id):
     Allows users to download the generated .sb3 Scratch project file.
     """
     sb3_filename = f"{project_id}.sb3"
-    sb3_filepath = GEN_PROJECT_DIR / sb3_filename # Use Path object consistent with creation
+    sb3_filepath = GEN_PROJECT_DIR / sb3_filename
 
     try:
         if sb3_filepath.exists():
             logger.info(f"Serving SB3 file for project ID: {project_id}")
             return send_from_directory(
-                directory=GEN_PROJECT_DIR, # Pass the Path object here
+                directory=GEN_PROJECT_DIR,
                 path=sb3_filename,
                 as_attachment=True,
                 download_name=sb3_filename
@@ -2160,11 +2156,11 @@ def download_sb3(project_id):
         logger.error(f"Error serving SB3 file for ID {project_id}: {e}", exc_info=True)
         return jsonify({"error": "Failed to retrieve Scratch project file"}), 500
 
-# API endpoint
 @app.route('/process_pdf', methods=['POST'])
 def process_pdf():
-    project_id = None # Initialize project_id outside try-block for error logging
+    project_id = None
     project_folder = None
+    temp_dir = None # Initialize temp_dir for finally block
     try:
         logger.info("Received request to process PDF.")
         if 'pdf_file' not in request.files:
@@ -2175,45 +2171,28 @@ def process_pdf():
         if pdf_file.filename == '':
             return jsonify({"error": "Empty filename"}), 400
 
-        # ================================================= #
-        #    Generate Random UUID for project folder name   #
-        # ================================================= #
         project_id = str(uuid.uuid4()).replace('-', '')
-        project_folder = OUTPUT_DIR / project_id # Use Path object
+        project_folder = OUTPUT_DIR / project_id
 
-        # =========================================================================== #
-        #            Create empty json in project_{random_id} folder                  #
-        # =========================================================================== #
-        # THIS WAS COMMENTED OUT - CRITICAL FIX!
         project_folder.mkdir(parents=True, exist_ok=True)
         logger.info(f"Created project folder: {project_folder}")
 
-        # Save the uploaded PDF temporarily
         filename = secure_filename(pdf_file.filename)
-        temp_dir = Path(tempfile.mkdtemp()) # Use Path for temp dir
+        temp_dir = Path(tempfile.mkdtemp())
         saved_pdf_path = temp_dir / filename
         pdf_file.save(saved_pdf_path)
 
         logger.info(f"Saved uploaded PDF to: {saved_pdf_path}")
         
-        # Extract & process
-        # Ensure extract_images_from_pdf can handle Path objects or convert before passing
-        json_path = None # As per original code, json_path is None
+        json_path = None
         extracted_output_dir, result = extract_images_from_pdf(saved_pdf_path, json_path)
         
-        # Check extracted_sprites.json for "scratch block" in any 'name'
-        # Ensure JSON_DIR is a Path object or use os.path.join consistently
-        extracted_sprites_json = JSON_DIR / Path(filename).stem / "extracted_sprites.json"
-        
-        # NOTE: The original `extracted_dir = os.path.join(JSON_DIR, os.path.splitext(filename)[0])`
-        # and `extracted_sprites_json = os.path.join(extracted_dir, "extracted_sprites.json")`
-        # implies `extract_images_from_pdf` puts stuff in JSON_DIR.
-        # Ensure `extract_images_from_pdf` actually creates this path.
-        # For this example, I'm assuming `extracted_output_dir` (from `extract_images_from_pdf`)
-        # contains the `extracted_sprites.json`. Adjust based on your `extract_images_from_pdf`
-        # implementation. Let's use `extracted_output_dir` if it's correct.
-        extracted_sprites_json_path = extracted_output_dir / "extracted_sprites.json"
+        # Ensure extracted_output_dir is a Path object for the '/' operator
+        # This was the source of the TypeError
+        if not isinstance(extracted_output_dir, Path):
+            extracted_output_dir = Path(extracted_output_dir)
 
+        extracted_sprites_json_path = extracted_output_dir / "extracted_sprites.json"
 
         if not extracted_sprites_json_path.exists():
             logger.error(f"No extracted_sprites.json found at {extracted_sprites_json_path}")
@@ -2222,45 +2201,41 @@ def process_pdf():
         with open(extracted_sprites_json_path, 'r') as f:
             sprite_data = json.load(f)
 
-        # similarity_matching should return the path to the project.json within project_folder
         project_output = similarity_matching(extracted_output_dir, project_folder)
-        logger.info("Similarity matching completed.") # Removed duplicate "Received request to process PDF."
+        logger.info("Similarity matching completed.")
         
         with open(project_output, 'r') as f:
             project_skeleton = json.load(f)
             
         images = convert_from_path(saved_pdf_path, dpi=300)
-        # print(type) # This `print(type)` line seems like a leftover debug statement and will print the `type` built-in function.
         page = images[0]
         buf = BytesIO()
         page.save(buf, format="PNG")
         img_bytes = buf.getvalue()
         img_b64 = base64.b64encode(img_bytes).decode("utf-8")
         
-        # initial_state_dict = {
-        #     "project_json": project_skeleton,
-        #     "description": "The pseudo code for the script",
-        #     "project_id": project_id,
-        #     "project_image": img_b64,
-        #     "action_plan": {},
-        #     "pseudo_code": {},
-        #     "temporary_node": {},
-        # }
+        initial_state_dict = {
+            "project_json": project_skeleton,
+            "description": "The pseudo code for the script",
+            "project_id": project_id,
+            "project_image": img_b64,
+            "action_plan": {},
+            "pseudo_code": {},
+            "temporary_node": {},
+        }
         
-        # final_state_dict = app_graph.invoke(initial_state_dict)
+        final_state_dict = app_graph.invoke(initial_state_dict)
 
-        final_project_json = project_skeleton#final_state_dict['project_json']
+        final_project_json = final_state_dict['project_json']
         
-        # Save the *final* filled project JSON, overwriting the skeleton
         with open(project_output, "w") as f:
             json.dump(final_project_json, f, indent=2)
         logger.info(f"Final project JSON saved to {project_output}")
 
-        # --- Call the new function to create the .sb3 file ---
         sb3_file_path = create_sb3_archive(project_folder, project_id)
         if sb3_file_path:
             logger.info(f"Successfully created SB3 file: {sb3_file_path}")
-            download_url = f"/download_sb3/{project_id}" # Use relative path for internal Flask app
+            download_url = f"/download_sb3/{project_id}"
             print(f"DOWNLOAD_URL: {download_url}")
             return jsonify({"message": "Processed PDF and Game sb3 generated successfully", "project_id": project_id, "download_url": download_url})
         else:
@@ -2270,15 +2245,9 @@ def process_pdf():
         logger.error(f"Error during processing the pdf workflow for project ID {project_id}: {e}", exc_info=True)
         return jsonify({"error": f"❌ Failed to process PDF: {str(e)}"}), 500
     finally:
-        # Clean up temporary PDF directory
-        if 'temp_dir' in locals() and temp_dir.exists():
+        if temp_dir and temp_dir.exists():
             shutil.rmtree(temp_dir)
             logger.info(f"Cleaned up temporary directory: {temp_dir}")
-        # Optionally, clean up the main project_folder if an error occurred before SB3 creation
-        # (Be careful with this if you want to inspect failed project folders)
-        # if project_folder and project_folder.exists() and sb3_file_path is None:
-        #     shutil.rmtree(project_folder)
-        #     logger.info(f"Cleaned up partial project folder: {project_folder}")
 
 @app.route('/list_projects', methods=['GET'])
 def list_projects():