Merge branch 'open-webui:dev' into dev

Author: Algorithm5838

backend/open_webui/utils/telemetry/instrumentors.py

@@ -22,6 +22,7 @@
 from opentelemetry.instrumentation.aiohttp_client import AioHttpClientInstrumentor
 from opentelemetry.trace import Span, StatusCode
 from redis import Redis
+from redis.cluster import RedisCluster
 from requests import PreparedRequest, Response
 from sqlalchemy import Engine
 from fastapi import status
@@ -59,16 +60,28 @@ def response_hook(span: Span, request: PreparedRequest, response: Response):
     span.set_status(StatusCode.ERROR if response.status_code >= 400 else StatusCode.OK)
 
 
-def redis_request_hook(span: Span, instance: Redis, args, kwargs):
+def redis_request_hook(span: Span, instance: Union[Redis|RedisCluster], args, kwargs):
     """
     Redis Request Hook
     """
 
+    # In cluster mode, the instance can be of two types:
+    # - redis.asyncio.cluster.RedisCluster
+    # - redis.cluster.RedisCluster
+    # Instead of checking the type, we check if the instance has a nodes_manager attribute.
     try:
-        connection_kwargs: dict = instance.connection_pool.connection_kwargs
-        host = connection_kwargs.get("host")
-        port = connection_kwargs.get("port")
-        db = connection_kwargs.get("db")
+        db = ""
+        if hasattr(instance, 'nodes_manager'):
+            default_node = instance.nodes_manager.default_node
+            if not default_node:
+                return
+            host = default_node.host
+            port = default_node.port
+        else:
+            connection_kwargs: dict = instance.connection_pool.connection_kwargs
+            host = connection_kwargs.get("host")
+            port = connection_kwargs.get("port")
+            db = connection_kwargs.get("db")
         span.set_attributes(
             {
                 SpanAttributes.DB_INSTANCE: f"{host}/{db}",

src/lib/components/chat/ShortcutsModal.svelte

@@ -73,6 +73,7 @@
 						<!-- {$i18n.t('New Chat')} -->
 						<!-- {$i18n.t('New Temporary Chat')} -->
 						<!-- {$i18n.t('Delete Chat')} -->
+						<!-- {$i18n.t('Open Model Selector')} -->
 						<!-- {$i18n.t('Search')} -->
 						<!-- {$i18n.t('Open Settings')} -->
 						<!-- {$i18n.t('Show Shortcuts')} -->

src/lib/components/workspace/Prompts/PromptEditor.svelte

@@ -418,7 +418,7 @@
 				<div class="mt-1.5">
 					<Tooltip content={$i18n.t('Click to copy ID')}>
 						<button
-							class="text-xs text-gray-500 font-mono bg-gray-50 dark:bg-gray-850 px-2 py-1 rounded-lg cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-800 transition"
+							class="text-xs text-gray-500 font-mono px-2 py-1 rounded-lg cursor-pointer hover:underline transition"
 							on:click={() => {
 								copyToClipboard(prompt.id);
 								toast.success($i18n.t('ID copied to clipboard'));
@@ -465,7 +465,7 @@
 						</div>
 						{#if selectedHistoryEntry}
 							<span
-								class="text-xs text-gray-500 font-mono bg-gray-100 dark:bg-gray-800 px-1.5 py-0.5 rounded"
+								class="text-xs text-gray-500 font-mono bg-gray-100 dark:bg-gray-800 px-1.5 rounded"
 							>
 								{selectedHistoryEntry.id.slice(0, 7)}
 							</span>
@@ -509,9 +509,9 @@
 					</div>
 					<!-- Scrollable content -->
 					<div
-						class="bg-gray-50 dark:bg-gray-900 rounded-xl px-4 py-3 border border-gray-100 dark:border-gray-800 h-full overflow-y-auto"
+						class="bg-gray-50 dark:bg-gray-900 rounded-xl px-4 py-3 border border-gray-100/50 dark:border-gray-850/50 h-full overflow-y-auto"
 					>
-						<pre class="text-sm whitespace-pre-wrap font-mono pr-8">{selectedHistoryEntry?.snapshot
+						<pre class="text-xs whitespace-pre-wrap font-mono pr-8">{selectedHistoryEntry?.snapshot
 								?.content || content}</pre>
 					</div>
 				</div>
@@ -623,10 +623,10 @@
 					<div class="flex">
 						<!-- Content -->
 						<button
-							class="flex-1 text-left px-3.5 py-2 mb-1 rounded-xl transition group
+							class="flex-1 text-left px-3.5 py-2 mb-1 rounded-2xl transition group
 								{selectedHistoryEntry?.id === entry.id
-								? 'bg-gray-50 dark:bg-gray-850'
-								: 'hover:bg-gray-50 dark:hover:bg-gray-850'}"
+								? 'bg-gray-100/50 dark:bg-gray-850/50'
+								: 'hover:bg-gray-100/50 dark:hover:bg-gray-850/50'}"
 							on:click={() => (selectedHistoryEntry = entry)}
 						>
 							<!-- Commit Message -->

src/lib/shortcuts.ts

@@ -16,6 +16,7 @@ export enum Shortcut {
 	NEW_CHAT = 'newChat',
 	NEW_TEMPORARY_CHAT = 'newTemporaryChat',
 	DELETE_CHAT = 'deleteChat',
+	OPEN_MODEL_SELECTOR = 'openModelSelector',
 
 	//Global
 	SEARCH = 'search',
@@ -58,6 +59,11 @@ export const shortcuts: ShortcutRegistry = {
 		keys: ['mod', 'shift', 'Backspace', 'Delete'],
 		category: 'Chat'
 	},
+	[Shortcut.OPEN_MODEL_SELECTOR]: {
+		name: 'Open Model Selector',
+		keys: ['mod', 'shift', 'M'],
+		category: 'Chat'
+	},
 
 	//Global
 	[Shortcut.SEARCH]: {

src/routes/(app)/+layout.svelte

@@ -230,6 +230,10 @@
 					event.preventDefault();
 					showSettings.set(false);
 					showShortcuts.set(false);
+				} else if (isShortcutMatch(event, shortcuts[Shortcut.OPEN_MODEL_SELECTOR])) {
+					console.log('Shortcut triggered: OPEN_MODEL_SELECTOR');
+					event.preventDefault();
+					document.getElementById('model-selector-0-button')?.click();
 				} else if (isShortcutMatch(event, shortcuts[Shortcut.NEW_TEMPORARY_CHAT])) {
 					console.log('Shortcut triggered: NEW_TEMPORARY_CHAT');
 					event.preventDefault();