Update app.py

app.py

@@ -6,14 +6,11 @@ import json
 from typing import List, Optional
 import requests
 from itertools import cycle
-import logging
 
-# 设置日志
-logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger(__name__)
-
-app = FastAPI(openapi_url="/api/v1/openapi.json", docs_url="/api/v1/docs")
+# 创建FastAPI应用
+app = FastAPI()
 
+# CORS设置
 app.add_middleware(
     CORSMiddleware,
     allow_origins=["*"],
@@ -22,8 +19,9 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+# 配置
 class Config:
-    OPENAI_API_BASE = "https://api.x.ai"  # 移除 /v1
+    OPENAI_API_BASE = "https://api.x.ai/v1"  # 注意这里是v1
     KEYS_URL = os.getenv("KEYS_URL", "")
     WHITELIST_IPS = os.getenv("WHITELIST_IPS", "").split(",")
 
@@ -31,6 +29,7 @@ class Config:
 keys = []
 key_cycle = None
 
+# 初始化keys
 def init_keys():
     global keys, key_cycle
     try:
@@ -42,12 +41,13 @@ def init_keys():
                 keys = [k.strip() for k in f.readlines() if k.strip()]
         
         key_cycle = cycle(keys)
-        logger.info(f"Loaded {len(keys)} API keys")
+        print(f"Loaded {len(keys)} API keys")
     except Exception as e:
-        logger.error(f"Error loading keys: {e}")
+        print(f"Error loading keys: {e}")
         keys = []
         key_cycle = cycle(keys)
 
+# IP白名单中间件
 @app.middleware("http")
 async def ip_whitelist(request: Request, call_next):
     if Config.WHITELIST_IPS and Config.WHITELIST_IPS[0]:
@@ -56,64 +56,44 @@ async def ip_whitelist(request: Request, call_next):
             raise HTTPException(status_code=403, detail="IP not allowed")
     return await call_next(request)
 
+# 获取下一个key
 def get_next_key():
     if not keys:
         raise HTTPException(status_code=500, detail="No API keys available")
     return next(key_cycle)
 
+# 代理请求到X.AI
 @app.api_route("/api/v1/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
 async def proxy(path: str, request: Request):
-    try:
-        # 获取请求信息
-        body = await request.body()
-        params = dict(request.query_params)
-        headers = dict(request.headers)
-        headers.pop("host", None)
-        
-        # 设置API key
-        api_key = get_next_key()
-        headers["Authorization"] = f"Bearer {api_key}"
-        
-        # 构建目标URL
-        url = f"{Config.OPENAI_API_BASE}/v1/{path}"
-        
-        logger.info(f"Proxying request to: {url}")
-        logger.info(f"Method: {request.method}")
-        logger.info(f"Headers: {headers}")
-        
-        async with httpx.AsyncClient() as client:
-            try:
-                response = await client.request(
-                    method=request.method,
-                    url=url,
-                    params=params,
-                    headers=headers,
-                    content=body,
-                    timeout=30.0  # 增加超时时间
-                )
-                
-                # 记录响应状态
-                logger.info(f"Response status: {response.status_code}")
-                
-                # 如果响应不是200，记录错误信息
-                if response.status_code != 200:
-                    logger.error(f"Error response: {response.text}")
-                    
-                return response.json()
-            except httpx.HTTPError as e:
-                logger.error(f"HTTP error occurred: {e}")
-                raise HTTPException(status_code=500, detail=str(e))
-            except Exception as e:
-                logger.error(f"Unexpected error: {e}")
-                raise HTTPException(status_code=500, detail=str(e))
-    except Exception as e:
-        logger.error(f"Error in proxy function: {e}")
-        raise HTTPException(status_code=500, detail=str(e))
-
-@app.get("/api/v1/health")
-async def health_check():
-    return {"status": "healthy", "key_count": len(keys)}
+    # 获取请求体
+    body = await request.body()
+    # 获取查询参数
+    params = dict(request.query_params)
+    # 获取headers
+    headers = dict(request.headers)
+    headers.pop("host", None)
+    
+    # 设置API key
+    headers["Authorization"] = f"Bearer {get_next_key()}"
+    
+    # 构建目标URL
+    url = f"{Config.OPENAI_API_BASE}/{path}"
+    
+    async with httpx.AsyncClient() as client:
+        try:
+            response = await client.request(
+                method=request.method,
+                url=url,
+                params=params,
+                headers=headers,
+                content=body
+            )
+            return response.json()
+        except Exception as e:
+            print(f"Error: {str(e)}")  # 添加错误日志
+            raise HTTPException(status_code=500, detail=str(e))
 
+# 启动时初始化
 @app.on_event("startup")
 async def startup_event():
     init_keys()