fix: drop output for removed tool call blocks

Author: Algorithm5838

backend/open_webui/routers/chats.py

@@ -6,7 +6,7 @@
 from fastapi.responses import StreamingResponse
 
 
-from open_webui.utils.misc import get_message_list
+from open_webui.utils.misc import get_message_list, filter_output_by_content
 from open_webui.socket.main import get_event_emitter
 from open_webui.models.chats import (
     ChatForm,
@@ -1031,12 +1031,21 @@ async def update_chat_message_by_id(
             detail=ERROR_MESSAGES.ACCESS_PROHIBITED,
         )
 
+    existing_message = (
+        chat.chat.get("history", {}).get("messages", {}).get(message_id, {})
+    )
+    existing_output = existing_message.get("output")
+
+    update_data = {"content": form_data.content}
+    if existing_output is not None:
+        update_data["output"] = filter_output_by_content(
+            existing_output, form_data.content
+        )
+
     chat = Chats.upsert_message_to_chat_by_id_and_message_id(
         id,
         message_id,
-        {
-            "content": form_data.content,
-        },
+        update_data,
         db=db,
     )
 

backend/open_webui/utils/misc.py

@@ -262,6 +262,22 @@ def flush_pending():
     return messages
 
 
+def filter_output_by_content(output: list, content: str) -> list:
+    """
+    Drop function_call and function_call_output items from output for any
+    tool call block removed from the message content.
+    """
+    present_call_ids = set(
+        re.findall(r'<details\s[^>]*\btype="tool_calls"[^>]*\bid="([^"]+)"', content)
+    )
+    return [
+        item
+        for item in output
+        if item.get("type") not in ("function_call", "function_call_output")
+        or item.get("call_id", "") in present_call_ids
+    ]
+
+
 def get_last_user_message(messages: list[dict]) -> Optional[str]:
     message = get_last_user_message_item(messages)
     if message is None: