Update hardware_qa_assistant_lang_graph_gradio_demo_version_users.py

hardware_qa_assistant_lang_graph_gradio_demo_version_users.py

@@ -1309,21 +1309,26 @@ APP = build_graph()
 # Gradio UI — simple but expressive for demos
 # =====================
 
-def to_pairs(history: List[Dict[str, str]]):
-    """Convert role-wise history into Chatbot (user, assistant) pairs."""
-    pairs: List[Tuple[str, str]] = []
-    u: Optional[str] = None
-    for m in history:
-        if m['role'] == 'user':
-            u = m['content']
-        elif m['role'] == 'assistant' and u is not None:
-            pairs.append((u, m['content']))
-            u = None
-    return pairs
+def normalize_messages(chat_history):
+    """
+    Ensure Chatbot history is a list of {"role":..., "content":...}.
+    """
+    if not chat_history:
+        return []
+    # Already messages format
+    if isinstance(chat_history, list) and isinstance(chat_history[0], dict):
+        return chat_history
+    # If something else sneaks in, fail safe:
+    out = []
+    for item in chat_history:
+        if isinstance(item, dict) and "role" in item and "content" in item:
+            out.append({"role": item["role"], "content": str(item["content"])})
+    return out
+
 
 def run_once(request: gr.Request,
              thread_id: str,
-             chat_pairs: List[Tuple[str, str]],
+             chat_history: List[Dict[str, str]],
              msg: str,
              files: List[gr.File],
              project: str,
@@ -1337,13 +1342,8 @@ def run_once(request: gr.Request,
     # Who is logged in?
     user_email = current_user(request)
 
-    # Rehydrate conversation history into role messages
-    history: List[Dict[str, str]] = []
-    for u_msg, a_msg in (chat_pairs or []):
-        history += [
-            {"role": "user", "content": u_msg},
-            {"role": "assistant", "content": a_msg},
-        ]
+    # Chatbot now stores OpenAI-style messages directly
+    history: List[Dict[str, str]] = normalize_messages(chat_history)
 
     # Read uploaded files as bytes now (Gradio gives temp filepaths)
     uploads: List[Dict[str, Any]] = []
@@ -1392,7 +1392,7 @@ def run_once(request: gr.Request,
 
     # Expose a Markdown report file if the session ended this turn
     report_path = out.get('report_path', None)
-    return to_pairs(history), (report_path if report_path else None), trace_md, dag_img
+    return history, (report_path if report_path else None), trace_md, dag_img
 
 def build_gradio_blocks(auth_secret: Optional[str] = None):
     # 👇 Force the same secret that FastAPI used to sign the JWT
@@ -1439,7 +1439,7 @@ def build_gradio_blocks(auth_secret: Optional[str] = None):
                     ocr_backend = gr.Dropdown(choices=["paddle","tesseract","auto"], value=OCR_BACKEND, label="OCR backend")
                     do_web_search = gr.Checkbox(value=True if tavily else False, label="Use Tavily web search if needed")
 
-                chat = gr.Chatbot(height=560, elem_id="chatui", type="tuples")
+                chat = gr.Chatbot(height=560, elem_id="chatui", type="messages")
 
                 # Uploader + Vision checkbox side-by-side (compact)
 
@@ -1577,10 +1577,12 @@ def build_gradio_blocks(auth_secret: Optional[str] = None):
                 # Put message into chat so user understands what to do
                 if c is None:
                     c = []
-                c = c + [("", "❗Please enter your name first (required).")]
+                c = normalize_messages(c)
+                c = c + [{"role": "assistant", "content": "❗Please enter your name first (required)."}]
                 return c, gr.update(value=None, visible=False), "(Enter your name first)", None, gr.update(), gr.update()
 
-            chat_pairs, summary_path, trace_md_val, dag_img_val = \
+
+            chat_history, summary_path, trace_md_val, dag_img_val = \
                 run_once(request, t, c, m, f, proj, prov, mdl, ocr, web, schem, progress=progress)
 
             upload_reset = gr.update(value=None)
@@ -1590,7 +1592,7 @@ def build_gradio_blocks(auth_secret: Optional[str] = None):
             summary_upd = (gr.update(value=summary_path, visible=True)
                         if summary_path else gr.update(value=None, visible=False))
 
-            return chat_pairs, summary_upd, trace_md_val, dag_img_val, upload_reset, msg_reset
+            return chat_history, summary_upd, trace_md_val, dag_img_val, upload_reset, msg_reset
 
 
         refresh_btn.click(ui_refresh, inputs=None, outputs=[project_dd, user_md])