Update app_relay2.py

app_relay2.py

@@ -1,12 +1,10 @@
 # ═══════════════════════════════════════════════════════════════════════════════
-# 🧅 SODA-GEN ANONYMOUS RELAY V1.3 — HF SPACE CPU (BACKEND ONLY)
+# 🧅 SODA-GEN ANONYMOUS RELAY V1.4 — HF SPACE CPU (BACKEND ONLY)
 # 
-# MODE: Anonymous + Tor IP Rotation
-# QUOTA: 120s per Tor exit node (auto-rotate on exhaustion)
-# TARGET: https://r3gm-wan2-2-fp8da-aoti-preview-2.hf.space
-# PLATFORM: Hugging Face Spaces (Docker / CPU Basic)
-#
-# V1.3 FIX: socks5h:// → socks5:// (httpx compatibility)
+# V1.4 FIX: Non-blocking startup (was causing 503 on HF Space)
+#   - on_startup: lightweight only, no Tor network calls
+#   - Tor IP check runs in background thread
+#   - Health endpoint always responds instantly
 # ═══════════════════════════════════════════════════════════════════════════════
 
 import json
@@ -35,12 +33,7 @@ import threading
 # ═══════════════════════════════════════════════════════════════════════════════
 
 TARGET_URL = "https://r3gm-wan2-2-fp8da-aoti-preview-2.hf.space"
-
-# ═══════════════════════════════════════════════════════════
-# 🔧 FIX V1.3: socks5h → socks5 (httpx only supports socks5://)
-# ═══════════════════════════════════════════════════════════
 TOR_PROXY = "socks5://127.0.0.1:9050"
-
 PREDICT_TIMEOUT = 300
 MAX_TOR_RETRIES = 5
 GPU_RETRY_DELAY = 15
@@ -59,12 +52,14 @@ UPLOAD_DIR.mkdir(exist_ok=True)
 TASKS: Dict[str, Dict[str, Any]] = {}
 
 _last_tor_ip = {"ip": "unknown", "time": 0}
+_tor_ready = False  # Set True once Tor is confirmed working
 
 # ═══════════════════════════════════════════════════════════════════════════════
 # 🧅 TOR ENGINE
 # ═══════════════════════════════════════════════════════════════════════════════
 
 def ensure_tor_running():
