Update app.py

app.py

@@ -10,18 +10,18 @@ client = InferenceClient("HuggingFaceH4/zephyr-7b-beta", token=hf_token)
 
 # Story genres with genre-specific example prompts
 GENRE_EXAMPLES = {
+    "fairy_tale": [
+        "I follow the shimmer of fairy dust into a hidden forest"
+        "I meet a talking rabbit who claims to know a secret about the king’s lost crown"
+        "A tiny dragon appears at my window, asking for help to find its mother"
+        "I step into a clearing where the trees whisper ancient riddles"
+        "A friendly witch invites me into her cozy cottage, offering a warm cup of tea"
+    ],
     "fantasy": [
         "I enter the ancient forest seeking the wizard's tower",
         "I approach the dragon cautiously with my shield raised",
         "I examine the mysterious runes carved into the stone altar",
         "I try to bargain with the elven council for safe passage"
-    ],
-        "fairy tale": [
-        "I follow the shimmer of fairy dust into a hidden forest",
-        "I meet a talking rabbit who claims to know a secret about the king’s lost crown",
-        "A tiny dragon appears at my window, asking for help to find its mother",
-        "I step into a clearing where the trees whisper ancient riddles",
-        "A friendly witch invites me into her cozy cottage, offering a warm cup of tea"
     ],
     "sci-fi": [
         "I hack into the space station's mainframe",
@@ -129,8 +129,10 @@ 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.append({"role": "user", "content": user_msg})
-        messages.append({"role": "assistant", "content": bot_msg})
+        messages.extend([
+            {"role": "user", "content": str(user_msg)},
+            {"role": "assistant", "content": str(bot_msg)}
+        ])
     return messages
 
 # 1. Add type hints for better code maintainability
@@ -144,45 +146,43 @@ def respond(
     """Generate a response based on the current message and conversation history."""
     if not message.strip():
         return chat_history
-    if genre and genre not in GENRE_EXAMPLES:
-        genre = "fantasy"  # fallback to default
 
     system_message = get_enhanced_system_prompt(genre)
-
-    # Convert your existing (user, bot) history into a format for the API request
+    
+    # Format history properly
     formatted_history = []
-    for user_msg, bot_msg in chat_history:
-        formatted_history.append({"role": "user", "content": user_msg})
-        formatted_history.append({"role": "assistant", "content": bot_msg})
+    if chat_history:
+        for user_msg, bot_msg in chat_history:
+            formatted_history.extend([
+                {"role": "user", "content": str(user_msg)},
+                {"role": "assistant", "content": str(bot_msg)}
+            ])
     
-    api_messages = [{"role": "system", "content": system_message}]
+    # Construct API messages
+    api_messages = [
+        {"role": "system", "content": system_message}
+    ]
     
-    # Use full memory or partial memory
+    # 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)
-            for msg in formatted_history[-MEMORY_WINDOW:]:
-                api_messages.append(msg)
+            api_messages.extend(formatted_history[-MEMORY_WINDOW*2:])
         else:
-            for msg in formatted_history:
-                api_messages.append(msg)
+            api_messages.extend(formatted_history)
     else:
-        memory_length = MEMORY_WINDOW
-        if formatted_history:
-            for msg in formatted_history[-memory_length*2:]:
-                api_messages.append(msg)
+        api_messages.extend(formatted_history[-MEMORY_WINDOW*2:])
     
     # Add current user message
-    api_messages.append({"role": "user", "content": message})
+    api_messages.append({"role": "user", "content": str(message)})
     
-    # Special handling for story initialization
-    if not chat_history or message.lower() in ["start", "begin", "begin my adventure"]:
-        api_messages.append({
-            "role": "system",
-            "content": f"Begin a new {genre or 'fantasy'} adventure with an intriguing opening scene. Introduce the protagonist without assuming too much about them."
-        })
+    # Add choice enforcement
+    api_messages.append({
+        "role": "system",
+        "content": "Remember to end your response with exactly three numbered choices, each starting with 'You'"
+    })
     
     bot_message = ""
     try:
@@ -193,18 +193,17 @@ def respond(
             temperature=TEMPERATURE,
             top_p=TOP_P,
         ):
-            delta = response_chunk.choices[0].delta.content
-            if delta:
-                bot_message += delta
-                # Yield more frequently
-                if len(bot_message.strip()) >= MIN_RESPONSE_LENGTH:
-                    new_history = chat_history.copy()
-                    new_history.append((message, bot_message))
-                    yield format_history_for_gradio(new_history)
+            if hasattr(response_chunk.choices[0].delta, 'content'):
+                delta = response_chunk.choices[0].delta.content
+                if delta:
+                    bot_message += delta
+                    if len(bot_message.strip()) >= MIN_RESPONSE_LENGTH:
+                        yield [{"role": "user", "content": message}, 
+                              {"role": "assistant", "content": bot_message}]
     except Exception as e:
         error_message = f"Story magic temporarily interrupted. Please try again. (Error: {str(e)})"
-        broken_history = chat_history + [(message, error_message)]
-        yield format_history_for_gradio(broken_history)
+        yield [{"role": "user", "content": message}, 
+               {"role": "assistant", "content": error_message}]
 
 def save_story(chat_history):
     """Convert chat history to markdown for download"""
@@ -344,4 +343,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)