🐛 Bug: Fix the bug where the next channel cannot be automatically switched when an error occurs in non-streaming output for o1-mini and o1-preview.

main.py

@@ -241,7 +241,12 @@ async def process_request(request: Union[RequestModel, ImageGenerationRequest],
             wrapped_generator = await error_handling_wrapper(generator)
             response = StreamingResponse(wrapped_generator, media_type="text/event-stream")
         else:
-            response = await anext(fetch_response(app.state.client, url, headers, payload))
+            generator = fetch_response(app.state.client, url, headers, payload)
+            wrapped_generator = await error_handling_wrapper(generator)
+            first_element = await anext(wrapped_generator)
+            first_element = first_element.lstrip("data: ")
+            first_element = json.loads(first_element)
+            response = JSONResponse(first_element)
 
         # 更新成功计数
         async with app.middleware_stack.app.lock:

utils.py

@@ -121,10 +121,8 @@ async def error_handling_wrapper(generator):
         if isinstance(first_item_str, (bytes, bytearray)):
             first_item_str = first_item_str.decode("utf-8")
         if isinstance(first_item_str, str):
-            if first_item_str.startswith("data: "):
-                first_item_str = first_item_str[6:]
-            elif first_item_str.startswith("data:"):
-                first_item_str = first_item_str[5:]
+            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]!")
                 raise StopAsyncIteration