Merge branch 'open-webui:dev' into dev

Author: Algorithm5838

backend/open_webui/main.py

@@ -1329,7 +1329,9 @@ async def dispatch(self, request: Request, call_next):
         token = None
 
         if auth_header:
-            scheme, token = auth_header.split(" ")
+            parts = auth_header.split(" ", 1)
+            if len(parts) == 2:
+                token = parts[1]
 
         # Only apply restrictions if an sk- API key is used
         if token and token.startswith("sk-"):

backend/open_webui/routers/retrieval.py

@@ -1042,13 +1042,25 @@ async def update_rag_config(
     )
 
     # File upload settings
-    request.app.state.config.FILE_MAX_SIZE = form_data.FILE_MAX_SIZE
-    request.app.state.config.FILE_MAX_COUNT = form_data.FILE_MAX_COUNT
+    request.app.state.config.FILE_MAX_SIZE = (
+        form_data.FILE_MAX_SIZE
+        if form_data.FILE_MAX_SIZE is not None
+        else request.app.state.config.FILE_MAX_SIZE
+    )
+    request.app.state.config.FILE_MAX_COUNT = (
+        form_data.FILE_MAX_COUNT
+        if form_data.FILE_MAX_COUNT is not None
+        else request.app.state.config.FILE_MAX_COUNT
+    )
     request.app.state.config.FILE_IMAGE_COMPRESSION_WIDTH = (
         form_data.FILE_IMAGE_COMPRESSION_WIDTH
+        if form_data.FILE_IMAGE_COMPRESSION_WIDTH is not None
+        else request.app.state.config.FILE_IMAGE_COMPRESSION_WIDTH
     )
     request.app.state.config.FILE_IMAGE_COMPRESSION_HEIGHT = (
         form_data.FILE_IMAGE_COMPRESSION_HEIGHT
+        if form_data.FILE_IMAGE_COMPRESSION_HEIGHT is not None
+        else request.app.state.config.FILE_IMAGE_COMPRESSION_HEIGHT
     )
     request.app.state.config.ALLOWED_FILE_EXTENSIONS = (
         form_data.ALLOWED_FILE_EXTENSIONS

backend/open_webui/tools/builtin.py

@@ -36,7 +36,7 @@
 from open_webui.models.channels import Channels, ChannelMember, Channel
 from open_webui.models.messages import Messages, Message
 from open_webui.models.groups import Groups
-from open_webui.utils.sanitize import strip_markdown_code_fences
+from open_webui.utils.sanitize import sanitize_code
 
 log = logging.getLogger(__name__)
 
@@ -371,8 +371,8 @@ async def execute_code(
         return json.dumps({"error": "Request context not available"})
 
     try:
-        # Strip markdown fences if model included them
-        code = strip_markdown_code_fences(code)
+        # Sanitize code (strips ANSI codes and markdown fences)
+        code = sanitize_code(code)
 
         # Import blocked modules from config (same as middleware)
         from open_webui.config import CODE_INTERPRETER_BLOCKED_MODULES

backend/open_webui/utils/middleware.py

@@ -73,7 +73,7 @@
 from open_webui.retrieval.utils import get_sources_from_items
 
 
-from open_webui.utils.sanitize import strip_markdown_code_fences
+from open_webui.utils.sanitize import sanitize_code
 from open_webui.utils.chat import generate_chat_completion
 from open_webui.utils.task import (
     get_task_model_id,
@@ -4175,8 +4175,8 @@ async def flush_pending_delta_data(threshold: int = 0):
                         try:
                             if content_blocks[-1]["attributes"].get("type") == "code":
                                 code = content_blocks[-1]["content"]
-                                # Strip markdown fences if model included them
-                                code = strip_markdown_code_fences(code)
+                                # Sanitize code (strips ANSI codes and markdown fences)
+                                code = sanitize_code(code)
 
                                 if CODE_INTERPRETER_BLOCKED_MODULES:
                                     blocking_code = textwrap.dedent(

backend/open_webui/utils/sanitize.py

@@ -1,5 +1,25 @@
 import re
 
+# ANSI escape code pattern - matches all common ANSI sequences
+# This includes color codes, cursor movement, and other terminal control sequences
+ANSI_ESCAPE_PATTERN = re.compile(r'\x1b\[[0-9;]*[A-Za-z]|\x1b\([AB]|\x1b[PX^_].*?\x1b\\|\x1b\].*?(?:\x07|\x1b\\)')
+
+
+def strip_ansi_codes(text: str) -> str:
+    """
+    Strip ANSI escape codes from text.
+
+    ANSI escape codes can be introduced by LLMs that include terminal
+    color codes in their output. These codes cause syntax errors when
+    the code is sent to Jupyter for execution.
+
+    Common ANSI codes include:
+    - Color codes: \x1b[31m (red), \x1b[32m (green), etc.
+    - Reset codes: \x1b[0m, \x1b[39m
+    - Cursor movement: \x1b[1A, \x1b[2J, etc.
+    """
+    return ANSI_ESCAPE_PATTERN.sub('', text)
+
 
 def strip_markdown_code_fences(code: str) -> str:
     """
@@ -19,3 +39,20 @@ def strip_markdown_code_fences(code: str) -> str:
     # Remove closing fence
     code = re.sub(r"\n?```\s*$", "", code)
     return code.strip()
+
+
+def sanitize_code(code: str) -> str:
+    """
+    Sanitize code for execution by applying all necessary cleanup steps.
+
+    This is the recommended function to use before sending code to
+    interpreters like Jupyter or Pyodide.
+
+    Steps applied:
+    1. Strip ANSI escape codes (from LLM output)
+    2. Strip markdown code fences (if model included them)
+    """
+    code = strip_ansi_codes(code)
+    code = strip_markdown_code_fences(code)
+    return code
+

src/lib/components/chat/MessageInput.svelte

@@ -1744,7 +1744,7 @@
 											<!-- {$i18n.t('Create Note')}  -->
 											<Tooltip content={$i18n.t('Create note')} className=" flex items-center">
 												<button
-													id="send-message-button"
+													id="create-note-button"
 													class=" text-gray-600 dark:text-gray-300 hover:text-gray-700 dark:hover:text-gray-200 transition rounded-full p-1.5 self-center"
 													type="button"
 													disabled={prompt === '' && files.length === 0}

src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte

@@ -134,6 +134,7 @@
 			<div class="scrollbar-hidden relative overflow-x-auto max-w-full">
 				<table
 					class=" w-full text-sm text-left text-gray-500 dark:text-gray-400 max-w-full rounded-xl"
+					dir="auto"
 				>
 					<thead
 						class="text-xs text-gray-700 uppercase bg-white dark:bg-gray-900 dark:text-gray-400 border-none"

src/lib/components/layout/Sidebar.svelte

@@ -815,9 +815,6 @@
 									{#if $config?.features?.enable_user_status}
 										<div class="absolute -bottom-0.5 -right-0.5">
 											<span class="relative flex size-2.5">
-												<span
-													class="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75"
-												></span>
 												<span
 													class="relative inline-flex size-2.5 rounded-full {true
 														? 'bg-green-500'
@@ -1384,9 +1381,6 @@
 									{#if $config?.features?.enable_user_status}
 										<div class="absolute -bottom-0.5 -right-0.5">
 											<span class="relative flex size-2.5">
-												<span
-													class="absolute inline-flex h-full w-full animate-ping rounded-full bg-green-400 opacity-75"
-												></span>
 												<span
 													class="relative inline-flex size-2.5 rounded-full {true
 														? 'bg-green-500'

src/lib/components/layout/Sidebar/UserMenu.svelte

@@ -110,9 +110,6 @@
 							{#if $user?.is_active ?? true}
 								<div>
 									<span class="relative flex size-2">
-										<span
-											class="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75"
-										/>
 										<span class="relative inline-flex rounded-full size-2 bg-green-500" />
 									</span>
 								</div>
@@ -371,9 +368,6 @@
 						>
 							<div class=" flex items-center">
 								<span class="relative flex size-2">
-									<span
-										class="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-400 opacity-75"
-									/>
 									<span class="relative inline-flex rounded-full size-2 bg-green-500" />
 								</span>
 							</div>