Update app.py

app.py

@@ -124,8 +124,11 @@ def create_story_summary(chat_history):
         return None
     
     story_text = ""
-    for user_msg, bot_msg in chat_history:
-        story_text += f"User: {user_msg}\nStory: {bot_msg}\n\n"
+    for msg in chat_history:
+        if msg["role"] == "user":
+            story_text += f"User: {msg['content']}\n"
+        else:
+            story_text += f"Story: {msg['content']}\n\n"
     
     summary_instruction = {
         "role": "system",
@@ -133,13 +136,8 @@ def create_story_summary(chat_history):
     }
     return summary_instruction
 
-def format_history_for_gradio(history_tuples):
-    """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
-def respond(message: str, chat_history: List[Tuple[str, str]], genre: Optional[str] = None, use_full_memory: bool = True) -> Tuple[str, List[Tuple[str, str]]]:
+# Modified function to handle message format
+def respond(message: str, chat_history: List[Dict], genre: Optional[str] = None, use_full_memory: bool = True) -> Tuple[str, List[Dict]]:
     """Generate a response based on the current message and conversation history."""
     if not message.strip():
         return "", chat_history
@@ -149,13 +147,10 @@ def respond(message: str, chat_history: List[Tuple[str, str]], genre: Optional[s
         api_messages = [{"role": "system", "content": get_enhanced_system_prompt(genre)}]
         logging.debug(f"System Message: {api_messages[0]}")
         
-        # Add chat history
+        # Add chat history - convert to API format
         if chat_history and use_full_memory:
-            for user_msg, bot_msg in chat_history[-MEMORY_WINDOW:]:
-                api_messages.extend([
-                    {"role": "user", "content": str(user_msg)},
-                    {"role": "assistant", "content": str(bot_msg)}
-                ])
+            for msg in chat_history[-MEMORY_WINDOW*2:]:  # Multiply by 2 since we have user and assistant messages
+                api_messages.append({"role": msg["role"], "content": msg["content"]})
             logging.debug(f"Chat History Messages: {api_messages[1:]}")
         
         # Add current message
@@ -176,14 +171,20 @@ def respond(message: str, chat_history: List[Tuple[str, str]], genre: Optional[s
         bot_message = response.choices[0].message.content
         logging.debug(f"Bot Response: {bot_message[:100]}...")  # First 100 chars
         
-        # Update history
-        updated_history = chat_history + [(message, bot_message)]
+        # Update history with proper message format
+        updated_history = chat_history + [
+            {"role": "user", "content": message},
+            {"role": "assistant", "content": bot_message}
+        ]
         return "", updated_history
     
     except Exception as e:
         logging.error("Error in respond function", exc_info=True)
         error_msg = f"Story magic temporarily interrupted. Please try again. (Error: {str(e)})"
-        return "", chat_history + [(message, error_msg)]
+        return "", chat_history + [
+            {"role": "user", "content": message},
+            {"role": "assistant", "content": error_msg}
+        ]
 
 def save_story(chat_history):
     """Convert chat history to markdown for download"""
@@ -191,31 +192,67 @@ def save_story(chat_history):
         return "No story to save yet!"
     
     story_text = "# My Interactive Adventure\n\n"
-    for user_msg, bot_msg in chat_history:
-        story_text += f"**Player:** {user_msg}\n\n"
-        story_text += f"**Story:** {bot_msg}\n\n---\n\n"
+    for msg in chat_history:
+        if msg["role"] == "user":
+            story_text += f"**Player:** {msg['content']}\n\n"
+        elif msg["role"] == "assistant":
+            story_text += f"**Story:** {msg['content']}\n\n---\n\n"
     
     return story_text
 
+# Add this function to get SVG for avatar
+def get_storyteller_avatar():
+    """Return SVG for storyteller avatar"""
+    return """
+    <svg viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+        <!-- Wizard hat -->
+        <path d="M50 10 L70 40 L30 40 Z" fill="#4b0082" stroke="#000" stroke-width="1"/>
+        <!-- Hat band -->
+        <rect x="30" y="38" width="40" height="5" fill="#ffd700" stroke="#000" stroke-width="1"/>
+        <!-- Hat stars -->
+        <path d="M40 25 L42 30 L37 27 L43 27 L38 30 Z" fill="#ffd700"/>
+        <path d="M60 30 L62 35 L57 32 L63 32 L58 35 Z" fill="#ffd700"/>
+        <!-- Face -->
+        <circle cx="50" cy="60" r="20" fill="#fbe8d3" stroke="#000" stroke-width="1"/>
+        <!-- Eyes -->
+        <ellipse cx="40" cy="55" rx="3" ry="4" fill="#fff" stroke="#000" stroke-width="1"/>
+        <ellipse cx="60" cy="55" rx="3" ry="4" fill="#fff" stroke="#000" stroke-width="1"/>
+        <circle cx="40" cy="55" r="1" fill="#000"/>
+        <circle cx="60" cy="55" r="1" fill="#000"/>
+        <!-- Eyebrows -->
+        <path d="M36 50 Q40 48 44 50" fill="none" stroke="#000" stroke-width="1"/>
+        <path d="M56 50 Q60 48 64 50" fill="none" stroke="#000" stroke-width="1"/>
+        <!-- Beard -->
+        <path d="M30 60 Q50 90 70 60" fill="#7c6e5c" stroke="#000" stroke-width="1"/>
+        <!-- Mouth -->
+        <path d="M45 65 Q50 70 55 65" fill="none" stroke="#000" stroke-width="1"/>
+        <!-- Sparkle -->
+        <circle cx="75" cy="25" r="3" fill="#ffd700"/>
+        <path d="M75 20 L75 30 M70 25 L80 25" stroke="#ffd700" stroke-width="1"/>
+    </svg>
+    """
+
 with gr.Blocks(theme=gr.themes.Soft()) as demo:
     gr.Markdown("# 🔮 Interactive Story Time")
     with gr.Row():
         status_message = gr.Markdown("Ready to begin your adventure...", visible=True)
     gr.Markdown("Create a completely unique literary world, one choice at a time. Dare to explore the unknown.")
     
+    wizard_avatar = get_storyteller_avatar()
+    
     with gr.Row():
         with gr.Column(scale=3):
-            # Chat window + user input
+            # Chat window + user input - FIXED MESSAGE FORMAT
             chatbot = gr.Chatbot(
-                height=500,  # Increased height
-                bubble_full_width=True,  # Allow bubbles to use full width
+                height=500,
+                bubble_full_width=True,
                 show_copy_button=True,
-                avatar_images=(None, "🧙"),
-                type="messages",
+                avatar_images=(None, wizard_avatar),  # Added wizard avatar
+                type="chatbot",  # Changed from "messages" to "chatbot"
                 container=True,
                 scale=1,
-                min_width=800,  # Ensure minimum width
-                value=[],  # Initialize with empty list
+                min_width=800,
+                value=[],
                 render=True
             )
             msg = gr.Textbox(
@@ -280,14 +317,17 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
                                 
                 except Exception as e:
                     error_msg = f"Story magic temporarily interrupted. Please try again. (Error: {str(e)})"
-                    return "", history + [(starter_text, error_msg)]
+                    return "", history + [
+                        {"role": "user", "content": starter_text},
+                        {"role": "assistant", "content": error_msg}
+                    ]
 
             # Simplified button connections
             for starter_button in starter_buttons:
                 starter_button.click(
                     fn=use_starter,
                     inputs=[starter_button, chatbot, genre, full_memory],
-                    outputs=[msg, chatbot],  # Now returning both message and chat history
+                    outputs=[msg, chatbot],
                     queue=True
                 )
 
@@ -302,12 +342,12 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
     msg.submit(
         fn=respond,
         inputs=[msg, chatbot, genre, full_memory],
-        outputs=[msg, chatbot]  # Now returning both message and chat history
+        outputs=[msg, chatbot]
     )
     submit.click(
         fn=respond,
         inputs=[msg, chatbot, genre, full_memory],
-        outputs=[msg, chatbot]  # Now returning both message and chat history
+        outputs=[msg, chatbot]
     )
     
     # Clear the chatbot for a new adventure
@@ -344,4 +384,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)