This commit is contained in:
Timothy Jaeryang Baek committed 2026-07-26 21:08:44 -04:00
1 parent d2936c880c
commit b45c020f68
1 file changed
+70 -56
+70 -56
View File
@@ -80,6 +80,7 @@ from open_webui.utils.access_control import has_connection_access, has_permissio
from open_webui.models.access_grants import AccessGrants from open_webui.models.access_grants import AccessGrants
from open_webui.utils.access_control.folders import has_folder_access from open_webui.utils.access_control.folders import has_folder_access
from open_webui.utils.chat import generate_chat_completion from open_webui.utils.chat import generate_chat_completion
from open_webui.utils.chat_id import is_saved_chat_id
from open_webui.utils.code_interpreter import execute_code_jupyter from open_webui.utils.code_interpreter import execute_code_jupyter
from open_webui.utils.context_compaction import compact_messages_for_request from open_webui.utils.context_compaction import compact_messages_for_request
from open_webui.utils.files import ( from open_webui.utils.files import (
@@ -142,7 +143,7 @@ async def publish_chat_finished_event(
request: Request, user: UserModel, metadata: dict, title: str, content: str, output: list | None = None request: Request, user: UserModel, metadata: dict, title: str, content: str, output: list | None = None
): ):
chat_id = metadata.get('chat_id') chat_id = metadata.get('chat_id')
if getattr(request.state, 'internal', False) is True or not chat_id or chat_id.startswith(('channel:', 'local:')): if getattr(request.state, 'internal', False) is True or not is_saved_chat_id(chat_id):
return return
content = content or get_output_text(output) content = content or get_output_text(output)
@@ -2404,7 +2405,7 @@ async def process_chat_payload(request, form_data, user, metadata, model):
# Uses lightweight column query — only fetches folder_id, not the full chat JSON blob # Uses lightweight column query — only fetches folder_id, not the full chat JSON blob
chat_id = metadata.get('chat_id', None) chat_id = metadata.get('chat_id', None)
folder_id = None folder_id = None
if chat_id and user: if user and is_saved_chat_id(chat_id):
folder_id = await Chats.get_chat_folder_id(chat_id, user.id) folder_id = await Chats.get_chat_folder_id(chat_id, user.id)
# Fallback: use folder_id from metadata (temporary chats have no DB record) # Fallback: use folder_id from metadata (temporary chats have no DB record)
@@ -3519,6 +3520,9 @@ async def non_streaming_chat_response_handler(response, ctx):
if response_data is None: if response_data is None:
return response return response
chat_id = metadata.get('chat_id') or ''
save_to_chat = is_saved_chat_id(chat_id)
if event_emitter: if event_emitter:
try: try:
if 'error' in response_data: if 'error' in response_data:
@@ -3531,7 +3535,7 @@ async def non_streaming_chat_response_handler(response, ctx):
log.error('Provider returned error (non-streaming): %s', error) log.error('Provider returned error (non-streaming): %s', error)
if not metadata.get('chat_id', '').startswith('channel:'): if save_to_chat:
await Chats.upsert_message_to_chat_by_id_and_message_id( await Chats.upsert_message_to_chat_by_id_and_message_id(
metadata['chat_id'], metadata['chat_id'],
metadata['message_id'], metadata['message_id'],
@@ -3547,7 +3551,7 @@ async def non_streaming_chat_response_handler(response, ctx):
} }
) )
if 'selected_model_id' in response_data and not metadata.get('chat_id', '').startswith('channel:'): if 'selected_model_id' in response_data and save_to_chat:
await Chats.upsert_message_to_chat_by_id_and_message_id( await Chats.upsert_message_to_chat_by_id_and_message_id(
metadata['chat_id'], metadata['chat_id'],
metadata['message_id'], metadata['message_id'],
@@ -3572,7 +3576,7 @@ async def non_streaming_chat_response_handler(response, ctx):
title = ( title = (
await Chats.get_chat_title_by_id(metadata['chat_id']) await Chats.get_chat_title_by_id(metadata['chat_id'])
if not metadata.get('chat_id', '').startswith('channel:') if save_to_chat
else '' else ''
) )
@@ -3625,7 +3629,7 @@ async def non_streaming_chat_response_handler(response, ctx):
# Save message in the database # Save message in the database
usage = normalize_usage(response_data.get('usage', {}) or {}) usage = normalize_usage(response_data.get('usage', {}) or {})
if not metadata.get('chat_id', '').startswith('channel:'): if save_to_chat:
await Chats.upsert_message_to_chat_by_id_and_message_id( await Chats.upsert_message_to_chat_by_id_and_message_id(
metadata['chat_id'], metadata['chat_id'],
metadata['message_id'], metadata['message_id'],
@@ -3708,6 +3712,8 @@ async def streaming_chat_response_handler(response, ctx):
event_emitter = ctx['event_emitter'] event_emitter = ctx['event_emitter']
event_caller = ctx['event_caller'] event_caller = ctx['event_caller']
chat_id = metadata.get('chat_id') or ''
save_to_chat = is_saved_chat_id(chat_id)
extra_params = { extra_params = {
'__event_emitter__': event_emitter, '__event_emitter__': event_emitter,
@@ -3959,7 +3965,11 @@ async def streaming_chat_response_handler(response, ctx):
return output, end_flag return output, end_flag
message = await Chats.get_message_by_id_and_message_id(metadata['chat_id'], metadata['message_id']) message = (
await Chats.get_message_by_id_and_message_id(metadata['chat_id'], metadata['message_id'])
if save_to_chat
else None
)
tool_calls = [] tool_calls = []
@@ -4041,13 +4051,14 @@ async def streaming_chat_response_handler(response, ctx):
) )
# Save message in the database # Save message in the database
await Chats.upsert_message_to_chat_by_id_and_message_id( if save_to_chat:
metadata['chat_id'], await Chats.upsert_message_to_chat_by_id_and_message_id(
metadata['message_id'], metadata['chat_id'],
{ metadata['message_id'],
**event, {
}, **event,
) },
)
async def stream_body_handler(response, form_data): async def stream_body_handler(response, form_data):
nonlocal content_parts nonlocal content_parts
@@ -4114,16 +4125,17 @@ async def streaming_chat_response_handler(response, ctx):
raw_obj = json.loads(data) raw_obj = json.loads(data)
raw_error = raw_obj.get('error') if isinstance(raw_obj, dict) else None raw_error = raw_obj.get('error') if isinstance(raw_obj, dict) else None
if raw_error: if raw_error:
try: if save_to_chat:
await Chats.upsert_message_to_chat_by_id_and_message_id( try:
metadata['chat_id'], await Chats.upsert_message_to_chat_by_id_and_message_id(
metadata['message_id'], metadata['chat_id'],
{ metadata['message_id'],
'error': {'content': raw_error}, {
}, 'error': {'content': raw_error},
) },
except Exception: )
pass except Exception:
pass
await event_emitter({'type': 'chat:completion', 'data': {'error': raw_error}}) await event_emitter({'type': 'chat:completion', 'data': {'error': raw_error}})
except Exception: except Exception:
pass pass
@@ -4149,14 +4161,15 @@ async def streaming_chat_response_handler(response, ctx):
if 'selected_model_id' in data: if 'selected_model_id' in data:
model_id = data['selected_model_id'] model_id = data['selected_model_id']
await Chats.upsert_message_to_chat_by_id_and_message_id( if save_to_chat:
metadata['chat_id'], await Chats.upsert_message_to_chat_by_id_and_message_id(
metadata['message_id'], metadata['chat_id'],
{ metadata['message_id'],
'selectedModelId': model_id, {
}, 'selectedModelId': model_id,
touch=False, },
) touch=False,
)
await event_emitter( await event_emitter(
{ {
'type': 'chat:completion', 'type': 'chat:completion',
@@ -4269,16 +4282,17 @@ async def streaming_chat_response_handler(response, ctx):
error = data.get('error', {}) error = data.get('error', {})
if error: if error:
log.error('Provider returned error (streaming): %s', error) log.error('Provider returned error (streaming): %s', error)
try: if save_to_chat:
await Chats.upsert_message_to_chat_by_id_and_message_id( try:
metadata['chat_id'], await Chats.upsert_message_to_chat_by_id_and_message_id(
metadata['message_id'], metadata['chat_id'],
{ metadata['message_id'],
'error': {'content': error}, {
}, 'error': {'content': error},
) },
except Exception: )
pass except Exception:
pass
await event_emitter( await event_emitter(
{ {
'type': 'chat:completion', 'type': 'chat:completion',
@@ -4384,13 +4398,15 @@ async def streaming_chat_response_handler(response, ctx):
image_urls = await get_image_urls(delta.get('images', []), request, metadata, user) image_urls = await get_image_urls(delta.get('images', []), request, metadata, user)
if image_urls: if image_urls:
image_file_list = [{'type': 'image', 'url': url} for url in image_urls] image_file_list = [{'type': 'image', 'url': url} for url in image_urls]
message_files = await Chats.add_message_files_by_id_and_message_id( message_files = image_file_list
metadata['chat_id'], if save_to_chat:
metadata['message_id'], message_files = await Chats.add_message_files_by_id_and_message_id(
image_file_list, metadata['chat_id'],
) metadata['message_id'],
if message_files is None: image_file_list,
message_files = image_file_list )
if message_files is None:
message_files = image_file_list
await event_emitter( await event_emitter(
{ {
@@ -4606,9 +4622,7 @@ async def streaming_chat_response_handler(response, ctx):
if end: if end:
break break
if ENABLE_REALTIME_CHAT_SAVE and not metadata.get('chat_id', '').startswith( if ENABLE_REALTIME_CHAT_SAVE and save_to_chat:
'channel:'
):
current_output = full_output() current_output = full_output()
# Save message in the database # Save message in the database
await Chats.upsert_message_to_chat_by_id_and_message_id( await Chats.upsert_message_to_chat_by_id_and_message_id(
@@ -5142,7 +5156,7 @@ async def streaming_chat_response_handler(response, ctx):
): ):
log.warning('Tool-call iteration limit reached (%s)', max_tool_call_iterations) log.warning('Tool-call iteration limit reached (%s)', max_tool_call_iterations)
error_content = f'Tool-call limit reached ({max_tool_call_iterations} iterations).' error_content = f'Tool-call limit reached ({max_tool_call_iterations} iterations).'
if not metadata.get('chat_id', '').startswith('channel:'): if save_to_chat:
await Chats.upsert_message_to_chat_by_id_and_message_id( await Chats.upsert_message_to_chat_by_id_and_message_id(
metadata['chat_id'], metadata['chat_id'],
metadata['message_id'], metadata['message_id'],
@@ -5332,7 +5346,7 @@ async def streaming_chat_response_handler(response, ctx):
title = ( title = (
await Chats.get_chat_title_by_id(metadata['chat_id']) await Chats.get_chat_title_by_id(metadata['chat_id'])
if not metadata.get('chat_id', '').startswith('channel:') if save_to_chat
else '' else ''
) )
data = { data = {
@@ -5342,7 +5356,7 @@ async def streaming_chat_response_handler(response, ctx):
**({'usage': usage} if usage else {}), **({'usage': usage} if usage else {}),
} }
if not metadata.get('chat_id', '').startswith('channel:'): if save_to_chat:
if not ENABLE_REALTIME_CHAT_SAVE: if not ENABLE_REALTIME_CHAT_SAVE:
# Save message in the database # Save message in the database
await Chats.upsert_message_to_chat_by_id_and_message_id( await Chats.upsert_message_to_chat_by_id_and_message_id(
@@ -5397,7 +5411,7 @@ async def streaming_chat_response_handler(response, ctx):
async def save_cancelled_state(): async def save_cancelled_state():
await event_emitter({'type': 'chat:tasks:cancel'}) await event_emitter({'type': 'chat:tasks:cancel'})
if not metadata.get('chat_id', '').startswith('channel:'): if save_to_chat:
if not ENABLE_REALTIME_CHAT_SAVE: if not ENABLE_REALTIME_CHAT_SAVE:
await Chats.upsert_message_to_chat_by_id_and_message_id( await Chats.upsert_message_to_chat_by_id_and_message_id(
metadata['chat_id'], metadata['chat_id'],