Upload _run.py with huggingface_hub

_run.py

@@ -6,9 +6,11 @@ from app_v2_entry import app  # v5-stable inline bongda proxy
 
 # Import and initialize the resilient shorts updater
 try:
-    from shorts_updater import get_shorts, get_shorts_with_status, init_updater, FALLBACK_SHORTS, _load_cache
+    from shorts_updater import get_shorts, get_shorts_with_status, init_updater, FALLBACK_SHORTS, _load_cache, clear_cache, update_shorts_background, YOUTUBE_HANDLES
+    import subprocess
     import threading
     import time
+    import json
     
     # Initialize on startup
     init_updater()
@@ -16,17 +18,17 @@ try:
     # Memory cache for fast access
     _shorts_mem_cache = {"t": 0, "d": [], "updating": False}
     
-    # Load existing cache on module load
+    # Load existing cache on module load (but mark as stale if old)
     try:
         _existing_cache = _load_cache()
+        cache_age = time.time() - _existing_cache.get("t", 0)
         if _existing_cache.get("d"):
             _shorts_mem_cache["d"] = _existing_cache["d"][:40]
             _shorts_mem_cache["t"] = _existing_cache.get("t", time.time())
-            print(f"[Shorts] Loaded {len(_shorts_mem_cache['d'])} shorts from cache")
+            print(f"[Shorts] Loaded {len(_shorts_mem_cache['d'])} shorts from cache (age: {int(cache_age/60)}min)")
     except Exception as e:
         print(f"[Shorts] Initial cache load error: {e}")
     
-    # Override the /api/shorts endpoint with timeout-safe version
     from fastapi import Query
     from fastapi.responses import JSONResponse
     
@@ -38,12 +40,13 @@ try:
         """
         Resilient shorts endpoint - returns immediately from cache, 
         triggers background update if stale, never hangs.
+        Query refresh=1 to force immediate update.
         """
         now = time.time()
         
-        # If refresh requested or cache is stale, trigger background update
+        # If refresh requested, trigger immediate background update
         cache_age = now - _shorts_mem_cache.get("t", 0)
-        if refresh or cache_age > 600 or not _shorts_mem_cache.get("d"):
+        if refresh or cache_age > 300 or not _shorts_mem_cache.get("d"):  # Reduced TTL: 5 min
             if not _shorts_mem_cache.get("updating"):
                 _shorts_mem_cache["updating"] = True
                 threading.Thread(target=update_shorts_if_stale, daemon=True).start()
@@ -57,28 +60,60 @@ try:
         
         return JSONResponse(result)
     
+    @app.post('/api/shorts/refresh')
+    def force_refresh_shorts():
+        """Force immediate refresh of shorts cache - admin endpoint"""
+        if _shorts_mem_cache.get("updating"):
+            return JSONResponse({"status": "already_updating", "message": "Refresh in progress"})
+        
+        # Clear cache first to force fresh fetch
+        clear_cache()
+        _shorts_mem_cache["d"] = []
+        _shorts_mem_cache["t"] = 0
+        
+        threading.Thread(target=update_shorts_if_stale, daemon=True).start()
+        return JSONResponse({"status": "refresh_started", "message": "Fetching fresh shorts..."})
+    
+    @app.get('/api/shorts/debug')
+    def debug_shorts():
+        """Debug endpoint to check cache status"""
+        return JSONResponse({
+            "cache_exists": bool(_shorts_mem_cache.get("d")),
+            "cache_count": len(_shorts_mem_cache.get("d", [])),
+            "cache_age_seconds": int(time.time() - _shorts_mem_cache.get("t", 0)),
+            "updating": _shorts_mem_cache.get("updating", False),
+            "channels_monitored": YOUTUBE_HANDLES
+        })
+    
     def update_shorts_if_stale():
         """Background task to update shorts cache"""
         try:
-            shorts_data = get_shorts_with_status()
-            shorts = shorts_data.get("shorts", [])
-            
-            # If empty (first load or all sources failed), use fallback
-            if not shorts:
-                shorts = FALLBACK_SHORTS
+            # Force fresh fetch (not from cache)
+            shorts, errors = _fetch_all_shorts()
             
-            _shorts_mem_cache["d"] = shorts[:40]
-            _shorts_mem_cache["t"] = time.time()
-            
-            print(f"[Shorts] Cache updated: {len(shorts)} items")
+            if shorts:
+                _shorts_mem_cache["d"] = shorts[:40]
+                _shorts_mem_cache["t"] = time.time()
+                print(f"[Shorts] Cache updated: {len(shorts)} items from channels")
+            else:
+                # Use fallback if all sources failed
+                _shorts_mem_cache["d"] = FALLBACK_SHORTS
+                _shorts_mem_cache["t"] = time.time()
+                print(f"[Shorts] Using fallback shorts, errors: {errors}")
         except Exception as e:
             print(f"[Shorts] Update error: {e}")
+            # Ensure we always have fallback
+            _shorts_mem_cache["d"] = FALLBACK_SHORTS
+            _shorts_mem_cache["t"] = time.time()
         finally:
             _shorts_mem_cache["updating"] = False
+
+    # Need to import the _fetch_all_shorts function
+    from shorts_updater import _fetch_all_shorts
             
 except Exception as e:
     print(f"[Shorts] Failed to load updater module: {e}")
-    # Fallback: define empty endpoints
+    # Fallback: define minimal endpoints
     from fastapi import Query
     from fastapi.responses import JSONResponse