refactor: 代码结构优化与常量化

将日志系统从 app/logger/ 移至 app/log/ 目录
将路由配置从 routers.py 重命名为 routes.py
将硬编码配置值移至 constants.py 中的默认常量
统一代码格式和导入排序
优化函数参数对齐方式

app/router/gemini_routes.py

@@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, HTTPException
 from fastapi.responses import StreamingResponse, JSONResponse
 from copy import deepcopy
 from app.config.config import settings
-from app.logger.logger import get_gemini_logger
+from app.log.logger import get_gemini_logger
 from app.core.security import SecurityService
 from app.domain.gemini_models import GeminiContent, GeminiRequest
 from app.service.chat.gemini_chat_service import GeminiChatService

app/router/openai_routes.py

@@ -1,37 +1,46 @@
-from fastapi import HTTPException, APIRouter, Depends
+from fastapi import APIRouter, Depends, HTTPException
 from fastapi.responses import StreamingResponse
 
 from app.config.config import settings
-from app.logger.logger import get_openai_logger
 from app.core.security import SecurityService
-from app.domain.openai_models import ChatRequest, EmbeddingRequest, ImageGenerationRequest
+from app.domain.openai_models import (
+    ChatRequest,
+    EmbeddingRequest,
+    ImageGenerationRequest,
+)
 from app.handler.retry_handler import RetryHandler
+from app.log.logger import get_openai_logger
+from app.service.chat.openai_chat_service import OpenAIChatService
 from app.service.embedding.embedding_service import EmbeddingService
 from app.service.image.image_create_service import ImageCreateService
 from app.service.key.key_manager import KeyManager, get_key_manager_instance
 from app.service.model.model_service import ModelService
-from app.service.chat.openai_chat_service import OpenAIChatService
 
 router = APIRouter()
 logger = get_openai_logger()
 
 # 初始化服务
 security_service = SecurityService(settings.ALLOWED_TOKENS, settings.AUTH_TOKEN)
-model_service = ModelService(settings.SEARCH_MODELS,settings.IMAGE_MODELS)
+model_service = ModelService(settings.SEARCH_MODELS, settings.IMAGE_MODELS)
 embedding_service = EmbeddingService(settings.BASE_URL)
 image_create_service = ImageCreateService()
 
+
 async def get_key_manager():
     return await get_key_manager_instance()
 
-async def get_next_working_key_wrapper(key_manager: KeyManager = Depends(get_key_manager)):
+
+async def get_next_working_key_wrapper(
+    key_manager: KeyManager = Depends(get_key_manager),
+):
     return await key_manager.get_next_working_key()
 
+
 @router.get("/v1/models")
 @router.get("/hf/v1/models")
 async def list_models(
     _=Depends(security_service.verify_authorization),
-    key_manager: KeyManager = Depends(get_key_manager)
+    key_manager: KeyManager = Depends(get_key_manager),
 ):
     logger.info("-" * 50 + "list_models" + "-" * 50)
     logger.info("Handling models list request")
