Update music_recommender.py

music_recommender.py

@@ -2,67 +2,98 @@ import spotipy
 from spotipy.oauth2 import SpotifyClientCredentials
 import random
 import os
+import logging
 
-# Enhanced emotion-to-genre mapping
-def get_music_recommendations(emotion):
+# Setup logging
+logging.basicConfig(level=logging.INFO)
 
+# Emotion-to-genre mapping
+MOOD_TO_GENRE = {
+    "Happy": "pop",
+    "Sad": "acoustic",
+    "Angry": "rock",
+    "Relaxed": "chill",
+    "Fear": "ambient",
+    "Disgust": "metal",
+    "Surprise": "electronic",
+    "Neutral": "indie"
+}
 
-    # Define emotion to genre mapping (now with Hindi/English focus)
-    mood_to_genre = {
-        "Happy": "bollywood pop",
-        "Sad": "indian indie",
-        "Angry": "indian rock",
-        "Relaxed": "indian classical",
-        "Fear": "indian ambient",
-        "Disgust": "indian metal",
-        "Surprise": "indian electronic",
-        "Neutral": "indian folk"
-    }
+# Hindi music indicators
+HINDI_KEYWORDS = [
+    # Popular Hindi singers
+    "Arijit", "Shreya", "Neha", "Kumar", "Jubin", "Sonu", "KK", "Rahat", "Mohit", "Atif", "Udit",
+    "Lata", "Kishore", "Asha", "Sunidhi", "Alka", "Shaan", "Pritam", "Armaan", "Badshah",
     
+    # Common Hindi song words
+    "Zindagi", "Dil", "Tera", "Mera", "Pyaar", "Ishq", "Mohabbat", "Yaad", "Saath", "Tum", "Hum",
+    "Jaan", "Pal", "Raat", "Sapna", "Chand", "Tujh", "Aankhon", "Leja", "Bekhayali",
+
+    # Bollywood related
+    "Bollywood", "Hindi", "Desi", "India", "Mumbai", "Aashiqui", "Kalank", "Kabir", "Dostana",
+
+    # Regional cross-over terms
+    "Punjabi", "Lofi", "Romantic", "Mashup", "Bolna", "Baarish", "Love Story"
+]
+
+def is_hindi_or_english(text):
+    """Heuristic to detect Hindi or English songs based on metadata"""
+    if not text:
+        return False
+    text_lower = text.lower()
+    return (
+        all(ord(char) < 128 for char in text)  # mostly English
+        or any(keyword.lower() in text_lower for keyword in HINDI_KEYWORDS)
+    )
+
+def get_spotify_client():
+    """Initialize Spotify client if credentials are available"""
     client_id = os.getenv("SPOTIFY_CLIENT_ID")
     client_secret = os.getenv("SPOTIFY_CLIENT_SECRET")
-    
+
     if client_id and client_secret:
-        sp = spotipy.Spotify(auth_manager=SpotifyClientCredentials(
-            client_id=client_id,
-            client_secret=client_secret
-        ))
-        
-        genre = mood_to_genre.get(emotion, "bollywood")
-        
-        # Search for Hindi/English tracks in the genre
-        query = f"genre:{genre} (tag:hindi OR tag:english)"
-        results = sp.search(q=query, type="track", limit=10, market="IN")  # 'IN' for India market
-        
-        songs = []
-        for track in results['tracks']['items']:
-            # Additional check for Hindi/English in track name or artist
-            if any(keyword in track['name'].lower() or 
-                   any(keyword in artist['name'].lower() for artist in track['artists'])
-                   for keyword in ["hindi", "english", "bollywood"]):
-                songs.append({
-                    "name": track['name'],
-                    "artist": track['artists'][0]['name'],
-                    "url": track['external_urls']['spotify'],
-                    "image_url": track['album']['images'][0]['url'] if track['album']['images'] else ""
-                })
-        
-        # If no results, fallback to Bollywood
-        if not songs:
-            results = sp.search(q="genre:bollywood", type="track", limit=10, market="IN")
-            for track in results['tracks']['items']:
-                songs.append({
-                    "name": track['name'],
-                    "artist": track['artists'][0]['name'],
-                    "url": track['external_urls']['spotify'],
-                    "image_url": track['album']['images'][0]['url'] if track['album']['images'] else ""
-                })
+        try:
+            return spotipy.Spotify(auth_manager=SpotifyClientCredentials(
+                client_id=client_id,
+                client_secret=client_secret
+            ))
+        except Exception as e:
+            logging.warning(f"Spotify auth failed: {e}")
     else:
-        # Fallback to Hindi/English mock data
-        songs = get_hindi_english_mock_recommendations(emotion)
-        
-    return songs
+        logging.warning("Spotify credentials not found in environment.")
+    return None
+
+def get_music_recommendations(emotion):
+    """Get songs based on emotion, filtered by language preference"""
+    genre = MOOD_TO_GENRE.get(emotion, "pop")
+    sp = get_spotify_client()
+
+    if sp:
+        try:
+            offset = random.randint(0, 950)
+            results = sp.search(q=f"genre:{genre}", type="track", limit=50, offset=offset)
+
+            songs = []
+            for track in results.get('tracks', {}).get('items', []):
+                title = track['name']
+                artist = track['artists'][0]['name']
+                if is_hindi_or_english(title) or is_hindi_or_english(artist):
+                    songs.append({
+                        "name": title,
+                        "artist": artist,
+                        "url": track['external_urls']['spotify'],
+                        "image_url": track['album']['images'][0]['url'] if track['album']['images'] else ""
+                    })
+
+            if songs:
+                return songs[:10]
+            else:
+                logging.info("No Hindi or English songs found in Spotify results. Falling back to mock data.")
+        except Exception as e:
+            logging.error(f"Spotify API error: {e}")
 
+    # Fallback to mock recommendations
+    return get_mock_recommendations(genre)
 
 def get_hindi_english_mock_recommendations(emotion):
     """Mock recommendations focused on Hindi/English songs"""