Update app.py

app.py

@@ -62,9 +62,9 @@ def detect_depression_risk(text: str) -> dict:
         "word_count": len(processed_text.split()),
     }
 
-# --- 3. AGENT LOGIC (API uses dicts, UI uses tuples) ---
+# --- 3. AGENT LOGIC (messages format only) ---
 
-def generate_response(api_history, risk_context, provider):
+def generate_response(history, risk_context, provider):
     if not risk_context:
         risk_context = {
             "risk_level": "Unknown",
@@ -96,7 +96,7 @@ YOUR GOAL: Provide supportive, scientifically-grounded chat. Max 2 sentences. Do
 """.strip()
 
     messages = [{"role": "system", "content": system_prompt}]
-    messages.extend(api_history)
+    messages.extend(history)  # history is already [{"role": ..., "content": ...}]
 
     try:
         resp = client.chat.completions.create(
@@ -109,11 +109,11 @@ YOUR GOAL: Provide supportive, scientifically-grounded chat. Max 2 sentences. Do
     except Exception as e:
         return f"⚠️ Error with {provider}: {e}"
 
-# --- 4. UI ORCHESTRATION ---
+# --- 4. UI ORCHESTRATION (Chatbot uses messages format) ---
 
 def run_analysis(text, location, provider):
     if not text.strip():
-        return None, [], [], None
+        return None, [], None
 
     data = detect_depression_risk(text)
     resources = get_crisis_resources(location)
@@ -138,31 +138,26 @@ def run_analysis(text, location, provider):
     </div>
     """
 
-    api_history = [{"role": "user", "content": "I just ran the analysis. Please explain my results."}]
-    ai_msg = generate_response(api_history, data, provider)
-    api_history.append({"role": "assistant", "content": ai_msg})
+    # Initial assistant message
+    history = [
+        {"role": "assistant", "content": generate_response(
+            [{"role": "user", "content": "I just ran the analysis. Please explain my results."}],
+            data,
+            provider
+        )}
+    ]
 
-    # Chatbot expects list of tuples: [(user, bot), ...]
-    ui_history = [(None, ai_msg)]
+    # dashboard HTML, chatbot messages (list[dict]), risk_data
+    return html_dashboard, history, data
 
-    return html_dashboard, ui_history, api_history, data
-
-def user_chat(user_message, ui_history, api_history, risk_data, provider):
+def user_chat(user_message, history, risk_data, provider):
     if not user_message:
-        return ui_history, api_history, ""
-
-    # For API
-    api_history.append({"role": "user", "content": user_message})
-
-    # For UI (append placeholder, then fill reply)
-    ui_history.append((user_message, None))
-
-    ai_msg = generate_response(api_history, risk_data, provider)
+        return history, ""
 
-    api_history.append({"role": "assistant", "content": ai_msg})
-    ui_history[-1] = (user_message, ai_msg)
-
-    return ui_history, api_history, ""
+    history.append({"role": "user", "content": user_message})
+    ai_msg = generate_response(history, risk_data, provider)
+    history.append({"role": "assistant", "content": ai_msg})
+    return history, ""
 
 # --- 5. EXAMPLES ---
 
@@ -186,7 +181,6 @@ with gr.Blocks(title="Depression Risk Agent") as demo:
     gr.Markdown("⚡ Powered by: SambaNova (Llama 3.3) & Nebius (Kimi K2)")
 
     risk_state = gr.State(None)
-    api_state = gr.State([])
 
     with gr.Row():
         with gr.Column(scale=1):
@@ -199,9 +193,9 @@ with gr.Blocks(title="Depression Risk Agent") as demo:
 
             gr.Markdown("### 🔍 Try Thesis Patterns")
             with gr.Row():
-                btn_low = gr.Button("🟢 Low Risk", size="sm")
-                btn_mod = gr.Button("🟡 Moderate", size="sm")
-                btn_high = gr.Button("🔴 High Risk", size="sm")
+                btn_low = gr.Button("🟢 Low Risk", size="sm", variant="secondary")
+                btn_mod = gr.Button("🟡 Moderate", size="sm", variant="secondary")
+                btn_high = gr.Button("🔴 High Risk", size="sm", variant="secondary")
 
             gr.Markdown("### ⚙️ Settings")
             with gr.Row():
@@ -218,22 +212,17 @@ with gr.Blocks(title="Depression Risk Agent") as demo:
 
             analyze_btn = gr.Button("🚀 Run Clinical Analysis", variant="primary", size="lg")
 
-            with gr.Accordion("🔧 MCP Tools Exposed", open=False):
-                gr.Markdown("- `detect_depression_risk`\n- `get_crisis_resources`")
-
         with gr.Column(scale=1):
             dashboard = gr.HTML(label="Clinical Dashboard")
-            # Chatbot uses list of (user, bot) tuples
-            chatbot = gr.Chatbot(label="Agent Chat", height=400)
+            chatbot = gr.Chatbot(label="Agent Chat", height=400, type="messages")
             msg_input = gr.Textbox(label="Chat with Agent", placeholder="Ask about your results or get advice...")
             send_btn = gr.Button("Send Message")
 
-    # --- Wiring ---
-
+    # Wiring
     analyze_btn.click(
         run_analysis,
         inputs=[input_text, loc_drop, prov_drop],
-        outputs=[dashboard, chatbot, api_state, risk_state],
+        outputs=[dashboard, chatbot, risk_state],
     )
 
     btn_low.click(lambda: example_low, None, input_text)
@@ -242,13 +231,13 @@ with gr.Blocks(title="Depression Risk Agent") as demo:
 
     send_btn.click(
         user_chat,
-        inputs=[msg_input, chatbot, api_state, risk_state, prov_drop],
-        outputs=[chatbot, api_state, msg_input],
+        inputs=[msg_input, chatbot, risk_state, prov_drop],
+        outputs=[chatbot, msg_input],
     )
     msg_input.submit(
         user_chat,
-        inputs=[msg_input, chatbot, api_state, risk_state, prov_drop],
-        outputs=[chatbot, api_state, msg_input],
+        inputs=[msg_input, chatbot, risk_state, prov_drop],
+        outputs=[chatbot, msg_input],
     )
 
 if __name__ == "__main__":