Update app.py

app.py

@@ -35,11 +35,18 @@ def is_healthcare_scenario(text: str, has_files: bool) -> bool:
     structured = any(s in t for s in ["background", "situation", "tasks", "deliverables"])
     return has_files and (structured or any(k in t for k in kws))
 
-def handle(user_msg: str, history: list, files: list) -> Tuple[list, str]:
+def _append_msg(history_messages: List[Dict[str, str]], role: str, content: str) -> List[Dict[str, str]]:
+    """Return a new history list with one message appended."""
+    return (history_messages or []) + [{"role": role, "content": content}]
+
+def handle(user_msg: str, history_messages: List[Dict[str, str]], files: list) -> Tuple[List[Dict[str, str]], str]:
     try:
         safe_in, blocked_in, reason_in = safety_filter(user_msg, mode="input")
         if blocked_in:
-            return history + [(user_msg, refusal_reply(reason_in))], ""
+            reply = refusal_reply(reason_in)
+            new_hist = _append_msg(history_messages, "user", user_msg)
+            new_hist = _append_msg(new_hist, "assistant", reply)
+            return new_hist, ""
 
         # Normalize files -> paths (safe when files is None)
         file_paths = [getattr(f, "name", None) or f for f in (files or [])]
@@ -74,23 +81,30 @@ def handle(user_msg: str, history: list, files: list) -> Tuple[list, str]:
             narrative = generate_narrative(safe_in, structured_md, rag_hits)
 
             final = f"{structured_md}\n\n# Narrative & Recommendations\n\n{narrative}"
-            return history + [(user_msg, _sanitize_text(final))], ""
-
-        # General conversation mode (no scenario/files required)
-        prompt = f"{GENERAL_CONVERSATION_PROMPT}\n\nUser: {safe_in}\nAssistant:"
-        ans = cohere_chat(prompt) or open_fallback_chat(prompt) or "How can I help further?"
-        return history + [(user_msg, _sanitize_text(ans))], ""
+            reply = _sanitize_text(final)
+        else:
+            # General conversation mode (no scenario/files required)
+            prompt = f"{GENERAL_CONVERSATION_PROMPT}\n\nUser: {safe_in}\nAssistant:"
+            reply = cohere_chat(prompt) or open_fallback_chat(prompt) or "How can I help further?"
+            reply = _sanitize_text(reply)
+
+        # Append user then assistant messages to history
+        new_hist = _append_msg(history_messages, "user", user_msg)
+        new_hist = _append_msg(new_hist, "assistant", reply)
+        return new_hist, ""
 
     except Exception as e:
         tb = traceback.format_exc()
         log_event("app_error", None, {"err": str(e), "tb": tb})
-        return history + [(user_msg, f"Error: {e}\n\n{tb}")], ""
+        new_hist = _append_msg(history_messages, "user", user_msg)
+        new_hist = _append_msg(new_hist, "assistant", f"Error: {e}\n\n{tb}")
+        return new_hist, ""
 
 # -------- UI --------
 with gr.Blocks(analytics_enabled=False) as demo:
     gr.Markdown("## Canadian Healthcare AI • Scenario-Agnostic (Cohere primary • Deterministic analytics)")
-    # Use the correct plural form: 'tuples'
-    chat = gr.Chatbot(type="tuples", height=520)
+    # Use the new 'messages' format to avoid deprecation
+    chat = gr.Chatbot(type="messages", height=520)
     files = gr.Files(
         file_count="multiple",
         type="filepath",
@@ -101,6 +115,7 @@ with gr.Blocks(analytics_enabled=False) as demo:
     clear = gr.Button("Clear")
 
     def _on_send(m, h, f):
+        # h is already a list of {'role','content'} dicts with type="messages"
         h2, _ = handle(m, h or [], f or [])
         return h2, ""
 
@@ -110,4 +125,3 @@ with gr.Blocks(analytics_enabled=False) as demo:
 
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", server_port=int(os.getenv("PORT", "7860")))
-