Revert "feat: Add support for OBKV-Redis (#3)"

This reverts commit 36db8b6.

Author: longbingljw

api/configs/middleware/cache/redis_config.py

@@ -98,8 +98,3 @@ class RedisConfig(BaseSettings):
         description="Enable client side cache in redis",
         default=False,
     )
-
-    REDIS_USE_OBKV: bool = Field(
-        description="Use OBKV instead of Redis",
-        default=False,
-    )

api/extensions/ext_redis.py

@@ -1,13 +1,9 @@
-import logging
-from typing import Any, Optional, Union
+from typing import Any, Union
 
 import redis
 from redis.cache import CacheConfig
-from redis.client import Pipeline
 from redis.cluster import ClusterNode, RedisCluster
 from redis.connection import Connection, SSLConnection
-from redis.exceptions import LockNotOwnedError
-from redis.lock import Lock
 from redis.sentinel import Sentinel
 
 from configs import dify_config
@@ -112,22 +108,6 @@ def init_app(app: DifyApp):
                 cache_config=clientside_cache_config,
             )
         )
-    elif dify_config.REDIS_USE_OBKV:
-        assert dify_config.REDIS_SERIALIZATION_PROTOCOL < 3, (
-            "OBKV does not support RESP version 3. "
-            "Please specify REDIS_SERIALIZATION_PROTOCOL=2 in the configuration file."
-        )
-        redis_params.update(
-            {
-                "host": dify_config.REDIS_HOST,
-                "port": dify_config.REDIS_PORT,
-                "username": dify_config.REDIS_USERNAME,
-                "password": dify_config.REDIS_PASSWORD,
-                "connection_class": connection_class,
-            }
-        )
-        pool = redis.ConnectionPool(**redis_params)
-        redis_client.initialize(OBKVClient(redis.Redis(connection_pool=pool)))
     else:
         redis_params.update(
             {
@@ -142,51 +122,3 @@ def init_app(app: DifyApp):
         redis_client.initialize(redis.Redis(connection_pool=pool))
 
     app.extensions["redis"] = redis_client
-
-
-class OceanBaseRedisLock(Lock):
-    def do_acquire(self, token: str) -> bool:
-        try:
-            result = self.redis.execute_command("SETNX", self.name, token)
-        except Exception as e:
-            logging.info(f"Failed to acquire redis lock {self.name}, error: {e}")
-            result = False
-        if result == 1:
-            self.redis.execute_command("EXPIRE", self.name, 60)
-            return True
-        else:
-            return False
-
-    def do_release(self, expected_token: str) -> None:
-        current_value = self.redis.get(self.name)
-        if current_value == expected_token:
-            redis_client.delete(self.name)
-            logging.info(f"Lock released: {self.name}")
-        else:
-            raise LockNotOwnedError(
-                "Cannot release a lock that's no longer owned",
-                lock_name=self.name,
-            )
-
-
-class OceanBasePipeLine(Pipeline):
-    def execute(self, raise_on_error=True):
-        """do nothing, OBKV cannot support redis pipeline"""
-        logging.info("executing pipeline: do nothing, OBKV cannot support redis pipeline")
-
-
-class OBKVClient:
-    def __init__(self, client: redis.Redis):
-        self._client = client
-
-    def lock(self, name: str, timeout: Optional[int] = None, **kwargs):
-        # Implementation using OceanBaseRedisLock
-        return self._client.lock(name, timeout=timeout, lock_class=OceanBaseRedisLock, **kwargs)
-
-    def pipeline(self, transaction=True, shard_hint=None) -> "Pipeline":
-        return OceanBasePipeLine(self.connection_pool, self.response_callbacks, transaction, shard_hint)
-
-    def __getattr__(self, item):
-        if self._client is None:
-            raise RuntimeError("Redis client is not initialized. Call init_app first.")
-        return getattr(self._client, item)

docker/.env.example

@@ -271,10 +271,6 @@ REDIS_USE_CLUSTERS=false
 REDIS_CLUSTERS=
 REDIS_CLUSTERS_PASSWORD=
 
-# Whether to use OBKV instead of Redis.
-REDIS_USE_OBKV=false
-
-
 # ------------------------------
 # Celery Configuration
 # ------------------------------

docker/docker-compose.middleware.yaml

@@ -43,43 +43,6 @@ services:
     healthcheck:
       test: [ "CMD", "redis-cli", "ping" ]
 
-
-  obkv_redis:
-    image: oceanbase/oceanbase-ce:4.2.5.3-103000022025033117
-    container_name: oceanbase
-    restart: always
-    environment:
-      OB_MEMORY_LIMIT: ${OCEANBASE_MEMORY_LIMIT:-6G}
-      OB_SYS_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
-      OB_TENANT_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
-      OB_CLUSTER_NAME: ${OCEANBASE_CLUSTER_NAME:-difyai}
-      MODE: MINI
-    volumes:
-      - ./volumes/oceanbase/obkv_redis/healthcheck.sh:/root/healthcheck.sh
-    ports:
-      - "${OCEANBASE_VECTOR_PORT:-2881}:2881"
-    healthcheck:
-      test: [ "CMD", "/root/healthcheck.sh" ]
-      interval: 10s
-      retries: 30
-      start_period: 30s
-      timeout: 10s
-
-  obproxy:
-    image: oceanbase/obproxy-ce:4.3.4.0-1
-    container_name: obproxy
-    environment:
-      APP_NAME: dify_obproxy
-      PROXYRO_PASSWORD: 123456
-      RS_LIST: ${OCEANBASE_IP}:${OCEANBASE_VECTOR_PORT:-2881}
-      OB_CLUSTER: ${OCEANBASE_CLUSTER_NAME:-difyai}
-    ports:
-      - "${OBPROXY_SQL_PORT:-2883}:2883"
-      - "${OBPROXY_RPC_PORT:-2885}:2885"
-    depends_on:
-      obkv_redis:
-        condition: service_healthy
-
   # The DifySandbox
   sandbox:
     image: langgenius/dify-sandbox:0.2.12
@@ -108,7 +71,7 @@ services:
 
   # plugin daemon
   plugin_daemon:
-    image: quay.io/oceanbase-devhub/dify-plugin-daemon:obkv-redis-0.1-local
+    image: langgenius/dify-plugin-daemon:0.0.10-local
     restart: always
     env_file:
       - ./middleware.env
@@ -157,9 +120,6 @@ services:
       - "${EXPOSE_PLUGIN_DEBUGGING_PORT:-5003}:${PLUGIN_DEBUGGING_PORT:-5003}"
     volumes:
       - ./volumes/plugin_daemon:/app/storage
-    depends_on:
-      obkv_redis:
-        condition: service_healthy
 
   # ssrf_proxy server
   # for more information, please refer to

docker/docker-compose.yaml

@@ -74,7 +74,6 @@ x-shared-env: &shared-api-worker-env
   REDIS_SENTINEL_PASSWORD: ${REDIS_SENTINEL_PASSWORD:-}
   REDIS_SENTINEL_SOCKET_TIMEOUT: ${REDIS_SENTINEL_SOCKET_TIMEOUT:-0.1}
   REDIS_USE_CLUSTERS: ${REDIS_USE_CLUSTERS:-false}
-  REDIS_USE_OBKV: ${REDIS_USE_OBKV:-false}
   REDIS_CLUSTERS: ${REDIS_CLUSTERS:-}
   REDIS_CLUSTERS_PASSWORD: ${REDIS_CLUSTERS_PASSWORD:-}
   CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://:difyai123456@redis:6379/1}
@@ -943,46 +942,6 @@ services:
       start_period: 30s
       timeout: 10s
 
-    obkv_redis:
-      image: oceanbase/oceanbase-ce:4.2.5.3-103000022025033117
-      container_name: oceanbase
-      profiles:
-        - oceanbase
-      restart: always
-      environment:
-        OB_MEMORY_LIMIT: ${OCEANBASE_MEMORY_LIMIT:-6G}
-        OB_SYS_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
-        OB_TENANT_PASSWORD: ${OCEANBASE_VECTOR_PASSWORD:-difyai123456}
-        OB_CLUSTER_NAME: ${OCEANBASE_CLUSTER_NAME:-difyai}
-        MODE: MINI
-      volumes:
-        - ./volumes/oceanbase/obkv_redis/healthcheck.sh:/root/healthcheck.sh
-      ports:
-        - "${OCEANBASE_VECTOR_PORT:-2881}:2881"
-      healthcheck:
-        test: [ "CMD", "/root/healthcheck.sh" ]
-        interval: 10s
-        retries: 30
-        start_period: 30s
-        timeout: 10s
-
-    obproxy:
-      image: oceanbase/obproxy-ce:4.3.4.0-1
-      container_name: obproxy
-      profiles:
-        - oceanbase
-      environment:
-        APP_NAME: dify_obproxy
-        PROXYRO_PASSWORD: 123456
-        RS_LIST: ${OCEANBASE_IP}:${OCEANBASE_VECTOR_PORT:-2881}
-        OB_CLUSTER: ${OCEANBASE_CLUSTER_NAME:-difyai}
-      ports:
-        - "${OBPROXY_SQL_PORT:-2883}:2883"
-        - "${OBPROXY_RPC_PORT:-2885}:2885"
-      depends_on:
-        obkv_redis:
-          condition: service_healthy
-
   # Oracle vector database
   oracle:
     image: container-registry.oracle.com/database/free:latest