UniqAI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2024-11-27 06:20:01 +00:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
smonux 2024-10-12 22:07:17 +02:00
parent 712f82e4dd
commit 0a902fc691
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/open_webui/main.py
View File

@ -470,7 +470,7 @@ async def handle_streaming_response(request: Request, response: Response,
try: try:
while True: while True:
peek = await generator.__anext__() peek = await generator.__anext__()
if peek in (b'\n', b'data: [DONE]'): if peek in (b'\n', b'data: [DONE]\n'):
yield peek yield peek
continue continue
peek_json = extract_json(peek) peek_json = extract_json(peek)
@ -486,7 +486,6 @@ async def handle_streaming_response(request: Request, response: Response,
fill_with_delta(tool_calls[current_index], peek_json) fill_with_delta(tool_calls[current_index], peek_json)
async for data in generator: async for data in generator:
log.debug(f"smonux 24 {data=}")
if data in (b'\n', b'data: [DONE]\n'): if data in (b'\n', b'data: [DONE]\n'):
continue continue
delta = extract_json(data) delta = extract_json(data)
@ -530,6 +529,8 @@ async def handle_streaming_response(request: Request, response: Response,
response = await generate_chat_completions(form_data = body, user = user ) response = await generate_chat_completions(form_data = body, user = user )
generator = response.body_iterator.__aiter__() generator = response.body_iterator.__aiter__()
except StopAsyncIteration as sie:
pass
except Exception as e: except Exception as e:
log.exception(f"Error: {e}") log.exception(f"Error: {e}")
@ -828,7 +829,6 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
if len(citations) > 0: if len(citations) > 0:
data_items.append({"citations": citations}) data_items.append({"citations": citations})
log.debug("smonux 10")
update_body_request(request, body) update_body_request(request, body)
first_response = await call_next(request) first_response = await call_next(request)