- adjust with the model marifn_emotion

backend/app.py

@@ -37,47 +37,50 @@ emotion_classifier = pipeline(
     framework="pt"
 )
 
-emotion_to_mood = {
-    "senang": "happy",
-    "sedih": "sad",
-    "marah": "excited",
-    "takut": "relaxed",
-    "cinta": "romantic"
-}
-
 clients = {}
 chat_history = deque(maxlen=4)
 
 mood_to_genre = {
-    "happy": "pop",
-    "sad": "acoustic",
-    "excited": "rock",
-    "intense": "cinematic",
-    "romantic": "rnb",
-    "chill": "chill"
+    "senang": {
+        "genre": "pop",
+        "word": "Poppin pops!"
+    },
+    "sedih": {
+        "genre": "acoustic",
+        "word": "Playing acoustic"
+    },
+    "marah": {
+        "genre": "rock",
+        "word": "Rock 'n play!!"
+    },
+    "cinta": {
+        "genre": "romantic",
+        "word": "Playing romantic"
+    },
+    "chill": {
+        "genre": "chill",
+        "word": "Chill!"
+    }
 }
 
 genre_to_song = {
     "pop": ["https://sounds.pond5.com/inspirational-motivational-uplifting-acoustic-positive-music-102770115_nw_prev.m4a"],
     "acoustic": ["https://sounds.pond5.com/sad-piano-music-063450274_nw_prev.m4a"],
     "rock": ["https://sounds.pond5.com/powerful-gritty-action-extreme-rock-music-136693652_nw_prev.m4a"],
-    "intense": ["https://sounds.pond5.com/epic-action-hybrid-trailer-instrum-music-072727124_nw_prev.m4a"],
     "romantic": ["https://sounds.pond5.com/bloom-sweet-tender-delicate-romantic-music-158563013_nw_prev.m4a"],
     "chill": ["https://sounds.pond5.com/fall-chill-music-088328584_nw_prev.m4a"]
 }
 
 def detect_emotion(text):
-    labels = ["takut", "marah", "sedih", "senang", "cinta"]
+    labels = ["marah", "sedih", "senang", "cinta"]
     result = emotion_classifier(text, candidate_labels=labels)
     top_emotion = result['labels'][0]
     top_scores = result['scores'][0]
     return top_emotion, top_scores
 
-def get_recommendations_by_mood(mood):
-    genre_folder = mood_to_genre.get(mood, "chill")
-    songs = genre_to_song.get(genre_folder, [])
+def get_recommendations_by_mood(genre):
+    songs = genre_to_song.get(genre, [])
 
-    # List and shuffle songs
     random.shuffle(songs)
     return songs[:3]  # Return top 3 shuffled songs
 
@@ -138,14 +141,16 @@ async def periodic_recommendation():
                     # 5. Dominant emotion
                     most_common_emotion = max(softmax_result, key=lambda x: x[1])[0]
                     print("Dominant Emotion:", most_common_emotion)
-                    mood = emotion_to_mood.get(most_common_emotion, "chill")
-                    music_recommendations = get_recommendations_by_mood(mood)
+                    music = mood_to_genre.get(most_common_emotion, mood_to_genre["chill"])
+                    music_recommendations = get_recommendations_by_mood(music["genre"])
+                    word = music["word"]
                 else:
-                    music_recommendations = ["chill"]  # default if no chat
+                    music_recommendations = get_recommendations_by_mood("chill")
+                    word = "Chill!"
 
                 recommendation_response = {
                     "recommendations": music_recommendations,
-                    "genre": mood_to_genre.get(mood, "pop")
+                    "genre": word
                 }
 
                 for client in clients.values():

frontend/index.html

@@ -178,7 +178,8 @@
             }
             console.log("location host")
             console.log(location.host)
-            ws = new WebSocket(`${location.protocol === 'https:' ? 'wss' : 'ws'}://${location.host}/chat/${username}`);
+            // ws = new WebSocket(`${location.protocol === 'https:' ? 'wss' : 'ws'}://${location.host}/chat/${username}`);
+            ws = new WebSocket(`ws://localhost:8000/chat/${username}`);
 
             document.getElementById("music-player").addEventListener("play", () => {
                 musicStatus = "playing"
@@ -252,7 +253,7 @@
             };
             let recommendationDiv = document.createElement("div");
             recommendationDiv.classList.add("recommendation-message");
-            recommendationDiv.innerHTML = `🎵 Recommended Song: "${recommendationSong.genre}" 🎶`;
+            recommendationDiv.innerHTML = `🎵 ${recommendationSong.genre}`;
             chatBox.appendChild(recommendationDiv);
             console.log("recommendation song")
             console.log(recommendationSong)