+    """Ensure Tor daemon is active (no network calls)"""
     try:
         result = subprocess.run(
             ["service", "tor", "status"],
@@ -75,11 +70,15 @@ def ensure_tor_running():
             time.sleep(3)
             print("🧅 Tor started")
     except:
-        subprocess.run(["service", "tor", "start"], capture_output=True, timeout=10)
-        time.sleep(3)
+        try:
+            subprocess.run(["service", "tor", "start"], capture_output=True, timeout=10)
+            time.sleep(3)
+        except Exception as e:
+            print(f"⚠️ Cannot start Tor: {e}")
 
 
 def get_tor_ip() -> str:
+    """Get current Tor exit node IP (cached for 10s)"""
     now = time.time()
     if now - _last_tor_ip["time"] < 10 and _last_tor_ip["ip"] != "unknown":
         return _last_tor_ip["ip"]
@@ -96,6 +95,7 @@ def get_tor_ip() -> str:
 
 
 def rotate_tor_circuit() -> str:
+    """Request new Tor circuit → new exit node → new IP"""
     try:
         with Controller.from_port(port=9051) as controller:
             controller.authenticate()
@@ -123,18 +123,40 @@ def rotate_tor_circuit() -> str:
             return "rotation_failed"
 
 
+def _background_tor_init():
+    """
+    Run in background thread AFTER server is ready.
+    This prevents blocking the startup event.
+    """
+    global _tor_ready
+    print("🧅 Background Tor init starting...")
+    
+    # Wait extra time for Tor to build circuits
+    time.sleep(10)
+    
+    ensure_tor_running()
+    
+    # Try to get IP (might take time)
+    ip = get_tor_ip()
+    if ip != "unknown":
+        _tor_ready = True
+        print(f"🧅 Tor ready! IP: {ip}")
+    else:
+        # Retry once after short delay
+        time.sleep(5)
+        ip = get_tor_ip()
+        if ip != "unknown":
+            _tor_ready = True
+            print(f"🧅 Tor ready (retry)! IP: {ip}")
+        else:
+            print("⚠️ Tor init incomplete — will retry on first request")
+
+
 # ═══════════════════════════════════════════════════════════════════════════════
 # 📡 GRADIO CLIENT WITH PROXY
 # ════════════════════════════════���══════════════════════════════════════════════
 
 class GradioClientWithProxy:
-    """
-    Wrapper gradio_client yang route traffic via Tor SOCKS5 proxy.
-    
-    V1.3: Menggunakan socks5:// (bukan socks5h://) agar compatible dengan httpx.
-    httpx internal gradio_client hanya recognize socks5:// scheme.
-    """
-    
     def __init__(self, base_url: str, proxy: str = None):
         self.base_url = base_url
         self.proxy = proxy
@@ -157,7 +179,7 @@ class GradioClientWithProxy:
         
         self.client = Client(
             self.base_url,
-            headers={"User-Agent": "SodaGen-Anonymous/1.3"}
+            headers={"User-Agent": "SodaGen-Anonymous/1.4"}
         )
     
     def submit(self, **kwargs):
@@ -269,7 +291,7 @@ def resize_image_for_video(image_path, width=768, height=512):
 
 
 # ═══════════════════════════════════════════════════════════════════════════════
-# 🚀 GENERATION TASK (ANONYMOUS MODE)
+# 🚀 GENERATION TASK
 # ═══════════════════════════════════════════════════════════════════════════════
 
 def run_generation_task(
@@ -281,27 +303,26 @@ def run_generation_task(
     steps: float,
     frame_mult: int,
 ):
+    global _tor_ready
     task = TASKS[task_id]
     
     try:
         task["status"] = "processing"
         task["log"] += f"🎬 [ANONYMOUS MODE] Prompt: {prompt[:80]}...\n"
         task["log"] += f"⏱️ Duration: {duration}s | Steps: {steps} | FPS Mult: {frame_mult}\n"
-        task["log"] += f"⏱️ Timeout: {PREDICT_TIMEOUT}s | Max Tor retries: {MAX_TOR_RETRIES}\n"
-        task["log"] += f"🔧 Proxy scheme: socks5:// (V1.3 fix)\n"
         
+        # Ensure Tor is running (may not be ready yet on first call)
         ensure_tor_running()
         
-        # Verify Tor is actually working
-        test_ip = get_tor_ip()
-        task["log"] += f"🧅 Initial Tor IP: {test_ip}\n"
-        if test_ip == "unknown":
-            task["log"] += f"⚠️ WARNING: Could not determine Tor IP. Tor may not be routing.\n"
-            task["log"] += f"   Attempting to restart Tor...\n"
-            subprocess.run(["service", "tor", "restart"], capture_output=True, timeout=15)
-            time.sleep(5)
-            test_ip = get_tor_ip()
-            task["log"] += f"   After restart: {test_ip}\n"
+        # Get Tor IP (might fail first time, that's ok)
+        current_ip = get_tor_ip()
+        task["log"] += f"🧅 Tor IP: {current_ip}\n"
+        
+        if current_ip == "unknown":
+            task["log"] += f"⚠️ Tor not ready yet, waiting 15s for circuits...\n"
+            time.sleep(15)
+            current_ip = get_tor_ip()
+            task["log"] += f"🧅 Tor IP (retry): {current_ip}\n"
         
         img1_resized = resize_image_for_video(img1_path) if img1_path else None
         img2_resized = resize_image_for_video(img2_path) if img2_path else None
@@ -368,9 +389,6 @@ def run_generation_task(
                 
                 if is_quota_error(err_msg):
                     task["log"] += f"⚠️ QUOTA EXCEEDED on IP {current_ip}\n"
-                    retry_time = parse_retry_time(err_msg)
-                    if retry_time:
-                        task["log"] += f"   ⏰ Retry in: {retry_time}s\n"
                     task["log"] += f"🔄 Rotating Tor circuit...\n"
                     new_ip = rotate_tor_circuit()
                     task["log"] += f"   🧅 New IP: {new_ip}\n"
@@ -509,7 +527,7 @@ def stream_video(video_path: str, request: Request):
 # 🌐 FASTAPI APPLICATION
 # ═══════════════════════════════════════════════════════════════════════════════
 
-app = FastAPI(title="SODA-GEN Anonymous Relay V1.3")
+app = FastAPI(title="SODA-GEN Anonymous Relay V1.4")
 
 app.add_middleware(
     CORSMiddleware,
@@ -520,16 +538,45 @@ app.add_middleware(
 )
 
 
+# ═══════════════════════════════════════════════════════════
+# 🔧 V1.4 FIX: STARTUP IS LIGHTWEIGHT — NO BLOCKING CALLS
+# ═══════════════════════════════════════════════════════════
+
+@app.on_event("startup")
+async def on_startup():
+    """
+    V1.4: Startup event is FAST and NON-BLOCKING.
+    Only prints basic info. Tor IP check runs in background thread.
+    This ensures HF Space health check gets instant response → no 503.
+    """
+    print("=" * 60)
+    print("🧅 SODA-GEN Anonymous Relay V1.4 — HF Space CPU")
+    print(f"   📡 Target: {TARGET_URL}")
+    print(f"   🧅 Proxy: {TOR_PROXY}")
+    print(f"   ⏱️ Timeout: {PREDICT_TIMEOUT}s")
+    print(f"   🎬 ffmpeg: {'✅' if shutil.which('ffmpeg') else '❌'}")
+    print(f"   🧅 Tor init: running in background thread...")
+    print("=" * 60)
+    
+    # Start Tor initialization in BACKGROUND thread
+    # This does NOT block the startup event
+    t = threading.Thread(target=_background_tor_init, daemon=True)
+    t.start()
+
+
 @app.get("/api/health")
 async def health_check():
-    ip = get_tor_ip()
-    tor_ok = ip != "unknown" and ip != "rotation_failed"
+    """
+    Lightweight health check — responds INSTANTLY.
+    Tor IP is optional (shows cached or 'initializing').
+    HF Space uses this to determine if space is alive.
+    """
     return JSONResponse({
         "status": "ok",
         "mode": "anonymous",
-        "version": "1.3",
-        "tor_ip": ip,
-        "tor_active": tor_ok,
+        "version": "1.4",
+        "tor_ip": _last_tor_ip["ip"],
+        "tor_ready": _tor_ready,
         "proxy_scheme": "socks5://",
         "ffmpeg": shutil.which("ffmpeg") is not None,
     })
@@ -623,15 +670,15 @@ async def serve_thumbnail(filename: str):
 
 @app.get("/api/stats")
 async def api_stats():
-    ip = get_tor_ip()
     return JSONResponse({
         "mode": "anonymous",
-        "tor_ip": ip,
+        "tor_ip": _last_tor_ip["ip"],
+        "tor_ready": _tor_ready,
         "quota_per_ip": 120,
         "total_tokens": "infinity (Tor rotation)",
         "active_tokens": "∞",
         "cooldown_tokens": 0,
-        "version": "1.3",
+        "version": "1.4",
     })
 
 
@@ -645,19 +692,3 @@ async def api_tor_ip():
 async def api_tor_rotate():
     new_ip = rotate_tor_circuit()
     return JSONResponse({"new_ip": new_ip, "success": new_ip != "rotation_failed"})
-
-
-@app.on_event("startup")
-async def on_startup():
-    ensure_tor_running()
-    ip = get_tor_ip()
-    print("=" * 60)
-    print("🧅 SODA-GEN Anonymous Relay V1.3 — HF Space CPU")
-    print(f"   🌐 Tor IP: {ip}")
-    print(f"   📡 Target: {TARGET_URL}")
-    print(f"   🧅 Proxy: {TOR_PROXY}")
-    print(f"   🔧 Scheme: socks5:// (V1.3 fix)")
-    print(f"   ⏱️ Timeout: {PREDICT_TIMEOUT}s")
-    print(f"   🎬 ffmpeg: {'✅' if shutil.which('ffmpeg') else '❌'}")
-    print(f"   🎬 ffprobe: {'✅' if shutil.which('ffprobe') else '❌'}")
-    print("=" * 60)