Change log display

log_config.py

@@ -0,0 +1,6 @@
+import logging
+logging.basicConfig(level=logging.INFO, format="%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+logger = logging.getLogger("uni-api")
+
+httpx_logger = logging.getLogger("httpx")
+httpx_logger.setLevel(logging.CRITICAL)

main.py

@@ -1,5 +1,4 @@
-import json
-import traceback
+from log_config import logger
 
 import httpx
 import secrets
@@ -58,7 +57,7 @@ async def process_request(request: RequestModel, provider: Dict):
 
     if provider.get("engine"):
         engine = provider["engine"]
-    print("provider:", provider['provider'], "engine:", engine)
+    logger.info(f"provider: {provider['provider']:<10} engine: {engine}")
 
     url, headers, payload = await get_payload(request, engine, provider)
 
@@ -71,15 +70,9 @@ async def process_request(request: RequestModel, provider: Dict):
 
     if request.stream:
         model = provider['model'][request.model]
-        # try:
         generator = fetch_response_stream(app.state.client, url, headers, payload, engine, model)
         wrapped_generator = await error_handling_wrapper(generator, status_code=500)
         return StreamingResponse(wrapped_generator, media_type="text/event-stream")
-        # except HTTPException as e:
-        #     return JSONResponse(status_code=e.status_code, content={"error": str(e.detail)})
-        # except Exception as e:
-        #     # 处理其他异常
-        #     return JSONResponse(status_code=500, content={"error": str(e)})
     else:
         return await fetch_response(app.state.client, url, headers, payload)
 
@@ -88,10 +81,6 @@ class ModelRequestHandler:
         self.last_provider_index = -1
 
     def get_matching_providers(self, model_name, token):
-        # for provider in config:
-        #     print("provider", model_name, list(provider['model'].keys()))
-        #     if model_name in provider['model'].keys():
-        #         print("provider", provider)
         api_index = api_list.index(token)
         provider_rules = []
 
@@ -150,9 +139,7 @@ class ModelRequestHandler:
                 response = await process_request(request, provider)
                 return response
             except (Exception, HTTPException) as e:
-                print('\033[31m')
-                print(f"Error with provider {provider['provider']}: {str(e)}")
-                print('\033[0m')
+                logger.error(f"Error with provider {provider['provider']}: {str(e)}")
                 if auto_retry:
                     continue
                 else:
@@ -164,13 +151,7 @@ model_handler = ModelRequestHandler()
 
 @app.post("/v1/chat/completions")
 async def request_model(request: RequestModel, token: str = Depends(verify_api_key)):
-    # try:
     return await model_handler.request_model(request, token)
-    # except Exception as e:
-    #     print('\033[31m')
-    #     print(f"request_model Error: {str(e)}")
-    #     traceback.print_exc()
-    #     print('\033[0m')
 
 @app.options("/v1/chat/completions")
 async def options_handler():

response.py

@@ -2,6 +2,8 @@ import json
 import httpx
 from datetime import datetime
 
+from log_config import logger
+
 
 async def generate_sse_response(timestamp, model, content=None, tools_id=None, function_call_name=None, function_call_content=None, role=None, tokens_use=None, total_tokens=None):
     sample_data = {
@@ -51,7 +53,7 @@ async def fetch_gemini_response_stream(client, url, headers, payload, model):
                         sse_string = await generate_sse_response(timestamp, model, content)
                         yield sse_string
                     except json.JSONDecodeError:
-                        print(f"无法解析JSON: {line}")
+                        logger.error(f"无法解析JSON: {line}")
 
         # # 处理缓冲区中剩余的内容
         # if buffer:
@@ -88,13 +90,9 @@ async def fetch_claude_response_stream(client, url, headers, payload, model):
     timestamp = datetime.timestamp(datetime.now())
     async with client.stream('POST', url, headers=headers, json=payload) as response:
         if response.status_code != 200:
-            print('\033[31m')
-            # print(f"请求失败，状态码是{response.status_code}，错误信息：")
             error_message = await response.aread()
             error_str = error_message.decode('utf-8', errors='replace')
             error_json = json.loads(error_str)
-            # print(json.dumps(error_json, indent=4, ensure_ascii=False))
-            print('\033[0m')
             yield {"error": f"fetch_claude_response_stream HTTP Error {response.status_code}", "details": error_json}
         buffer = ""
         async for chunk in response.aiter_text():
@@ -143,19 +141,15 @@ async def fetch_claude_response_stream(client, url, headers, payload, model):
                         yield sse_string
 
 async def fetch_response(client, url, headers, payload):
-    for _ in range(2):
-        try:
-            response = await client.post(url, headers=headers, json=payload)
-            return response.json()
-        except httpx.ConnectError as e:
-            print(f"fetch_response 连接错误： {e}")
-            continue
-        except httpx.ReadTimeout as e:
-            print(f"fetch_response 读取响应超时： {e}")
-            continue
+    try:
+        response = await client.post(url, headers=headers, json=payload)
+        return response.json()
+    except httpx.ConnectError as e:
+        return {"error": f"500", "details": "fetch_response Connect Error"}
+    except httpx.ReadTimeout as e:
+        return {"error": f"500", "details": "fetch_response Read Response Timeout"}
 
 async def fetch_response_stream(client, url, headers, payload, engine, model):
-    # for _ in range(2):
     try:
         if engine == "gemini":
             async for chunk in fetch_gemini_response_stream(client, url, headers, payload, model):
@@ -171,12 +165,7 @@ async def fetch_response_stream(client, url, headers, payload, engine, model):
                 yield chunk
         else:
             raise ValueError("Unknown response")
-        # break
     except httpx.ConnectError as e:
-        # print(f"fetch_response_stream 连接错误： {e}")
         yield {"error": f"500", "details": "fetch_response_stream Connect Error"}
-        # continue
     except httpx.ReadTimeout as e:
-        # print(f"fetch_response_stream 读取响应超时 {e}")
-        yield {"error": f"500", "details": "fetch_response_stream Read Response Timeout"}
-        # continue
+        yield {"error": f"500", "details": "fetch_response_stream Read Response Timeout"}

utils.py

@@ -3,6 +3,8 @@ import json
 from fastapi import HTTPException, Depends
 from fastapi.security import HTTPBearer, HTTPAuthorizationCredentials
 
+from log_config import logger
+
 # 读取YAML配置文件
 def load_config():
     try:
@@ -20,13 +22,13 @@ def load_config():
                 conf['providers'][index] = provider
             api_keys_db = conf['api_keys']
             api_list = [item["api"] for item in api_keys_db]
-            # print(json.dumps(conf, indent=4, ensure_ascii=False))
+            # logger.info(json.dumps(conf, indent=4, ensure_ascii=False))
             return conf, api_keys_db, api_list
     except FileNotFoundError:
-        print("配置文件 'api.yaml' 未找到。请确保文件存在于正确的位置。")
+        logger.error("配置文件 'api.yaml' 未找到。请确保文件存在于正确的位置。")
         return [], [], []
     except yaml.YAMLError:
-        print("配置文件 'api.yaml' 格式不正确。请检查 YAML 格式。")
+        logger.error("配置文件 'api.yaml' 格式不正确。请检查 YAML 格式。")
         return [], [], []
 
 config, api_keys_db, api_list = load_config()
@@ -59,7 +61,7 @@ async def error_handling_wrapper(generator, status_code=200):
             try:
                 first_item_str = json.loads(first_item_str)
             except json.JSONDecodeError:
-                print("error_handling_wrapper JSONDecodeError!", first_item_str)
+                logger.error("error_handling_wrapper JSONDecodeError!", first_item_str)
                 pass  # 如果不是有效的JSON，保持原样
         if isinstance(first_item_str, dict) and 'error' in first_item_str:
             # 如果第一个 yield 的项是错误信息，抛出 HTTPException