Update app.py

app.py

@@ -536,12 +536,12 @@ def prepare_message_with_media(text, images=None, documents=None):
 def format_to_message_dict(history):
     """Convert history to proper message format"""
     messages = []
-    for message in history:
-        if isinstance(message, dict) and "role" in message and "content" in message:
-            # Already in the correct format
-            messages.append(message)
-        elif len(message) == 2:  # Handle old format [user_msg, ai_msg]
-            human, ai = message
+    for item in history:
+        if isinstance(item, dict) and "role" in item and "content" in item:
+            messages.append(item)
+        elif isinstance(item, list) and len(item) == 2:
+            # Convert from old format [user_msg, ai_msg]
+            human, ai = item
             if human:
                 messages.append({"role": "user", "content": human})
             if ai:
@@ -1131,12 +1131,11 @@ def extract_ai_response(result, provider):
 # STREAMING HANDLERS
 # ==========================================================
 
-def openrouter_streaming_handler(response, chatbot, message_idx, message):
+def openrouter_streaming_handler(response, history, message):
     try:
-        # First add the user message if needed
-        if len(chatbot) == message_idx:
-            chatbot.append([message, ""])
-            
+        updated_history = history + [{"role": "user", "content": message}]
+        assistant_response = ""
+        
         for line in response.iter_lines():
             if not line:
                 continue
@@ -1155,16 +1154,14 @@ def openrouter_streaming_handler(response, chatbot, message_idx, message):
                     delta = chunk["choices"][0].get("delta", {})
                     if "content" in delta and delta["content"]:
                         # Update the current response
-                        chatbot[-1][1] += delta["content"]
-                        yield chatbot
+                        assistant_response += delta["content"]
+                        yield updated_history + [{"role": "assistant", "content": assistant_response}]
             except json.JSONDecodeError:
                 logger.error(f"Failed to parse JSON from chunk: {data}")
     except Exception as e:
         logger.error(f"Error in streaming handler: {str(e)}")
         # Add error message to the current response
-        if len(chatbot) > message_idx:
-            chatbot[-1][1] += f"\n\nError during streaming: {str(e)}"
-            yield chatbot
+        yield updated_history + [{"role": "assistant", "content": f"Error during streaming: {str(e)}"}]
 
 def openai_streaming_handler(response, chatbot, message_idx, message):
     try: