Simplify Redis Cluster mode implementation

Author: giladwpx

Dockerfile

@@ -11,14 +11,8 @@ COPY . /app
 RUN pip install --upgrade pip \
     && pip install .
 
-# Default environment variables
-ENV REDIS_HOST=127.0.0.1 \
-    REDIS_PORT=6379 \
-    REDIS_CLUSTER_MODE=false \
-    REDIS_CLUSTER_NODES=""
-
-# Expose the MCP server port
-EXPOSE 3333
+# Expose necessary port if any (MCP typically uses stdio, but if needed, uncomment below)
+# EXPOSE 8000
 
 # Run the MCP Server
 CMD ["python", "src/main.py"]

README.md

@@ -74,37 +74,6 @@ To configure this Redis MCP Server, consider the following environment variables
 | `REDIS_CERT_REQS`       | Whether the client should verify the server's certificate | `"required"`  |
 | `REDIS_CA_CERTS`        | Path to the trusted CA certificates file                  | None          |
 | `REDIS_CLUSTER_MODE`    | Enable Redis Cluster mode                                 | `False`       |
-| `REDIS_CLUSTER_NODES`   | Comma-separated list of cluster nodes (host:port)         | ""            |
-
-## Docker Deployment
-
-You can run the Redis MCP Server in a Docker container:
-
-```bash
-# Build the Docker image
-docker build -t mcp-redis .
-
-# Run in standalone mode
-docker run --rm -it \
-  -e REDIS_HOST=<your-redis-host> \
-  -e REDIS_PORT=<your-redis-port> \
-  -p 3333:3333 \
-  mcp-redis
-
-# Run in cluster mode (only one node needed, others will be auto-discovered)
-docker run --rm -it \
-  -e REDIS_CLUSTER_MODE=true \
-  -e REDIS_HOST=<your-cluster-node-host> \
-  -p 3333:3333 \
-  mcp-redis
-
-# Or specify one or more cluster nodes explicitly
-docker run --rm -it \
-  -e REDIS_CLUSTER_MODE=true \
-  -e REDIS_CLUSTER_NODES="<node1:port>" \
-  -p 3333:3333 \
-  mcp-redis
-```
 
 ## Integration with OpenAI Agents SDK
 
@@ -155,8 +124,7 @@ You can configure Claude Desktop to use this MCP Server.
                 "REDIS_PSW": "<your_redis_database_password>",
                 "REDIS_SSL": True|False,
                 "REDIS_CA_PATH": "<your_redis_ca_path>",
-                "REDIS_CLUSTER_MODE": True|False,
-                "REDIS_CLUSTER_NODES": "<single_node:port>" // Optional, uses REDIS_HOST if not specified
+                "REDIS_CLUSTER_MODE": True|False
             }
         }
     }

src/common/config.py

@@ -9,10 +9,6 @@
 # Add cluster mode flag
 REDIS_CLUSTER_MODE = os.getenv('REDIS_CLUSTER_MODE', 'false').lower() in ('true', '1', 't')
 
-# Add cluster nodes configuration - only one node is required, others will be auto-discovered
-# If not specified, REDIS_HOST and REDIS_PORT will be used as the initial node
-REDIS_CLUSTER_NODES = os.getenv('REDIS_CLUSTER_NODES', '').split(',') if os.getenv('REDIS_CLUSTER_NODES') else []
-
 REDIS_CFG = {"host": os.getenv('REDIS_HOST', '127.0.0.1'),
              "port": int(os.getenv('REDIS_PORT',6379)),
              "username": os.getenv('REDIS_USERNAME', None),

src/common/connection.py

@@ -3,39 +3,24 @@
 import redis
 from redis import Redis
 from redis.cluster import RedisCluster
-from typing import Optional, Union, List, Dict, Any, Tuple
-from common.config import REDIS_CFG, REDIS_CLUSTER_MODE, REDIS_CLUSTER_NODES
+from typing import Optional
+from common.config import REDIS_CFG, REDIS_CLUSTER_MODE
 
 from common.config import generate_redis_uri
 
 
 class RedisConnectionManager:
-    _instance: Optional[Union[Redis, RedisCluster]] = None
+    _instance: Optional[Redis] = None
 
     @classmethod
-    def get_connection(cls, decode_responses=True) -> Union[Redis, RedisCluster]:
+    def get_connection(cls, decode_responses=True) -> Redis:
         if cls._instance is None:
             try:
                 if REDIS_CLUSTER_MODE:
-                    # In cluster mode, we can connect to one node and the client will discover the rest
-                    # If specific cluster nodes are provided, use the first one as the startup node
-                    if REDIS_CLUSTER_NODES and REDIS_CLUSTER_NODES[0]:
-                        node = REDIS_CLUSTER_NODES[0]
-                        if ':' in node:
-                            host, port = node.split(':')
-                            port = int(port)
-                        else:
-                            # Default to the configured port if only host is provided
-                            host = node
-                            port = REDIS_CFG["port"]
-                    else:
-                        # Use the primary node from REDIS_CFG as the startup node
-                        host = REDIS_CFG["host"]
-                        port = REDIS_CFG["port"]
-                    
+                    # In cluster mode, connect to the host and port from REDIS_CFG
                     cls._instance = RedisCluster(
-                        host=host,
-                        port=port,
+                        host=REDIS_CFG["host"],
+                        port=REDIS_CFG["port"],
                         username=REDIS_CFG["username"],
                         password=REDIS_CFG["password"],
                         ssl=REDIS_CFG["ssl"],