Simplified proxy

app.py

@@ -1,101 +1,61 @@
 import os
-import time
 import random
 import httpx
-from typing import Dict
 from fastapi import FastAPI, Request, HTTPException
-from fastapi.responses import JSONResponse, StreamingResponse, Response
+from fastapi.responses import JSONResponse, Response
 
 app = FastAPI()
 
-BASE_URL = os.getenv("BASE_URL", "https://ollama.com")
-MASTER_API_KEY = "ollama-proxy-free"
+BASE_URL = "https://ollama.com"
+MASTER_KEY = "ollama-proxy-free"
 
-API_KEYS = [
+KEYS = [
     "8ca25de51e554c099962b78b7ce0c9e9.Mp5dnqctR2zzq3g-NO_M-cjW",
     "dbd1d0c534964684a6d4678348ab8d30.ieDfmSYVnf0MmTjR-AIdNrW9",
     "37e81a6be4104fbfbfbe2ecf557a2c10.GoIbzpHebdM9ZcHarQ9A12Cp"
 ]
 
-key_status = {k: {"fail": 0, "cooldown": 0, "status": "active"} for k in API_KEYS}
-
-def auth(req: Request):
-    key = req.headers.get("Authorization", "").replace("Bearer ", "")
-    if key != MASTER_API_KEY:
-        print(f"[AUTH] reject: {key[:8]} != {MASTER_API_KEY[:8]}")
-        raise HTTPException(401, "Unauthorized")
-    print(f"[AUTH] ok")
-
-def pick_key() -> str:
-    now = time.time()
-    valid = [k for k, v in key_status.items() if v["status"] != "dead" and v["cooldown"] < now]
-    return random.choice(valid) if valid else random.choice(API_KEYS)
-
-def mark_fail(k):
-    key_status[k]["fail"] += 1
-    if key_status[k]["fail"] >= 3:
-        key_status[k]["cooldown"] = time.time() + 60
-
-def mark_ok(k):
-    key_status[k]["fail"] = 0
-    key_status[k]["status"] = "active"
-
 @app.get("/")
 def root():
-    return {"status": "ok", "keys": len(API_KEYS), "master_set": MASTER_API_KEY[:10]}
+    return {"status": "ok", "master": MASTER_KEY[:10]}
 
-# Simple route for testing
-@app.post("/test")
-def test(req: Request):
-    auth(req)
-    key = pick_key()
-    return {"key": key[:10], "url": BASE_URL}
-
-@app.api_route("/v1/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
-async def proxy(req: Request, path: str):
-    try:
-        auth(req)
-    except HTTPException:
-        raise
+@app.post("/v1/chat/completions")
+async def chat(req: Request):
+    # Auth
+    auth_key = req.headers.get("Authorization", "").replace("Bearer ", "")
+    if auth_key != MASTER_KEY:
+        raise HTTPException(401, "Unauthorized")
     
-    target = f"{BASE_URL}/v1/{path}"
-    body = await req.body()
-    headers = dict(req.headers)
-    headers.pop("host", None)
-    headers.pop("content-length", None)
-
-    print(f"[PROXY] {req.method} {path}")
+    body = await req.json()
     
-    for i in range(len(API_KEYS)):
-        key = pick_key()
-        headers["Authorization"] = f"Bearer {key}"
-        
-        print(f"[TRY] key={key[:6]}...")
-        
+    for key in KEYS:
         try:
-            async with httpx.AsyncClient(timeout=120.0, follow_redirects=True) as client:
-                resp = await client.request(
-                    method=req.method,
-                    url=target,
-                    headers=headers,
-                    content=body,
-                    params=req.query_params
+            async with httpx.AsyncClient(timeout=60) as client:
+                resp = await client.post(
+                    f"{BASE_URL}/v1/chat/completions",
+                    json=body,
+                    headers={"Authorization": f"Bearer {key}"}
                 )
                 
-                print(f"[RESP] {key[:6]} <- {resp.status_code}")
-                
-                if resp.status_code < 400:
-                    mark_ok(key)
-                    return Response(
-                        content=resp.content,
-                        status_code=resp.status_code,
-                        headers=dict(resp.headers)
-                    )
-                
-                mark_fail(key)
+                if resp.status_code == 200:
+                    return Response(resp.content, status_code=200)
         except Exception as e:
-            print(f"[ERR] {key[:6]} {type(e).__name__}: {e}")
-            mark_fail(key)
-
-    print("[FAIL] all keys failed")
+            print(f"ERR {key[:6]}: {e}")
+    
     return JSONResponse({"error": "all keys failed"}, status_code=500)
+
+@app.get("/v1/models")
+def models():
+    for key in KEYS:
+        try:
+            resp = httpx.get(
+                f"{BASE_URL}/v1/models",
+                headers={"Authorization": f"Bearer {key}"},
+                timeout=30
+            )
+            if resp.status_code == 200:
+                return Response(resp.content, status_code=200)
+        except:
+            pass
+    
+    return JSONResponse({"error": "error"}, status_code=500)