Merge pull request #2 from giladwpx/feature/cluster-mode-support

Add Redis Cluster mode support

Author: mortensi

README.md

@@ -73,6 +73,7 @@ To configure this Redis MCP Server, consider the following environment variables
 | `REDIS_SSL_CERTFILE`    | Client's certificate file for client authentication       | None          |
 | `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`       |
 
 ## Integration with OpenAI Agents SDK
 
@@ -122,7 +123,8 @@ You can configure Claude Desktop to use this MCP Server.
                 "REDIS_PORT": "<your_redis_database_port>",
                 "REDIS_PSW": "<your_redis_database_password>",
                 "REDIS_SSL": True|False,
-                "REDIS_CA_PATH": "<your_redis_ca_path>"
+                "REDIS_CA_PATH": "<your_redis_ca_path>",
+                "REDIS_CLUSTER_MODE": True|False
             }
         }
     }

src/common/config.py

@@ -15,7 +15,8 @@
              "ssl_keyfile": os.getenv('REDIS_SSL_KEYFILE', None),
              "ssl_certfile": os.getenv('REDIS_SSL_CERTFILE', None),
              "ssl_cert_reqs": os.getenv('REDIS_SSL_CERT_REQS', 'required'),
-             "ssl_ca_certs": os.getenv('REDIS_SSL_CA_CERTS', None)}
+             "ssl_ca_certs": os.getenv('REDIS_SSL_CA_CERTS', None),
+             "cluster_mode": os.getenv('REDIS_CLUSTER_MODE', False) in ('true', '1', 't')}
 
 
 def generate_redis_uri():

src/common/connection.py

@@ -2,7 +2,8 @@
 from version import __version__
 import redis
 from redis import Redis
-from typing import Optional
+from redis.cluster import RedisCluster
+from typing import Optional, Type, Union
 from common.config import REDIS_CFG
 
 from common.config import generate_redis_uri
@@ -15,7 +16,9 @@ class RedisConnectionManager:
     def get_connection(cls, decode_responses=True) -> Redis:
         if cls._instance is None:
             try:
-                cls._instance = redis.Redis(
+                redis_class: Type[Union[Redis, RedisCluster]] = redis.cluster.RedisCluster if REDIS_CFG["cluster_mode"] else redis.Redis
+                
+                cls._instance = redis_class(
                     host=REDIS_CFG["host"],
                     port=REDIS_CFG["port"],
                     username=REDIS_CFG["username"],
@@ -27,8 +30,8 @@ def get_connection(cls, decode_responses=True) -> Redis:
                     ssl_cert_reqs=REDIS_CFG["ssl_cert_reqs"],
                     ssl_ca_certs=REDIS_CFG["ssl_ca_certs"],
                     decode_responses=decode_responses,
-                    max_connections=10,
-                    lib_name=f"redis-py(mcp-server_v{__version__})"
+                    lib_name=f"redis-py(mcp-server_v{__version__})",
+                    **({"max_connections_per_node": 10} if REDIS_CFG["cluster_mode"] else {"max_connections": 10})
                 )
 
             except redis.exceptions.ConnectionError:
@@ -46,6 +49,9 @@ def get_connection(cls, decode_responses=True) -> Redis:
             except redis.exceptions.RedisError as e:
                 print(f"Redis error: {e}", file=sys.stderr)
                 raise
+            except redis.exceptions.ClusterError as e:
+                print(f"Redis Cluster error: {e}", file=sys.stderr)
+                raise
             except Exception as e:
                 print(f"Unexpected error: {e}", file=sys.stderr)
                 raise