@@ -41,7 +50,9 @@ async def list_models(
         return model_service.get_gemini_openai_models(api_key)
     except Exception as e:
         logger.error(f"Error getting models list: {str(e)}")
-        raise HTTPException(status_code=500, detail="Internal server error while fetching models list") from e
+        raise HTTPException(
+            status_code=500, detail="Internal server error while fetching models list"
+        ) from e
 
 
 @router.post("/v1/chat/completions")
@@ -51,7 +62,7 @@ async def chat_completion(
     request: ChatRequest,
     _=Depends(security_service.verify_authorization),
     api_key: str = Depends(get_next_working_key_wrapper),
-    key_manager: KeyManager = Depends(get_key_manager)
+    key_manager: KeyManager = Depends(get_key_manager),
 ):
     # 如果model是imagen3,使用paid_key
     if request.model == f"{settings.CREATE_IMAGE_MODEL}-chat":
@@ -63,8 +74,10 @@ async def chat_completion(
     logger.info(f"Using API key: {api_key}")
 
     if not model_service.check_model_support(request.model):
-        raise HTTPException(status_code=400, detail=f"Model {request.model} is not supported")
-       
+        raise HTTPException(
+            status_code=400, detail=f"Model {request.model} is not supported"
+        )
+
     try:
         # 如果model是imagen3,使用paid_key
         if request.model == f"{settings.CREATE_IMAGE_MODEL}-chat":
@@ -80,6 +93,7 @@ async def chat_completion(
         logger.error(f"Chat completion failed after retries: {str(e)}")
         raise HTTPException(status_code=500, detail="Chat completion failed") from e
 
+
 @router.post("/v1/images/generations")
 @router.post("/hf/v1/images/generations")
 async def generate_image(
@@ -95,14 +109,17 @@ async def generate_image(
         return response
     except Exception as e:
         logger.error(f"Image generation request failed: {str(e)}")
-        raise HTTPException(status_code=500, detail="Image generation request failed") from e
+        raise HTTPException(
+            status_code=500, detail="Image generation request failed"
+        ) from e
+
 
 @router.post("/v1/embeddings")
 @router.post("/hf/v1/embeddings")
 async def embedding(
     request: EmbeddingRequest,
     _=Depends(security_service.verify_authorization),
-    key_manager: KeyManager = Depends(get_key_manager)
+    key_manager: KeyManager = Depends(get_key_manager),
 ):
     logger.info("-" * 50 + "embedding" + "-" * 50)
     logger.info(f"Handling embedding request for model: {request.model}")
@@ -118,11 +135,12 @@ async def embedding(
         logger.error(f"Embedding request failed: {str(e)}")
         raise HTTPException(status_code=500, detail="Embedding request failed") from e
 
+
 @router.get("/v1/keys/list")
 @router.get("/hf/v1/keys/list")
 async def get_keys_list(
     _=Depends(security_service.verify_auth_token),
-    key_manager: KeyManager = Depends(get_key_manager)
+    key_manager: KeyManager = Depends(get_key_manager),
 ):
     """获取有效和无效的API key列表"""
     logger.info("-" * 50 + "get_keys_list" + "-" * 50)
@@ -133,13 +151,12 @@ async def get_keys_list(
             "status": "success",
             "data": {
                 "valid_keys": keys_status["valid_keys"],
-                "invalid_keys": keys_status["invalid_keys"]
+                "invalid_keys": keys_status["invalid_keys"],
             },
-            "total": len(keys_status["valid_keys"]) + len(keys_status["invalid_keys"])
+            "total": len(keys_status["valid_keys"]) + len(keys_status["invalid_keys"]),
         }
     except Exception as e:
         logger.error(f"Error getting keys list: {str(e)}")
         raise HTTPException(
-            status_code=500,
-            detail="Internal server error while fetching keys list"
+            status_code=500, detail="Internal server error while fetching keys list"
         ) from e

app/router/routes.py

@@ -1,24 +1,26 @@
 """
 路由配置模块，负责设置和配置应用程序的路由
 """
+
 from fastapi import FastAPI, Request
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
 
-from app.logger.logger import get_main_logger
 from app.core.security import verify_auth_token
+from app.log.logger import get_routes_logger
 from app.router import gemini_routes, openai_routes
 from app.service.key.key_manager import get_key_manager_instance
 
-logger = get_main_logger()
+logger = get_routes_logger()
 
 # 配置Jinja2模板
 templates = Jinja2Templates(directory="app/templates")
 
+
 def setup_routers(app: FastAPI) -> None:
     """
     设置应用程序的路由
-    
+
     Args:
         app: FastAPI应用程序实例
     """
@@ -26,20 +28,22 @@ def setup_routers(app: FastAPI) -> None:
     app.include_router(openai_routes.router)
     app.include_router(gemini_routes.router)
     app.include_router(gemini_routes.router_v1beta)
-    
+
     # 添加页面路由
     setup_page_routes(app)
-    
+
     # 添加健康检查路由
     setup_health_routes(app)
 
+
 def setup_page_routes(app: FastAPI) -> None:
     """
     设置页面相关的路由
-    
+
     Args:
         app: FastAPI应用程序实例
     """
+
     @app.get("/", response_class=HTMLResponse)
     async def auth_page(request: Request):
         """认证页面"""
@@ -54,11 +58,13 @@ def setup_page_routes(app: FastAPI) -> None:
             if not auth_token:
                 logger.warning("Authentication attempt with empty token")
                 return RedirectResponse(url="/", status_code=302)
-            
+
             if verify_auth_token(auth_token):
                 logger.info("Successful authentication")
                 response = RedirectResponse(url="/keys", status_code=302)
-                response.set_cookie(key="auth_token", value=auth_token, httponly=True, max_age=3600)
+                response.set_cookie(
+                    key="auth_token", value=auth_token, httponly=True, max_age=3600
+                )
                 return response
             logger.warning("Failed authentication attempt with invalid token")
             return RedirectResponse(url="/", status_code=302)
@@ -74,28 +80,33 @@ def setup_page_routes(app: FastAPI) -> None:
             if not auth_token or not verify_auth_token(auth_token):
                 logger.warning("Unauthorized access attempt to keys page")
                 return RedirectResponse(url="/", status_code=302)
-            
+
             key_manager = await get_key_manager_instance()
             keys_status = await key_manager.get_keys_by_status()
             total = len(keys_status["valid_keys"]) + len(keys_status["invalid_keys"])
             logger.info(f"Keys status retrieved successfully. Total keys: {total}")
-            return templates.TemplateResponse("keys_status.html", {
-                "request": request,
-                "valid_keys": keys_status["valid_keys"],
-                "invalid_keys": keys_status["invalid_keys"],
-                "total": total
-            })
+            return templates.TemplateResponse(
+                "keys_status.html",
+                {
+                    "request": request,
+                    "valid_keys": keys_status["valid_keys"],
+                    "invalid_keys": keys_status["invalid_keys"],
+                    "total": total,
+                },
+            )
         except Exception as e:
             logger.error(f"Error retrieving keys status: {str(e)}")
             raise
 
+
 def setup_health_routes(app: FastAPI) -> None:
     """
     设置健康检查相关的路由
-    
+
     Args:
         app: FastAPI应用程序实例
     """
+
     @app.get("/health")
     async def health_check(request: Request):
         """健康检查端点"""