Update main.py

main.py

@@ -1,5 +1,5 @@
 # ===================================================================
-# main.py (已修复 Hugging Face 健康检查问题)
+# main.py (最终修复版：修正函数定义顺序)
 # ===================================================================
 
 import json
@@ -35,7 +35,6 @@ class ChatMessage(BaseModel):
     role: str
     content: Union[str, List[Dict[str, Any]]]
     reasoning_content: Optional[str] = None
-# ... (其他模型保持不变)
 class ChatCompletionRequest(BaseModel):
     model: str
     messages: List[ChatMessage]
@@ -43,22 +42,18 @@ class ChatCompletionRequest(BaseModel):
     temperature: Optional[float] = None
     max_tokens: Optional[int] = None
     top_p: Optional[float] = None
-
 class ModelInfo(BaseModel):
     id: str
     object: str = "model"
     created: int
     owned_by: str
-
 class ModelList(BaseModel):
     object: str = "list"
     data: List[ModelInfo]
-
 class ChatCompletionChoice(BaseModel):
     message: ChatMessage
     index: int = 0
     finish_reason: str = "stop"
-
 class ChatCompletionResponse(BaseModel):
     id: str = Field(default_factory=lambda: f"chatcmpl-{uuid.uuid4().hex}")
     object: str = "chat.completion"
@@ -66,12 +61,10 @@ class ChatCompletionResponse(BaseModel):
     model: str
     choices: List[ChatCompletionChoice]
     usage: Dict[str, int] = Field(default_factory=lambda: {"prompt_tokens": 0, "completion_tokens": 0, "total_tokens": 0})
-
 class StreamChoice(BaseModel):
     delta: Dict[str, Any] = Field(default_factory=dict)
     index: int = 0
     finish_reason: Optional[str] = None
-
 class StreamResponse(BaseModel):
     id: str = Field(default_factory=lambda: f"chatcmpl-{uuid.uuid4().hex}")
     object: str = "chat.completion.chunk"
@@ -115,30 +108,7 @@ def load_codegeex_tokens_from_secrets():
     except Exception as e:
         print(f"FATAL: Error loading CodeGeeX tokens: {e}")
 
-@app.on_event("startup")
-async def startup():
-    print("Starting CodeGeeX OpenAI API Adapter server...")
-    load_client_api_keys_from_secrets()
-    load_codegeex_tokens_from_secrets()
-    print("Server initialization completed.")
-
-# --- THE FIX: Add a root endpoint for the health check ---
-@app.get("/")
-def health_check():
-    """Health check endpoint for Hugging Face."""
-    return {"status": "ok", "message": "CodeGeeX API Adapter is running."}
-# ---------------------------------------------------------
-
-# --- 原始路由 ---
-def get_models_list_response() -> ModelList:
-    return ModelList(data=[ModelInfo(id=model, created=int(time.time()), owned_by="anthropic") for model in CODEGEEX_MODELS])
-
-@app.get("/v1/models", response_model=ModelList)
-async def list_v1_models(_: None = Depends(authenticate_client)):
-    return get_models_list_response()
-
-# ... (所有其他函数和路由都与之前的文件一致，无需改动)
-# The rest of the original code is unchanged.
+# --- 核心工具函数和认证 (确保在使用前定义) ---
 def get_best_codegeex_token() -> Optional[CodeGeeXToken]:
     with token_rotation_lock:
         now = time.time()
@@ -173,6 +143,25 @@ async def authenticate_client(auth: Optional[HTTPAuthorizationCredentials] = Dep
     if not auth or not auth.credentials: raise HTTPException(status_code=401, detail="API key required.", headers={"WWW-Authenticate": "Bearer"})
     if auth.credentials not in VALID_CLIENT_KEYS: raise HTTPException(status_code=403, detail="Invalid client API key.")
 
+# --- FastAPI 事件和路由 ---
+@app.on_event("startup")
+async def startup():
+    print("Starting CodeGeeX OpenAI API Adapter server...")
+    load_client_api_keys_from_secrets()
+    load_codegeex_tokens_from_secrets()
+    print("Server initialization completed.")
+
+@app.get("/")
+def health_check():
+    return {"status": "ok", "message": "CodeGeeX API Adapter is running."}
+
+def get_models_list_response() -> ModelList:
+    return ModelList(data=[ModelInfo(id=model, created=int(time.time()), owned_by="anthropic") for model in CODEGEEX_MODELS])
+
+@app.get("/v1/models", response_model=ModelList)
+async def list_v1_models(_: None = Depends(authenticate_client)):
+    return get_models_list_response()
+
 @app.get("/models", response_model=ModelList)
 async def list_models_no_auth():
     return get_models_list_response()
@@ -258,3 +247,4 @@ async def chat_completions(request: ChatCompletionRequest, _: None = Depends(aut
                 elif status_code in [429, 500, 502, 503, 504]: token["error_count"] += 1
         except Exception as e:
             with token_rotation_lock: token["error_count"] += 1
+