refac

Author: tjbck

backend/open_webui/models/chat_messages.py

@@ -169,7 +169,10 @@ def upsert_message(
                     info = data.get('info', {})
                     usage = info.get('usage') if info else None
                 if usage:
-                    existing.usage = usage
+                    # Deep-merge: preserve existing keys not present in new data
+                    # This prevents background tasks (follow-ups, title, tags)
+                    # from accidentally clearing the primary response's token counts
+                    existing.usage = {**(existing.usage or {}), **usage}
                 existing.updated_at = now
                 db.commit()
                 db.refresh(existing)

backend/open_webui/utils/middleware.py

@@ -4626,6 +4626,7 @@ def restricted_import(name, globals=None, locals=None, fromlist=(), level=0):
                     'content': serialize_output(output),
                     'output': output,
                     'title': title,
+                    **({'usage': usage} if usage else {}),
                 }
 
                 if not ENABLE_REALTIME_CHAT_SAVE: