fixed for demo

app.py

@@ -1,3 +1,4 @@
+import inspect
 import logging
 import uuid
 from typing import List
@@ -8,6 +9,9 @@ from core.conversation import ConversationEngine
 
 logging.basicConfig(level=logging.INFO)
 
+# Gradio 3.x and 4.x differ in Chatbot payload formats.
+_CHATBOT_SUPPORTS_MESSAGES = "type" in inspect.signature(gr.Chatbot.__init__).parameters
+
 try:
     engine = ConversationEngine()
     engine_error = None
@@ -19,7 +23,7 @@ except Exception as exc:  # noqa: BLE001
 
 def init_state():
     sid = engine.session_manager.new_session_id() if engine else str(uuid.uuid4())
-    return {"session_id": sid, "pending": False}
+    return {"session_id": sid, "pending": False, "triage_hold": False}
 
 
 def _normalize_choice(choice_value: str | None) -> str | None:
@@ -29,33 +33,55 @@ def _normalize_choice(choice_value: str | None) -> str | None:
     return value.split(":")[0].strip() if ":" in value else value
 
 
-def _ensure_message_history(history: List | None) -> list[dict[str, str]]:
-    """Convert legacy tuple chat history into Gradio message format."""
+def _ensure_chat_history(history: List | None):
+    """Normalize chat history for the running Gradio Chatbot."""
     if not history:
         return []
 
-    messages: list[dict[str, str]] = []
+    if _CHATBOT_SUPPORTS_MESSAGES:
+        messages: list[dict[str, str]] = []
+        for item in history:
+            if isinstance(item, dict) and "role" in item and "content" in item:
+                messages.append({"role": str(item["role"]), "content": str(item["content"])})
+            elif isinstance(item, (list, tuple)) and len(item) == 2:
+                user, assistant = item
+                if user is not None:
+                    messages.append({"role": "user", "content": str(user)})
+                if assistant is not None:
+                    messages.append({"role": "assistant", "content": str(assistant)})
+        return messages
+
+    # Gradio 3.x tuple format
+    pairs: list[tuple[str | None, str | None]] = []
+    pending_user: str | None = None
     for item in history:
