Fix error

utils.py

@@ -73,63 +73,20 @@ def ensure_string(item):
     else:
         return str(item)
 
-import asyncio
-async def error_handling_wrapper(generator, status_code=200):
-    async def new_generator():
-        try:
-            yield ensure_string(first_item)
-            async for item in generator:
-                yield ensure_string(item)
-        except (httpx.ReadError, asyncio.CancelledError) as e:
-            logger.error(f"Network error in new_generator: {e}")
-            raise HTTPException(status_code=503, detail=f"Stream interrupted: {str(e)}")
-        except Exception as e:
-            logger.exception(f"Error in new_generator: {e}")
-            raise HTTPException(status_code=status_code, detail=f"Stream error: {str(e)}")
-
-    try:
-        first_item = await generator.__anext__()
-        first_item_str = first_item
-        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("[DONE]"):
-                logger.error("error_handling_wrapper [DONE]!")
-                raise StopAsyncIteration
-            try:
-                first_item_str = json.loads(first_item_str)
-            except json.JSONDecodeError:
-                logger.error("error_handling_wrapper JSONDecodeError!" + repr(first_item_str))
-                raise StopAsyncIteration
-        if isinstance(first_item_str, dict) and 'error' in first_item_str:
-            raise HTTPException(status_code=status_code, detail=f"{first_item_str}"[:300])
-
-        wrapped_generator = new_generator()
-        try:
-            async for item in wrapped_generator:
-                yield item
-        except HTTPException as http_exc:
-            raise HTTPException(status_code=status_code, detail=f"Wrapper error: {str(http_exc)}")
-        except (httpx.ReadError, asyncio.CancelledError) as e:
-            logger.error(f"Network error during streaming: {e}")
-            raise HTTPException(status_code=503, detail=f"Stream interrupted: {str(e)}")
-        except Exception as e:
-            logger.exception(f"Unexpected error in error_handling_wrapper: {e}")
-            raise HTTPException(status_code=status_code, detail=f"Unexpected error: {str(e)}")
-
-    except StopAsyncIteration:
-        raise HTTPException(status_code=status_code, detail="data: {'error': 'No data returned'}")
-    except HTTPException as http_exc:
-        raise HTTPException(status_code=status_code, detail=f"Wrapper error: {str(http_exc)}")
-    except Exception as e:
-        logger.exception(f"Error in error_handling_wrapper: {e}")
-        raise HTTPException(status_code=status_code, detail=f"Wrapper error: {str(e)}")
-
+# import asyncio
 # async def error_handling_wrapper(generator, status_code=200):
+#     async def new_generator():
+#         try:
+#             yield ensure_string(first_item)
+#             async for item in generator:
+#                 yield ensure_string(item)
+#         except (httpx.ReadError, asyncio.CancelledError) as e:
+#             logger.error(f"Network error in new_generator: {e}")
+#             raise HTTPException(status_code=503, detail=f"Stream interrupted: {str(e)}")
+#         except Exception as e:
+#             logger.exception(f"Error in new_generator: {e}")
+#             raise HTTPException(status_code=status_code, detail=f"Stream error: {str(e)}")
+
 #     try:
 #         first_item = await generator.__anext__()
 #         first_item_str = first_item
@@ -149,19 +106,62 @@ async def error_handling_wrapper(generator, status_code=200):
 #                 logger.error("error_handling_wrapper JSONDecodeError!" + repr(first_item_str))
 #                 raise StopAsyncIteration
 #         if isinstance(first_item_str, dict) and 'error' in first_item_str:
-#             # 如果第一个 yield 的项是错误信息，抛出 HTTPException
 #             raise HTTPException(status_code=status_code, detail=f"{first_item_str}"[:300])
 
-#         # 如果不是错误，创建一个新的生成器，首先yield第一个项，然后yield剩余的项
-#         async def new_generator():
-#             yield ensure_string(first_item)
-#             async for item in generator:
-#                 yield ensure_string(item)
-
-#         return new_generator()
+#         wrapped_generator = new_generator()
+#         try:
+#             async for item in wrapped_generator:
+#                 yield item
+#         except HTTPException as http_exc:
+#             raise HTTPException(status_code=status_code, detail=f"Wrapper error: {str(http_exc)}")
+#         except (httpx.ReadError, asyncio.CancelledError) as e:
+#             logger.error(f"Network error during streaming: {e}")
+#             raise HTTPException(status_code=503, detail=f"Stream interrupted: {str(e)}")
+#         except Exception as e:
+#             logger.exception(f"Unexpected error in error_handling_wrapper: {e}")
+#             raise HTTPException(status_code=status_code, detail=f"Unexpected error: {str(e)}")
 
 #     except StopAsyncIteration:
 #         raise HTTPException(status_code=status_code, detail="data: {'error': 'No data returned'}")
+#     except HTTPException as http_exc:
+#         raise HTTPException(status_code=status_code, detail=f"Wrapper error: {str(http_exc)}")
+#     except Exception as e:
+#         logger.exception(f"Error in error_handling_wrapper: {e}")
+#         raise HTTPException(status_code=status_code, detail=f"Wrapper error: {str(e)}")
+
+async def error_handling_wrapper(generator, status_code=200):
+    try:
+        first_item = await generator.__anext__()
+        first_item_str = first_item
+        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("[DONE]"):
+                logger.error("error_handling_wrapper [DONE]!")
+                raise StopAsyncIteration
+            try:
+                first_item_str = json.loads(first_item_str)
+            except json.JSONDecodeError:
+                logger.error("error_handling_wrapper JSONDecodeError!" + repr(first_item_str))
+                raise StopAsyncIteration
+        if isinstance(first_item_str, dict) and 'error' in first_item_str:
+            # 如果第一个 yield 的项是错误信息，抛出 HTTPException
+            raise HTTPException(status_code=status_code, detail=f"{first_item_str}"[:300])
+
+        # 如果不是错误，创建一个新的生成器，首先yield第一个项，然后yield剩余的项
+        async def new_generator():
+            yield ensure_string(first_item)
+            async for item in generator:
+                yield ensure_string(item)
+
+        return new_generator()
+
+    except StopAsyncIteration:
+        raise HTTPException(status_code=status_code, detail="data: {'error': 'No data returned'}")
 
 def post_all_models(token, config, api_list):
     all_models = []