Update app.py

app.py

@@ -217,59 +217,122 @@ agent_json_resolver = create_react_agent(
 )
 
 # 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(file_path: str) -> Dict:
+#     """Loads the Scratch block catalog from a specified JSON file."""
+#     try:
+#         with open(file_path, 'r') as f:
+#             catalog = json.load(f)
+#         logger.info(f"Successfully loaded block catalog from {file_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 {}
+#     except json.JSONDecodeError as e:
+#         logger.error(f"Error decoding JSON from {file_path}: {e}")
+#         return {}
+#     except Exception as e:
+#         logger.error(f"An unexpected error occurred while loading {file_path}: {e}")
+#         return {}
+
+# Helper function to load the block catalog from a JSON file
+def _load_block_catalog(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}.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}")
 
 # --- Global variable for the block catalog ---
 # --- Global variable for the block catalog ---
 ALL_SCRATCH_BLOCKS_CATALOG = {}
-BLOCK_CATALOG_PATH = r"blocks\blocks.json" # Define the path to your JSON file
-HAT_BLOCKS_PATH = r"blocks\hat_blocks.json" # Path to the hat blocks JSON file
-STACK_BLOCKS_PATH = r"blocks\stack_blocks.json" # Path to the stack blocks JSON file
-REPORTER_BLOCKS_PATH = r"blocks\reporter_blocks.json" # Path to the reporter blocks JSON file
-BOOLEAN_BLOCKS_PATH = r"blocks\boolean_blocks.json" # Path to the boolean blocks JSON file
-C_BLOCKS_PATH = r"blocks\c_blocks.json" # Path to the C blocks JSON file
-CAP_BLOCKS_PATH = r"blocks\cap_blocks.json" # Path to the cap blocks JSON file
+# BLOCK_CATALOG_PATH = r"blocks\blocks.json" # Define the path to your JSON file
+# HAT_BLOCKS_PATH = r"blocks\hat_blocks.json" # Path to the hat blocks JSON file
+# STACK_BLOCKS_PATH = r"blocks\stack_blocks.json" # Path to the stack blocks JSON file
+# REPORTER_BLOCKS_PATH = r"blocks\reporter_blocks.json" # Path to the reporter blocks JSON file
+# BOOLEAN_BLOCKS_PATH = r"blocks\boolean_blocks.json" # Path to the boolean blocks JSON file
+# C_BLOCKS_PATH = r"blocks\c_blocks.json" # Path to the C blocks JSON file
+# CAP_BLOCKS_PATH = r"blocks\cap_blocks.json" # Path to the cap blocks JSON file
+
+# BLOCK_CATALOG_PATH = r"blocks/blocks.json" 
+# HAT_BLOCKS_PATH = r"blocks/hat_blocks.json" 
+# STACK_BLOCKS_PATH = r"blocks/stack_blocks.json" 
+# REPORTER_BLOCKS_PATH = r"blocks/reporter_blocks.json" 
+# BOOLEAN_BLOCKS_PATH = r"blocks/boolean_blocks.json" 
+# C_BLOCKS_PATH = r"blocks/c_blocks.json" 
+# CAP_BLOCKS_PATH = r"blocks/cap_blocks.json" 
+
+BLOCK_CATALOG_PATH = "blocks" # Define the path to your JSON file
+HAT_BLOCKS_PATH = "hat_blocks" # Path to the hat blocks JSON file
+STACK_BLOCKS_PATH = "stack_blocks" # Path to the stack blocks JSON file
+REPORTER_BLOCKS_PATH = "reporter_blocks" # Path to the reporter blocks JSON file
+BOOLEAN_BLOCKS_PATH = "boolean_blocks" # Path to the boolean blocks JSON file
+C_BLOCKS_PATH = "c_blocks" # Path to the C blocks JSON file
+CAP_BLOCKS_PATH = "cap_blocks" # Path to the cap blocks JSON file
 
 # Load the block catalogs from their respective JSON files
 hat_block_data = _load_block_catalog(HAT_BLOCKS_PATH)
