Update app.py

app.py

@@ -6,81 +6,73 @@ import importlib
 import inspect
 import json
 
-# Fix path to include src
+# === Fix path to include src/txagent
 sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
 
-# Reload TxAgent from txagent.py
+# === Import and reload to ensure correct file
 import txagent.txagent
 importlib.reload(txagent.txagent)
 from txagent.txagent import TxAgent
 
-# Debug info
+# === Debug print
 print(">>> TxAgent loaded from:", inspect.getfile(TxAgent))
 print(">>> TxAgent has run_gradio_chat:", hasattr(TxAgent, "run_gradio_chat"))
 
-# Env vars
+# === Environment
 current_dir = os.path.abspath(os.path.dirname(__file__))
 os.environ["MKL_THREADING_LAYER"] = "GNU"
 os.environ["TOKENIZERS_PARALLELISM"] = "false"
 
-# Model config
+# === Model config
 model_name = "mims-harvard/TxAgent-T1-Llama-3.1-8B"
 rag_model_name = "mims-harvard/ToolRAG-T1-GTE-Qwen2-1.5B"
 new_tool_files = {
     "new_tool": os.path.join(current_dir, "data", "new_tool.json")
 }
 
-# Sample questions
+# === Example prompts
 question_examples = [
     ["Given a patient with WHIM syndrome on prophylactic antibiotics, is it advisable to co-administer Xolremdi with fluconazole?"],
     ["What treatment options exist for HER2+ breast cancer resistant to trastuzumab?"]
 ]
 
-# Helper: format assistant responses in collapsible panels
-
-def format_collapsible(content, tool_name=None):
-    # Try parsing if it's a JSON string
-    if isinstance(content, str):
-        try:
-            content = json.loads(content)
-        except Exception:
-            pass
-
-    if isinstance(content, dict) and "results" in content:
-        readable = ""
-        for i, result in enumerate(content["results"], 1):
-            readable += f"\n🔹 **Result {i}:**\n"
-            for key, value in result.items():
-                key_str = key.replace("openfda.", "").replace("_", " ").capitalize()
-                val_str = ", ".join(value) if isinstance(value, list) else str(value)
-                readable += f"- **{key_str}**: {val_str}\n"
-        formatted = readable.strip()
-    elif isinstance(content, (dict, list)):
-        formatted = json.dumps(content, indent=2)
-    else:
-        formatted = str(content)
-
-    title = f"{tool_name or 'Answer'}"
+# === Helper: extract tool name from content
+def extract_tool_name_and_clean_content(raw_content):
+    if isinstance(raw_content, (dict, list)):
+        return "Answer", json.dumps(raw_content, indent=2)
+    if not isinstance(raw_content, str):
+        return "Answer", str(raw_content)
+
+    lines = raw_content.strip().splitlines()
+    title = "Answer"
+    clean = raw_content.strip()
+    for line in lines:
+        if line.strip().lower().startswith("tool_"):
+            title = f"Answer ({line.strip()})"
+            clean = raw_content.replace(line, "", 1).strip()
+            break
+    return title, clean
+
+# === Helper: formatted collapsible output
+def format_collapsible(content, title="Answer"):
     return (
-        "<details style='border: 1px solid #aaa; border-radius: 8px; padding: 10px; margin: 12px 0; background-color: #f8f8f8;'>"
-        f"<summary style='font-weight: bold; font-size: 16px; color: #333;'>{title}</summary>"
-        f"<div style='white-space: pre-wrap; font-family: sans-serif; color: #222; padding-top: 6px;'>{formatted}</div>"
-        "</details>"
+        f"<details style='border: 1px solid #ccc; padding: 8px; margin-top: 8px;'>"
+        f"<summary style='font-weight: bold;'>{title}</summary>"
+        f"<div style='margin-top: 8px; white-space: pre-wrap;'>{content}</div></details>"
     )
 
-# === UI setup
+# === UI creation
 def create_ui(agent):
-    with gr.Blocks(css="body { background-color: #f5f5f5; font-family: sans-serif; }") as demo:
+    with gr.Blocks(theme=gr.themes.Soft()) as demo:
         gr.Markdown("<h1 style='text-align: center;'>TxAgent: Therapeutic Reasoning</h1>")
-        gr.Markdown("<p style='text-align: center;'>Ask biomedical or therapeutic questions. Powered by step-by-step reasoning and tools.</p>")
-
-        conversation_state = gr.State([])
+        gr.Markdown("Ask biomedical or therapeutic questions. Powered by step-by-step reasoning and tools.")
 
         chatbot = gr.Chatbot(label="TxAgent", height=600, type="messages")
         message_input = gr.Textbox(placeholder="Ask your biomedical question...", show_label=False)
         send_button = gr.Button("Send", variant="primary")
+        conversation_state = gr.State([])
 
-        # Main handler
+        # === Core handler (streaming generator)
         def handle_chat(message, history, conversation):
             generator = agent.run_gradio_chat(
                 message=message,
@@ -94,30 +86,30 @@ def create_ui(agent):
             )
 
             for update in generator:
-                formatted = []
+                formatted_messages = []
                 for m in update:
                     role = m["role"] if isinstance(m, dict) else getattr(m, "role", "assistant")
                     content = m["content"] if isinstance(m, dict) else getattr(m, "content", "")
-                    tool_name = m.get("tool_name") if isinstance(m, dict) else getattr(m, "tool_name", None)
-
                     if role == "assistant":
-                        content = format_collapsible(content, tool_name)
-
-                    formatted.append({"role": role, "content": content})
-                yield formatted
+                        title, clean = extract_tool_name_and_clean_content(content)
+                        content = format_collapsible(clean, title)
+                    formatted_messages.append({"role": role, "content": content})
+                yield formatted_messages
 
+        # === Trigger handlers
         inputs = [message_input, chatbot, conversation_state]
         send_button.click(fn=handle_chat, inputs=inputs, outputs=chatbot)
         message_input.submit(fn=handle_chat, inputs=inputs, outputs=chatbot)
 
         gr.Examples(examples=question_examples, inputs=message_input)
-        gr.Markdown("<p style='font-size: 12px; text-align: center; color: gray;'>This demo is for research purposes only and does not provide medical advice.</p>")
+        gr.Markdown("**DISCLAIMER**: This demo is for research purposes only and does not provide medical advice.")
 
     return demo
 
-# === Entry point
+# === Startup
 if __name__ == "__main__":
     freeze_support()
+
     try:
         agent = TxAgent(
             model_name=model_name,
@@ -132,11 +124,16 @@ if __name__ == "__main__":
         agent.init_model()
 
         if not hasattr(agent, "run_gradio_chat"):
-            raise AttributeError("TxAgent missing run_gradio_chat")
+            raise AttributeError("❌ TxAgent is missing `run_gradio_chat`.")
 
         demo = create_ui(agent)
-        demo.queue().launch(server_name="0.0.0.0", server_port=7860, share=True, show_error=True)
+        demo.queue().launch(
+            server_name="0.0.0.0",
+            server_port=7860,
+            show_error=True,
+            share=True
+        )
 
     except Exception as e:
-        print(f"\u274c App failed to start: {e}")
+        print(f"❌ App failed to start: {e}")
         raise