OpenWebUI/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui synced 2025-06-26 18:26:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refac

Browse Source
This commit is contained in:
Timothy Jaeryang Baek 2025-06-23 12:54:50 +04:00
parent 9b2c3dec3a
commit f4b92868c4
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
backend/open_webui/utils/middleware.py
View File

@ -804,7 +804,6 @@ async def process_chat_payload(request, form_data, user, metadata, model):
raise e raise e
try: try:
filter_functions = [ filter_functions = [
Functions.get_function_by_id(filter_id) Functions.get_function_by_id(filter_id)
for filter_id in get_sorted_filter_ids( for filter_id in get_sorted_filter_ids(
@ -1741,7 +1740,7 @@ async def process_chat_response(
}, },
) )
async def stream_body_handler(response): async def stream_body_handler(response, form_data):
nonlocal content nonlocal content
nonlocal content_blocks nonlocal content_blocks
@ -1770,7 +1769,7 @@ async def process_chat_response(
filter_functions=filter_functions, filter_functions=filter_functions,
filter_type="stream", filter_type="stream",
form_data=data, form_data=data,
extra_params=extra_params, extra_params={"__body__": form_data, **extra_params},
) )
if data: if data:
@ -2032,7 +2031,7 @@ async def process_chat_response(
if response.background: if response.background:
await response.background() await response.background()
await stream_body_handler(response) await stream_body_handler(response, form_data)
MAX_TOOL_CALL_RETRIES = 10 MAX_TOOL_CALL_RETRIES = 10
tool_call_retries = 0 tool_call_retries = 0
@ -2181,22 +2180,24 @@ async def process_chat_response(
) )
try: try:
new_form_data = {
"model": model_id,
"stream": True,
"tools": form_data["tools"],
"messages": [
*form_data["messages"],
*convert_content_blocks_to_messages(content_blocks),
],
}
res = await generate_chat_completion( res = await generate_chat_completion(
request, request,
{ new_form_data,
"model": model_id,
"stream": True,
"tools": form_data["tools"],
"messages": [
*form_data["messages"],
*convert_content_blocks_to_messages(content_blocks),
],
},
user, user,
) )
if isinstance(res, StreamingResponse): if isinstance(res, StreamingResponse):
await stream_body_handler(res) await stream_body_handler(res, new_form_data)
else: else:
break break
except Exception as e: except Exception as e: