fixed emotions issues

app.py

@@ -53,10 +53,10 @@ emotions.update({
 
 # Add keywords for new emotions in `analyze_history`
 emotion_keywords = {
-    "happy": ["happy", "joy", "excited", "awesome"],
+    "happy": ["happy", "joy", "excited", "awesome", "great", "fantastic"],
     "playful": ["fun", "play", "joke", "quirky"],
     "curious": ["curious", "wonder", "question", "thinking"],
-    "thoughtful": ["sad", "thoughtful", "hmm", "ponder"],
+    "thoughtful": ["sad", "thoughtful", "hmm", "ponder", "upset"],
     "concerned": ["error", "wrong", "problem", "issue", "stuck"],
     "mischievous": ["trouble", "mischief", "sneaky", "prank"]
 }
@@ -65,6 +65,7 @@ current_emotion = "happy"
 
 # Analyze history for emotional state
 def analyze_history(history):
+    # Join the last 5 messages for context
     recent_messages = " ".join(history[-5:]).lower()
     print(f"Analyzing history: {recent_messages}")  # Debug log
 
@@ -73,7 +74,7 @@ def analyze_history(history):
                       for emotion, keywords in emotion_keywords.items()}
     print(f"Keyword counts: {keyword_counts}")
 
-    # Perform sentiment analysis
+    # Perform sentiment analysis on recent messages
     sentiment_result = sentiment_analyzer(recent_messages)
     sentiment = sentiment_result[0]["label"]
     sentiment_score = sentiment_result[0]["score"]
@@ -89,11 +90,22 @@ def analyze_history(history):
 
     # Combine results using weights
     combined_scores = {emotion: keyword_counts.get(emotion, 0) for emotion in emotion_keywords}
-    combined_scores[sentiment_emotion] += sentiment_score * 2  # Give more weight to sentiment analysis
+    combined_scores[sentiment_emotion] += sentiment_score * 1.5  # Adjust sentiment weight as needed
+
+    # Debug combined scores
     print(f"Combined scores: {combined_scores}")
 
-    # Choose the emotion with the highest score
-    detected_emotion = max(combined_scores, key=combined_scores.get)
+    # Prevent frequent unnecessary changes by requiring a significant score difference
+    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
+    if len(detected_emotions) > 1:
+        print(f"Tie detected. Using current emotion: {current_emotion}")
+        return current_emotion
+
+    # Choose the detected emotion if it's a clear winner
+    detected_emotion = detected_emotions[0]
     print(f"Detected emotion: {detected_emotion}")
 
     return detected_emotion
@@ -150,11 +162,23 @@ def chat(input_text):
     for artifact in artifacts:
         response = response.replace(artifact, "").strip()
     
-    if current_emotion != previous_emotion:
-        response = f"{emotions[current_emotion]} {response}"
+    # Only add emotional context if the emotion changes significantly
+    if current_emotion != previous_emotion and emotions.get(current_emotion):
+    # Subtle integration into the response
+        if current_emotion == "concerned":
+            response = f"That sounds like an issue! Let me help. 💖 {response}"
+        elif current_emotion == "happy":
+            response = f"I'm feeling great about this! 😊 {response}"
+        elif current_emotion == "playful":
+            response = f"This is fun! Let’s see what we can do. 😜 {response}"
+        elif current_emotion == "flirty":
+            response = f"You're making me blush! 😘 {response}"
+        elif current_emotion == "thoughtful":
+            response = f"Hmm, let me think about this carefully... 🧐 {response}"
     else:
         response = response.strip()
 
+
     # Add Rena's response to the conversation history
     conversation_history.append(f"Rena: {response}")