Update app.py

app.py

@@ -136,46 +136,39 @@ def respond(
     chat_history: List[Tuple[str, str]], 
     genre: Optional[str] = None,
     use_full_memory: bool = True
-) -> Generator[List[Tuple[str, str]], None, None]:
+) -> List[Tuple[str, str]]:  # Changed return type
     """Generate a response based on the current message and conversation history."""
     if not message.strip():
         return chat_history
 
-    # Format messages for the API
-    formatted_messages = [{
-        "role": "system",
-        "content": get_enhanced_system_prompt(genre)
-    }]
+    # Ensure formatted_messages is correctly structured
+    formatted_messages = [{"role": "system", "content": get_enhanced_system_prompt(genre)}]
     
-    # Add chat history
+    # Add chat history correctly
     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)
-    })
+            formatted_messages.append({"role": "user", "content": str(user_msg)})
+            formatted_messages.append({"role": "assistant", "content": str(bot_msg)})
+
+    # Append user message
+    formatted_messages.append({"role": "user", "content": str(message)})
 
     try:
+        # Make API call with correct message structure
         response = client.chat_completion(
-            formatted_messages,
+            messages=formatted_messages,
             max_tokens=MAX_TOKENS,
             temperature=TEMPERATURE,
             top_p=TOP_P
         )
+
+        # Extract and format bot response
         bot_message = response.choices[0].message.content
-        new_history = list(chat_history) + [(message, bot_message)]
-        return new_history
+        return chat_history + [(str(message), str(bot_message))]
                         
     except Exception as e:
         error_message = f"Story magic temporarily interrupted. Please try again. (Error: {str(e)})"
-        error_history = list(chat_history) + [(message, error_message)]
-        return error_history
+        return chat_history + [(str(message), str(error_message))]
 
 def save_story(chat_history):
     """Convert chat history to markdown for download"""
@@ -268,7 +261,7 @@ 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: {"role": "user", "content": str(x)},  # Format as message dict
+                    fn=lambda x: [(str(x), "")],  # Return initial history tuple
                     inputs=[starter_button],
                     outputs=[chatbot],
                     queue=False
@@ -318,4 +311,3 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
 # Run the app
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", server_port=7860)
-