Update app.py

app.py

@@ -173,7 +173,7 @@ DEFAULT_CHARACTER = Character.model_validate_json(DEFAULT_CHARACTER_JSON)
 DECK_PATH = Path(__file__).with_name("tacklebox_deck.json")
 DECK_DATA = json.loads(DECK_PATH.read_text(encoding="utf-8"))
 
-ChatHistory = List[Tuple[str, str]]
+ChatHistory = List[Dict[str, Any]]
 
 
 def fresh_deck() -> TackleboxDeck:
@@ -198,14 +198,58 @@ def get_openai_client(api_key: Optional[str]) -> OpenAI:
     return OpenAI(api_key=key)
 
 
+def content_to_text(content: Any) -> str:
+    """Extract displayable text from Gradio/OpenAI-style content structures."""
+    if content is None:
+        return ""
+    if isinstance(content, str):
+        return content
+    if isinstance(content, list):
+        parts: List[str] = []
+        for part in content:
+            if isinstance(part, dict):
+                if part.get("type") == "text" and "text" in part:
+                    parts.append(str(part["text"]))
+                elif "text" in part:
+                    parts.append(str(part["text"]))
+            elif part is not None:
+                parts.append(str(part))
+        return "\n".join(p for p in parts if p)
+    if isinstance(content, dict):
+        if content.get("type") == "text" and "text" in content:
+            return str(content["text"])
+        if "text" in content:
+            return str(content["text"])
+        return ""
+    return str(content)
+
+
 def normalize_history(history: Optional[List[Any]]) -> ChatHistory:
-    """Coerce Gradio chat history into a predictable list of string pairs."""
-    normalized: ChatHistory = []
-    for turn in history or []:
+    """Coerce Gradio chat history into openai-style message dicts."""
+    raw = history or []
+    if not isinstance(raw, list) or not raw:
+        return []
+
+    if isinstance(raw[0], dict):
+        normalized: ChatHistory = []
+        for msg in raw:
+            if not isinstance(msg, dict):
+                continue
+            role = msg.get("role")
+            if not role:
+                continue
+            normalized.append(msg)
+        return normalized
+
+    normalized = []
+    for turn in raw:
         if not isinstance(turn, (list, tuple)) or len(turn) != 2:
             continue
         user_turn, assistant_turn = turn
-        normalized.append((str(user_turn or ""), str(assistant_turn or "")))
+        if user_turn:
+            normalized.append({"role": "user", "content": str(user_turn)})
+        if assistant_turn:
+            normalized.append({"role": "assistant", "content": str(assistant_turn)})
     return normalized
 
 
@@ -446,11 +490,15 @@ def generate_model_reply(
     base_prompt = append_ai_hand_to_prompt(persona_prompt, ai_hand)
     messages: List[Dict[str, Any]] = [{"role": "system", "content": base_prompt}]
 
-    for user_turn, assistant_turn in history:
-        if user_turn:
-            messages.append({"role": "user", "content": user_turn})
-        if assistant_turn:
-            messages.append({"role": "assistant", "content": assistant_turn})
+    for msg in history:
+        if not isinstance(msg, dict):
+            continue
+        role = msg.get("role")
+        if role not in ("user", "assistant"):
+            continue
+        text = content_to_text(msg.get("content"))
+        if text:
+            messages.append({"role": role, "content": text})
 
     tool_output_note = ""
     if tool_results.get("tool_outputs"):
@@ -712,7 +760,7 @@ def grab_card_for_player(
     if not card:
         status = hand_status_md(deck, player_hand) + " • **No more cards** in the tackle box."
         notice = "*You reached for the tacklebox, but it was empty.*"
-        chat_history.append((notice, ""))
+        chat_history.append({"role": "assistant", "content": notice})
         return render_hand_html(player_hand), status, chat_history, deck, player_hand, ai_hand
 
     player_hand.add_card(card)
@@ -732,7 +780,7 @@ def grab_card_for_player(
         notice_lines.append(shared_with_ai_notice)
 
     notice = "\n".join(notice_lines)
-    chat_history.append((notice, ""))
+    chat_history.append({"role": "assistant", "content": notice})
     return render_hand_html(player_hand), status, chat_history, deck, player_hand, ai_hand
 
 
@@ -742,6 +790,18 @@ def show_ai_hand_debug(ai_hand_state: Optional[Hand]) -> str:
     return format_ai_hand_debug(ai_hand)
 
 
+def example_prompt_water() -> str:
+    return "Hey, how does the water look today?"
+
+
+def example_prompt_catch() -> str:
+    return "What do you think we might catch?"
+
+
+def example_prompt_memory() -> str:
+    return "Remember fishing when we were young?"
+
+
 def reset_session() -> Tuple[str, str, ChatHistory, TackleboxDeck, Hand, Hand]:
     hand_html, status, chat_history, deck, player_hand, ai_hand = init_session()
     return hand_html, status + " • Reset.", chat_history, deck, player_hand, ai_hand
@@ -904,8 +964,22 @@ with gr.Blocks(title="Tacklebox - Player 2 Customizer", css=CUSTOM_CSS) as demo:
                     reset_btn = gr.Button("Reset session", variant="secondary")
 
             with gr.Group(elem_classes=["section-card"]):
+                with gr.Row():
+                    prompt_water_btn = gr.Button("Water today?")
+                    prompt_catch_btn = gr.Button("What might we catch?")
+                    prompt_memory_btn = gr.Button("Old memory")
+
+                chat_input = gr.Textbox(
+                    placeholder="Say something as Robin…",
+                    container=False,
+                )
+                chat_bot = gr.Chatbot(type="messages", height=360)
+
                 chat = gr.ChatInterface(
                     orchestrate_chat,
+                    type="messages",
+                    chatbot=chat_bot,
+                    textbox=chat_input,
                     additional_inputs=[
                         persona_prompt_state,
                         api_key_state,
@@ -922,13 +996,16 @@ with gr.Blocks(title="Tacklebox - Player 2 Customizer", css=CUSTOM_CSS) as demo:
                     ],
                     title="Tacklebox Chat",
                     description="Robin chats with Player 2 (LLM persona).",
-                    examples=[
-                        ["Hey, how does the water look today?"],
-                        ["What do you think we might catch?"],
-                        ["Remember fishing when we were young?"],
-                    ],
+                    # On Hugging Face Spaces, examples are cached by default which can
+                    # break startup (and/or trigger OpenAI calls) when additional
+                    # inputs/outputs include complex state.
+                    cache_examples=False,
                 )
 
+                prompt_water_btn.click(example_prompt_water, outputs=chat_input)
+                prompt_catch_btn.click(example_prompt_catch, outputs=chat_input)
+                prompt_memory_btn.click(example_prompt_memory, outputs=chat_input)
+
     apply_btn.click(
         update_player_two_from_form,
         inputs=[
@@ -976,4 +1053,9 @@ with gr.Blocks(title="Tacklebox - Player 2 Customizer", css=CUSTOM_CSS) as demo:
 
 
 if __name__ == "__main__":
-    demo.launch()
+    try:
+        demo.launch(ssr_mode=False)
+    except TypeError as exc:
+        if "ssr_mode" not in str(exc):
+            raise
+        demo.launch()