Update app.py

app.py

@@ -77,8 +77,15 @@ def user_message(message, history):
     if message is None or message == "":
         return "", history
     
-    # Add user message to history
-    history = history + [(message, None)]
+    # Convert history to list if it's None
+    history = history or []
+    
+    # Add user message to history with proper format
+    history.append({
+        "role": "user",
+        "content": message
+    })
+    
     return "", history
 
 def bot_response(history, system_msg, max_tokens, temperature, top_p):
@@ -86,9 +93,10 @@ def bot_response(history, system_msg, max_tokens, temperature, top_p):
     if not history:
         return history, None
     
-    last_user_message = history[-1][0]
-    
     try:
+        # Get the last user message
+        last_user_message = history[-1]["content"]
+        
         # Process the message for language and script
         processed_message = detect_and_transliterate(last_user_message)
         translated_message = translate_to_english(processed_message)
@@ -97,8 +105,11 @@ def bot_response(history, system_msg, max_tokens, temperature, top_p):
         if check_for_image_generation(translated_message):
             # Generate image based on the message
             image = generate_image(translated_message)
-            # Update history with a confirmation message
-            history[-1] = (history[-1][0], "I've generated an image based on your request.")
+            # Add bot response with proper format
+            history.append({
+                "role": "assistant",
+                "content": "I've generated an image based on your request."
+            })
             return history, image
         
         # Prepare chat messages for the model
@@ -107,14 +118,8 @@ def bot_response(history, system_msg, max_tokens, temperature, top_p):
         ]
         
         # Add conversation history
-        for msg in history[:-1]:  # Exclude the last message pair
-            if msg[0]:  # User message
-                messages.append({"role": "user", "content": msg[0]})
-            if msg[1]:  # Assistant message
-                messages.append({"role": "assistant", "content": msg[1]})
-        
-        # Add the last user message
-        messages.append({"role": "user", "content": translated_message})
+        for msg in history:
+            messages.append(msg)
         
         # Get model response
         response = text_client.text_generation(
@@ -125,16 +130,22 @@ def bot_response(history, system_msg, max_tokens, temperature, top_p):
             repetition_penalty=1.1,
         )
         
-        # Update history with bot response
-        history[-1] = (history[-1][0], response)
+        # Add bot response with proper format
+        history.append({
+            "role": "assistant",
+            "content": response
+        })
         
     except Exception as e:
         # Handle errors gracefully
         error_message = f"I apologize, but I encountered an error: {str(e)}"
-        history[-1] = (history[-1][0], error_message)
+        history.append({
+            "role": "assistant",
+            "content": error_message
+        })
     
     return history, None
-
+    
 def create_chat_interface():
     # Custom CSS for better styling with Inter font and animations
     custom_css = """