Update app.py

app.py

@@ -97,29 +97,43 @@ def validate_tool_file(file_path):
         with open(file_path, 'r') as f:
             data = json.load(f)
         if isinstance(data, list):
-            assert all(isinstance(t, dict) and "name" in t for t in data), "Invalid tool list format"
+            assert all(isinstance(t, dict) and "name" in t for t in data), "Invalid list format"
         elif isinstance(data, dict):
             assert "tools" in data and isinstance(data["tools"], list), "'tools' field missing or invalid"
-            assert all(isinstance(t, dict) and "name" in t for t in data["tools"]), "Invalid tools inside 'tools' field"
+            assert all(isinstance(t, dict) and "name" in t for t in data["tools"]), "Invalid item in 'tools'"
         else:
-            raise ValueError("Tool file is neither a list nor a dict with 'tools'")
+            raise ValueError("Unexpected structure")
         return True
     except Exception as e:
-        print(f"❌ Error validating tool file {file_path}: {e}")
+        print(f"❌ Tool validation failed for {file_path}: {e}")
         return False
 
 def init_agent():
-    tool_path = os.path.join(tool_cache_dir, "new_tool.json")
-    if not os.path.exists(tool_path):
-        shutil.copy(os.path.abspath("data/new_tool.json"), tool_path)
+    all_tool_paths = {
+        "opentarget": "/home/user/.pyenv/versions/3.10.17/lib/python3.10/site-packages/tooluniverse/data/opentarget_tools.json",
+        "fda_drug_label": "/home/user/.pyenv/versions/3.10.17/lib/python3.10/site-packages/tooluniverse/data/fda_drug_labeling_tools.json",
+        "special_tools": "/home/user/.pyenv/versions/3.10.17/lib/python3.10/site-packages/tooluniverse/data/special_tools.json",
+        "monarch": "/home/user/.pyenv/versions/3.10.17/lib/python3.10/site-packages/tooluniverse/data/monarch_tools.json",
+        "new_tool": os.path.join(tool_cache_dir, "new_tool.json"),
+    }
 
-    if not validate_tool_file(tool_path):
-        raise ValueError("Tool file format invalid, cannot initialize agent.")
+    if not os.path.exists(all_tool_paths["new_tool"]):
+        shutil.copy(os.path.abspath("data/new_tool.json"), all_tool_paths["new_tool"])
+
+    valid_tool_paths = {}
+    for key, path in all_tool_paths.items():
+        if validate_tool_file(path):
+            valid_tool_paths[key] = path
+        else:
+            print(f"⚠️ Skipping invalid tool file: {path}")
+
+    if not valid_tool_paths:
+        raise RuntimeError("❌ No valid tool files found to load into TxAgent.")
 
     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={"new_tool": tool_path},
+        tool_files_dict=valid_tool_paths,
         force_finish=True,
         enable_checker=True,
         step_rag_num=4,
@@ -220,9 +234,8 @@ def create_ui(agent):
             background: linear-gradient(135deg, #37b6e9, #4b4ced);
         }
     """) as demo:
-        gr.Markdown("""# 🧠 Clinical Reasoning Assistant
-Upload clinical Excel records below and click **Analyze** to generate a medical summary.
-""")
+        gr.Markdown("""# 🧠 Clinical Reasoning Assistant  
+Upload clinical Excel records below and click **Analyze** to generate a medical summary.""")
         file_upload = gr.File(label="Upload Excel File", file_types=[".xlsx"])
         analyze_btn = gr.Button("Analyze")
         report_output_markdown = gr.Markdown(elem_classes="output-markdown")