Update app_relay2.py

app_relay2.py

@@ -1,13 +1,12 @@
 # ═══════════════════════════════════════════════════════════════════════════════
-# 🧅 SODA-GEN ANONYMOUS RELAY V1.2 — HF SPACE CPU (BACKEND ONLY)
+# 🧅 SODA-GEN ANONYMOUS RELAY V1.3 — 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)
 #
-# INI BACKEND ONLY — Relay 1 (HF Space) tetap full stack dengan UI
-# V1.2: Adapted for HF Space (no ngrok, Docker-native Tor)
+# V1.3 FIX: socks5h:// → socks5:// (httpx compatibility)
 # ═══════════════════════════════════════════════════════════════════════════════
 
 import json
@@ -36,10 +35,15 @@ import threading
 # ═══════════════════════════════════════════════════════════════════════════════
 
 TARGET_URL = "https://r3gm-wan2-2-fp8da-aoti-preview-2.hf.space"
-TOR_PROXY = "socks5h://127.0.0.1:9050"
-PREDICT_TIMEOUT = 300          # 5 minutes for full generation
-MAX_TOR_RETRIES = 5            # Max circuit rotations per request
-GPU_RETRY_DELAY = 15           # Wait before GPU cold retry
+
+# ═══════════════════════════════════════════════════════════
+# 🔧 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
 
 WAN_NEG = (
     "色调艳丽, 过曝, 静态, 细节模糊不清, 字幕, 风格, 作品, 画作, 画面, 静止, "
@@ -54,7 +58,6 @@ UPLOAD_DIR.mkdir(exist_ok=True)
 
 TASKS: Dict[str, Dict[str, Any]] = {}
 
-# Track last known Tor IP for caching
 _last_tor_ip = {"ip": "unknown", "time": 0}
 
 # ═══════════════════════════════════════════════════════════════════════════════
@@ -62,7 +65,6 @@ _last_tor_ip = {"ip": "unknown", "time": 0}
 # ═══════════════════════════════════════════════════════════════════════════════
 
 def ensure_tor_running():
-    """Ensure Tor daemon is active"""
     try:
         result = subprocess.run(
             ["service", "tor", "status"],
@@ -78,7 +80,6 @@ def ensure_tor_running():
 
 
 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"]
@@ -95,18 +96,16 @@ 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()
             controller.signal(Signal.NEWNYM)
             time.sleep(5)
-            _last_tor_ip["ip"] = "unknown"  # Force refresh
+            _last_tor_ip["ip"] = "unknown"
             new_ip = get_tor_ip()
             print(f"🔄 Tor rotated → {new_ip}")
             return new_ip
     except Exception as e:
-        # Fallback: restart Tor entirely
         print(f"⚠️ Tor rotation method 1 failed: {e}, trying restart...")
         try:
             subprocess.run(["service", "tor", "restart"], capture_output=True, timeout=15)
@@ -130,10 +129,10 @@ def rotate_tor_circuit() -> str:
 
 class GradioClientWithProxy:
     """
-    Wrapper untuk gradio_client yang route traffic via Tor proxy.
+    Wrapper gradio_client yang route traffic via Tor SOCKS5 proxy.
     
-    gradio_client internal menggunakan httpx, yang respect env vars.
-    Kita set HTTP_PROXY/HTTPS_PROXY sebelum Client() dibuat.
+    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):
@@ -144,20 +143,21 @@ class GradioClientWithProxy:
         self._setup_client()
     
     def _setup_client(self):
-        """Setup gradio_client dengan proxy"""
         if self.proxy:
-            # Save old values
-            for key in ["HTTP_PROXY", "HTTPS_PROXY", "http_proxy", "https_proxy"]:
+            for key in ["HTTP_PROXY", "HTTPS_PROXY", "http_proxy", "https_proxy",
+                        "ALL_PROXY", "all_proxy"]:
                 self._old_env[key] = os.environ.get(key)
-            # Set proxy
+            
             os.environ["HTTP_PROXY"] = self.proxy
             os.environ["HTTPS_PROXY"] = self.proxy
             os.environ["http_proxy"] = self.proxy
             os.environ["https_proxy"] = self.proxy
+            os.environ["ALL_PROXY"] = self.proxy
+            os.environ["all_proxy"] = self.proxy
         
         self.client = Client(
             self.base_url,
-            headers={"User-Agent": "SodaGen-Anonymous/1.2"}
+            headers={"User-Agent": "SodaGen-Anonymous/1.3"}
         )
     
     def submit(self, **kwargs):
@@ -167,7 +167,6 @@ class GradioClientWithProxy:
         return self.client.predict(**kwargs)
     
     def _restore_env(self):
-        """Restore original env vars"""
         for key, val in self._old_env.items():
             if val is None:
                 os.environ.pop(key, None)
@@ -289,9 +288,21 @@ def run_generation_task(
         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_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"
+        
         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
         
@@ -495,10 +506,10 @@ def stream_video(video_path: str, request: Request):
 
 
 # ═══════════════════════════════════════════════════════════════════════════════
-# 🌐 FASTAPI APPLICATION (BACKEND ONLY — NO UI)
+# 🌐 FASTAPI APPLICATION
 # ═══════════════════════════════════════════════════════════════════════════════
 
-app = FastAPI(title="SODA-GEN Anonymous Relay V1.2")
+app = FastAPI(title="SODA-GEN Anonymous Relay V1.3")
 
 app.add_middleware(
     CORSMiddleware,
@@ -516,9 +527,10 @@ async def health_check():
     return JSONResponse({
         "status": "ok",
         "mode": "anonymous",
-        "version": "1.2",
+        "version": "1.3",
         "tor_ip": ip,
         "tor_active": tor_ok,
+        "proxy_scheme": "socks5://",
         "ffmpeg": shutil.which("ffmpeg") is not None,
     })
 
@@ -619,13 +631,13 @@ async def api_stats():
         "total_tokens": "infinity (Tor rotation)",
         "active_tokens": "∞",
         "cooldown_tokens": 0,
-        "version": "1.2",
+        "version": "1.3",
     })
 
 
 @app.get("/api/tor-ip")
 async def api_tor_ip():
-    _last_tor_ip["ip"] = "unknown"  # Force fresh check
+    _last_tor_ip["ip"] = "unknown"
     return JSONResponse({"ip": get_tor_ip()})
 
 
@@ -640,10 +652,11 @@ async def on_startup():
     ensure_tor_running()
     ip = get_tor_ip()
     print("=" * 60)
-    print("🧅 SODA-GEN Anonymous Relay V1.2 — HF Space CPU")
+    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 '❌'}")