Adds the per-kind generator modules and registers them with the
PlaylistKindRegistry so the manager's `refresh_playlist` can dispatch
to any of them.
Generators (each in its own module under
`core/personalized/generators/`):
Singletons (variant=''):
- hidden_gems -> wraps service.get_hidden_gems
- discovery_shuffle -> wraps service.get_discovery_shuffle
- popular_picks -> wraps service.get_popular_picks
Variant-bearing kinds:
- time_machine -> variant = decade label ('1980s', '1990s', ...).
Variant resolver returns 7 standard decades.
Generator parses '1980s' -> 1980 + delegates
to service.get_decade_playlist.
- genre_playlist -> variant = URL-safe genre key
('electronic_dance', 'hip_hop_rap', ...).
Resolver normalizes parent-genre keys from
service.GENRE_MAPPING; free-form keywords
pass through to service.get_genre_playlist.
- daily_mix -> variant = top-genre rank ('1' / '2' / '3' / '4').
Generator looks up user's Nth-ranked library
genre and returns discovery picks within it.
Library half (was a stub returning []) is
intentionally dropped: tracks table has no
source IDs, so library rows can't sync. Fixed
the stub to return [] cleanly without the
misleading log warning.
- fresh_tape -> Spotify Release Radar. Reads curated track
IDs from discovery_curated_playlists (tries
'release_radar_<source>' first, falls back to
'release_radar') and hydrates against the
discovery pool.
- archives -> Spotify Discover Weekly. Same hydration path
as fresh_tape but uses 'discovery_weekly'.
- seasonal_mix -> variant = season key ('halloween' / 'christmas'
/ 'valentines' / 'summer' / 'spring' / 'autumn').
Reads curated IDs via SeasonalDiscoveryService
then hydrates from seasonal_tracks (which
carries full track_data_json).
Each module:
- Defines `generate(deps, variant, config) -> List[Track]`.
- Defines `SPEC = PlaylistKindSpec(...)` and registers it on import
(idempotent — re-import safe via `if registry.get(...) is None`).
- For variant-bearing kinds, also defines `variant_resolver(deps)`.
Shared helpers in `_common.py`:
- `get_service(deps)` pulls the legacy
`PersonalizedPlaylistsService` instance (deps.service or
deps['service']).
- `coerce_tracks(rows)` runs each dict through `Track.from_dict`,
tolerates None / non-list inputs.
Tests (50 new, total 85 across personalized subsystem):
- Singletons: registration + display name + dispatch + limit
forwarding + empty/None tolerance + missing-deps error +
dict-form deps acceptance (16 tests).
- Variants: variant_resolver listing + label parsing + invalid
variant errors + parent-key normalization + free-form passthrough
(13 tests).
- Curated/hybrid: daily_mix rank-to-genre resolution + rank-out-of-
range empty + invalid-variant error; fresh_tape & archives
hydration order + missing-id skip + source-specific-then-fallback
key dispatch + limit + missing-database-dep error; seasonal_mix
curated-id hydration order + missing-id skip + JSON round-trip +
empty-curated empty + limit + missing-service error (21 tests).
3304+ tests pass. No regression on existing 62 personalized tests.
136 lines
4.4 KiB
Python
136 lines
4.4 KiB
Python
"""Seasonal Mix generator (variant = season key).
|
|
|
|
Variant = season key from ``SEASONAL_CONFIG`` (``'halloween'`` /
|
|
``'christmas'`` / ``'valentines'`` / ``'summer'`` / ``'spring'`` /
|
|
``'autumn'``). One playlist per season — user picks which seasons
|
|
to enable; idle seasons can stay un-refreshed until their active
|
|
period.
|
|
|
|
Reads curated track IDs from ``curated_seasonal_playlists`` (via
|
|
``SeasonalDiscoveryService.get_curated_seasonal_playlist``) and
|
|
hydrates them against ``seasonal_tracks`` (which carries full
|
|
metadata including ``track_data_json`` for sync-ready downstream
|
|
use)."""
|
|
|
|
from __future__ import annotations
|
|
|
|
import json
|
|
from typing import Any, List
|
|
|
|
from core.personalized.specs import PlaylistKindSpec, get_registry
|
|
from core.personalized.types import PlaylistConfig, Track
|
|
|
|
|
|
KIND = 'seasonal_mix'
|
|
|
|
|
|
def _resolve_seasonal_service(deps: Any):
|
|
"""Pull the SeasonalDiscoveryService instance from deps."""
|
|
svc = getattr(deps, 'seasonal_service', None) or (
|
|
deps.get('seasonal_service') if isinstance(deps, dict) else None
|
|
)
|
|
if svc is None:
|
|
raise RuntimeError(
|
|
"Seasonal mix generator deps missing `seasonal_service` "
|
|
"(SeasonalDiscoveryService instance)."
|
|
)
|
|
return svc
|
|
|
|
|
|
def _resolve_database(deps: Any):
|
|
db = getattr(deps, 'database', None) or (
|
|
deps.get('database') if isinstance(deps, dict) else None
|
|
)
|
|
if db is None:
|
|
raise RuntimeError("Seasonal mix generator deps missing `database`")
|
|
return db
|
|
|
|
|
|
def _resolve_active_source(deps: Any) -> str:
|
|
fn = getattr(deps, 'get_active_discovery_source', None) or (
|
|
deps.get('get_active_discovery_source') if isinstance(deps, dict) else None
|
|
)
|
|
return fn() if callable(fn) else 'spotify'
|
|
|
|
|
|
def _hydrate_seasonal_tracks(db, season_key: str, source: str, track_ids: List[str]) -> List[Track]:
|
|
"""Look up the seasonal_tracks rows for the given IDs."""
|
|
if not track_ids:
|
|
return []
|
|
placeholders = ','.join('?' * len(track_ids))
|
|
with db._get_connection() as conn:
|
|
cursor = conn.cursor()
|
|
cursor.execute(
|
|
f"""
|
|
SELECT spotify_track_id, track_name, artist_name, album_name,
|
|
album_cover_url, duration_ms, popularity, track_data_json
|
|
FROM seasonal_tracks
|
|
WHERE season_key = ? AND source = ?
|
|
AND spotify_track_id IN ({placeholders})
|
|
""",
|
|
(season_key, source, *track_ids),
|
|
)
|
|
rows = cursor.fetchall()
|
|
|
|
by_id = {}
|
|
for r in rows:
|
|
if hasattr(r, 'keys'):
|
|
r = dict(r)
|
|
else:
|
|
r = dict(zip(
|
|
('spotify_track_id', 'track_name', 'artist_name', 'album_name',
|
|
'album_cover_url', 'duration_ms', 'popularity', 'track_data_json'),
|
|
r,
|
|
))
|
|
td = r.get('track_data_json')
|
|
if isinstance(td, str):
|
|
try:
|
|
td = json.loads(td)
|
|
except (ValueError, TypeError):
|
|
td = None
|
|
r['track_data_json'] = td
|
|
r['source'] = source
|
|
by_id[r['spotify_track_id']] = r
|
|
|
|
# Preserve curated order.
|
|
return [
|
|
Track.from_dict(by_id[tid])
|
|
for tid in track_ids
|
|
if tid in by_id
|
|
]
|
|
|
|
|
|
def generate(deps: Any, variant: str, config: PlaylistConfig) -> List[Track]:
|
|
if not variant:
|
|
raise ValueError('Seasonal Mix requires a season variant')
|
|
seasonal_service = _resolve_seasonal_service(deps)
|
|
db = _resolve_database(deps)
|
|
source = _resolve_active_source(deps)
|
|
track_ids = seasonal_service.get_curated_seasonal_playlist(variant, source=source) or []
|
|
tracks = _hydrate_seasonal_tracks(db, variant, source, track_ids)
|
|
return tracks[:config.limit]
|
|
|
|
|
|
def variant_resolver(deps: Any) -> List[str]:
|
|
"""Return every season key from SEASONAL_CONFIG."""
|
|
try:
|
|
from core.seasonal_discovery import SEASONAL_CONFIG
|
|
except Exception:
|
|
return []
|
|
return list(SEASONAL_CONFIG.keys())
|
|
|
|
|
|
SPEC = PlaylistKindSpec(
|
|
kind=KIND,
|
|
name_template='Seasonal — {variant}',
|
|
description='Holiday / season-themed picks. One playlist per season; user enables which to track.',
|
|
default_config=PlaylistConfig(limit=50, max_per_album=2, max_per_artist=3),
|
|
generator=generate,
|
|
variant_resolver=variant_resolver,
|
|
requires_variant=True,
|
|
tags=['curated', 'seasonal'],
|
|
)
|
|
|
|
|
|
if get_registry().get(KIND) is None:
|
|
get_registry().register(SPEC)
|