Update app.py

app.py

@@ -126,14 +126,8 @@ def create_story_summary(chat_history):
     return summary_instruction
 
 def format_history_for_gradio(history_tuples):
-    """Convert (user, bot) tuples into Gradio 'messages' format (role/content dicts)."""
-    messages = []
-    for user_msg, bot_msg in history_tuples:
-        messages.extend([
-            {"role": "user", "content": str(user_msg)},
-            {"role": "assistant", "content": str(bot_msg)}
-        ])
-    return messages
+    """Convert chat history to Gradio's message format."""
+    return [(str(user_msg), str(bot_msg)) for user_msg, bot_msg in history_tuples]
 
 # 1. Add type hints for better code maintainability
 # 4. Add input validation
@@ -142,52 +136,40 @@ def respond(
     chat_history: List[Tuple[str, str]], 
     genre: Optional[str] = None,
     use_full_memory: bool = True
-) -> Generator[List[Dict[str, str]], None, None]:
+) -> Generator[List[Tuple[str, str]], None, None]:
     """Generate a response based on the current message and conversation history."""
     if not message.strip():
         return chat_history
 
-    system_message = get_enhanced_system_prompt(genre)
+    system_message = f"""You are an interactive storyteller creating an immersive {genre or 'fantasy'} story.
+When responding:
+1. First, write 2-3 paragraphs (150-300 words) continuing the story based on the user's choice
+2. Use vivid sensory details and second-person perspective ("you", "your")
+3. Include dialogue and character thoughts
+4. After the story segment, provide exactly three numbered choices for what to do next
+5. Format the choices as:
+
+1. You [action verb]...
+2. You [action verb]...
+3. You [action verb]...
+"""
+
+    # Format history properly for the API
+    formatted_messages = [{"role": "system", "content": system_message}]
     
-    # Format history properly
-    formatted_history = []
     if chat_history:
-        for user_msg, bot_msg in chat_history:
-            formatted_history.extend([
+        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)}
             ])
     
-    # Construct API messages
-    api_messages = [
-        {"role": "system", "content": system_message}
-    ]
-    
-    # Add memory management
-    if use_full_memory and formatted_history:
-        if len(formatted_history) > MAX_HISTORY_LENGTH:
-            summary_instruction = create_story_summary(chat_history[:len(chat_history)-5])
-            if summary_instruction:
-                api_messages.append(summary_instruction)
-            api_messages.extend(formatted_history[-MEMORY_WINDOW*2:])
-        else:
-            api_messages.extend(formatted_history)
-    else:
-        api_messages.extend(formatted_history[-MEMORY_WINDOW*2:])
-    
-    # Add current user message
-    api_messages.append({"role": "user", "content": str(message)})
-    
-    # Add choice enforcement
-    api_messages.append({
-        "role": "system",
-        "content": "Remember to end your response with exactly three numbered choices, each starting with 'You'"
-    })
+    formatted_messages.append({"role": "user", "content": str(message)})
     
-    bot_message = ""
     try:
+        bot_message = ""
         for response_chunk in client.chat_completion(
-            api_messages,
+            formatted_messages,
             max_tokens=MAX_TOKENS,
             stream=True,
             temperature=TEMPERATURE,
@@ -198,12 +180,15 @@ def respond(
                 if delta:
                     bot_message += delta
                     if len(bot_message.strip()) >= MIN_RESPONSE_LENGTH:
-                        yield [{"role": "user", "content": message}, 
-                              {"role": "assistant", "content": bot_message}]
+                        chat_history = list(chat_history)
+                        chat_history.append((message, bot_message))
+                        yield chat_history
+                        
     except Exception as e:
         error_message = f"Story magic temporarily interrupted. Please try again. (Error: {str(e)})"
-        yield [{"role": "user", "content": message}, 
-               {"role": "assistant", "content": error_message}]
+        chat_history = list(chat_history)
+        chat_history.append((message, error_message))
+        yield chat_history
 
 def save_story(chat_history):
     """Convert chat history to markdown for download"""
@@ -343,4 +328,4 @@ 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)
+    demo.launch(server_name="0.0.0.0", server_port=7860)