Update app.py

app.py

@@ -1,4 +1,4 @@
-from fastapi import FastAPI, HTTPException, Request
+from fastapi import FastAPI, HTTPException, Request, Response
 from fastapi.middleware.cors import CORSMiddleware
 import httpx
 import os
@@ -21,7 +21,7 @@ app.add_middleware(
 
 # 配置
 class Config:
-    OPENAI_API_BASE = "https://api.x.ai/v1"  # 注意这里是v1
+    OPENAI_API_BASE = "https://api.x.ai/v1"
     KEYS_URL = os.getenv("KEYS_URL", "")
     WHITELIST_IPS = os.getenv("WHITELIST_IPS", "").split(",")
 
@@ -62,23 +62,49 @@ def get_next_key():
         raise HTTPException(status_code=500, detail="No API keys available")
     return next(key_cycle)
 
-# 代理请求到X.AI
+# 模型列表路由
+@app.get("/api/v1/models")
+async def list_models():
+    headers = {
+        "Authorization": f"Bearer {get_next_key()}",
+        "Content-Type": "application/json"
+    }
+    
+    async with httpx.AsyncClient() as client:
+        try:
+            response = await client.get(
+                f"{Config.OPENAI_API_BASE}/models",
+                headers=headers
+            )
+            return response.json()
+        except Exception as e:
+            print(f"Models Error: {str(e)}")
+            raise HTTPException(status_code=500, detail=str(e))
+
+# 代理其他请求到X.AI
 @app.api_route("/api/v1/{path:path}", methods=["GET", "POST", "PUT", "DELETE"])
 async def proxy(path: str, request: Request):
     # 获取请求体
     body = await request.body()
+    body_str = body.decode() if body else ""
+    
     # 获取查询参数
     params = dict(request.query_params)
-    # 获取headers
+    
+    # 获取并处理headers
     headers = dict(request.headers)
     headers.pop("host", None)
-    
-    # 设置API key
     headers["Authorization"] = f"Bearer {get_next_key()}"
+    headers["Content-Type"] = "application/json"
     
     # 构建目标URL
     url = f"{Config.OPENAI_API_BASE}/{path}"
     
+    print(f"Proxying request to: {url}")
+    print(f"Method: {request.method}")
+    print(f"Headers: {headers}")
+    print(f"Body: {body_str}")
+    
     async with httpx.AsyncClient() as client:
         try:
             response = await client.request(
@@ -86,13 +112,38 @@ async def proxy(path: str, request: Request):
                 url=url,
                 params=params,
                 headers=headers,
-                content=body
+                content=body_str if body_str else None
             )
-            return response.json()
+            
+            # 获取响应内容
+            response_content = response.text
+            print(f"Response status: {response.status_code}")
+            print(f"Response content: {response_content}")
+            
+            # 尝试解析JSON响应
+            try:
+                return Response(
+                    content=response_content,
+                    status_code=response.status_code,
+                    headers=dict(response.headers)
+                )
+            except json.JSONDecodeError as e:
+                print(f"JSON decode error: {str(e)}")
+                return Response(
+                    content=response_content,
+                    status_code=response.status_code,
+                    headers=dict(response.headers)
+                )
+                
         except Exception as e:
-            print(f"Error: {str(e)}")  # 添加错误日志
+            print(f"Proxy Error: {str(e)}")
             raise HTTPException(status_code=500, detail=str(e))
 
+# 健康检查路由
+@app.get("/api/health")
+async def health_check():
+    return {"status": "healthy", "key_count": len(keys)}
+
 # 启动时初始化
 @app.on_event("startup")
 async def startup_event():