more

app.py

@@ -32,14 +32,18 @@ def respond(message, history, system_message, max_tokens, temperature, top_p):
     print(f"History Type: {type(history)}")
     print(f"History Content: {history}")
     
-    # Prepare the messages for the model
-    messages = []
+    # Ensure history is formatted as a list of dictionaries
+    messages = [{"role": "system", "content": system_message}]  # Add system message at the start
+
     try:
         if history:
             print("\n--- Processing Existing History ---")
             for entry in history:
-                messages.append({"role": "user", "content": entry[0]})
-                messages.append({"role": "assistant", "content": entry[1]})
+                # Ensure each history entry is in the correct format
+                if isinstance(entry, dict) and 'role' in entry and 'content' in entry:
+                    messages.append(entry)
+                else:
+                    print(f"Skipping malformed history entry: {entry}")
         
         # Add the current user message
         print("\n--- Adding Current Message ---")
@@ -48,7 +52,7 @@ def respond(message, history, system_message, max_tokens, temperature, top_p):
         # Debug messages before tokenization
         print("\n--- Messages Before Tokenization ---")
         for msg in messages:
-            print(f"Role: {msg['role']}, Content: {msg['content']}")
+            print(f"Role: {msg['role']}, Content: {msg['content'][:100]}...")
         
         # Tokenize the input
         print("\n--- Tokenizing Input ---")
@@ -80,20 +84,13 @@ def respond(message, history, system_message, max_tokens, temperature, top_p):
             print("\n--- Generated Response ---")
             print(f"Raw Response: {response}")
             
-            # Check and filter response
-            #if "system" in response.lower():
-            #    print("WARNING: System message detected in response")
-            #    response = "Hello! How can I assist you today?"
-            
             # Prepare return history in OpenAI messages format
-            return_messages = []
-            for entry in (history or []):
-                return_messages.append({"role": "user", "content": entry[0]})
-                return_messages.append({"role": "assistant", "content": entry[1]})
+            return_messages = [{"role": "user", "content": message},
+                               {"role": "assistant", "content": response}]
             
-            # Add current conversation turn
-            return_messages.append({"role": "user", "content": message})
-            return_messages.append({"role": "assistant", "content": response})
+            # Add previous conversation turns if any
+            for entry in (history or []):
+                return_messages.insert(0, {"role": entry['role'], "content": entry['content']})
             
             print("\n--- Return Messages ---")
             for msg in return_messages:
@@ -124,4 +121,4 @@ demo = gr.ChatInterface(
 )
 
 if __name__ == "__main__":
-    demo.launch(share=False)  # Use share=False for local testing
+    demo.launch(share=False)  # Use share=False for local testing