fix: sync chat_message rows on chat update

Author: Algorithm5838

backend/open_webui/models/chats.py

@@ -404,6 +404,9 @@ async def update_chat_by_id(self, id: str, chat: dict, db: AsyncSession | None =
 
                 await db.commit()
 
+                new_messages = (chat.get('history', {}) or {}).get('messages', {}) or {}
+                await self.reconcile_messages_by_chat_id(id, chat_item.user_id, new_messages)
+
                 return ChatModel.model_validate(chat_item)
         except Exception:
             return None
@@ -499,22 +502,25 @@ async def backfill_messages_by_chat_id(self, chat_id: str, user_id: str, message
                 log.warning('Backfill failed for message %s in chat %s: %s', message_id, chat_id, e)
 
     async def reconcile_messages_by_chat_id(
-        self, chat_id: str, user_id: str, messages: dict[str, dict]
+        self, chat_id: str, user_id: str, messages: dict[str, dict],
+        *, delete_orphans: bool = False,
     ) -> None:
         """Sync ``chat_message`` rows with the committed JSON blob.
 
         Upserts current messages via ``backfill_messages_by_chat_id``
-        and deletes orphaned rows whose message_id no longer appears
-        in the blob.  Best-effort: errors are logged but never raised.
+        and, when *delete_orphans* is True, deletes rows whose
+        message_id no longer appears in the blob.  Best-effort: errors
+        are logged but never raised.
         """
         try:
             await self.backfill_messages_by_chat_id(chat_id, user_id, messages)
 
-            existing_map = await ChatMessages.get_messages_map_by_chat_id(chat_id)
-            if existing_map is not None:
-                orphaned_ids = set(existing_map.keys()) - set(messages.keys())
-                if orphaned_ids:
-                    await ChatMessages.delete_message_ids_by_chat_id(chat_id, orphaned_ids)
+            if delete_orphans:
+                existing_map = await ChatMessages.get_messages_map_by_chat_id(chat_id)
+                if existing_map is not None:
+                    orphaned_ids = set(existing_map.keys()) - set(messages.keys())
+                    if orphaned_ids:
+                        await ChatMessages.delete_message_ids_by_chat_id(chat_id, orphaned_ids)
         except Exception as e:
             log.warning('Failed to reconcile chat_message rows for chat %s: %s', chat_id, e)
 

backend/open_webui/routers/chats.py

@@ -988,13 +988,6 @@ async def update_chat_by_id(
 
         chat = await Chats.update_chat_by_id(id, updated_chat, db=db)
 
-        # Reconcile chat_message rows with the committed blob.
-        # This is the only caller where the frontend pushes a full
-        # history with potential edits, deletions, or new branches.
-        messages = (updated_chat.get('history') or {}).get('messages') or {}
-        if messages:
-            await Chats.reconcile_messages_by_chat_id(id, user.id, messages)
-
         return ChatResponse(**chat.model_dump())
     else:
         raise HTTPException(