refactor: enhance recommendation services by consolidating utility functions and improving filtering logic

Author: TimilsinaBimal

.gitignore

@@ -47,3 +47,4 @@ logs/
 */ipynb_checkpoints/
 *.ipynb
 .vercel
+migration.py

app/services/recommendation/catalog_service.py

@@ -45,17 +45,6 @@ async def get_catalog(
         """
         Get catalog recommendations.
 
-        Args:
-            token: User token
-            content_type: Content type (movie/series)
-            catalog_id: Catalog ID (watchly.rec, watchly.creators, watchly.theme.*, etc.)
-
-        Returns:
-            Tuple of (recommendations list, response headers dict)
-        """
-        """
-        Get catalog recommendations.
-
         Args:
             token: User token
             content_type: Content type (movie/series)
@@ -193,9 +182,8 @@ async def _resolve_auth(self, bundle: StremioBundle, credentials: dict, token: s
             try:
                 auth_key = await bundle.auth.login(email, password)
                 credentials["authKey"] = auth_key
-                # Note: token is not stored in credentials, we'd need to pass it separately
-                # For now, this is handled by the caller if needed
-                pass
+                # Update token store with refreshed credentials
+                await token_store.update_user_data(token, credentials)
             except Exception as e:
                 logger.error(f"Failed to refresh auth key during catalog fetch: {e}")
 

app/services/recommendation/creators.py

@@ -14,6 +14,7 @@
 from app.models.taste_profile import TasteProfile
 from app.services.recommendation.filtering import RecommendationFiltering
 from app.services.recommendation.metadata import RecommendationMetadata
+from app.services.recommendation.utils import content_type_to_mtype, filter_watched_by_imdb, resolve_tmdb_id
 
 
 class CreatorsService:
@@ -65,7 +66,7 @@ async def get_recommendations_from_creators(
         Returns:
             List of recommended items
         """
-        mtype = "tv" if content_type in ("tv", "series") else "movie"
+        mtype = content_type_to_mtype(content_type)
 
         # Get top directors and cast from profile
         top_directors = profile.get_top_directors(limit=20)
@@ -171,13 +172,7 @@ async def get_recommendations_from_creators(
         )
 
         # Final filter (remove watched by IMDB ID)
-        final = []
-        for item in enriched:
-            if item.get("id") in watched_imdb:
-                continue
-            if item.get("_external_ids", {}).get("imdb_id") in watched_imdb:
-                continue
-            final.append(item)
+        final = filter_watched_by_imdb(enriched, watched_imdb)
 
         return final[:limit]
 
@@ -209,15 +204,7 @@ async def count_creators(item: dict):
             try:
                 # Resolve TMDB ID
                 item_id = item.get("_id", "")
-                tmdb_id = None
-
-                if item_id.startswith("tmdb:"):
-                    try:
-                        tmdb_id = int(item_id.split(":")[1])
-                    except (ValueError, IndexError):
-                        return
-                elif item_id.startswith("tt"):
-                    tmdb_id, _ = await self.tmdb_service.find_by_imdb_id(item_id)
+                tmdb_id = await resolve_tmdb_id(item_id, self.tmdb_service)
 
                 if not tmdb_id:
                     return