Update app.py

app.py

@@ -78,6 +78,7 @@ def is_identity_query(message, history):
     return False
 
 def _iter_user_assistant(history):
+    # history is a list of (user, assistant) tuples (Chatbot default format)
     for item in (history or []):
         if isinstance(item, (list, tuple)):
             u = item[0] if len(item) > 0 else ""
@@ -133,6 +134,7 @@ def load_local_model():
     return mdl, tok
 
 def build_inputs(tokenizer, message, history):
+    # Convert tuple history to chat template input for HF models
     msgs = []
     for u, a in _iter_user_assistant(history):
         if u: msgs.append({"role": "user", "content": u})
@@ -227,7 +229,7 @@ def clarityops_reply(user_msg, history, tz, uploaded_files_paths):
         )
         computed = compute_operational_numbers(snapshot)
 
-        # Smart scenario detection: if user message itself looks like exec MDSi context, include the pre-compute block
+        # Smart scenario detection: if user message suggests exec MDSi context, include pre-compute block
         user_lower = (safe_in or "").lower()
         mdsi_extra = _mdsi_block() if ("diabetes" in user_lower or "mdsi" in user_lower or "mobile screening" in user_lower) else ""
 
@@ -321,8 +323,8 @@ with gr.Blocks(theme=theme, css=custom_css) as demo:
 
     gr.Markdown("# ClarityOps Augmented Decision AI")
 
-    # Main chat area
-    chat = gr.Chatbot(label="", show_label=False, type="messages", height=700)
+    # Main chat area (IMPORTANT: no type="messages" -> uses tuple history)
+    chat = gr.Chatbot(label="", show_label=False, height=700)
 
     # ---- Bottom bar: uploads + message box + send/clear ----
     with gr.Row():
@@ -330,12 +332,16 @@ with gr.Blocks(theme=theme, css=custom_css) as demo:
             label="Upload docs/images (PDF, DOCX, CSV, PNG, JPG)",
             file_types=["file"],
             file_count="multiple",
-            # keep compact footprint
             height=68
         )
 
     with gr.Row():
-        msg = gr.Textbox(placeholder="Type a message… (paste scenarios here too; ClarityOps will adapt)", scale=10)
+        msg = gr.Textbox(
+            label="",
+            show_label=False,
+            placeholder="Type a message… (paste scenarios here too; ClarityOps will adapt)",
+            scale=10
+        )
         send = gr.Button("Send", scale=1)
         clear = gr.Button("Clear chat", scale=1)
 
@@ -347,23 +353,22 @@ with gr.Blocks(theme=theme, css=custom_css) as demo:
     def _store_uploads(files, current):
         paths = []
         for f in (files or []):
-            # gradio Files returns tempfile objects with .name
             paths.append(getattr(f, "name", None) or f)
         return (current or []) + paths
 
     uploads.change(fn=_store_uploads, inputs=[uploads, state_uploaded], outputs=state_uploaded)
 
-    # Send message -> compute reply -> update chat
+    # Send message -> compute reply -> update chat & history
     def _on_send(user_msg, history, tz, up_paths):
         if not user_msg or not user_msg.strip():
-            return history, ""  # no-op
+            return history, "", history  # no-op
         new_history = clarityops_reply(user_msg.strip(), history or [], tz, up_paths or [])
-        return new_history, ""
+        return new_history, "", new_history
 
     send.click(
         fn=_on_send,
         inputs=[msg, state_history, tz_box, state_uploaded],
-        outputs=[chat, msg],
+        outputs=[chat, msg, state_history],
         queue=True,
     )
 
@@ -371,21 +376,16 @@ with gr.Blocks(theme=theme, css=custom_css) as demo:
     msg.submit(
         fn=_on_send,
         inputs=[msg, state_history, tz_box, state_uploaded],
-        outputs=[chat, msg],
+        outputs=[chat, msg, state_history],
         queue=True,
     )
 
-    # Keep Chatbot history state in sync whenever it updates
-    chat.change(lambda h: h, inputs=chat, outputs=state_history)
-
     # Clear chat (keeps uploads so you can keep referencing docs)
     def _clear_chat():
-        return [], []
-    clear.click(lambda: [], None, chat)
-    # If you also want to clear uploads, uncomment below:
-    # clear.click(_clear_chat, None, [chat, state_uploaded])
+        return [], [], []
+    # Clear only chat + input; keep uploads
+    clear.click(lambda: ([], "", []), None, [chat, msg, state_history])
 
 if __name__ == "__main__":
     port = int(os.environ.get("PORT", "7860"))
     demo.launch(server_name="0.0.0.0", server_port=port, show_api=False, max_threads=8)
-