Fix the bug in RemoteProtocolError handling.

response.py

@@ -92,33 +92,35 @@ async def fetch_gpt_response_stream(client, url, headers, payload, max_redirects
                 return
 
             buffer = ""
-            async for chunk in response.aiter_text():
-                # logger.info(f"chunk: {repr(chunk)}")
-                buffer += chunk
-                if chunk.startswith("<script"):
-                    import re
-                    redirect_match = re.search(r"window\.location\.href\s*=\s*'([^']+)'", chunk)
-                    if redirect_match:
-                        new_url = redirect_match.group(1)
-                        # logger.info(f"new_url: {new_url}")
-                        if not new_url.startswith('http'):
-                            # 如果是相对路径，构造完整URL
-                            # logger.info(url.split('/'))
-                            base_url = '/'.join(url.split('/')[:3])
-                            new_url = base_url + new_url
-                        url = new_url
-                        # logger.info(f"new_url: {new_url}")
-                        redirect_count += 1
-                        break
-                redirect_count = 0
-                while "\n" in buffer:
-                    line, buffer = buffer.split("\n", 1)
-                    # logger.info("line: %s", repr(line))
-                    if line and line != "data: " and line != "data:" and not line.startswith(": "):
-                        yield line + "\n"
-        if redirect_count != 0:
-            continue
-        else:
+            try:
+                async for chunk in response.aiter_text():
+                    # logger.info(f"chunk: {repr(chunk)}")
+                    buffer += chunk
+                    if chunk.startswith("<script"):
+                        import re
+                        redirect_match = re.search(r"window\.location\.href\s*=\s*'([^']+)'", chunk)
+                        if redirect_match:
+                            new_url = redirect_match.group(1)
+                            # logger.info(f"new_url: {new_url}")
+                            if not new_url.startswith('http'):
+                                # 如果是相对路径，构造完整URL
+                                # logger.info(url.split('/'))
+                                base_url = '/'.join(url.split('/')[:3])
+                                new_url = base_url + new_url
+                            url = new_url
+                            # logger.info(f"new_url: {new_url}")
+                            redirect_count += 1
+                            break
+                    redirect_count = 0
+                    while "\n" in buffer:
+                        line, buffer = buffer.split("\n", 1)
+                        # logger.info("line: %s", repr(line))
+                        if line and line != "data: " and line != "data:" and not line.startswith(": "):
+                            yield line + "\n"
+            except httpx.RemoteProtocolError as e:
+                yield {"error": f"fetch_gpt_response_stream RemoteProtocolError {e.__class__.__name__}", "details": str(e)}
+                return
+        if redirect_count == 0:
             return
 
     yield {"error": "Too many redirects", "details": f"Reached maximum of {max_redirects} redirects"}

utils.py

@@ -78,9 +78,6 @@ async def async_generator(items):
     for item in items:
         yield item
 
-class GeneratorStopError(Exception):
-    pass
-
 async def error_handling_wrapper(generator, status_code=200):
     try:
         first_item = await generator.__anext__()
@@ -107,19 +104,13 @@ async def error_handling_wrapper(generator, status_code=200):
         # 如果不是错误，创建一个新的生成器，首先yield第一个项，然后yield剩余的项
         async def new_generator():
             yield ensure_string(first_item)
-            try:
-                async for item in generator:
-                    yield ensure_string(item)
-            except httpx.RemoteProtocolError as e:
-                logger.error(f"Remote protocol error occurred: {e}")
-                raise GeneratorStopError("Generator stopped due to remote protocol error")
+            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'}")
-    except GeneratorStopError:
-        raise HTTPException(status_code=status_code, detail="data: {'error': 'No data returned'}")
 
 def post_all_models(token, config, api_list):
     all_models = []