Update app.py

app.py

@@ -136,30 +136,16 @@ def respond(
     chat_history: List[Tuple[str, str]], 
     genre: Optional[str] = None,
     use_full_memory: bool = True
-) -> List[Dict[str, str]]:  # Changed return type
+) -> List[Tuple[str, str]]:  # Changed return type to match Gradio's chatbot format
     """Generate a response based on the current message and conversation history."""
     if not message.strip():
-        return [{"role": "assistant", "content": "Please enter a message"}]
-
-    # Format messages for API
-    formatted_messages = [{"role": "system", "content": get_enhanced_system_prompt(genre)}]
-    
-    # Format chat history
-    if chat_history and use_full_memory:
-        for user_msg, bot_msg in chat_history[-MEMORY_WINDOW:]:
-            formatted_messages.extend([
-                {"role": "user", "content": str(user_msg)},
-                {"role": "assistant", "content": str(bot_msg)}
-            ])
-
-    # Add current message
-    formatted_messages.append({"role": "user", "content": str(message)})
+        return chat_history
 
     try:
-        # Ensure messages are properly formatted
+        # Format messages for API - always start with system prompt
         api_messages = [{"role": "system", "content": get_enhanced_system_prompt(genre)}]
         
-        # Add chat history
+        # Add chat history in correct format
         if chat_history and use_full_memory:
             for user_msg, bot_msg in chat_history[-MEMORY_WINDOW:]:
                 api_messages.extend([
@@ -172,17 +158,21 @@ def respond(
 
         # Make API call with properly formatted messages
         response = client.chat_completion(
-            messages=api_messages,
+            messages=api_messages,  # Use formatted messages
             max_tokens=MAX_TOKENS,
             temperature=TEMPERATURE,
             top_p=TOP_P
         )
         
+        # Extract bot message and append to history
         bot_message = response.choices[0].message.content
-        return chat_history + [(str(message), str(bot_message))]
+        new_history = list(chat_history)
+        new_history.append((str(message), str(bot_message)))
+        return new_history
                         
     except Exception as e:
-        return [{"role": "assistant", "content": f"Story magic temporarily interrupted. Please try again. (Error: {str(e)})"}]
+        # Return existing history plus error message
+        return chat_history + [(str(message), f"Story magic temporarily interrupted. Please try again. (Error: {str(e)})")]
 
 def save_story(chat_history):
     """Convert chat history to markdown for download"""
@@ -275,17 +265,14 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
             # 4) Connect each starter button:
             for starter_button in starter_buttons:
                 starter_button.click(
-                    fn=lambda x: [(x, "")],  # Simple tuple for chat history
+                    # Initial click creates empty chat history with starter message
+                    fn=lambda x: [(str(x), "")],
                     inputs=[starter_button],
                     outputs=[chatbot],
                     queue=False
-                ).success(  # Use success instead of then for better flow control
-                    fn=lambda x, h, g, m: respond(
-                        message=x,
-                        chat_history=h if h else [],
-                        genre=g,
-                        use_full_memory=m
-                    ),
+                ).success(
+                    # Then process the message with respond function
+                    fn=respond,
                     inputs=[
                         starter_button,  # The starter text
                         chatbot,         # Current chat history