From 67185b85e904f910d5e86380a772d3cfcf214b81 Mon Sep 17 00:00:00 2001 From: Honey Date: Wed, 13 May 2026 01:01:35 +0200 Subject: [PATCH] fix: track needs Public() client; fix album partner API structure parsing - Song() requires a client instance as first arg; pass Public() for unauthenticated access - Album response is data.albumUnion.{name,artists,coverArt,tracks.items} not flat keys - Add per-field debug logging for track and album responses Co-Authored-By: Claude Sonnet 4.6 --- backend/spotify_resolve.py | 47 ++++++++++++++++++++++++++++---------- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/backend/spotify_resolve.py b/backend/spotify_resolve.py index 3b682d6..75e57e4 100644 --- a/backend/spotify_resolve.py +++ b/backend/spotify_resolve.py @@ -64,13 +64,18 @@ def resolve(sp_type, sp_id): url = f'https://open.spotify.com/{sp_type}/{sp_id}' if sp_type == 'track': - cls_name = next((n for n in ('PublicSong', 'Song', 'PublicTrack', 'Track') if n in available), None) - if not cls_name: - raise Exception(f'spotapi has no track class (available: {available})') - song = getattr(sp_mod, cls_name)(url) + # Song requires a client instance as first arg; Public() is the unauthenticated client + public = sp_mod.Public() + song = sp_mod.Song(public, url) raw = song.get_song_info() - eprint(f'[spotapi] track raw keys: {list(raw.keys()) if isinstance(raw, dict) else type(raw)}') - tr = _parse_track(raw) or { + eprint(f'[spotapi] track raw type={type(raw).__name__} keys={list(raw.keys()) if isinstance(raw, dict) else "?"}') + if isinstance(raw, dict): + for k, v in raw.items(): + eprint(f'[spotapi] track[{k!r}] = {repr(v)[:120]}') + # Partner API nests track under data.trackUnion + d = raw.get('data') or {} + tu = d.get('trackUnion') or d + tr = _parse_track({'itemV2': {'data': {'trackUnion': tu}}}) or { 'trackName': raw.get('name', ''), 'artistName': raw.get('artist', ''), 'collectionName': raw.get('album', ''), @@ -91,12 +96,30 @@ def resolve(sp_type, sp_id): alb = getattr(sp_mod, cls_name)(url) alb_info = alb.get_album_info() eprint(f'[spotapi] album raw type={type(alb_info).__name__} keys={list(alb_info.keys()) if isinstance(alb_info, dict) else "?"}') - meta = alb_info if isinstance(alb_info, dict) else {} - name = meta.get('name', '') - artist = meta.get('artist', '') or meta.get('artists', '') - art = meta.get('image', '') or meta.get('cover', '') - raw_tracks = meta.get('tracks') or meta.get('items') or (alb_info if isinstance(alb_info, list) else []) - tracks = [t for t in (_parse_track(i) for i in raw_tracks) if t] + if isinstance(alb_info, dict): + for k, v in alb_info.items(): + eprint(f'[spotapi] alb[{k!r}] = {repr(v)[:160]}') + # Partner API: data.albumUnion.{name, artists, coverArt, tracks.items[]} + d = (alb_info.get('data') or {}) if isinstance(alb_info, dict) else {} + au = d.get('albumUnion') or d.get('albumV2') or (alb_info if isinstance(alb_info, dict) else {}) + name = au.get('name', '') + # artist(s) + artist_items = (au.get('artists') or {}).get('items') or [] + artist = ', '.join( + (a.get('profile') or {}).get('name', '') or a.get('name', '') for a in artist_items + ) or au.get('artist', '') + # artwork + cover_items = (au.get('coverArt') or {}).get('sources') or (au.get('images') or {}).get('items') or [] + art = cover_items[0].get('url', '') if cover_items else '' + # tracks + raw_tracks = (au.get('tracks') or {}).get('items') or [] + # album track items look like {uid, track: {data: {trackUnion: {...}}}} + def _alb_track(item): + inner = item.get('track') or item + return _parse_track(inner, + default_album=name, default_art=art, + default_artist=artist) + tracks = [t for t in (_alb_track(i) for i in raw_tracks) if t] eprint(f'[spotapi] album ok — {len(tracks)} tracks') return {'type': 'album', 'name': name, 'artist': artist, 'artworkUrl': art, 'tracks': tracks}