refac
This commit is contained in:
1 parent
5b8975b7da
commit
a33fa05adc
1 file changed
+9
-9
@@ -1151,17 +1151,17 @@ async def stream_wrapper(response, session, content_handler=None):
|
|||||||
|
|
||||||
def stream_chunks_handler(stream: aiohttp.StreamReader):
|
def stream_chunks_handler(stream: aiohttp.StreamReader):
|
||||||
"""
|
"""
|
||||||
Handle stream response chunks, supporting large data chunks that exceed the original 16kb limit.
|
Handle stream response chunks without using aiohttp's line reader.
|
||||||
When a single line exceeds max_buffer_size, returns an empty JSON string {} and skips subsequent data
|
When configured and a single line exceeds max_buffer_size, returns an empty
|
||||||
until encountering normally sized data.
|
JSON string {} and skips subsequent data until encountering normally sized data.
|
||||||
|
|
||||||
:param stream: The stream reader to handle.
|
:param stream: The stream reader to handle.
|
||||||
:return: An async generator that yields the stream data.
|
:return: An async generator that yields the stream data.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
max_buffer_size = CHAT_STREAM_RESPONSE_CHUNK_MAX_BUFFER_SIZE
|
max_buffer_size = CHAT_STREAM_RESPONSE_CHUNK_MAX_BUFFER_SIZE
|
||||||
if max_buffer_size is None or max_buffer_size <= 0:
|
if max_buffer_size is not None and max_buffer_size <= 0:
|
||||||
return stream
|
max_buffer_size = None
|
||||||
|
|
||||||
async def yield_safe_stream_chunks():
|
async def yield_safe_stream_chunks():
|
||||||
buffer = b''
|
buffer = b''
|
||||||
@@ -1172,7 +1172,7 @@ def stream_chunks_handler(stream: aiohttp.StreamReader):
|
|||||||
continue
|
continue
|
||||||
|
|
||||||
# In skip_mode, if buffer already exceeds the limit, clear it (it's part of an oversized line)
|
# In skip_mode, if buffer already exceeds the limit, clear it (it's part of an oversized line)
|
||||||
if skip_mode and len(buffer) > max_buffer_size:
|
if max_buffer_size is not None and skip_mode and len(buffer) > max_buffer_size:
|
||||||
buffer = b''
|
buffer = b''
|
||||||
|
|
||||||
lines = (buffer + data).split(b'\n')
|
lines = (buffer + data).split(b'\n')
|
||||||
@@ -1183,14 +1183,14 @@ def stream_chunks_handler(stream: aiohttp.StreamReader):
|
|||||||
|
|
||||||
if skip_mode:
|
if skip_mode:
|
||||||
# Skip mode: check if current line is small enough to exit skip mode
|
# Skip mode: check if current line is small enough to exit skip mode
|
||||||
if len(line) <= max_buffer_size:
|
if max_buffer_size is None or len(line) <= max_buffer_size:
|
||||||
skip_mode = False
|
skip_mode = False
|
||||||
yield line
|
yield line
|
||||||
else:
|
else:
|
||||||
yield b'data: {}\n'
|
yield b'data: {}\n'
|
||||||
else:
|
else:
|
||||||
# Normal mode: check if line exceeds limit
|
# Normal mode: check if line exceeds limit
|
||||||
if len(line) > max_buffer_size:
|
if max_buffer_size is not None and len(line) > max_buffer_size:
|
||||||
skip_mode = True
|
skip_mode = True
|
||||||
yield b'data: {}\n'
|
yield b'data: {}\n'
|
||||||
log.info('Skip mode triggered, line size: %s', len(line))
|
log.info('Skip mode triggered, line size: %s', len(line))
|
||||||
@@ -1201,7 +1201,7 @@ def stream_chunks_handler(stream: aiohttp.StreamReader):
|
|||||||
buffer = lines[-1]
|
buffer = lines[-1]
|
||||||
|
|
||||||
# Check if buffer exceeds limit
|
# Check if buffer exceeds limit
|
||||||
if not skip_mode and len(buffer) > max_buffer_size:
|
if max_buffer_size is not None and not skip_mode and len(buffer) > max_buffer_size:
|
||||||
skip_mode = True
|
skip_mode = True
|
||||||
log.info('Skip mode triggered, buffer size: %s', len(buffer))
|
log.info('Skip mode triggered, buffer size: %s', len(buffer))
|
||||||
# Clear oversized buffer to prevent unlimited growth
|
# Clear oversized buffer to prevent unlimited growth
|
||||||
|
|||||||
Reference in new issue
Block a user