💻 Code: Optimize log display: add error provider name display.

main.py

@@ -706,7 +706,8 @@ async def process_request(request: Union[RequestModel, ImageGenerationRequest, A
     if provider.get("engine"):
         engine = provider["engine"]
 
-    logger.info(f"provider: {provider['provider']:<11} model: {request.model:<22} engine: {engine}")
+    channel_id = f"{provider['provider']}"
+    logger.info(f"provider: {channel_id:<11} model: {request.model:<22} engine: {engine}")
 
     url, headers, payload = await get_payload(request, engine, provider)
     if is_debug:
@@ -738,11 +739,11 @@ async def process_request(request: Union[RequestModel, ImageGenerationRequest, A
         async with app.state.client_manager.get_client(timeout_value) as client:
             if request.stream:
                 generator = fetch_response_stream(client, url, headers, payload, engine, original_model)
-                wrapped_generator, first_response_time = await error_handling_wrapper(generator)
+                wrapped_generator, first_response_time = await error_handling_wrapper(generator, channel_id)
                 response = StarletteStreamingResponse(wrapped_generator, media_type="text/event-stream")
             else:
                 generator = fetch_response(client, url, headers, payload, engine, original_model)
-                wrapped_generator, first_response_time = await error_handling_wrapper(generator)
+                wrapped_generator, first_response_time = await error_handling_wrapper(generator, channel_id)
                 first_element = await anext(wrapped_generator)
                 first_element = first_element.lstrip("data: ")
                 # print("first_element", first_element)
@@ -751,14 +752,14 @@ async def process_request(request: Union[RequestModel, ImageGenerationRequest, A
                 # response = JSONResponse(first_element)
 
             # 更新成功计数和首次响应时间
-            await update_channel_stats(current_info["request_id"], provider['provider'], request.model, current_info["api_key"], success=True)
+            await update_channel_stats(current_info["request_id"], channel_id, request.model, current_info["api_key"], success=True)
             current_info["first_response_time"] = first_response_time
             current_info["success"] = True
-            current_info["provider"] = provider['provider']
+            current_info["provider"] = channel_id
             return response
 
     except (Exception, HTTPException, asyncio.CancelledError, httpx.ReadError, httpx.RemoteProtocolError, httpx.ReadTimeout) as e:
-        await update_channel_stats(current_info["request_id"], provider['provider'], request.model, current_info["api_key"], success=False)
+        await update_channel_stats(current_info["request_id"], channel_id, request.model, current_info["api_key"], success=False)
         raise e
 
 def weighted_round_robin(weights):

utils.py

@@ -405,7 +405,7 @@ def ensure_string(item):
 
 import asyncio
 import time as time_module
-async def error_handling_wrapper(generator):
+async def error_handling_wrapper(generator, channel_id):
     start_time = time_module.time()
     try:
         first_item = await generator.__anext__()
@@ -418,18 +418,18 @@ async def error_handling_wrapper(generator):
             if first_item_str.startswith("data:"):
                 first_item_str = first_item_str.lstrip("data: ")
             if first_item_str.startswith("[DONE]"):
-                logger.error("error_handling_wrapper [DONE]!")
+                logger.error(f"provider: {channel_id:<11} error_handling_wrapper [DONE]!")
                 raise StopAsyncIteration
             if "The bot's usage is covered by the developer" in first_item_str:
-                logger.error("error const string: %s", first_item_str)
+                logger.error(f"provider: {channel_id:<11} error const string: %s", first_item_str)
                 raise StopAsyncIteration
             if "process this request due to overload or policy" in first_item_str:
-                logger.error("error const string: %s", first_item_str)
+                logger.error(f"provider: {channel_id:<11} error const string: %s", first_item_str)
                 raise StopAsyncIteration
             try:
                 first_item_str = json.loads(first_item_str)
             except json.JSONDecodeError:
-                logger.error("error_handling_wrapper JSONDecodeError!" + repr(first_item_str))
+                logger.error(f"provider: {channel_id:<11} error_handling_wrapper JSONDecodeError! {repr(first_item_str)}")
                 raise StopAsyncIteration
         if isinstance(first_item_str, dict) and 'error' in first_item_str:
             # 如果第一个 yield 的项是错误信息，抛出 HTTPException
@@ -445,11 +445,11 @@ async def error_handling_wrapper(generator):
                     yield ensure_string(item)
             except asyncio.CancelledError:
                 # 客户端断开连接是正常行为，不需要记录错误日志
-                logger.debug("Stream cancelled by client")
+                logger.debug(f"provider: {channel_id:<11} Stream cancelled by client")
                 return
             except (httpx.ReadError, httpx.RemoteProtocolError) as e:
                 # 只记录真正的网络错误
-                logger.error(f"Network error in new_generator: {e}")
+                logger.error(f"provider: {channel_id:<11} Network error in new_generator: {e}")
                 raise
 
         return new_generator(), first_response_time