Update api/utils.py

api/utils.py

@@ -7,13 +7,13 @@ import uuid
 import httpx
 from api import validate
 from api.config import MODEL_MAPPING, headers, AGENT_MODE, TRENDING_AGENT_MODE
-from fastapi import Depends
+from fastapi import Depends, security
 from fastapi.security import HTTPAuthorizationCredentials
 
 from api.config import APP_SECRET, BASE_URL
 from api.models import ChatRequest
 
-from api.logger import setup_logger, log_info, log_error  # Import wrapper functions
+from api.logger import setup_logger
 
 logger = setup_logger(__name__)
 
@@ -60,9 +60,8 @@ async def process_streaming_response(request: ChatRequest):
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
 
-    # Log reduced information using the wrapper function
-    log_info(
-        logger,
+    # Log reduced information
+    logger.info(
         f"Streaming request for model: '{request.model}', "
         f"agent mode: {agent_mode}, trending agent mode: {trending_agent_mode}"
     )
@@ -117,19 +116,18 @@ async def process_streaming_response(request: ChatRequest):
                 yield f"data: {json.dumps(create_chat_completion_data('', request.model, timestamp, 'stop'))}\n\n"
                 yield "data: [DONE]\n\n"
         except httpx.HTTPStatusError as e:
-            log_error(logger, f"HTTP error occurred: {e}")  # Use wrapper function
+            logger.error(f"HTTP error occurred: {e}")
             raise HTTPException(status_code=e.response.status_code, detail=str(e))
         except httpx.RequestError as e:
-            log_error(logger, f"Error occurred during request: {e}")  # Use wrapper function
+            logger.error(f"Error occurred during request: {e}")
             raise HTTPException(status_code=500, detail=str(e))
 
 async def process_non_streaming_response(request: ChatRequest):
     agent_mode = AGENT_MODE.get(request.model, {})
     trending_agent_mode = TRENDING_AGENT_MODE.get(request.model, {})
 
-    # Log reduced information using the wrapper function
-    log_info(
-        logger,
+    # Log reduced information
+    logger.info(
         f"Non-streaming request for model: '{request.model}', "
         f"agent mode: {agent_mode}, trending agent mode: {trending_agent_mode}"
     )
@@ -169,7 +167,6 @@ async def process_non_streaming_response(request: ChatRequest):
         full_response = "hid已刷新，重新对话即可"
     if full_response.startswith("$@$v=undefined-rv1$@$"):
         full_response = full_response[21:]
-    
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion",