updated

app.py

@@ -1,7 +1,7 @@
 import inspect
 import logging
 import uuid
-from typing import List, Tuple
+from typing import List, Dict
 
 import gradio as gr
 
@@ -31,7 +31,7 @@ def _normalize_choice(choice_value: str | None) -> str | None:
 
 
 def _extract_text(item) -> str:
-    """Extract plain text from any Gradio message format."""
+    """Recursively extract plain text from any Gradio message format."""
     if item is None:
         return ""
     if isinstance(item, str):
@@ -54,29 +54,61 @@ def _extract_text(item) -> str:
     return str(item)
 
 
+def _ensure_messages_format(history: List) -> List[Dict[str, str]]:
+    """Convert any history format to messages format: [{"role": "user", "content": "..."}, ...]"""
+    if not history:
+        return []
+    
+    messages: List[Dict[str, str]] = []
+    for item in history:
+        if isinstance(item, dict) and "role" in item and "content" in item:
+            # Already messages format - extract clean text
+            content = _extract_text(item.get("content"))
+            if content:
+                messages.append({"role": str(item["role"]), "content": content})
+        elif hasattr(item, "role") and hasattr(item, "content"):
+            # ChatMessage object
+            content = _extract_text(getattr(item, "content"))
+            if content:
+                messages.append({"role": str(getattr(item, "role")), "content": content})
+        elif isinstance(item, (list, tuple)) and len(item) == 2:
+            # Tuple format (user, assistant)
+            user_text = _extract_text(item[0])
+            bot_text = _extract_text(item[1])
+            if user_text:
+                messages.append({"role": "user", "content": user_text})
+            if bot_text:
+                messages.append({"role": "assistant", "content": bot_text})
+    
+    return messages
+
+
+def _append_message(history: List[Dict], role: str, content: str) -> List[Dict]:
+    """Append a message in messages format."""
+    new_history = list(history)
+    if content:
+        new_history.append({"role": role, "content": content})
+    return new_history
+
+
 def respond(
     user_message: str,
-    chat_history: List[Tuple[str | None, str | None]],
+    chat_history: List,
     app_state: dict,
     choice_value: str | None,
 ):
-    """Main response handler using tuples format: [(user_msg, bot_msg), ...]"""
+    """Main response handler using messages format."""
     state = app_state or init_state()
     session_id = state.get("session_id") or init_state()["session_id"]
     state["session_id"] = session_id
 
-    # Ensure history is a clean list of tuples with plain strings
-    history: List[Tuple[str | None, str | None]] = []
-    if chat_history:
-        for item in chat_history:
-            if isinstance(item, (list, tuple)) and len(item) == 2:
-                user_text = _extract_text(item[0])
-                bot_text = _extract_text(item[1])
-                history.append((user_text or None, bot_text or None))
+    # Normalize history to clean messages format
+    history = _ensure_messages_format(chat_history)
 
     if engine is None:
         reply = f"初期化エラー: {engine_error}. OPENAI_API_KEY を確認してください。"
-        history.append((user_message or "(入力なし)", reply))
+        history = _append_message(history, "user", user_message or "(入力なし)")
+        history = _append_message(history, "assistant", reply)
         return history, state, "", gr.update(choices=[], value=None, visible=False), [], {}
 
     pending = state.get("pending", False)
@@ -93,7 +125,8 @@ def respond(
     else:
         if not user_message:
             warn = "質問を入力してください。"
-            history.append(("(入力なし)", warn))
+            history = _append_message(history, "user", "(入力なし)")
+            history = _append_message(history, "assistant", warn)
             return history, state, "", gr.update(choices=[], value=None, visible=False), citations, trace
         result = engine.handle_user_message(session_id, user_message)
         user_bubble = user_message
@@ -102,7 +135,8 @@ def respond(
         state["pending"] = True
         options = [f"{c.id}: {c.text}" for c in result["question"].choices]
         trace = result.get("trace", {})
-        history.append((user_bubble, result["reply"]))
+        history = _append_message(history, "user", user_bubble)
+        history = _append_message(history, "assistant", result["reply"])
         return (
             history,
             state,
@@ -116,7 +150,8 @@ def respond(
         state["pending"] = False
         citations = result.get("citations", [])
         trace = result.get("trace", {})
-        history.append((user_bubble, result["reply"]))
+        history = _append_message(history, "user", user_bubble)
+        history = _append_message(history, "assistant", result["reply"])
         return (
             history,
             state,
@@ -127,7 +162,8 @@ def respond(
         )
 
     # Error fallback
-    history.append((user_bubble, result.get("reply", "エ��ーが発生しました。")))
+    history = _append_message(history, "user", user_bubble)
+    history = _append_message(history, "assistant", result.get("reply", "エラーが発生しました。"))
     state["pending"] = False
     trace = result.get("trace", {})
     return history, state, "", gr.update(choices=[], value=None, visible=False), citations, trace
@@ -156,7 +192,7 @@ with gr.Blocks() as demo:
     )
     with gr.Row():
         with gr.Column(scale=3):
-            # Tuples format: [(user_msg, bot_msg), ...]
+            # Messages format for Gradio 4.44+
             chatbot = gr.Chatbot(label="対話", height=520)
             user_input = gr.Textbox(
                 label="質問を入力",