fixed roles issue in chat

app.py

@@ -98,8 +98,24 @@ def generate_reply(chat_history, user_message, max_new_tokens=512, temperature=0
     return reply
 
 def gradio_chat(user_message, history, max_new_tokens, temperature, top_p):
-    # Gradio 6.0.2 Chatbot returns list of (user, assistant) tuples
-    history_pairs = history or []
+    # Chatbot (type="messages") returns list of dicts with role/content
+    history_messages = history or []
+
+    # Convert role/content messages into (user, assistant) pairs for the model
+    history_pairs = []
+    pending_user = None
+    for msg in history_messages:
+        if isinstance(msg, (list, tuple)) and len(msg) == 2:
+            history_pairs.append((msg[0], msg[1]))
+            pending_user = None
+            continue
+        role = msg.get("role")
+        content = msg.get("content", "")
+        if role == "user":
+            pending_user = content
+        elif role == "assistant":
+            history_pairs.append((pending_user or "", content))
+            pending_user = None
 
     reply = generate_reply(
         history_pairs,
@@ -109,8 +125,10 @@ def gradio_chat(user_message, history, max_new_tokens, temperature, top_p):
         top_p=float(top_p),
     )
 
-    # Return as list of (user, assistant) tuples
-    new_history = history_pairs + [(user_message, reply)]
+    new_history = history_messages + [
+        {"role": "user", "content": user_message},
+        {"role": "assistant", "content": reply},
+    ]
 
     return "", new_history
 
@@ -481,7 +499,8 @@ with gr.Blocks() as demo:
                 height=550,
                 show_label=False,
                 avatar_images=(None, "ml-chat.png"),
-                elem_classes="chatbot"
+                elem_classes="chatbot",
+                type="messages",
             )
 
         # Settings sidebar