scriptoriumadmin/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2026-08-28 05:27:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refac

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2026-08-25 13:18:38 -04:00
parent a4738e0459
commit 1c13fedb16
4 changed files with 82 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
backend/open_webui/main.py
View file

@ -1472,15 +1472,13 @@ async def chat_completion(
# The old frontend saveChatHandler did this on every message;
# now the backend owns persistence.
chat_files = metadata.get('files')
if chat_files is not None or selected_chat_models:
existing_chat = await Chats.get_chat_by_id(chat_id)
if existing_chat:
updated = {**existing_chat.chat}
if chat_files is not None:
updated['files'] = chat_files
if selected_chat_models:
updated['models'] = selected_chat_models
await Chats.update_chat_by_id(chat_id, updated, touch=False)
chat_fields = {}
if chat_files is not None:
chat_fields['files'] = chat_files
if selected_chat_models:
chat_fields['models'] = selected_chat_models
if chat_fields:
await Chats.update_chat_by_id(chat_id, chat_fields, touch=False)
await Chats.update_chat_variables_by_id(chat_id, chat_variables)

84
backend/open_webui/models/chats.py
View file

@ -699,17 +699,29 @@ class ChatTable:
*,
touch: bool = True,
) -> ChatModel | None:
"""Persist updated chat content, sanitizing null bytes."""
try: # load the chat record for in-place mutation
"""Patch top-level chat keys; history is merged so stale writers don't drop messages."""
try:
async with get_async_db_context(db) as session:
chat_item = await session.get(Chat, id)
chat_item = await session.get(
Chat,
id,
populate_existing=True,
with_for_update=session.bind.dialect.name == 'postgresql',
)
if chat_item is None:
return None
chat_item.chat = self._clean_null_bytes(chat)
chat_item.title = self._clean_null_bytes(chat['title']) if 'title' in chat else 'New Chat'
stored = chat_item.chat or {}
updated = {**stored, **chat}
if 'history' in chat:
# The caller built its history from an earlier read; merge so messages saved since then survive.
updated['history'] = self.merge_history(stored.get('history'), chat['history'])
updated = self._clean_null_bytes(updated)
chat_item.chat = updated
chat_item.title = updated.get('title', 'New Chat')
if any(key in chat for key in ('history', 'messages', 'currentId', 'branchPointMessageId')):
chat_item.current_message_id = self.get_current_message_id(chat)
chat_item.current_message_id = self.get_current_message_id(updated)
if touch:
chat_item.updated_at = int(time.time())
@ -816,7 +828,12 @@ class ChatTable:
async def update_chat_title_by_id(self, id: str, title: str) -> ChatModel | None:
try:
async with get_async_db_context() as session:
chat_item = await session.get(Chat, id)
chat_item = await session.get(
Chat,
id,
populate_existing=True,
with_for_update=session.bind.dialect.name == 'postgresql',
)
if chat_item is None:
return None
clean_title = self._clean_null_bytes(title)
@ -877,11 +894,12 @@ class ChatTable:
def merge_history(existing_history: dict | None, incoming_history: dict | None) -> dict:
existing = (existing_history or {}).get('messages') or {}
incoming = (incoming_history or {}).get('messages') or {}
merged = {**existing, **incoming}
merged = {message_id: message for message_id, message in merged.items() if isinstance(message, dict)}
merged = {
message_id: {**message, 'childrenIds': []}
for message_id, message in {**existing, **incoming}.items()
if isinstance(message, dict)
}
for message in merged.values():
message['childrenIds'] = []
for message_id, message in merged.items():
parent_id = message.get('parentId')
if parent_id in merged:
@ -1108,7 +1126,12 @@ class ChatTable:
try:
async with get_async_db_context() as session:
chat_item = await session.get(Chat, id)
chat_item = await session.get(
Chat,
id,
populate_existing=True,
with_for_update=session.bind.dialect.name == 'postgresql',
)
if chat_item is None:
return None
@ -1149,7 +1172,12 @@ class ChatTable:
async def delete_message_from_chat_by_id_and_message_id(self, id: str, message_id: str) -> ChatModel | None:
try:
async with get_async_db_context() as session:
chat_item = await session.get(Chat, id)
chat_item = await session.get(
Chat,
id,
populate_existing=True,
with_for_update=session.bind.dialect.name == 'postgresql',
)
if chat_item is None:
return None
@ -1191,7 +1219,12 @@ class ChatTable:
try:
status = self._clean_null_bytes(status)
async with get_async_db_context() as session:
chat_item = await session.get(Chat, id)
chat_item = await session.get(
Chat,
id,
populate_existing=True,
with_for_update=session.bind.dialect.name == 'postgresql',
)
if chat_item is None:
return None
@ -1216,13 +1249,20 @@ class ChatTable:
except Exception:
return None
async def add_message_files_by_id_and_message_id(self, id: str, message_id: str, files: list[dict]) -> list[dict]:
async def add_message_files_by_id_and_message_id(
self, id: str, message_id: str, files: list[dict]
) -> list[dict] | None:
async with get_async_db_context() as session:
chat = await self.get_chat_by_id(id, db=session)
if chat is None:
chat_item = await session.get(
Chat,
id,
populate_existing=True,
with_for_update=session.bind.dialect.name == 'postgresql',
)
if chat_item is None:
return None
chat = chat.chat
chat = chat_item.chat or {}
history = chat.get('history', {})
message_files = []
@ -1232,8 +1272,14 @@ class ChatTable:
message_files = message_files + files
history['messages'][message_id]['files'] = message_files
# Written here rather than through update_chat_by_id: with session sharing off that opens a second
# connection, which then blocks on the lock this one holds.
chat['history'] = history
await self.update_chat_by_id(id, chat, db=session)
chat_item.chat = self._clean_null_bytes(chat)
# History was mutated in place, so the new blob compares equal to the loaded one.
flag_modified(chat_item, 'chat')
chat_item.updated_at = int(time.time())
await session.commit()
return message_files
async def insert_shared_chat_by_chat_id(self, chat_id: str, db: AsyncSession | None = None) -> ChatModel | None:

