ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-12 04:15:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge pull request #15941 from taylorwilsdon/tasks_redis_key_prefix

Browse source 
fix: Implement outstanding REDIS_KEY_PREFIX declarations
This commit is contained in:
Tim Jaeryang Baek 2025-07-23 12:18:03 +04:00 committed by GitHub
commit 4d93ad4474
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
backend/open_webui/socket/main.py
View file

@ -25,6 +25,7 @@ from open_webui.env import (
WEBSOCKET_REDIS_LOCK_TIMEOUT, WEBSOCKET_REDIS_LOCK_TIMEOUT,
WEBSOCKET_SENTINEL_PORT, WEBSOCKET_SENTINEL_PORT,
WEBSOCKET_SENTINEL_HOSTS, WEBSOCKET_SENTINEL_HOSTS,
REDIS_KEY_PREFIX,
) )
from open_webui.utils.auth import decode_token from open_webui.utils.auth import decode_token
from open_webui.socket.utils import RedisDict, RedisLock, YdocManager from open_webui.socket.utils import RedisDict, RedisLock, YdocManager
@ -92,17 +93,17 @@ if WEBSOCKET_MANAGER == "redis":
WEBSOCKET_SENTINEL_HOSTS, WEBSOCKET_SENTINEL_PORT WEBSOCKET_SENTINEL_HOSTS, WEBSOCKET_SENTINEL_PORT
) )
SESSION_POOL = RedisDict( SESSION_POOL = RedisDict(
"open-webui:session_pool", f"{REDIS_KEY_PREFIX}:session_pool",
redis_url=WEBSOCKET_REDIS_URL, redis_url=WEBSOCKET_REDIS_URL,
redis_sentinels=redis_sentinels, redis_sentinels=redis_sentinels,
) )
USER_POOL = RedisDict( USER_POOL = RedisDict(
"open-webui:user_pool", f"{REDIS_KEY_PREFIX}:user_pool",
redis_url=WEBSOCKET_REDIS_URL, redis_url=WEBSOCKET_REDIS_URL,
redis_sentinels=redis_sentinels, redis_sentinels=redis_sentinels,
) )
USAGE_POOL = RedisDict( USAGE_POOL = RedisDict(
"open-webui:usage_pool", f"{REDIS_KEY_PREFIX}:usage_pool",
redis_url=WEBSOCKET_REDIS_URL, redis_url=WEBSOCKET_REDIS_URL,
redis_sentinels=redis_sentinels, redis_sentinels=redis_sentinels,
) )
@ -126,7 +127,7 @@ else:
YDOC_MANAGER = YdocManager( YDOC_MANAGER = YdocManager(
redis=REDIS, redis=REDIS,
redis_key_prefix="open-webui:ydoc:documents", redis_key_prefix=f"{REDIS_KEY_PREFIX}:ydoc:documents",
) )

3
backend/open_webui/socket/utils.py
View file

@ -1,6 +1,7 @@
import json import json
import uuid import uuid
from open_webui.utils.redis import get_redis_connection from open_webui.utils.redis import get_redis_connection
from open_webui.env import REDIS_KEY_PREFIX
from typing import Optional, List, Tuple from typing import Optional, List, Tuple
import pycrdt as Y import pycrdt as Y
@ -97,7 +98,7 @@ class YdocManager:
def __init__( def __init__(
self, self,
redis=None, redis=None,
redis_key_prefix: str = "open-webui:ydoc:documents", redis_key_prefix: str = f"{REDIS_KEY_PREFIX}:ydoc:documents",
): ):
self._updates = {} self._updates = {}
self._users = {} self._users = {}

8
backend/open_webui/tasks.py
View file

@ -8,7 +8,7 @@ from redis.asyncio import Redis
from fastapi import Request from fastapi import Request
from typing import Dict, List, Optional 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__) log = logging.getLogger(__name__)
@ -19,9 +19,9 @@ tasks: Dict[str, asyncio.Task] = {}
item_tasks = {} item_tasks = {}
REDIS_TASKS_KEY = "open-webui:tasks" REDIS_TASKS_KEY = f"{REDIS_KEY_PREFIX}:tasks"
REDIS_ITEM_TASKS_KEY = "open-webui:tasks:item" REDIS_ITEM_TASKS_KEY = f"{REDIS_KEY_PREFIX}:tasks:item"
REDIS_PUBSUB_CHANNEL = "open-webui:tasks:commands" REDIS_PUBSUB_CHANNEL = f"{REDIS_KEY_PREFIX}:tasks:commands"
async def redis_task_command_listener(app): async def redis_task_command_listener(app):