From 2b99945d2726bdf5aed7b1712f9e3b7b622671df Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Wed, 20 May 2026 00:22:27 +0400
Subject: [PATCH] refac

Co-Authored-By: Classic298 <27028174+Classic298@users.noreply.github.com>
---
 backend/open_webui/env.py              | 19 +++++++++++-----
 backend/open_webui/utils/middleware.py | 31 ++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/backend/open_webui/env.py b/backend/open_webui/env.py
index 20d59ca804..1deed8da83 100644
--- a/backend/open_webui/env.py
+++ b/backend/open_webui/env.py
@@ -845,15 +845,24 @@ else:
         CHAT_RESPONSE_STREAM_DELTA_CHUNK_SIZE = 1
 
 
-CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES = os.getenv('CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES', '30')
+# Maximum tool-call iterations per chat response. Set to -1 for unlimited.
+# The old CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES name is accepted as a fallback.
+CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS = os.getenv(
+    'CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS',
+    os.getenv('CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES', '256'),
+)
 
-if CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES == '':
-    CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES = 30
+if CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS == '':
+    CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS = 256
 else:
     try:
-        CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES = int(CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES)
+        CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS = int(CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS)
     except Exception:
-        CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES = 30
+        CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS = 256
+
+# -1 means unlimited (no cap).
+if CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS == -1:
+    CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS = None
 
 
 # WARNING: Experimental. Only enable if your upstream Responses API endpoint
diff --git a/backend/open_webui/utils/middleware.py b/backend/open_webui/utils/middleware.py
index b78ad9f701..6c07cd02de 100644
--- a/backend/open_webui/utils/middleware.py
+++ b/backend/open_webui/utils/middleware.py
@@ -30,7 +30,7 @@ from open_webui.config import (
 from open_webui.constants import TASKS
 from open_webui.env import (
     BYPASS_MODEL_ACCESS_CONTROL,
-    CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES,
+    CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS,
     CHAT_RESPONSE_STREAM_DELTA_CHUNK_SIZE,
     ENABLE_CHAT_RESPONSE_BASE64_IMAGE_URL_CONVERSION,
     ENABLE_QUERIES_CACHE,
@@ -4438,7 +4438,7 @@ async def streaming_chat_response_handler(response, ctx):
                     if response.background:
                         await response.background()
 
-                tool_call_retries = 0
+                tool_call_iterations = 0
                 tool_call_sources = []  # Track citation sources from tool results
                 all_tool_call_sources = []  # Accumulated sources across all iterations
                 user_message = get_last_user_message(form_data['messages'])
@@ -4458,8 +4458,11 @@ async def streaming_chat_response_handler(response, ctx):
                         get_content_from_message(original_system_message) if original_system_message else None
                     )
 
-                while len(tool_calls) > 0 and tool_call_retries < CHAT_RESPONSE_MAX_TOOL_CALL_RETRIES:
-                    tool_call_retries += 1
+                while tool_calls and (
+                    CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS is None
+                    or tool_call_iterations < CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS
+                ):
+                    tool_call_iterations += 1
 
                     response_tool_calls = tool_calls.pop(0)
 
@@ -4832,6 +4835,26 @@ async def streaming_chat_response_handler(response, ctx):
                         log.debug(e)
                         break
 
+                if (
+                    CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS is not None
+                    and tool_calls
+                    and tool_call_iterations >= CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS
+                ):
+                    log.warning('Tool-call iteration limit reached (%s)', CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS)
+                    error_content = f'Tool-call limit reached ({CHAT_RESPONSE_MAX_TOOL_CALL_ITERATIONS} iterations).'
+                    if not metadata.get('chat_id', '').startswith('channel:'):
+                        await Chats.upsert_message_to_chat_by_id_and_message_id(
+                            metadata['chat_id'],
+                            metadata['message_id'],
+                            {'error': {'content': error_content}},
+                        )
+                    await event_emitter(
+                        {
+                            'type': 'chat:message:error',
+                            'data': {'error': {'content': error_content}},
+                        }
+                    )
+
                 if DETECT_CODE_INTERPRETER:
                     MAX_RETRIES = 5
                     retries = 0