feat: enhance dynamic catalog building and improve error handling

Author: TimilsinaBimal

app/api/endpoints/manifest.py

@@ -41,8 +41,14 @@ def get_base_manifest():
     }
 
 
-async def build_dynamic_catalogs(bundle: StremioBundle, auth_key: str, user_settings: UserSettings) -> list[dict]:
+async def build_dynamic_catalogs(
+    bundle: StremioBundle, auth_key: str, user_settings: UserSettings | None
+) -> list[dict]:
     # Fetch library using bundle directly
+    if not user_settings:
+        logger.error("User settings not found. Please reconfigure the addon.")
+        raise HTTPException(status_code=401, detail="User settings not found. Please reconfigure the addon.")
+
     library_items = await bundle.library.get_library_items(auth_key)
     dynamic_catalog_service = DynamicCatalogService(
         language=user_settings.language,

app/services/recommendation/all_based.py

@@ -166,16 +166,13 @@ async def _fetch_recommendations_for_item(self, item_id: str, mtype: str) -> lis
         combined = {}
 
         # Fetch 1 page each for recommendations
-        for action in ["recommendations"]:
-            method = getattr(self.tmdb_service, f"get_{action}")
-            try:
-                res = await method(tmdb_id, mtype, page=1)
-                for item in res.get("results", []):
-                    item_id = item.get("id")
-                    if item_id:
-                        combined[item_id] = item
-            except Exception as e:
-                logger.debug(f"Error fetching {action} for {tmdb_id}: {e}")
-                continue
+        try:
+            res = await self.tmdb_service.get_recommendations(tmdb_id, mtype, page=1)
+            for item in res.get("results", []):
+                item_id = item.get("id")
+                if item_id:
+                    combined[item_id] = item
+        except Exception as e:
+            logger.debug(f"Error fetching recommendations for {tmdb_id}: {e}")
 
         return list(combined.values())

app/services/recommendation/catalog_service.py

@@ -16,6 +16,7 @@
 from app.services.recommendation.item_based import ItemBasedService
 from app.services.recommendation.theme_based import ThemeBasedService
 from app.services.recommendation.top_picks import TopPicksService
+from app.services.recommendation.utils import pad_to_min
 from app.services.stremio.service import StremioBundle
 from app.services.tmdb.service import get_tmdb_service
 from app.services.token_store import token_store
@@ -98,16 +99,17 @@ async def get_catalog(
             )
 
             # Pad if needed
-            # if len(recommendations) < min_items:
-            #     recommendations = await pad_to_min(
-            #         content_type,
-            #         recommendations,
-            #         min_items,
-            #         services["tmdb"],
-            #         user_settings,
-            #         watched_tmdb,
-            #         watched_imdb,
-            #     )
+            # TODO: This is risky because it can fetch too many unrelated items.
+            if recommendations and len(recommendations) < 8:
+                recommendations = await pad_to_min(
+                    content_type,
+                    recommendations,
+                    10,  # only fetch 10 items if less than 8
+                    services["tmdb"],
+                    user_settings,
+                    watched_tmdb,
+                    watched_imdb,
+                )
 
             logger.info(f"Returning {len(recommendations)} items for {content_type}")
 
@@ -304,22 +306,8 @@ async def _get_recommendations(
             logger.info(f"Found {len(recommendations)} top picks for {content_type}")
 
         # Based on what you loved
-        elif catalog_id == "watchly.all.loved":
-            all_based_service: AllBasedService = services["all_based"]
-            recommendations = await all_based_service.get_recommendations_from_all_items(
-                library_items=library_items,
-                content_type=content_type,
-                watched_tmdb=watched_tmdb,
-                watched_imdb=watched_imdb,
-                whitelist=whitelist,
-                limit=max_items,
-                item_type="loved",
-                profile=profile,
-            )
-            logger.info(f"Found {len(recommendations)} recommendations based on all loved items")
-
-        # Based on what you liked
-        elif catalog_id == "watchly.liked.all":
+        elif catalog_id in ("watchly.all.loved", "watchly.liked.all"):
+            item_type = "loved" if catalog_id == "watchly.all.loved" else "liked"
             all_based_service: AllBasedService = services["all_based"]
             recommendations = await all_based_service.get_recommendations_from_all_items(
                 library_items=library_items,
@@ -328,10 +316,10 @@ async def _get_recommendations(
                 watched_imdb=watched_imdb,
                 whitelist=whitelist,
                 limit=max_items,
-                item_type="liked",
+                item_type=item_type,
                 profile=profile,
             )
-            logger.info(f"Found {len(recommendations)} recommendations based on all liked items")
+            logger.info(f"Found {len(recommendations)} recommendations based on all {item_type} items")
 
         else:
             logger.warning(f"Unknown catalog ID: {catalog_id}")