fix: 修复 OpenAI 和 Gemini API 调用重试逻辑及日志记录

app/api/gemini_routes.py

@@ -1,14 +1,13 @@
-from email.header import Header
 from fastapi import APIRouter, Depends
 from fastapi.responses import StreamingResponse
 
+from app.core.config import settings
+from app.core.logger import get_gemini_logger
 from app.core.security import SecurityService
+from app.schemas.gemini_models import GeminiRequest
 from app.services.chat_service import ChatService
 from app.services.key_manager import KeyManager
 from app.services.model_service import ModelService
-from app.schemas.gemini_models import GeminiRequest
-from app.core.config import settings
-from app.core.logger import get_gemini_logger
 
 router = APIRouter(prefix="/gemini/v1beta")
 logger = get_gemini_logger()
@@ -19,10 +18,11 @@ key_manager = KeyManager(settings.API_KEYS)
 model_service = ModelService(settings.MODEL_SEARCH)
 chat_service = ChatService(base_url=settings.BASE_URL, key_manager=key_manager)
 
+
 @router.get("/models")
 async def list_models(
-    key: str = None,
-    token: str = Depends(security_service.verify_key),
+        key: str = None,
+        token: str = Depends(security_service.verify_key),
 ):
     """获取可用的Gemini模型列表"""
     logger.info("-" * 50 + "list_gemini_models" + "-" * 50)
@@ -31,17 +31,18 @@ async def list_models(
     logger.info(f"Using API key: {api_key}")
     return model_service.get_gemini_models(api_key)
 
+
 @router.post("/models/{model_name}:generateContent")
 async def generate_content(
-    model_name: str,
-    request: GeminiRequest,
-    x_goog_api_key: str = Depends(security_service.verify_goog_api_key),
+        model_name: str,
+        request: GeminiRequest,
+        x_goog_api_key: str = Depends(security_service.verify_goog_api_key),
 ):
     """非流式生成内容"""
     logger.info("-" * 50 + "gemini_generate_content" + "-" * 50)
     logger.info(f"Handling Gemini content generation request for model: {model_name}")
     logger.info(f"Request: \n{request.model_dump_json(indent=2)}")
-    
+
     api_key = await key_manager.get_next_working_key()
     logger.info(f"Using API key: {api_key}")
     retries = 0
@@ -66,19 +67,20 @@ async def generate_content(
             if retries >= MAX_RETRIES:
                 logger.error(f"Max retries ({MAX_RETRIES}) reached. Raising error")
 
-@router.post("/models/{model_name}:streamGenerateContent") 
+
+@router.post("/models/{model_name}:streamGenerateContent")
 async def stream_generate_content(
-    model_name: str,
-    request: GeminiRequest,
-    x_goog_api_key: str = Depends(security_service.verify_goog_api_key),
+        model_name: str,
+        request: GeminiRequest,
+        x_goog_api_key: str = Depends(security_service.verify_goog_api_key),
 ):
     """流式生成内容"""
     logger.info("-" * 50 + "gemini_stream_generate_content" + "-" * 50)
     logger.info(f"Handling Gemini streaming content generation for model: {model_name}")
-    
+
     api_key = await key_manager.get_next_working_key()
     logger.info(f"Using API key: {api_key}")
-    
+
     try:
         chat_service = ChatService(base_url=settings.BASE_URL, key_manager=key_manager)
         response_stream = chat_service.stream_generate_content(
@@ -87,6 +89,6 @@ async def stream_generate_content(
             api_key=api_key
         )
         return StreamingResponse(response_stream, media_type="text/event-stream")
-        
+
     except Exception as e:
-        logger.error(f"Streaming request failed: {str(e)}")
+        logger.error(f"Streaming request failed: {str(e)}")

app/api/openai_routes.py

@@ -48,9 +48,9 @@ async def chat_completion(
     api_key = await key_manager.get_next_working_key()
     logger.info(f"Using API key: {api_key}")
     retries = 0
-    MAX_RETRIES = 3
+    max_retries = 3
 
-    while retries < MAX_RETRIES:
+    while retries < max_retries:
         try:
             response = await chat_service.create_chat_completion(
                 request=request,
@@ -64,13 +64,13 @@ async def chat_completion(
 
         except Exception as e:
             logger.warning(
-                f"API call failed with error: {str(e)}. Attempt {retries + 1} of {MAX_RETRIES}"
+                f"API call failed with error: {str(e)}. Attempt {retries + 1} of {max_retries}"
             )
             api_key = await key_manager.handle_api_failure(api_key)
             logger.info(f"Switched to new API key: {api_key}")
             retries += 1
-            if retries >= MAX_RETRIES:
-                logger.error(f"Max retries ({MAX_RETRIES}) reached. Raising error")
+            if retries >= max_retries:
+                logger.error(f"Max retries ({max_retries}) reached. Raising error")
                 raise