Deploy TextAI v2 - Clean architecture

app.py

@@ -100,6 +100,34 @@ def _estimate_title(conv: Dict[str, Any]) -> str:
     return "New chat"
 
 
+def _to_chatbot_format(messages: List[Dict[str, Any]]) -> List[Tuple[Optional[str], Optional[str]]]:
+    """Convert messages to Gradio Chatbot tuple format: [(user, assistant), ...]"""
+    result = []
+    i = 0
+    while i < len(messages):
+        user_msg = None
+        assistant_msg = None
+
+        # Get user message
+        if i < len(messages) and messages[i].get("role") == "user":
+            content = messages[i].get("content", "")
+            if isinstance(content, list):
+                user_msg = " ".join(str(c) if isinstance(c, str) else f"[file]" for c in content)
+            else:
+                user_msg = str(content)
+            i += 1
+
+        # Get assistant message
+        if i < len(messages) and messages[i].get("role") == "assistant":
+            assistant_msg = str(messages[i].get("content", ""))
+            i += 1
+
+        if user_msg is not None or assistant_msg is not None:
+            result.append((user_msg, assistant_msg))
+
+    return result
+
+
 def _strip_content_for_prompt(messages: List[Dict[str, Any]]) -> List[Dict[str, str]]:
     """Convert messages to simple role/content format for API calls"""
     out = []
@@ -246,7 +274,7 @@ def ui_new_chat(state):
 def ui_select_chat(state, conv_id):
     state = _set_active(state, conv_id)
     conv = _active_conv(state)
-    return state, conv["messages"], conv["title"]
+    return state, _to_chatbot_format(conv["messages"]), conv["title"]
 
 
 def ui_rename_chat(state, new_title):
@@ -264,7 +292,7 @@ def ui_delete_chat(state):
     else:
         state["active_id"] = state["conversations"][0]["id"]
     conv = _active_conv(state)
-    return state, _conv_choices(state), conv["id"], conv["messages"], conv["title"]
+    return state, _conv_choices(state), conv["id"], _to_chatbot_format(conv["messages"]), conv["title"]
 
 
 def ui_export(state):
@@ -277,7 +305,7 @@ def ui_export(state):
 def ui_import(state, file_obj):
     if file_obj is None:
         conv = _active_conv(state)
-        return state, _conv_choices(state), state["active_id"], conv["messages"], conv["title"]
+        return state, _conv_choices(state), state["active_id"], _to_chatbot_format(conv["messages"]), conv["title"]
     try:
         with open(file_obj.name, "r", encoding="utf-8") as f:
             loaded = json.load(f)
@@ -290,7 +318,7 @@ def ui_import(state, file_obj):
     except Exception:
         pass
     conv = _active_conv(state)
-    return state, _conv_choices(state), conv["id"], conv["messages"], conv["title"]
+    return state, _conv_choices(state), conv["id"], _to_chatbot_format(conv["messages"]), conv["title"]
 
 
 def ui_add_user_message(state, mm_value):
@@ -314,7 +342,7 @@ def ui_add_user_message(state, mm_value):
                 content_parts.append({"path": f})
 
     if not content_parts:
-        return state, conv["messages"], gr.MultimodalTextbox(value=None)
+        return state, _to_chatbot_format(conv["messages"]), gr.MultimodalTextbox(value=None)
 
     conv["messages"].append({
         "role": "user",
@@ -325,7 +353,7 @@ def ui_add_user_message(state, mm_value):
     if conv["title"] == "New chat":
         conv["title"] = _estimate_title(conv)
 
-    return state, conv["messages"], gr.MultimodalTextbox(value=None)
+    return state, _to_chatbot_format(conv["messages"]), gr.MultimodalTextbox(value=None)
 
 
 def ui_regenerate_prepare(state):
@@ -333,7 +361,7 @@ def ui_regenerate_prepare(state):
     if conv["messages"] and conv["messages"][-1].get("role") == "assistant":
         conv["messages"].pop()
         _touch(conv)
-    return state, conv["messages"]
+    return state, _to_chatbot_format(conv["messages"])
 
 
 def ui_generate_assistant(state, backend, system_prompt, temperature, max_tokens,
@@ -356,7 +384,7 @@ def ui_generate_assistant(state, backend, system_prompt, temperature, max_tokens
 
     for partial in pseudo_stream(full):
         conv["messages"][-1]["content"] = partial
-        yield state, conv["messages"]
+        yield state, _to_chatbot_format(conv["messages"])
 
 
 # ═══════════════════════════════════════════════════════════════════════════════
@@ -594,7 +622,6 @@ with gr.Blocks(title=APP_TITLE) as demo:
 
             chatbot = gr.Chatbot(
                 elem_id="chatbot",
-                type="messages",
                 height=550,
             )
 
@@ -614,7 +641,7 @@ with gr.Blocks(title=APP_TITLE) as demo:
         choices = _conv_choices(s)
         active = s["active_id"]
         conv = _active_conv(s)
-        return choices, active, conv["title"], conv["messages"]
+        return choices, active, conv["title"], _to_chatbot_format(conv["messages"])
 
     demo.load(
         _init_sidebar,