Tune mood recos to trending Naija playlists and pre-load HF models

app/main.py

@@ -39,7 +39,7 @@ from .spotify_catalog_api import (
     search_tracks_by_artist,
     get_artist_top_tracks,
 )
-from .spotify_playlist_reco import recommend_playlist_for_emotion
+from .spotify_playlist_reco import recommend_playlist_for_emotion, pick_random_track_from_playlist
 
 
 Base.metadata.create_all(bind=engine)
@@ -102,13 +102,27 @@ def mood_from_text(
         raise HTTPException(status_code=400, detail="Text cannot be empty")
 
     label, score = analyze_text_emotion(body.text)
-    track = recommend_track_for_emotion(label, source="text") or {}
-    track_id = track.get("id") if track else None
     try:
         playlist = recommend_playlist_for_emotion(label)
     except SpotifyAPIError:
         playlist = {}
 
+    track: dict = {}
+    track_id: str | None = None
+    try:
+        if playlist:
+            track = pick_random_track_from_playlist(
+                playlist_id=playlist.get("id"),
+            )
+            track_id = track.get("id") if track else None
+    except SpotifyAPIError:
+        track = {}
+        track_id = None
+
+    if not track_id:
+        track = recommend_track_for_emotion(label, source="text") or {}
+        track_id = track.get("id") if track else None
+
     playlist_id = playlist.get("id") if playlist else None
 
     try:
@@ -160,13 +174,27 @@ async def mood_from_face(
         raise HTTPException(status_code=400, detail="Invalid image file") from exc
 
     label, score = analyze_face_emotion(image)
-    track = recommend_track_for_emotion(label, source="face") or {}
-    track_id = track.get("id") if track else None
     try:
         playlist = recommend_playlist_for_emotion(label)
     except SpotifyAPIError:
         playlist = {}
 
+    track: dict = {}
+    track_id: str | None = None
+    try:
+        if playlist:
+            track = pick_random_track_from_playlist(
+                playlist_id=playlist.get("id"),
+            )
+            track_id = track.get("id") if track else None
+    except SpotifyAPIError:
+        track = {}
+        track_id = None
+
+    if not track_id:
+        track = recommend_track_for_emotion(label, source="face") or {}
+        track_id = track.get("id") if track else None
+
     playlist_id = playlist.get("id") if playlist else None
 
     try:

app/spotify_playlist_reco.py

@@ -49,3 +49,42 @@ def recommend_playlist_for_emotion(emotion: str, *, market: Optional[str] = None
     return {}
 
 
+def pick_random_track_from_playlist(playlist_id: str, *, market: Optional[str] = None) -> Dict[str, Any]:
+    """
+    Given a playlist ID, return a random track from it (using app-only token).
+    This is used so mood-based suggestions come from popular Naija playlists.
+    """
+    import random
+
+    token = get_app_access_token()
+    mk = market or settings.spotify_market or "NG"
+    data = spotify_get(
+        f"https://api.spotify.com/v1/playlists/{playlist_id}/tracks",
+        token,
+        params={"market": mk},
+    )
+    items = data.get("items") or []
+    tracks = []
+    for it in items:
+        t = (it or {}).get("track") or {}
+        if not t or t.get("is_local"):
+            continue
+        album = t.get("album") or {}
+        images = album.get("images") or []
+        image_url = images[0].get("url") if images else None
+        tracks.append(
+            {
+                "id": t.get("id"),
+                "name": t.get("name"),
+                "artists": [a.get("name") for a in (t.get("artists") or []) if isinstance(a, dict)],
+                "preview_url": t.get("preview_url"),
+                "external_url": (t.get("external_urls") or {}).get("spotify"),
+                "album": album.get("name"),
+                "image_url": image_url,
+            }
+        )
+    if not tracks:
+        return {}
+    return random.choice(tracks)
+
+