updated emotional logic

app.py

@@ -138,13 +138,10 @@ def chat(input_text):
     # Limit the size of the conversation history
     conversation_history = truncate_history(conversation_history, max_tokens=1024)
 
-    # Update current emotion based on conversation history
-    previous_emotion = current_emotion
-    current_emotion = analyze_history(conversation_history)
-
-    # Combine base prompt and conversation history
+    # Combine base prompt and conversation history (instructions are not included in history)
     history = "\n".join(conversation_history)
     final_prompt = f"""{base_prompt}
+
 ### Instructions ###
 Respond concisely and directly to the user's input. Avoid repeating the user's input unless clarification is needed.
 
@@ -159,7 +156,16 @@ Rena:"""
     response = tokenizer.decode(outputs[0], skip_special_tokens=True)
 
     # Remove artifacts and repeated user input
-    artifacts = [base_prompt, "### Conversation History ###", "Rena:", "Assistant:", "<|assistant|>", "<|user|>", "### Instructions ###"]
+    artifacts = [
+        base_prompt,
+        "### Conversation History ###",
+        "Rena:",
+        "Assistant:",
+        "<|assistant|>",
+        "<|user|>",
+        "### Instructions ###",
+        "Respond concisely and directly to the user's input. Avoid repeating the user's input unless clarification is needed."
+    ]
     for artifact in artifacts:
         response = response.replace(artifact, "").strip()
 
@@ -169,13 +175,9 @@ Rena:"""
     # Add emotional context only if the emotion changes significantly
     if current_emotion != previous_emotion:
         emotional_prefix = emotions.get(current_emotion, "")
-        if emotional_prefix and not response.startswith(emotional_prefix) and not response.startswith("User:"):
+        if emotional_prefix and not response.startswith(emotional_prefix):
             response = f"{emotional_prefix} {response}".strip()
 
-    # Clean up "User:" if it appears in the response
-    if response.startswith("User:"):
-        response = response.replace("User:", "").strip()
-
     # Add Rena's response to the conversation history
     conversation_history.append(f"Rena: {response}")
 
@@ -212,6 +214,7 @@ Rena:"""
 
 
 
+
 # Custom CSS for avatar styling
 css = """
 #rena_avatar img {