Update app.py

app.py

@@ -136,7 +136,7 @@ def create_story_summary(chat_history):
     return summary_instruction
 
 # Modified function for proper Gradio format (lists)
-def respond(message: str, chat_history: List[str], genre: Optional[str] = None, use_full_memory: bool = True) -> Tuple[str, List[str]]:
+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]]]:
     """Generate a response based on the current message and conversation history."""
     if not message.strip():
         return "", chat_history
@@ -146,11 +146,9 @@ def respond(message: str, chat_history: List[str], genre: Optional[str] = None,
         api_messages = [{"role": "system", "content": get_enhanced_system_prompt(genre)}]
         logging.debug(f"System Message: {api_messages[0]}")
         
-        # Add chat history - convert from lists to API format
+        # Add chat history - convert from tuples to API format
         if chat_history and use_full_memory:
-            # Take pairs of messages (user, bot) from history
-            history_pairs = list(zip(chat_history[::2], chat_history[1::2]))
-            for user_msg, bot_msg in history_pairs[-MEMORY_WINDOW:]:
+            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)}
@@ -161,28 +159,30 @@ def respond(message: str, chat_history: List[str], genre: Optional[str] = None,
         api_messages.append({"role": "user", "content": str(message)})
         logging.debug(f"Final Message List: {api_messages}")
 
-        # Make API call
+        # Make API call with timeout
         logging.debug("Making API call...")
         response = client.chat_completion(
             messages=api_messages,
             max_tokens=MAX_TOKENS,
             temperature=TEMPERATURE,
-            top_p=TOP_P
+            top_p=TOP_P,
+            timeout=30  # 30 second timeout
         )
         logging.debug("API call completed")
         
         # Extract response
         bot_message = response.choices[0].message.content
-        logging.debug(f"Bot Response: {bot_message[:100]}...")  # First 100 chars
+        logging.debug(f"Bot Response: {bot_message[:100]}...")
         
-        # Update history using list format [user_msg, bot_msg, user_msg, bot_msg, ...]
-        updated_history = chat_history + [message, bot_message]
+        # Update history using tuple format [(user_msg, bot_msg), ...]
+        updated_history = list(chat_history)  # Create a copy
+        updated_history.append((message, bot_message))  # Add as tuple
         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 "", list(chat_history) + [(message, error_msg)]
 
 def save_story(chat_history):
     """Convert chat history to markdown and return as downloadable file"""
@@ -281,7 +281,7 @@ with gr.Blocks(theme=gr.themes.Soft()) as demo:
                 return tuple(results)
 
             # New direct handler for starter clicks
-            def use_starter(starter_text, history, selected_genre, memory_flag):
+            def use_starter(starter_text: str, history: List[Tuple[str, str]], selected_genre: str, memory_flag: bool) -> Tuple[str, List[Tuple[str, str]]]:
                 """Handle starter button clicks with proper message formatting"""
                 if not starter_text:
                     return "", history
@@ -298,7 +298,7 @@ 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 "", list(history) + [(starter_text, error_msg)]
 
             # Simplified button connections
             for starter_button in starter_buttons: