Enhance API key verification to include ADMIN_KEY check and return DEEPSIDER_TOKEN; improve error handling in create_chat_completion function.

app.py

@@ -172,7 +172,23 @@ def verify_api_key(api_key: str = Header(..., alias="Authorization")):
     """验证API密钥"""
     if not api_key.startswith("Bearer "):
         raise HTTPException(status_code=401, detail="Invalid API key format")
-    return api_key.replace("Bearer ", "")
+    
+    # 获取环境变量中的 ADMIN_KEY
+    admin_key = os.getenv("ADMIN_KEY")
+    if not admin_key:
+        raise HTTPException(status_code=500, detail="ADMIN_KEY not configured")
+    
+    # 验证传入的 key 是否匹配 ADMIN_KEY
+    provided_key = api_key.replace("Bearer ", "").strip()
+    if provided_key != admin_key:
+        raise HTTPException(status_code=401, detail="Invalid API key")
+    
+    # 验证通过后，返回 DEEPSIDER_TOKEN
+    deepsider_token = os.getenv("DEEPSIDER_TOKEN")
+    if not deepsider_token:
+        raise HTTPException(status_code=500, detail="DEEPSIDER_TOKEN not configured")
+    
+    return deepsider_token
 
 def map_openai_to_deepsider_model(model: str) -> str:
     """将OpenAI模型名称映射到DeepSider模型名称"""
@@ -350,7 +366,7 @@ async def list_models(api_key: str = Depends(verify_api_key)):
 @app.post("/v1/chat/completions")
 async def create_chat_completion(
     request: Request,
-    api_key: str = Depends(verify_api_key)
+    api_key: str = Depends(verify_api_key)  # 这里返回的是 DEEPSIDER_TOKEN
 ):
     """创建聊天完成API - 支持普通请求和流式请求"""
     # 解析请求体
@@ -370,15 +386,12 @@ async def create_chat_completion(
     payload = {
         "model": deepsider_model,
         "prompt": prompt,
-        "webAccess": "close",  # 默认关闭网络访问
+        "webAccess": "close",
         "timezone": "Asia/Shanghai"
     }
     
-    # 获取请求头（包含选择的token）
-    headers = get_headers(api_key)
-    # 获取当前使用的token
-    tokens = api_key.split(',')
-    current_token_index = (TOKEN_INDEX - 1) % len(tokens) if len(tokens) > 0 else 0
+    # 获取请求头（使用 DEEPSIDER_TOKEN）
+    headers = get_headers(api_key)  # api_key 现在是 DEEPSIDER_TOKEN
     
     try:
         response = requests.post(
@@ -386,7 +399,7 @@ async def create_chat_completion(
             headers=headers,
             json=payload,
             stream=True,
-            timeout=30  # 新增超时设置
+            timeout=30
         )
         
         # 新增调试日志
@@ -407,13 +420,13 @@ async def create_chat_completion(
                 error_msg += f" - {response.text}"
                 
             logger.error(error_msg)
-            raise HTTPException(status_code=response.status_code, detail="API请求失败")
+            raise HTTPException(status_code=response.status_code, detail=error_msg)
         
         # 处理流式或非流式响应
         if chat_request.stream:
             # 返回流式响应
             return StreamingResponse(
-                stream_openai_response(response, request_id, chat_request.model, api_key, current_token_index),
+                stream_openai_response(response, request_id, chat_request.model, api_key, TOKEN_INDEX),
                 media_type="text/event-stream"
             )
         else:
@@ -438,7 +451,7 @@ async def create_chat_completion(
             # 返回OpenAI格式的完整响应
             return await generate_openai_response(full_response, request_id, chat_request.model)
             
-    except requests.exTimeout as e:
+    except requests.Timeout as e:
         logger.error(f"请求超时: {str(e)}")
         raise HTTPException(status_code=504, detail="上游服务响应超时")