refactor: update cache_profile_and_watched_sets to return profile and watched sets, simplifying retrieval in ManifestService and CatalogService

TimilsinaBimal · TimilsinaBimal · commit 6e79931b1137 · 2025-12-30T15:11:34.000+05:45
diff --git a/app/services/manifest.py b/app/services/manifest.py
@@ -103,7 +103,7 @@ async def cache_library_and_profiles(
         for content_type in ["movie", "series"]:
             try:
                 logger.info(f"[{redact_token(token)}] Building and caching profile for {content_type}")
-                await cache_profile_and_watched_sets(
+                _, _, _ = await cache_profile_and_watched_sets(
                     token, content_type, integration_service, library_items, bundle, auth_key
                 )
                 logger.debug(f"[{redact_token(token)}] Cached profile and watched sets for {content_type}")
diff --git a/app/services/recommendation/catalog_service.py b/app/services/recommendation/catalog_service.py
@@ -135,18 +135,9 @@ async def get_catalog(
             else:
                 # Build profile if not cached
                 logger.info(f"[{redact_token(token)}...] Profile not cached for {content_type}, building from library")
-                await cache_profile_and_watched_sets(
+                profile, watched_tmdb, watched_imdb = await cache_profile_and_watched_sets(
                     token, content_type, integration_service, library_items, bundle, auth_key
                 )
-                # Fetch the newly cached data
-                cached_data = await user_cache.get_profile_and_watched_sets(token, content_type)
-                if cached_data:
-                    profile, watched_tmdb, watched_imdb = cached_data
-                else:
-                    # Fallback: profile build may have failed
-                    profile = None
-                    watched_tmdb = set()
-                    watched_imdb = set()
 
             whitelist = await integration_service.get_genre_whitelist(profile, content_type) if profile else set()
 
diff --git a/app/utils/catalog.py b/app/utils/catalog.py
@@ -38,6 +38,7 @@ async def cache_profile_and_watched_sets(
     )
 
     await user_cache.set_profile_and_watched_sets(token, content_type, profile, watched_tmdb, watched_imdb)
+    return profile, watched_tmdb, watched_imdb
 
 
 def get_config_id(catalog) -> str | None:

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ async def cache_library_and_profiles(`
`103`	`103`	`for content_type in ["movie", "series"]:`
`104`	`104`	`try:`
`105`	`105`	`logger.info(f"[{redact_token(token)}] Building and caching profile for {content_type}")`
`106`		`- await cache_profile_and_watched_sets(`
	`106`	`+ _, _, _ = await cache_profile_and_watched_sets(`
`107`	`107`	`token, content_type, integration_service, library_items, bundle, auth_key`
`108`	`108`	`)`
`109`	`109`	`logger.debug(f"[{redact_token(token)}] Cached profile and watched sets for {content_type}")`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,7 @@ async def cache_profile_and_watched_sets(`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`await user_cache.set_profile_and_watched_sets(token, content_type, profile, watched_tmdb, watched_imdb)`
	`41`	`+ return profile, watched_tmdb, watched_imdb`
`41`	`42`
`42`	`43`
`43`	`44`	`def get_config_id(catalog) -> str \| None:`