From 6116c6dca0d9b6770aab40f620f3317e965ec201 Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Sat, 9 May 2026 16:06:09 +0900 Subject: [PATCH] refac --- backend/open_webui/utils/middleware.py | 16 ++++++++++++---- backend/open_webui/utils/oauth.py | 1 + 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/backend/open_webui/utils/middleware.py b/backend/open_webui/utils/middleware.py index f2d472631a..3e25effa9a 100644 --- a/backend/open_webui/utils/middleware.py +++ b/backend/open_webui/utils/middleware.py @@ -2198,7 +2198,9 @@ def process_messages_with_output( if message.get('role') == 'assistant' and message.get('output'): # Use output items for clean OpenAI-format messages output_messages = convert_output_to_messages( - message['output'], raw=True, reasoning_format=reasoning_format, + message['output'], + raw=True, + reasoning_format=reasoning_format, ) if output_messages: processed.extend(output_messages) @@ -4766,10 +4768,14 @@ async def streaming_chat_response_handler(response, ctx): system_message = get_system_message(form_data['messages']) new_form_data['messages'] = ( [system_message] if system_message else [] - ) + convert_output_to_messages(output, raw=True, reasoning_format=get_reasoning_format(model)) + ) + convert_output_to_messages( + output, raw=True, reasoning_format=get_reasoning_format(model) + ) new_form_data['previous_response_id'] = last_response_id else: - tool_messages = convert_output_to_messages(output, raw=True, reasoning_format=get_reasoning_format(model)) + tool_messages = convert_output_to_messages( + output, raw=True, reasoning_format=get_reasoning_format(model) + ) # Chat Completions providers don't support multimodal # tool messages. Extract images into a user message. @@ -4989,7 +4995,9 @@ async def streaming_chat_response_handler(response, ctx): 'metadata': metadata, 'messages': [ *form_data['messages'], - *convert_output_to_messages(output, raw=True, reasoning_format=get_reasoning_format(model)), + *convert_output_to_messages( + output, raw=True, reasoning_format=get_reasoning_format(model) + ), ], } diff --git a/backend/open_webui/utils/oauth.py b/backend/open_webui/utils/oauth.py index d039f6260c..56341bdca3 100644 --- a/backend/open_webui/utils/oauth.py +++ b/backend/open_webui/utils/oauth.py @@ -295,6 +295,7 @@ def get_parsed_and_base_url(server_url) -> tuple[urllib.parse.ParseResult, str]: @dataclass class ProtectedResourceMetadata: """RFC 9728 Protected Resource Metadata fields relevant to OAuth flows.""" + resource: str | None = None authorization_servers: list[str] = field(default_factory=list)