11
backend/open_webui/routers/chats.py
View file

@ -1361,15 +1361,8 @@ async def update_chat_by_id(
):
chat = await Chats.get_chat_by_id_and_user_id(id, user.id, db=db)
if chat:
updated_chat = {**chat.chat, **form_data.chat}
if 'history' in form_data.chat:
updated_chat['history'] = Chats.merge_history(
chat.chat.get('history'),
form_data.chat.get('history'),
)
touch = 'history' in form_data.chat or 'messages' in form_data.chat
chat = await Chats.update_chat_by_id(id, updated_chat, db=db, touch=touch)
chat = await Chats.update_chat_by_id(id, form_data.chat, db=db, touch=touch)
if form_data.variables is not None:
chat = (
await Chats.update_chat_variables_by_id(
@ -1383,7 +1376,7 @@ async def update_chat_by_id(
# Reconcile chat_message rows without inferring deletes from missing IDs.
# Message deletion has its own endpoint below.
messages = (updated_chat.get('history') or {}).get('messages') or {}
messages = ((chat.chat or {}).get('history') or {}).get('messages') or {}
if messages:
await Chats.reconcile_messages_by_chat_id(id, user.id, messages)

26
backend/open_webui/routers/notes.py
View file

@ -339,11 +339,10 @@ async def get_note_chat_by_id(
chat = await Chats.get_internal_chat_by_note_id(note.id, user.id, db=db)
if chat:
log.info('[note-chat] reusing hidden chat note_id=%s chat_id=%s user_id=%s', note.id, chat.id, user.id)
payload = {**(chat.chat or {})}
params = {**(payload.get('params') or {})}
params = {**((chat.chat or {}).get('params') or {})}
changed = False
if params.pop('note_id', None) is not None:
if 'note_id' in params:
del params['note_id']
changed = True
system = (
@ -356,12 +355,8 @@ async def get_note_chat_by_id(
params['system'] = system
changed = True
if payload.pop('system', None) is not None:
changed = True
payload['params'] = params
if changed:
updated_chat = await Chats.update_chat_by_id(chat.id, payload, db=db, touch=False)
updated_chat = await Chats.update_chat_by_id(chat.id, {'params': params}, db=db, touch=False)
if updated_chat:
return updated_chat
@ -434,11 +429,10 @@ async def get_note_chats_by_id(
chats = await Chats.get_internal_chats_by_note_id(note.id, user.id, db=db)
normalized_chats = []
for chat in chats:
payload = {**(chat.chat or {})}
params = {**(payload.get('params') or {})}
params = {**((chat.chat or {}).get('params') or {})}
changed = False
if params.pop('note_id', None) is not None:
if 'note_id' in params:
del params['note_id']
changed = True
system = (
@ -451,12 +445,8 @@ async def get_note_chats_by_id(
params['system'] = system
changed = True
if payload.pop('system', None) is not None:
changed = True
payload['params'] = params
if changed:
chat = await Chats.update_chat_by_id(chat.id, payload, db=db, touch=False) or chat
chat = await Chats.update_chat_by_id(chat.id, {'params': params}, db=db, touch=False) or chat
normalized_chats.append(chat)