feat: update catalogs on user request with better mechanism (#70)

Author: TimilsinaBimal

.env.example

@@ -1,17 +1,20 @@
 TMDB_API_KEY=<your_tmdb_api_key>
-PORT=8000
-ADDON_ID=com.bimal.watchly
-ADDON_NAME=Watchly
 REDIS_URL=redis://redis:6379/0
-TOKEN_TTL_SECONDS=0
-ANNOUNCEMENT_HTML=
+TOKEN_SALT=change-me # generate secure salt...
+
+# app setup
+APP_ENV="development"  # available values are ["development", "production"]
 HOST_NAME=<your_addon_url>
-RECOMMENDATION_SOURCE_ITEMS_LIMIT=10 # fetches recent watched/loved 10 movies and series to recommend based on those
-TOKEN_SALT=change-me
-# generate some very long random string preferrably using cryptography libraries
+PORT=8000
+
+# redis
+REDIS_MAX_CONNECTIONS=20
+REDIS_CONNECTIONS_THRESHOLD=100
+
 # UPDATER
-CATALOG_UPDATE_MODE=cron # Available options: cron, interval
-# cron updates catalogs at specified times
-# interval updates in specific intervals
-CATALOG_UPDATE_CRON_SCHEDULES=[{"hour": 12, "minute": 0, "id": "catalog_refresh_noon"},{"hour": 0, "minute": 0, "id": "catalog_refresh_midnight"}]
+AUTO_UPDATE_CATALOGS=True
 CATALOG_REFRESH_INTERVAL_SECONDS=6*60*60
+
+# AI Catalog name generation
+GEMINI_API_KEY=<your_gemini_api_key>
+DEFAULT_GEMINI_MODEL="gemma-3-27b-it"

.gitignore

@@ -46,3 +46,4 @@ logs/
 # python notebooks
 */ipynb_checkpoints/
 *.ipynb
+.vercel

app/api/endpoints/catalogs.py

@@ -4,9 +4,10 @@
 from loguru import logger
 
 from app.api.endpoints.manifest import get_config_id
+from app.core.config import settings
 from app.core.security import redact_token
 from app.core.settings import UserSettings, get_default_settings
-from app.services.catalog_updater import refresh_catalogs_for_credentials
+from app.services.catalog_updater import catalog_updater
 from app.services.recommendation.engine import RecommendationEngine
 from app.services.stremio.service import StremioBundle
 from app.services.token_store import token_store
@@ -80,6 +81,10 @@ async def get_catalog(type: str, id: str, response: Response, token: str):
     if not credentials:
         raise HTTPException(status_code=401, detail="Invalid or expired token. Please reconfigure the addon.")
 
+    # Trigger lazy update if needed
+    if settings.AUTO_UPDATE_CATALOGS:
+        await catalog_updater.trigger_update(token, credentials)
+
     bundle = StremioBundle()
     try:
         # 1. Resolve Auth Key (with potential fallback to login)
@@ -200,17 +205,3 @@ def _get_limits() -> tuple[int, int]:
         raise HTTPException(status_code=500, detail=str(e))
     finally:
         await bundle.close()
-
-
-@router.get("/{token}/catalog/update")
-async def update_catalogs(token: str):
-    """
-    Update the catalogs for the addon. This is a manual endpoint to update the catalogs.
-    """
-    # Decode credentials from path
-    credentials = await token_store.get_user_data(token)
-
-    logger.info(f"[{redact_token(token)}] Updating catalogs in response to manual request")
-    updated = await refresh_catalogs_for_credentials(token, credentials)
-    logger.info(f"Manual catalog update completed: {updated}")
-    return {"success": updated}

app/api/endpoints/manifest.py

@@ -6,6 +6,7 @@
 from app.core.settings import UserSettings, get_default_settings
 from app.core.version import __version__
 from app.services.catalog import DynamicCatalogService
+from app.services.catalog_updater import get_config_id
 from app.services.stremio.service import StremioBundle
 from app.services.token_store import token_store
 from app.services.translation import translation_service
@@ -69,21 +70,6 @@ async def build_dynamic_catalogs(bundle: StremioBundle, auth_key: str, user_sett
     return await dynamic_catalog_service.get_dynamic_catalogs(library_items, user_settings)
 
 
-def get_config_id(catalog) -> str | None:
-    catalog_id = catalog.get("id", "")
-    if catalog_id.startswith("watchly.theme."):
-        return "watchly.theme"
-    if catalog_id.startswith("watchly.loved."):
-        return "watchly.loved"
-    if catalog_id.startswith("watchly.watched."):
-        return "watchly.watched"
-    if catalog_id.startswith("watchly.item."):
-        return "watchly.item"
-    if catalog_id.startswith("watchly.rec"):
-        return "watchly.rec"
-    return catalog_id
-
-
 async def _manifest_handler(response: Response, token: str):
     response.headers["Cache-Control"] = "public, max-age=300"  # 5 minutes
 

app/api/endpoints/tokens.py

@@ -1,3 +1,5 @@
+from datetime import datetime, timezone
+
 from fastapi import APIRouter, HTTPException, Request
 from loguru import logger
 from pydantic import BaseModel, Field
@@ -89,6 +91,11 @@ async def create_token(payload: TokenRequest, request: Request) -> TokenResponse
         "email": resolved_email or email or "",
         "settings": user_settings.model_dump(),
     }
+    if existing_data:
+        payload_to_store["last_updated"] = existing_data.get("last_updated")
+    else:
+        payload_to_store["last_updated"] = datetime.now(timezone.utc).isoformat()
+
     if email and password:
         payload_to_store["password"] = password
 
@@ -101,12 +108,13 @@ async def create_token(payload: TokenRequest, request: Request) -> TokenResponse
     # Maybe generate manifest and check if catalogs exist and if not raise error?
     expires_in = settings.TOKEN_TTL_SECONDS if settings.TOKEN_TTL_SECONDS > 0 else None
 
+    await bundle.close()
+
     return TokenResponse(
         token=token,
         manifestUrl=manifest_url,
         expiresInSeconds=expires_in,
     )
-    await bundle.close()
 
 
 async def get_stremio_user_data(payload: TokenRequest) -> tuple[str, str]:

app/core/app.py

@@ -10,34 +10,18 @@
 from loguru import logger
 
 from app.api.main import api_router
-from app.services.catalog_updater import BackgroundCatalogUpdater
 from app.services.token_store import token_store
 
 from .config import settings
 from .version import __version__
 
-# Global catalog updater instance
-catalog_updater: BackgroundCatalogUpdater | None = None
-
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     """
     Manage application lifespan events (startup/shutdown).
     """
-    global catalog_updater
-    # Startup
-    if settings.AUTO_UPDATE_CATALOGS:
-        catalog_updater = BackgroundCatalogUpdater()
-        catalog_updater.start()
     yield
-
-    # Shutdown
-    if catalog_updater:
-        await catalog_updater.stop()
-        catalog_updater = None
-        logger.info("Background catalog updates stopped")
-    # Close shared token store Redis client
     try:
         await token_store.close()
         logger.info("TokenStore Redis client closed")

app/core/config.py

@@ -31,9 +31,7 @@ class Settings(BaseSettings):
     TOKEN_TTL_SECONDS: int = 0  # 0 = never expire
     ANNOUNCEMENT_HTML: str = ""
     AUTO_UPDATE_CATALOGS: bool = True
-    CATALOG_UPDATE_MODE: Literal["cron", "interval"] = "cron"  # "cron" for fixed times, "interval" for periodic
-    CATALOG_UPDATE_CRON_SCHEDULES: list[dict] = ({"hour": 0, "minute": 0, "id": "catalog_refresh_midnight"},)
-    CATALOG_REFRESH_INTERVAL_SECONDS: int = 6 * 60 * 60  # 6 hours (used when CATALOG_UPDATE_MODE="interval")
+    CATALOG_REFRESH_INTERVAL_SECONDS: int = 43200  # 12 hours
     APP_ENV: Literal["development", "production", "vercel"] = "development"
     HOST_NAME: str = "https://1ccea4301587-watchly.baby-beamup.club"
 

app/core/version.py

@@ -1 +1 @@
-__version__ = "1.3.2"
+__version__ = "1.3.3"