diff --git a/backend/open_webui/socket/main.py b/backend/open_webui/socket/main.py index 0c7374254a..997026acad 100644 --- a/backend/open_webui/socket/main.py +++ b/backend/open_webui/socket/main.py @@ -25,6 +25,7 @@ from open_webui.env import ( WEBSOCKET_REDIS_LOCK_TIMEOUT, WEBSOCKET_SENTINEL_PORT, WEBSOCKET_SENTINEL_HOSTS, + REDIS_KEY_PREFIX, ) from open_webui.utils.auth import decode_token from open_webui.socket.utils import RedisDict, RedisLock, YdocManager @@ -92,17 +93,17 @@ if WEBSOCKET_MANAGER == "redis": WEBSOCKET_SENTINEL_HOSTS, WEBSOCKET_SENTINEL_PORT ) SESSION_POOL = RedisDict( - "open-webui:session_pool", + f"{REDIS_KEY_PREFIX}:session_pool", redis_url=WEBSOCKET_REDIS_URL, redis_sentinels=redis_sentinels, ) USER_POOL = RedisDict( - "open-webui:user_pool", + f"{REDIS_KEY_PREFIX}:user_pool", redis_url=WEBSOCKET_REDIS_URL, redis_sentinels=redis_sentinels, ) USAGE_POOL = RedisDict( - "open-webui:usage_pool", + f"{REDIS_KEY_PREFIX}:usage_pool", redis_url=WEBSOCKET_REDIS_URL, redis_sentinels=redis_sentinels, ) @@ -126,7 +127,7 @@ else: YDOC_MANAGER = YdocManager( redis=REDIS, - redis_key_prefix="open-webui:ydoc:documents", + redis_key_prefix=f"{REDIS_KEY_PREFIX}:ydoc:documents", ) diff --git a/backend/open_webui/socket/utils.py b/backend/open_webui/socket/utils.py index a422d76207..84ef334156 100644 --- a/backend/open_webui/socket/utils.py +++ b/backend/open_webui/socket/utils.py @@ -1,6 +1,7 @@ import json import uuid from open_webui.utils.redis import get_redis_connection +from open_webui.env import REDIS_KEY_PREFIX from typing import Optional, List, Tuple import pycrdt as Y @@ -97,7 +98,7 @@ class YdocManager: def __init__( self, redis=None, - redis_key_prefix: str = "open-webui:ydoc:documents", + redis_key_prefix: str = f"{REDIS_KEY_PREFIX}:ydoc:documents", ): self._updates = {} self._users = {} diff --git a/backend/open_webui/tasks.py b/backend/open_webui/tasks.py index a4132d9cf6..714c532fca 100644 --- a/backend/open_webui/tasks.py +++ b/backend/open_webui/tasks.py @@ -8,7 +8,7 @@ from redis.asyncio import Redis from fastapi import Request from typing import Dict, List, Optional -from open_webui.env import SRC_LOG_LEVELS +from open_webui.env import SRC_LOG_LEVELS, REDIS_KEY_PREFIX log = logging.getLogger(__name__) @@ -19,9 +19,9 @@ tasks: Dict[str, asyncio.Task] = {} item_tasks = {} -REDIS_TASKS_KEY = "open-webui:tasks" -REDIS_ITEM_TASKS_KEY = "open-webui:tasks:item" -REDIS_PUBSUB_CHANNEL = "open-webui:tasks:commands" +REDIS_TASKS_KEY = f"{REDIS_KEY_PREFIX}:tasks" +REDIS_ITEM_TASKS_KEY = f"{REDIS_KEY_PREFIX}:tasks:item" +REDIS_PUBSUB_CHANNEL = f"{REDIS_KEY_PREFIX}:tasks:commands" async def redis_task_command_listener(app):