refac

Author: tjbck

backend/open_webui/utils/auth.py

@@ -19,7 +19,6 @@
 from pytz import UTC
 from typing import Optional, Union, List, Dict
 
-from opentelemetry import trace
 
 
 from open_webui.utils.access_control import has_permission
@@ -30,6 +29,7 @@
 from open_webui.constants import ERROR_MESSAGES
 
 from open_webui.env import (
+    ENABLE_OTEL,
     ENABLE_PASSWORD_VALIDATION,
     OFFLINE_MODE,
     LICENSE_BLOB,
@@ -327,12 +327,15 @@ async def get_current_user(
         user = get_current_user_by_api_key(request, token)
 
         # Add user info to current span
-        current_span = trace.get_current_span()
-        if current_span:
-            current_span.set_attribute('client.user.id', user.id)
-            current_span.set_attribute('client.user.email', user.email)
-            current_span.set_attribute('client.user.role', user.role)
-            current_span.set_attribute('client.auth.type', 'api_key')
+        if ENABLE_OTEL:
+            from opentelemetry import trace
+
+            current_span = trace.get_current_span()
+            if current_span:
+                current_span.set_attribute('client.user.id', user.id)
+                current_span.set_attribute('client.user.email', user.email)
+                current_span.set_attribute('client.user.role', user.role)
+                current_span.set_attribute('client.auth.type', 'api_key')
 
         return user
 
@@ -369,12 +372,15 @@ async def get_current_user(
                         )
 
                 # Add user info to current span
-                current_span = trace.get_current_span()
-                if current_span:
-                    current_span.set_attribute('client.user.id', user.id)
-                    current_span.set_attribute('client.user.email', user.email)
-                    current_span.set_attribute('client.user.role', user.role)
-                    current_span.set_attribute('client.auth.type', 'jwt')
+                if ENABLE_OTEL:
+                    from opentelemetry import trace
+
+                    current_span = trace.get_current_span()
+                    if current_span:
+                        current_span.set_attribute('client.user.id', user.id)
+                        current_span.set_attribute('client.user.email', user.email)
+                        current_span.set_attribute('client.user.role', user.role)
+                        current_span.set_attribute('client.auth.type', 'jwt')
 
                 # Refresh the user's last active timestamp asynchronously
                 # to prevent blocking the request
@@ -422,12 +428,15 @@ def get_current_user_by_api_key(request, api_key: str):
         raise HTTPException(status.HTTP_403_FORBIDDEN, detail=ERROR_MESSAGES.API_KEY_NOT_ALLOWED)
 
     # Add user info to current span
-    current_span = trace.get_current_span()
-    if current_span:
-        current_span.set_attribute('client.user.id', user.id)
-        current_span.set_attribute('client.user.email', user.email)
-        current_span.set_attribute('client.user.role', user.role)
-        current_span.set_attribute('client.auth.type', 'api_key')
+    if ENABLE_OTEL:
+        from opentelemetry import trace
+
+        current_span = trace.get_current_span()
+        if current_span:
+            current_span.set_attribute('client.user.id', user.id)
+            current_span.set_attribute('client.user.email', user.email)
+            current_span.set_attribute('client.user.role', user.role)
+            current_span.set_attribute('client.auth.type', 'api_key')
 
     Users.update_last_active_by_id(user.id)
     return user

backend/open_webui/utils/logger.py

@@ -4,7 +4,7 @@
 from typing import TYPE_CHECKING
 
 from loguru import logger
-from opentelemetry import trace
+
 from open_webui.env import (
     ENABLE_AUDIT_STDOUT,
     ENABLE_AUDIT_LOGS_FILE,
@@ -100,6 +100,8 @@ def _get_extras(self):
         if not ENABLE_OTEL:
             return {}
 
+        from opentelemetry import trace
+
         extras = {}
         context = trace.get_current_span().get_span_context()
         if context.is_valid:

src/lib/components/chat/Chat.svelte

@@ -1245,10 +1245,12 @@
 				}
 			}
 
-			if (query) {
-				messageInput?.setText(query);
+			if (query || eventFiles?.length) {
+				if (query) {
+					messageInput?.setText(query);
+				}
 				await tick();
-				submitHandler(query);
+				submitHandler(query || '');
 			}
 		} else if ($page.url.searchParams.get('q')) {
 			const q = $page.url.searchParams.get('q') ?? '';