-hat_description = hat_block_data["description"]
-hat_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in hat_block_data["blocks"]])
+# hat_description = hat_block_data["description"]
+hat_description = hat_block_data.get("description", "No description available")
+# hat_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in hat_block_data["blocks"]])
+hat_opcodes_functionalities = "\n".join([
+    f"    - Opcode: {block.get('op_code', 'N/A')}, functionality: {block.get('functionality', 'N/A')}, example: standalone use {block.get('example_standalone', 'N/A')}"
+    for block in hat_block_data.get("blocks", [])
+]) if isinstance(hat_block_data.get("blocks"), list) else "    No blocks information available."
 print("Hat blocks loaded successfully.", hat_description)
+
 boolean_block_data = _load_block_catalog(BOOLEAN_BLOCKS_PATH)
 boolean_description = boolean_block_data["description"]
-boolean_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in boolean_block_data["blocks"]])
+# boolean_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in boolean_block_data["blocks"]])
+boolean_opcodes_functionalities = "\n".join([
+    f"    - Opcode: {block.get('op_code', 'N/A')}, functionality: {block.get('functionality', 'N/A')}, example: standalone use {block.get('example_standalone', 'N/A')}"
+    for block in boolean_block_data.get("blocks", [])
+]) if isinstance(boolean_block_data.get("blocks"), list) else "    No blocks information available."
 
 c_block_data = _load_block_catalog(C_BLOCKS_PATH)
 c_description = c_block_data["description"]
-c_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in c_block_data["blocks"]])
+# c_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in c_block_data["blocks"]])
+c_opcodes_functionalities = "\n".join([
+    f"    - Opcode: {block.get('op_code', 'N/A')}, functionality: {block.get('functionality', 'N/A')}, example: standalone use {block.get('example_standalone', 'N/A')}"
+    for block in c_block_data.get("blocks", [])
+]) if isinstance(c_block_data.get("blocks"), list) else "    No blocks information available."
 
 cap_block_data = _load_block_catalog(CAP_BLOCKS_PATH)
 cap_description = cap_block_data["description"]                                                                                                                                                                                                                                                                                                                                                                                                                                                      
-cap_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in cap_block_data["blocks"]])
+# cap_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in cap_block_data["blocks"]])
+cap_opcodes_functionalities = "\n".join([
+    f"    - Opcode: {block.get('op_code', 'N/A')}, functionality: {block.get('functionality', 'N/A')}, example: standalone use {block.get('example_standalone', 'N/A')}"
+    for block in cap_block_data.get("blocks", [])
+]) if isinstance(cap_block_data.get("blocks"), list) else "    No blocks information available."
 
 reporter_block_data = _load_block_catalog(REPORTER_BLOCKS_PATH)
 reporter_description = reporter_block_data["description"]
-reporter_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in reporter_block_data["blocks"]])
+# reporter_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in reporter_block_data["blocks"]])
+reporter_opcodes_functionalities = "\n".join([
+    f"    - Opcode: {block.get('op_code', 'N/A')}, functionality: {block.get('functionality', 'N/A')}, example: standalone use {block.get('example_standalone', 'N/A')}"
+    for block in reporter_block_data.get("blocks", [])
+]) if isinstance(reporter_block_data.get("blocks"), list) else "    No blocks information available."
 
 stack_block_data = _load_block_catalog(STACK_BLOCKS_PATH)
 stack_description = stack_block_data["description"]
-stack_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in stack_block_data["blocks"]])
+# stack_opcodes_functionalities = "\n".join([f"    - Opcode: {block['op_code']}, functionality: {block['functionality']} example: standalone use: {block['example_standalone']}" for block in stack_block_data["blocks"]])
+stack_opcodes_functionalities = "\n".join([
+    f"    - Opcode: {block.get('op_code', 'N/A')}, functionality: {block.get('functionality', 'N/A')}, example: standalone use {block.get('example_standalone', 'N/A')}"
+    for block in stack_block_data.get("blocks", [])
+]) if isinstance(stack_block_data.get("blocks"), list) else "    No blocks information available."
 
 # This makes ALL_SCRATCH_BLOCKS_CATALOG available globally
 ALL_SCRATCH_BLOCKS_CATALOG = _load_block_catalog(BLOCK_CATALOG_PATH)