Update app.py

app.py

@@ -292,10 +292,11 @@ class PersonaChat:
             yield status, self.enhanced_profile, self.enhanced_profile, []
             self.system_prompt = generate_system_prompt_with_llm(name, profile_for_prompt, context)
             # Clean tokenizer artifacts from system prompt
-            self.system_prompt = re.sub(r'<\|im_end\|>|<\|im_start\|>|<think>.*?</think>', '', self.system_prompt).strip()
+            self.system_prompt = re.sub(r'<\|im_end\|>|<\|im_start\|>|<think>.*?</think>|^assistant\s*', '', self.system_prompt).strip()
             self.messages = [{"role": "system", "content": self.system_prompt}]
-            print(f"set_persona: Final yield with messages: {self.messages}")
-            yield f"Persona set to '{name}'. Ready to chat!", self.system_prompt, self.enhanced_profile, self.messages
+            print(f"set_persona: Final yield with messages (not sent to Chatbot): {self.messages}")
+            # Yield empty history for Chatbot to avoid system message issues
+            yield f"Persona set to '{name}'. Ready to chat!", self.system_prompt, self.enhanced_profile, []
         except Exception as e:
             error_msg = f"An unexpected error occurred during persona setup: {str(e)}"
             print(f"set_persona: Yielding exception: {error_msg}")
@@ -382,25 +383,25 @@ def create_interface():
             initial_profile = "Enhanced profile will appear here..."
             initial_history = []
             print(f"set_persona_flow: Starting with initial history: {initial_history}")
-            # Log initial chatbot state
             print(f"set_persona_flow: Initial chatbot state: {chatbot.value if hasattr(chatbot, 'value') else 'Unknown'}")
             yield initial_status, initial_prompt, initial_profile, initial_character_display, initial_history
             final_status, final_prompt, final_profile, final_character_display, final_history = "Error", "", "", f"### Error creating {name}", []
             try:
                 for status_update, prompt_update, profile_update, history_update in persona_chat.set_persona(name, context):
-                    # Filter history to ensure valid messages
+                    # Strict validation of history
                     filtered_history = [
                         msg for msg in (history_update or [])
                         if isinstance(msg, dict) and "content" in msg and isinstance(msg["content"], str) and msg["content"]
                     ]
-                    # Check chatbot state for stale messages
+                    # Log chatbot state
                     current_chatbot_state = chatbot.value if hasattr(chatbot, 'value') else []
                     print(f"set_persona_flow: Current chatbot state: {current_chatbot_state}")
-                    # Combine filtered history with cleaned chatbot state
+                    # Clean and validate chatbot state
                     cleaned_chatbot_state = [
                         msg for msg in current_chatbot_state
                         if isinstance(msg, dict) and "content" in msg and isinstance(msg["content"], str) and msg["content"]
                     ]
+                    # Combine histories
                     combined_history = cleaned_chatbot_state + filtered_history
                     print(f"set_persona_flow: Processing yield - status: {status_update}, filtered_history: {filtered_history}, combined_history: {combined_history}")
                     final_status = status_update
@@ -428,11 +429,9 @@ def create_interface():
                 history.append({"role": "assistant", "content": "Error: Please create a valid persona first."})
                 return "", history
             history.append({"role": "user", "content": message})
-            history.append({"role": "assistant", "content": None})
-            yield "", history
             response_text = persona_chat.chat(message)
-            history[-1]["content"] = response_text
-            yield "", history
+            history.append({"role": "assistant", "content": response_text})
+            return "", history
         set_persona_button.click(
             set_persona_flow,
             inputs=[name_input, context_input],