Update app.py

app.py

@@ -14,6 +14,7 @@ import uuid
 from langgraph.graph import StateGraph, END
 import logging
 from typing import Dict, TypedDict, Optional, Any, List
+from pathlib import Path
 
 # --- Configure logging ---
 logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
@@ -26,9 +27,18 @@ BLOCKS_FOLDER = "blocks/"
 GEN_PROJECT_FOLDER = "generated_projects/"
 STATIC_FOLDER = "static/"
 
-os.makedirs(BLOCKS_FOLDER, exist_ok=True)
-os.makedirs(GEN_PROJECT_FOLDER, exist_ok=True)
-os.makedirs(STATIC_FOLDER, exist_ok=True)
+BASE_DIR = Path(__file__).parent
+BLOCKS_DIR      = BASE_DIR / "blocks"
+STATIC_DIR      = BASE_DIR / "static"
+GEN_PROJECT_DIR = BASE_DIR / "generated_projects"
+ASSET_DIR = STATIC_DIR / "assets"
+BACKDROP_DIR = ASSET_DIR / "backdrops"
+SPRITE_DIR = ASSET_DIR / "sprites"
+SOUND_DIR = ASSET_DIR / "sounds"
+
+# Create them if they're missing:
+for d in (BLOCKS_DIR, STATIC_DIR, GEN_PROJECT_DIR, ASSET_DIR, BACKDROP_DIR, SPRITE_DIR, SOUND_DIR):
+    d.mkdir(parents=True, exist_ok=True)
 
 # --- LLM / Vision model setup ---
 os.environ["GROQ_API_KEY"] = os.getenv("GROQ_API_KEY_2", "default_key_or_placeholder")
@@ -237,23 +247,28 @@ def update_project_with_sprite_positions(project_json: dict, sprite_positions: d
     return updated_project
 
 # Helper function to load the block catalog from a JSON file
-def _load_block_catalog(file_path: str) -> Dict:
-    """Loads the Scratch block catalog from a specified JSON file."""
+def _load_block_catalog_safe(block_type: str) -> Dict:
+    """
+    Loads the Scratch block catalog named '{block_type}_blocks.json'
+    from the <project_root>/blocks/ folder. Returns {} on any error.
+    """
+    catalog_path = BLOCKS_DIR / f"{block_type}_blocks.json"
+
     try:
-        with open(file_path, 'r') as f:
-            catalog = json.load(f)
-        logger.info(f"Successfully loaded block catalog from {file_path}")
+        text = catalog_path.read_text()  # will raise FileNotFoundError if missing
+        catalog = json.loads(text)       # will raise JSONDecodeError if malformed
+        logger.info(f"Successfully loaded block catalog from {catalog_path}")
         return catalog
+
     except FileNotFoundError:
-        logger.error(f"Error: Block catalog file not found at {file_path}")
-        # Return an empty dict or raise an error, depending on desired behavior
-        return {}
+        logger.error(f"Error: Block catalog file not found at {catalog_path}")
     except json.JSONDecodeError as e:
-        logger.error(f"Error decoding JSON from {file_path}: {e}")
-        return {}
+        logger.error(f"Error decoding JSON from {catalog_path}: {e}")
     except Exception as e:
-        logger.error(f"An unexpected error occurred while loading {file_path}: {e}")
-        return {}
+        logger.error(f"Unexpected error loading {catalog_path}: {e}")
+
+    # In all error cases, return an empty dict so the rest of your app can continue
+    return {}
 
 # --- Global variable for the block catalog ---
 ALL_SCRATCH_BLOCKS_CATALOG = {}