fix: priotrize keywords for row generation than genre

Author: TimilsinaBimal

app/services/catalog.py

@@ -34,9 +34,9 @@ def build_catalog_entry(self, item, label, config_id):
             catalog_id = item_id
 
         name = item.get("name")
-        # Truncate long names for cleaner UI
-        if len(name) > 25:
-            name = name[:25] + "..."
+        # # Truncate long names for cleaner UI
+        # if len(name) > 25:
+        #     name = name[:25] + "..."
 
         return {
             "type": self.normalize_type(item.get("type")),
@@ -88,7 +88,6 @@ async def get_dynamic_catalogs(
         """
         Generate all dynamic catalog rows.
         """
-        print(user_settings)
 
         include_item_based_rows = bool(
             next((c for c in user_settings.catalogs if c.id == "watchly.item" and c.enabled), True)

app/services/catalog_updater.py

@@ -38,6 +38,9 @@ async def refresh_catalogs_for_credentials(
         logger.info(f"[{redacted}] Prepared {len(catalogs)} catalogs")
         auth_key = await stremio_service.get_auth_key()
         return await stremio_service.update_catalogs(catalogs, auth_key)
+    except Exception as e:
+        logger.exception(f"Failed to update catalogs: {e}", exc_info=True)
+        raise e
     finally:
         await stremio_service.close()
 

app/services/row_generator.py

@@ -4,10 +4,14 @@
 
 from app.models.profile import UserTasteProfile
 from app.services.tmdb.countries import COUNTRY_ADJECTIVES
-from app.services.tmdb.genre import GENRE_ADJECTIVES, movie_genres, series_genres
+from app.services.tmdb.genre import movie_genres, series_genres
 from app.services.tmdb_service import TMDBService
 
 
+def normalize_keyword(kw):
+    return kw.strip().replace("-", " ").replace("_", " ").title()
+
+
 class RowDefinition(BaseModel):
     """
     Defines a dynamic catalog row.
@@ -42,7 +46,7 @@ async def generate_rows(self, profile: UserTasteProfile, content_type: str = "mo
 
         # Extract features
         top_genres = profile.get_top_genres(limit=3)  # [(id, score), ...]
-        top_keywords = profile.get_top_keywords(limit=3)  # [(id, score), ...]
+        top_keywords = profile.get_top_keywords(limit=4)  # [(id, score), ...]
         top_countries = profile.get_top_countries(limit=1)  # [(code, score)]
         top_years = profile.years.get_top_features(limit=1)  # [(decade_start, score)]
 
@@ -58,41 +62,53 @@ def get_cname(code):
                 return random.choice(adjectives)
             return ""
 
-        # Strategy 1: Genre + Mood (Adjective)
-        if top_genres:
-            g_id = top_genres[0][0]
-            adj = random.choice(GENRE_ADJECTIVES.get(g_id, ["Essential"]))
-            rows.append(
-                RowDefinition(
-                    title=f"{adj} {get_gname(g_id)}",
-                    id=f"watchly.theme.g{g_id}.sort-vote",  # Use sort-vote for quality
-                    genres=[g_id],
-                )
-            )
-
-        # Strategy 2: Genre + Keyword ("Time-Travel Adventures")
-        if len(top_genres) > 0 and top_keywords:
-            g_id = top_genres[0][0]  # Use top genre
+        # Strategy 1: Pure Keyword Row (Top Priority)
+        if top_keywords:
             k_id = top_keywords[0][0]
-
             kw_name = await self._get_keyword_name(k_id)
             if kw_name:
                 rows.append(
                     RowDefinition(
-                        title=f"{kw_name.title()} {get_gname(g_id)}",
-                        id=f"watchly.theme.g{g_id}.k{k_id}",
-                        genres=[g_id],
+                        title=f"{normalize_keyword(kw_name)}",
+                        id=f"watchly.theme.k{k_id}",
                         keywords=[k_id],
                     )
                 )
 
-        # Strategy 3: Genre + Country ("Korean Thrillers")
-        if len(top_genres) > 0 and top_countries:
-            # Pick a genre (maybe 2nd top to vary)
+        # Strategy 2: Keyword + Genre (Specific Niche)
+        if top_genres and len(top_keywords) > 1:
+            g_id = top_genres[0][0]
+            # get random keywords: Just to surprise user in every refresh
+            k_id = random.choice(top_keywords[1:])[0]
+
+            if k_id:
+                kw_name = await self._get_keyword_name(k_id)
+                if kw_name:
+                    title = f"{normalize_keyword(kw_name)} {get_gname(g_id)}"
+                    # keyword and genre can have same name sometimes, remove if so
+                    words = title.split()
+                    seen_words = set()
+                    unique_words = []
+                    for word in words:
+                        if word not in seen_words:
+                            unique_words.append(word)
+                            seen_words.add(word)
+                    title = " ".join(unique_words)
+
+                    rows.append(
+                        RowDefinition(
+                            title=title,
+                            id=f"watchly.theme.g{g_id}.k{k_id}",
+                            genres=[g_id],
+                            keywords=[k_id],
+                        )
+                    )
+
+        # Strategy 3: Genre + Country (e.g. "Bollywood Action")
+        if top_countries and len(top_genres) > 0:
             g_id = top_genres[0][0] if len(top_genres) == 1 else top_genres[1][0]
             c_code = top_countries[0][0]
             c_adj = get_cname(c_code)
-
             if c_adj:
                 rows.append(
                     RowDefinition(
@@ -111,7 +127,7 @@ def get_cname(code):
                 g_id = top_genres[2][0]
 
             decade_start = top_years[0][0]
-            # Only do this if decade is valid and somewhat old (nostalgia factor)
+            # # Only do this if decade is valid and somewhat old (nostalgia factor)
             if 1970 <= decade_start <= 2010:
                 decade_str = str(decade_start)[2:] + "s"  # "90s"
                 rows.append(