Update app.py

app.py

@@ -119,36 +119,53 @@ Please analyze these clinical notes and provide:
 Provide a structured response with clear medical reasoning.
 """
 
-def validate_tool_file(tool_name: str, tool_path: str) -> None:
-    """Validate the structure of a tool JSON file."""
+def validate_tool_file(tool_name: str, tool_path: str) -> bool:
+    """Validate the structure of a tool JSON file. Return True if valid, False if invalid."""
     try:
         if not os.path.exists(tool_path):
-            raise FileNotFoundError(f"Tool file not found: {tool_path}")
+            logger.error(f"Tool file not found: {tool_path}")
+            return False
         
         with open(tool_path, 'r') as f:
             tool_data = json.load(f)
         
         logger.info(f"Contents of {tool_name} ({tool_path}): {tool_data}")
         
-        if isinstance(tool_data, list):
+        if isinstance(tool_data, str):
+            logger.error(f"Invalid tool file {tool_name}: JSON root is a string, expected list or dict")
+            return False
+        elif isinstance(tool_data, list):
             for item in tool_data:
-                if not isinstance(item, dict) or 'name' not in item:
-                    raise ValueError(f"Invalid tool format in {tool_name}: each item must be a dict with a 'name' key, got {item}")
+                if not isinstance(item, dict):
+                    logger.error(f"Invalid tool format in {tool_name}: each item must be a dict, got {type(item)}: {item}")
+                    return False
+                if 'name' not in item:
+                    logger.error(f"Invalid tool format in {tool_name}: each dict must have a 'name' key, got {item}")
+                    return False
         elif isinstance(tool_data, dict):
             if 'tools' in tool_data:
                 if not isinstance(tool_data['tools'], list):
-                    raise ValueError(f"'tools' field in {tool_name} must be a list, got {type(tool_data['tools'])}")
+                    logger.error(f"'tools' field in {tool_name} must be a list, got {type(tool_data['tools'])}")
+                    return False
                 for item in tool_data['tools']:
-                    if not isinstance(item, dict) or 'name' not in item:
-                        raise ValueError(f"Invalid tool format in {tool_name}: each tool must be a dict with a 'name' key, got {item}")
+                    if not isinstance(item, dict):
+                        logger.error(f"Invalid tool format in {tool_name}: each tool must be a dict, got {type(item)}: {item}")
+                        return False
+                    if 'name' not in item:
+                        logger.error(f"Invalid tool format in {tool_name}: each tool dict must have a 'name' key, got {item}")
+                        return False
             else:
                 if 'name' not in tool_data:
-                    raise ValueError(f"Invalid tool format in {tool_name}: dict must have a 'name' key or 'tools' field, got {tool_data}")
+                    logger.error(f"Invalid tool format in {tool_name}: dict must have a 'name' key or 'tools' field, got {tool_data}")
+                    return False
         else:
-            raise ValueError(f"Invalid tool file {tool_name}: must be a list or dict, got {type(tool_data)}")
+            logger.error(f"Invalid tool file {tool_name}: must be a list or dict, got {type(tool_data)}")
+            return False
+        
+        return True
     except Exception as e:
         logger.error(f"Error validating tool file {tool_name} ({tool_path}): {str(e)}")
-        raise
+        return False
 
 def init_agent() -> TxAgent:
     tool_path = os.path.join(tool_cache_dir, "new_tool.json")
@@ -177,17 +194,27 @@ def init_agent() -> TxAgent:
         'new_tool': tool_path
     }
     
-    # Validate all tool files
+    # Validate all tool files and filter invalid ones
+    valid_tool_files = {}
     for tool_name, tool_path in tool_files_dict.items():
-        validate_tool_file(tool_name, tool_path)
+        if validate_tool_file(tool_name, tool_path):
+            valid_tool_files[tool_name] = tool_path
+        else:
+            logger.warning(f"Skipping invalid tool file: {tool_name} ({tool_path})")
+    
+    if not valid_tool_files:
+        raise ValueError("No valid tool files found after validation")
+    
+    # For testing, you can use only new_tool.json to isolate the issue
+    # valid_tool_files = {'new_tool': tool_path}
     
     # Initialize TxAgent
     try:
-        logger.info(f"Initializing TxAgent with tool_files_dict: {tool_files_dict}")
+        logger.info(f"Initializing TxAgent with tool_files_dict: {valid_tool_files}")
         agent = TxAgent(
             model_name="mims-harvard/TxAgent-T1-Llama-3.1-8B",
             rag_model_name="mims-harvard/ToolRAG-T1-GTE-Qwen2-1.5B",
-            tool_files_dict=tool_files_dict,
+            tool_files_dict=valid_tool_files,
             force_finish=True,
             enable_checker=True,
             step_rag_num=4,