fixed emotions issues

app.py

@@ -81,16 +81,15 @@ def analyze_history(history):
     print(f"Sentiment analysis: {sentiment}, Score: {sentiment_score}")
 
     # Determine sentiment-based emotion
+    sentiment_emotion = "curious"  # Default
     if sentiment == "POSITIVE":
         sentiment_emotion = "happy"
     elif sentiment == "NEGATIVE":
         sentiment_emotion = "thoughtful"
-    else:
-        sentiment_emotion = "curious"
 
     # Combine results using weights
     combined_scores = {emotion: keyword_counts.get(emotion, 0) for emotion in emotion_keywords}
-    combined_scores[sentiment_emotion] += sentiment_score * 1.5  # Adjust sentiment weight as needed
+    combined_scores[sentiment_emotion] += sentiment_score * 1.5  # Adjust sentiment weight
 
     # Debug combined scores
     print(f"Combined scores: {combined_scores}")
@@ -99,24 +98,18 @@ def analyze_history(history):
     max_score = max(combined_scores.values())
     detected_emotions = [emotion for emotion, score in combined_scores.items() if score == max_score]
 
-    # Handle ties: Default to the previous emotion or use the first detected one
+    # Handle ties: Add variety by randomizing among ties
     if len(detected_emotions) > 1:
-        print(f"Tie detected. Using current emotion: {current_emotion}")
-        return current_emotion
+        detected_emotion = random.choice(detected_emotions)
+        print(f"Tie detected. Randomly chosen emotion: {detected_emotion}")
+    else:
+        detected_emotion = detected_emotions[0]
 
-    # Choose the detected emotion if it's a clear winner
-    detected_emotion = detected_emotions[0]
     print(f"Detected emotion: {detected_emotion}")
-
     return detected_emotion
 
 
 
-
-
-
-
-
 # Load the Rena avatar
 rena_avatar = Image.open("assets/rena2.png")  # Ensure the file exists
 conversation_history = []
@@ -146,22 +139,19 @@ def chat(input_text):
     conversation_history = truncate_history(conversation_history, max_tokens=1024)
 
     # Update current emotion based on conversation history
-    previous_emotion = current_emotion  # Fixed typo here
+    previous_emotion = current_emotion
     current_emotion = analyze_history(conversation_history)
 
     # Combine base prompt and conversation 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.
+### Instructions ###
+Respond concisely and directly to the user's input. Avoid repeating the user's input unless clarification is needed.
 
-    ### Conversation History ###
-    {history}
-
-    
+### Conversation History ###
+{history}
 
-    Rena:"""
+Rena:"""
 
     # Tokenize and generate a response
     inputs = tokenizer(final_prompt, return_tensors="pt").to('cuda')
@@ -169,7 +159,7 @@ def chat(input_text):
     response = tokenizer.decode(outputs[0], skip_special_tokens=True)
 
     # Remove artifacts and repeated user input
-    artifacts = [base_prompt, "### Conversation History ###", "Rena:", "Assistant:", "<|assistant|>", "<|user|>"]
+    artifacts = [base_prompt, "### Conversation History ###", "Rena:", "Assistant:", "<|assistant|>", "<|user|>", "### Instructions ###"]
     for artifact in artifacts:
         response = response.replace(artifact, "").strip()
 
@@ -178,20 +168,7 @@ def chat(input_text):
 
     # Add emotional context if the emotion changes significantly
     if current_emotion != previous_emotion:
-        if current_emotion == "concerned":
-            emotional_prefix = "It sounds like there's something challenging! Let me help. 💖"
-        elif current_emotion == "happy":
-            emotional_prefix = "I'm feeling great about this! 😊"
-        elif current_emotion == "playful":
-            emotional_prefix = "This sounds fun! Let’s dive in. 😜"
-        elif current_emotion == "flirty":
-            emotional_prefix = "Oh, you're making me blush! 😘"
-        elif current_emotion == "thoughtful":
-            emotional_prefix = "Hmm, let me think about this carefully... 🧐"
-        else:
-            emotional_prefix = ""
-
-        # Add the prefix naturally to the response
+        emotional_prefix = emotions.get(current_emotion, "")
         response = f"{emotional_prefix} {response}".strip()
 
     # Add Rena's response to the conversation history
@@ -229,6 +206,7 @@ def chat(input_text):
 
 
 
+
 # Custom CSS for avatar styling
 css = """
 #rena_avatar img {