Update app.py

app.py

@@ -252,13 +252,17 @@ async def handle_api_request(url: str, headers: dict, method: str = "GET", body:
     while current_try < max_retries:
         try:
             # 获取key
-            key = get_chat_key() if for_chat else first_key
+            if for_chat:
+                key = get_chat_key()
+            else:
+                key = first_key
+                
             if not key:
                 raise HTTPException(status_code=500, detail="No API keys available")
                 
             headers["Authorization"] = f"Bearer {key}"
             
-            async with httpx.AsyncClient() as client:
+            async with httpx.AsyncClient(timeout=60.0) as client:
                 response = await client.request(
                     method=method,
                     url=url,
@@ -267,7 +271,8 @@ async def handle_api_request(url: str, headers: dict, method: str = "GET", body:
                 )
                 
                 # 检查配额不足
-                if response.status_code == 429 or "insufficient_quota" in response.text:
+                if response.status_code == 429 or "insufficient_quota" in response.text.lower():
+                    print(f"Key {key} quota exceeded, trying next key...")
                     set_key_cooling(key)
                     current_try += 1
                     continue
@@ -275,40 +280,58 @@ async def handle_api_request(url: str, headers: dict, method: str = "GET", body:
                 return response
                 
         except Exception as e:
+            print(f"Request error: {str(e)}")
             current_try += 1
             if current_try == max_retries:
-                raise e
+                raise HTTPException(status_code=500, detail=f"API request failed after {max_retries} retries")
 
 # 聊天完成路由
 @app.post("/api/v1/chat/completions")
 async def chat_completions(request: Request):
     try:
-        body = await request.json()
+        # 获取请求体
+        body = await request.body()
+        body_json = json.loads(body)
+        
+        # 获取headers
         headers = {
             "Content-Type": "application/json",
-            "Accept": "text/event-stream" if body.get("stream") else "application/json"
+            "Accept": "text/event-stream" if body_json.get("stream") else "application/json"
         }
         
+        print("Starting chat completion request...")
         response = await handle_api_request(
             url=f"{Config.OPENAI_API_BASE}/chat/completions",
             headers=headers,
             method="POST",
-            body=body,
+            body=body_json,
             for_chat=True
         )
         
-        if body.get("stream"):
+        if not response:
+            raise HTTPException(status_code=500, detail="Failed to get response from API")
+            
+        print(f"Chat completion response status: {response.status_code}")
+        
+        if body_json.get("stream"):
             return StreamingResponse(
                 stream_generator(response),
-                media_type="text/event-stream"
+                media_type="text/event-stream",
+                headers={
+                    "Cache-Control": "no-cache",
+                    "Connection": "keep-alive",
+                    "Content-Type": "text/event-stream"
+                }
             )
         
         return Response(
             content=response.text,
-            media_type="application/json"
+            media_type="application/json",
+            status_code=response.status_code
         )
         
     except Exception as e:
+        print(f"Chat completion error: {str(e)}")
         raise HTTPException(status_code=500, detail=str(e))
 
 # 代理其他请求