-        if isinstance(item, dict) and "role" in item and "content" in item:
-            messages.append({"role": str(item["role"]), "content": str(item["content"])})
-        elif isinstance(item, (list, tuple)) and len(item) == 2:
-            user, assistant = item
-            if user is not None:
-                messages.append({"role": "user", "content": str(user)})
-            if assistant is not None:
-                messages.append({"role": "assistant", "content": str(assistant)})
-    return messages
-
-
-def _append_exchange(
-    history: list[dict[str, str]], user_text: str | None, assistant_text: str | None
-) -> list[dict[str, str]]:
-    updated = list(history)
-    if user_text is not None:
-        updated.append({"role": "user", "content": user_text})
-    if assistant_text is not None:
-        updated.append({"role": "assistant", "content": assistant_text})
-    return updated
+        if isinstance(item, (list, tuple)) and len(item) == 2:
+            pairs.append((item[0], item[1]))
+        elif isinstance(item, dict) and "role" in item and "content" in item:
+            role = item["role"]
+            if role == "user":
+                pending_user = str(item["content"])
+            elif role == "assistant":
+                pairs.append((pending_user, str(item["content"])))
+                pending_user = None
+    if pending_user is not None:
+        pairs.append((pending_user, None))
+    return pairs
+
+
+def _append_exchange(history, user_text: str | None, assistant_text: str | None):
+    """Append one exchange in the correct Chatbot format."""
+    if _CHATBOT_SUPPORTS_MESSAGES:
+        updated = list(history)
+        if user_text is not None:
+            updated.append({"role": "user", "content": user_text})
+        if assistant_text is not None:
+            updated.append({"role": "assistant", "content": assistant_text})
+        return updated
+
+    updated_pairs = list(history)
+    updated_pairs.append((user_text, assistant_text))
+    return updated_pairs
 
 
 def respond(
@@ -68,7 +94,14 @@ def respond(
     session_id = state.get("session_id") or init_state()["session_id"]
     state["session_id"] = session_id
 
-    history = _ensure_message_history(chat_history)
+    history = _ensure_chat_history(chat_history)
+    triage_hold = bool(state.get("triage_hold", False))
+
+    if triage_hold:
+        warn = "緊急性の警告が表示されています。「警告を承知して続ける」を押すと続行します。"
+        if user_message:
+            history = _append_exchange(history, user_message, warn)
+        return history, state, "", gr.update(choices=[], value=None, visible=False), [], {}
 
     if engine is None:
         reply = f"初期化エラー: {engine_error}. OPENAI_API_KEY を確認してください。"
@@ -95,8 +128,23 @@ def respond(
         result = engine.handle_user_message(session_id, user_message)
         user_bubble = user_message
 
+    if result.get("type") == "triage_warning":
+        state["triage_hold"] = True
+        state["pending"] = False
+        trace = result.get("trace", {})
+        history = _append_exchange(history, user_bubble, result["reply"])
+        return (
+            history,
+            state,
+            "",
+            gr.update(choices=[], value=None, visible=False),
+            [],
+            trace,
+        )
+
     if result.get("type") == "clarify":
         state["pending"] = True
+        state["triage_hold"] = False
         options = [f"{c.id}: {c.text}" for c in result["question"].choices]
         trace = result.get("trace", {})
         history = _append_exchange(history, user_bubble, result["reply"])
@@ -111,6 +159,7 @@ def respond(
 
     if result.get("type") == "answer":
         state["pending"] = False
+        state["triage_hold"] = False
         citations = result.get("citations", [])
         trace = result.get("trace", {})
         history = _append_exchange(history, user_bubble, result["reply"])
@@ -126,6 +175,7 @@ def respond(
     # error fallback
     history = _append_exchange(history, user_bubble, result.get("reply", "エラーが発生しました。"))
     state["pending"] = False
+    state["triage_hold"] = False
     trace = result.get("trace", {})
     return history, state, "", gr.update(choices=[], value=None, visible=False), citations, trace
 
@@ -135,6 +185,62 @@ def reset():
     return [], new_state, "", gr.update(choices=[], value=None, visible=False), [], {}
 
 
+def continue_after_warning(
+    chat_history: List[dict[str, str]] | List[tuple[str, str]],
+    app_state: dict,
+):
+    state = app_state or init_state()
+    session_id = state.get("session_id") or init_state()["session_id"]
+    state["session_id"] = session_id
+
+    history = _ensure_chat_history(chat_history)
+
+    if engine is None:
+        reply = f"初期化エラー: {engine_error}. OPENAI_API_KEY を確認してください。"
+        history = _append_exchange(history, None, reply)
+        state["triage_hold"] = False
+        return history, state, "", gr.update(choices=[], value=None, visible=False), [], {}
+
+    result = engine.continue_after_warning(session_id)
+
+    if result.get("type") == "clarify":
+        state["pending"] = True
+        state["triage_hold"] = False
+        options = [f"{c.id}: {c.text}" for c in result["question"].choices]
+        trace = result.get("trace", {})
+        history = _append_exchange(history, None, result["reply"])
+        return (
+            history,
+            state,
+            "",
+            gr.update(choices=options, value=None, visible=True),
+            [],
+            trace,
+        )
+
+    if result.get("type") == "answer":
+        state["pending"] = False
+        state["triage_hold"] = False
+        citations = result.get("citations", [])
+        trace = result.get("trace", {})
+        history = _append_exchange(history, None, result["reply"])
+        return (
+            history,
+            state,
+            "",
+            gr.update(choices=[], value=None, visible=False),
+            citations,
+            trace,
+        )
+
+    # error or unexpected
+    history = _append_exchange(history, None, result.get("reply", "エラーが発生しました。"))
+    state["pending"] = False
+    state["triage_hold"] = False
+    trace = result.get("trace", {})
+    return history, state, "", gr.update(choices=[], value=None, visible=False), [], trace
+
+
 with gr.Blocks() as demo:
     gr.HTML(
         """
@@ -153,7 +259,10 @@ with gr.Blocks() as demo:
     )
     with gr.Row():
         with gr.Column(scale=3):
-            chatbot = gr.Chatbot(label="対話", height=520)
+            chatbot_kwargs = {"label": "対話", "height": 520}
+            if _CHATBOT_SUPPORTS_MESSAGES:
+                chatbot_kwargs["type"] = "messages"
+            chatbot = gr.Chatbot(**chatbot_kwargs)
             user_input = gr.Textbox(
                 label="質問を入力",
                 placeholder="例: 熱があって食欲がないときインスリンはどうする？",
@@ -162,6 +271,7 @@ with gr.Blocks() as demo:
             choice_radio = gr.Radio(label="Clarifying 選択肢", choices=[], visible=False)
             with gr.Row():
                 send_btn = gr.Button("送信", variant="primary")
+                continue_btn = gr.Button("警告を承知して続ける", variant="secondary")
                 reset_btn = gr.Button("新しいセッション", variant="secondary")
         with gr.Column(scale=2):
             gr.Markdown(
@@ -183,8 +293,21 @@ with gr.Blocks() as demo:
         inputs=[user_input, chatbot, state, choice_radio],
         outputs=[chatbot, state, user_input, choice_radio, sources, trace_view],
     )
+    continue_btn.click(
+        continue_after_warning,
+        inputs=[chatbot, state],
+        outputs=[chatbot, state, user_input, choice_radio, sources, trace_view],
+    )
     reset_btn.click(reset, outputs=[chatbot, state, user_input, choice_radio, sources, trace_view])
 
 
 if __name__ == "__main__":
-    demo.queue().launch()
+    launch_opts = {}
+    try:
+        launch_sig = inspect.signature(gr.Blocks.launch)
+        if "ssr_mode" in launch_sig.parameters:
+            launch_opts["ssr_mode"] = False  # disable experimental SSR to avoid shutdown quirks
+    except Exception:
+        pass
+
+    demo.queue().launch(**launch_opts)

core/conversation.py

@@ -82,7 +82,13 @@ class ConversationEngine:
             )
         return cites
 
-    def _run_pipeline(self, session: SessionState, user_input: str, append_user: bool) -> Dict:
+    def _run_pipeline(
+        self,
+        session: SessionState,
+        user_input: str,
+        append_user: bool,
+        force_continue: bool = False,
+    ) -> Dict:
         trace: Dict[str, object] = {"state": dict(session.patient_state)}
         if append_user:
             session.messages.append({"role": "user", "content": user_input})
@@ -91,14 +97,17 @@ class ConversationEngine:
         # Step 3: emergency triage
         emergency, label = self.llm.triage_emergency(session.messages)
         trace["triage"] = label
-        if emergency:
+        if emergency and not force_continue:
             reply = (
-                "緊急性が疑われます。意識がぼんやりする、けいれん、"
-                "強い息切れや胸痛がある場合は、ただちに救急要請や受診をしてください。"
-                "ご本人が口から摂取できない場合も同様です。"
+                "緊急性が疑われます。意識がぼんやりする、けいれん、強い息切れや胸痛がある場合は、"
+                "ただちに救急要請や受診をしてください。ご本人が口から摂取できない場合も同様です。"
+                "\n\n警告を確認し、続けて確認する場合は画面下の「警告を承知して続ける」を押してください。"
             )
             session.messages.append({"role": "assistant", "content": reply})
-            return {"type": "answer", "reply": reply, "citations": [], "trace": trace}
+            session.pending_emergency = True
+            return {"type": "triage_warning", "reply": reply, "citations": [], "trace": trace}
+
+        session.pending_emergency = False
 
         # Step 4: PageIndex search
         query_text = self._build_query(user_input, session.patient_state, None)
@@ -176,6 +185,14 @@ class ConversationEngine:
         session = self.session_manager.get(session_id)
         return self._run_pipeline(session, user_input, append_user=True)
 
+    def continue_after_warning(self, session_id: str) -> Dict:
+        session = self.session_manager.get(session_id)
+        if not session.pending_emergency:
+            return {"type": "error", "reply": "現在表示中の緊急性警告はありません。"}
+        if not session.last_user_query:
+            return {"type": "error", "reply": "前の質問が見つかりません。再度質問してください。"}
+        return self._run_pipeline(session, session.last_user_query, append_user=False, force_continue=True)
+
     def handle_clarifying_answer(self, session_id: str, choice_id: str) -> Dict:
         session = self.session_manager.get(session_id)
         pending = session.pending_clarifying

core/state.py

@@ -14,6 +14,7 @@ class SessionState:
     patient_state: Dict[str, object] = field(default_factory=dict)
     last_user_query: str | None = None
     pending_clarifying: dict | None = None  # {"question_id": str, "choice_map": {...}}
+    pending_emergency: bool = False  # triage warning state
 
 
 class SessionManager: