Fix history parameter handling in predict function and adjust question formatting in Conversation class

app.py

@@ -224,7 +224,7 @@ def predict(message,
                                             pixel_values, 
                                             message, 
                                             generation_config, 
-                                            history=None,
+                                            history=history,
                                             return_history=True)
         logger.info(f"==== Conv History ====\n{conv_history}")
         return response, conv_history

conversation.py

@@ -148,8 +148,10 @@ class Conversation:
                 # Check if it's the first user message and contains <image>
                 if i == 0 and '<image>' in user_content:
                     question = f"<image> {system_message}\n{user_content}"
-                else:
+                elif i == 0 and '<imgage>' not in user_content:
                     question = f"{system_message}\n{user_content}"
+                else:
+                    question = f"{user_content}"
 
                 # Check for the corresponding assistant response
                 answer = ""