resolve conflicts

main.py

@@ -1215,15 +1215,19 @@ def verify_admin_api_key(credentials: HTTPAuthorizationCredentials = Depends(sec
         raise HTTPException(status_code=403, detail="Permission denied")
     return token
 
-@app.post("/v1/chat/completions", dependencies=[Depends(rate_limit_dependency)])
+# 创建一个新的路由器并设置前缀
+v1_router = APIRouter(prefix="/api")
+
+# 将现有的 /v1 路由移动到新路由器
+@v1_router.post("/v1/chat/completions", dependencies=[Depends(rate_limit_dependency)])
 async def request_model(request: RequestModel, api_index: int = Depends(verify_api_key)):
     return await model_handler.request_model(request, api_index)
 
-@app.options("/v1/chat/completions", dependencies=[Depends(rate_limit_dependency)])
+@v1_router.options("/v1/chat/completions", dependencies=[Depends(rate_limit_dependency)])
 async def options_handler():
     return JSONResponse(status_code=200, content={"detail": "OPTIONS allowed"})
 
-@app.get("/v1/models", dependencies=[Depends(rate_limit_dependency)])
+@v1_router.get("/v1/models", dependencies=[Depends(rate_limit_dependency)])
 async def list_models(api_index: int = Depends(verify_api_key)):
     models = post_all_models(api_index, app.state.config)
     return JSONResponse(content={
@@ -1231,28 +1235,28 @@ async def list_models(api_index: int = Depends(verify_api_key)):
         "data": models
     })
 
-@app.post("/v1/images/generations", dependencies=[Depends(rate_limit_dependency)])
+@v1_router.post("/v1/images/generations", dependencies=[Depends(rate_limit_dependency)])
 async def images_generations(
     request: ImageGenerationRequest,
     api_index: int = Depends(verify_api_key)
 ):
     return await model_handler.request_model(request, api_index, endpoint="/v1/images/generations")
 
-@app.post("/v1/embeddings", dependencies=[Depends(rate_limit_dependency)])
+@v1_router.post("/v1/embeddings", dependencies=[Depends(rate_limit_dependency)])
 async def embeddings(
     request: EmbeddingRequest,
     api_index: int = Depends(verify_api_key)
 ):
     return await model_handler.request_model(request, api_index, endpoint="/v1/embeddings")
 
-@app.post("/v1/audio/speech", dependencies=[Depends(rate_limit_dependency)])
+@v1_router.post("/v1/audio/speech", dependencies=[Depends(rate_limit_dependency)])
 async def audio_speech(
     request: TextToSpeechRequest,
     api_index: str = Depends(verify_api_key)
 ):
     return await model_handler.request_model(request, api_index, endpoint="/v1/audio/speech")
 
-@app.post("/v1/moderations", dependencies=[Depends(rate_limit_dependency)])
+@v1_router.post("/v1/moderations", dependencies=[Depends(rate_limit_dependency)])
 async def moderations(
     request: ModerationRequest,
     api_index: int = Depends(verify_api_key)
@@ -1261,7 +1265,7 @@ async def moderations(
 
 from fastapi import UploadFile, File, Form, HTTPException
 import io
-@app.post("/v1/audio/transcriptions", dependencies=[Depends(rate_limit_dependency)])
+@v1_router.post("/v1/audio/transcriptions", dependencies=[Depends(rate_limit_dependency)])
 async def audio_transcriptions(
     file: UploadFile = File(...),
     model: str = Form(...),
@@ -1287,7 +1291,7 @@ async def audio_transcriptions(
             traceback.print_exc()
         raise HTTPException(status_code=500, detail=f"Error processing audio file: {str(e)}")
 
-@app.get("/v1/generate-api-key", dependencies=[Depends(rate_limit_dependency)])
+@v1_router.get("/v1/generate-api-key", dependencies=[Depends(rate_limit_dependency)])
 def generate_api_key():
     # Define the character set (only alphanumeric)
     chars = string.ascii_letters + string.digits
@@ -1301,7 +1305,7 @@ from datetime import datetime, timedelta, timezone
 from sqlalchemy import func, desc, case
 from fastapi import Query
 
-@app.get("/v1/stats", dependencies=[Depends(rate_limit_dependency)])
+@v1_router.get("/v1/stats", dependencies=[Depends(rate_limit_dependency)])
 async def get_stats(
     request: Request,
     token: str = Depends(verify_admin_api_key),
@@ -2070,6 +2074,8 @@ async def delete_row(row_id: str):
 
     return await root()
 
+# 在文件末尾添加路由器到应用
+app.include_router(v1_router, tags=["v1"])
 app.include_router(frontend_router, tags=["frontend"])
 
 # async def on_fetch(request, env):