Spaces:

MarfinF
/

Smart-MP-Rekomend

Sleeping

App Files Files Community

MarfinF commited on Mar 27

Commit

b1c9ac9

1 Parent(s): cbf1942

- update BE & FE adjust music

Browse files

Files changed (2) hide show

backend/app.py +28 -14
frontend/index.html +24 -8

backend/app.py CHANGED Viewed

@@ -9,6 +9,8 @@ from collections import deque
 from collections import defaultdict
 import math
 import sys
 sys.path.append(".")
@@ -37,6 +39,15 @@ emotion_to_mood = {
 clients = {}
 chat_history = deque(maxlen=4)
 # 🔹 Detect Emotion
 def detect_emotion(text):
     labels = ["takut", "marah", "sedih", "senang", "cinta"]
@@ -47,16 +58,20 @@ def detect_emotion(text):
 # 🔹 Get Music Recommendations
 def get_recommendations_by_mood(mood):
-    mood_to_genre = {
-        "happy": "pop",
-        "sad": "acoustic",
-        "excited": "rock",
-        "relaxed": "jazz",
-        "romantic": "rnb",
-        "chill": "chill"
-    }
-    genre = mood_to_genre.get(mood, "pop")
-    return [genre]
 def softmax(scores):
     exp_scores = [math.exp(score) for score in scores]
@@ -78,7 +93,7 @@ async def periodic_recommendation():
     while True:
         user_list = list(clients.keys())
         if len(user_list) >= 2:
-            await asyncio.sleep(60)
             if clients:  # Only run if someone is connected
                 if len(chat_history) > 0:
                     # 1. Detect emotion dan ambil (label, score)
@@ -110,9 +125,8 @@ async def periodic_recommendation():
                     music_recommendations = ["chill"]  # default if no chat
                 recommendation_response = {
-                    "username": "AI",
-                    "message": f"🎶 Recommended Songs: {', '.join(music_recommendations)}",
-                    "recommendations": music_recommendations
                 }
                 for client in clients.values():

 from collections import defaultdict
 import math
 import sys
+import random
+import os
 sys.path.append(".")
 clients = {}
 chat_history = deque(maxlen=4)
+mood_to_genre = {
+    "happy": "pop",
+    "sad": "acoustic",
+    "excited": "rock",
+    "intense": "cinematic",
+    "romantic": "rnb",
+    "chill": "chill"
+}
 # 🔹 Detect Emotion
 def detect_emotion(text):
     labels = ["takut", "marah", "sedih", "senang", "cinta"]
 # 🔹 Get Music Recommendations
 def get_recommendations_by_mood(mood):
+    genre_folder = mood_to_genre.get(mood, "pop")
+    folder_path = f"../music/{genre_folder}"
+    print("folder path")
+    print(folder_path)
+    # Check if folder exists
+    if not os.path.exists(folder_path):
+        return []
+    print("folder exist")
+    # List and shuffle songs
+    songs = [f"../music/{genre_folder}/{song}" for song in os.listdir(folder_path) if song.endswith(".mp3")]
+    random.shuffle(songs)
+    return songs[:3]  # Return top 3 shuffled songs
 def softmax(scores):
     exp_scores = [math.exp(score) for score in scores]
     while True:
         user_list = list(clients.keys())
         if len(user_list) >= 2:
+            await asyncio.sleep(10)
             if clients:  # Only run if someone is connected
                 if len(chat_history) > 0:
                     # 1. Detect emotion dan ambil (label, score)
                     music_recommendations = ["chill"]  # default if no chat
                 recommendation_response = {
+                    "recommendations": music_recommendations,
+                    "genre": mood_to_genre.get(mood, "pop")
                 }
                 for client in clients.values():

frontend/index.html CHANGED Viewed

@@ -139,7 +139,7 @@
 </head>
 <body>
-    <h1>🎵 Smart MP Rekomend</h1>
     <!-- Chat Box -->
     <div id="chat-container">
@@ -165,7 +165,10 @@
         let ws;
         let username = "";
         let musicStatus = "";
-        let delayedMusic = "";
         function connectChat() {
             username = document.getElementById("username").value.trim();
@@ -181,7 +184,7 @@
             });
             document.getElementById("music-player").addEventListener("ended", () => {
                 musicStatus = "stop"
-                if (delayedMusic != "") playCurrentMusic(delayedMusic)
             });
             ws.onmessage = function (event) {
@@ -201,9 +204,17 @@
                 if (data.recommendations) {
                     if (musicStatus != "playing") {
-                        playCurrentMusic(data.recommendations[0])
                     } else {
-                        delayedMusic = data.recommendations[0]
                     }
                 } else {
                     let messageDiv = document.createElement("div");
@@ -234,12 +245,17 @@
         function playCurrentMusic(recommendationSong) {
             const chatBox = document.getElementById("chat-box");
-            delayedMusic = ""
             let recommendationDiv = document.createElement("div");
             recommendationDiv.classList.add("recommendation-message");
-            recommendationDiv.innerHTML = `🎵 Recommended Song: "${recommendationSong}" 🎶`;
             chatBox.appendChild(recommendationDiv);
-            document.getElementById("music-player").src = "https://sounds.pond5.com/inspirational-motivational-uplifting-acoustic-positive-music-102770115_nw_prev.m4a"
             document.getElementById("music-player").play()
         }

 </head>
 <body>
+    <h1>🎵 Smart Music Rekomend</h1>
     <!-- Chat Box -->
     <div id="chat-container">
         let ws;
         let username = "";
         let musicStatus = "";
+        let delayedMusic = {
+            song: "",
+            genre: ""
+        };
         function connectChat() {
             username = document.getElementById("username").value.trim();
             });
             document.getElementById("music-player").addEventListener("ended", () => {
                 musicStatus = "stop"
+                if (delayedMusic.song != "") playCurrentMusic(delayedMusic)
             });
             ws.onmessage = function (event) {
                 if (data.recommendations) {
                     if (musicStatus != "playing") {
+                        console.log("data")
+                        console.log(data)
+                        playCurrentMusic({
+                            song: data.recommendations[0],
+                            genre: data.genre
+                        })
                     } else {
+                        delayedMusic = {
+                            song: data.recommendations[0],
+                            genre: data.genre
+                        }
                     }
                 } else {
                     let messageDiv = document.createElement("div");
         function playCurrentMusic(recommendationSong) {
             const chatBox = document.getElementById("chat-box");
+            delayedMusic = {
+                song: "",
+                genre: ""
+            };
             let recommendationDiv = document.createElement("div");
             recommendationDiv.classList.add("recommendation-message");
+            recommendationDiv.innerHTML = `🎵 Recommended Song: "${recommendationSong.genre}" 🎶`;
             chatBox.appendChild(recommendationDiv);
+            console.log("recommendation song")
+            console.log(recommendationSong)
+            document.getElementById("music-player").src = recommendationSong.song
             document.getElementById("music-player").play()
         }