Update app.py

app.py

@@ -1,7 +1,6 @@
 import os
 import time
 import random
-import json
 import httpx
 from typing import Dict
 
@@ -33,7 +32,11 @@ print(f"[INIT] Loaded {len(API_KEYS)} keys")
 # STATE
 # ─────────────────────────────
 key_status: Dict[str, Dict] = {
-    k: {"fail": 0, "cooldown": 0, "status": "active"}
+    k: {
+        "fail": 0,
+        "cooldown": 0,
+        "status": "active"
+    }
     for k in API_KEYS
 }
 
@@ -70,7 +73,7 @@ def mark_ok(k):
     key_status[k]["status"] = "active"
 
 # ─────────────────────────────
-# UNIVERSAL OPENAI PROXY
+# UNIVERSAL OPENAI PROXY (/v1/*)
 # ─────────────────────────────
 @app.api_route("/v1/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
 async def proxy(req: Request, path: str):
@@ -91,51 +94,61 @@ async def proxy(req: Request, path: str):
         headers["Authorization"] = f"Bearer {key}"
 
         try:
-            async with httpx.AsyncClient(timeout=None) as client:
+            async with httpx.AsyncClient(timeout=60) as client:
 
-                # 🔥 STREAM SAFE MODE (FIX UTAMA)
-                async with client.stream(
+                # ─────────────────────────────
+                # STEP 1: VALIDATE REQUEST (NO STREAM)
+                # ─────────────────────────────
+                test = await client.request(
                     method=req.method,
                     url=target_url,
                     headers=headers,
                     content=body,
                     params=req.query_params
-                ) as r:
-
-                    # ERROR RESPONSE
-                    if r.status_code >= 400:
-                        err = await r.aread()
-                        if r.status_code == 429:
-                            mark_limit(key)
-                        elif r.status_code >= 500:
-                            key_status[key]["fail"] += 1
-                            if key_status[key]["fail"] >= 3:
-                                mark_dead(key)
-
-                        continue
-
-                    mark_ok(key)
-
-                    # STREAMING RESPONSE
-                    return StreamingResponse(
-                        r.aiter_bytes(),
-                        media_type=r.headers.get(
-                            "content-type",
-                            "application/json"
-                        )
+                )
+
+                if test.status_code >= 400:
+                    if test.status_code == 429:
+                        mark_limit(key)
+                    elif test.status_code >= 500:
+                        key_status[key]["fail"] += 1
+                        if key_status[key]["fail"] >= 3:
+                            mark_dead(key)
+                    continue
+
+                mark_ok(key)
+
+                # ─────────────────────────────
+                # STEP 2: STREAM RESPONSE (SAFE)
+                # ─────────────────────────────
+                stream = await client.stream(
+                    method=req.method,
+                    url=target_url,
+                    headers=headers,
+                    content=body,
+                    params=req.query_params
+                )
+
+                return StreamingResponse(
+                    stream.aiter_bytes(),
+                    media_type=test.headers.get(
+                        "content-type",
+                        "application/json"
                     )
+                )
 
         except Exception as e:
             key_status[key]["fail"] += 1
+
             if key_status[key]["fail"] >= 3:
                 mark_dead(key)
 
-            print(f"[ERROR] key={key[:6]} err={e}")
+            print(f"[ERROR] key={key[:6]} -> {e}")
 
     return JSONResponse(
         {
             "error": "all keys failed",
-            "hint": "check keys or model access"
+            "hint": "check keys / model access / BASE_URL"
         },
         500
     )
@@ -147,6 +160,6 @@ async def proxy(req: Request, path: str):
 def root():
     return {
         "status": "ok",
-        "mode": "openai-grade-proxy",
+        "mode": "openai-proxy-fixed",
         "keys": len(API_KEYS)
     }