FalkorDB · MuhammadQadora · Oct 28, 2024 · Nov 6, 2024 · Nov 14, 2024 · Nov 14, 2024
diff --git a/falkordb/falkordb.py b/falkordb/falkordb.py
@@ -3,7 +3,7 @@
 from .sentinel import *
 from .graph import Graph
 from typing import List, Union
-
+import socket
 # config command
 LIST_CMD = "GRAPH.LIST"
 CONFIG_CMD = "GRAPH.CONFIG"
@@ -75,6 +75,7 @@
         dynamic_startup_nodes=True,
         url=None,
         address_remap=None,
+        decode_responses=True
     ):
 
         conn = redis.Redis(
@@ -92,7 +93,7 @@
             encoding_errors=encoding_errors,
             charset=charset,
             errors=errors,
-            decode_responses=True,
+            decode_responses=decode_responses,
             retry_on_timeout=retry_on_timeout,
             retry_on_error=retry_on_error,
             ssl=ssl,
@@ -125,6 +126,7 @@
             self.sentinel, self.service_name = Sentinel_Conn(conn, ssl)
             conn = self.sentinel.master_for(self.service_name, ssl=ssl)
 
+
         if Is_Cluster(conn):
             conn = Cluster_Conn(
                 conn,
@@ -138,6 +140,7 @@
                 url,
                 address_remap,
             )
+            self.cluster_flag = True
 
         self.connection = conn
         self.flushdb = conn.flushdb
@@ -225,6 +228,22 @@
 
         return self.connection.execute_command(CONFIG_CMD, "GET", name)[1]
 
+
+    def get_replica_connections(self):
+        #decide if its Sentinel or cluster
+        redis_mode= self.connection.execute_command("info")['redis_mode']
+        if redis_mode == "standalone":
+            replica_hostnames = self.sentinel.discover_slaves(service_name=self.service_name)
+            result = [(host,port) for host, port in replica_hostnames]
+            return result
+        elif redis_mode == "cluster":
+            data = self.connection.cluster_nodes()
+            # List comprehension to get a list of (ip, port, hostname) tuples
+            host_port_list = [(ip_port.split(':')[0], ip_port.split(':')[1], flag['hostname']) for ip_port, flag in data.items() if 'slave' in flag["flags"]]
+            result = [tup for tup in host_port_list]
+            return result
-        redis_mode= self.connection.execute_command("info")['redis_mode']
-        if redis_mode == "standalone":
-            replica_hostnames = self.sentinel.discover_slaves(service_name=self.service_name)
-            result = [(host,port) for host, port in replica_hostnames]
-            return result
-        elif redis_mode == "cluster":
-            data = self.connection.cluster_nodes()
-            # List comprehension to get a list of (ip, port, hostname) tuples
-            host_port_list = [(ip_port.split(':')[0], ip_port.split(':')[1], flag['hostname']) for ip_port, flag in data.items() if 'slave' in flag["flags"]]
-            result = [tup for tup in host_port_list]
-            return result
+        redis_mode = self.connection.execute_command("info", section="server").get('redis_mode')
+        if not redis_mode:
+            raise ConnectionError("Unable to determine Redis mode")
+
+        if redis_mode == "standalone":
+            replica_hostnames = self.sentinel.discover_replicas(service_name=self.service_name)
+            result = [(host,port) for host, port in replica_hostnames]
+            return result
+        elif redis_mode == "cluster":
+            data = self.connection.cluster_nodes()
+            result = []
+            for ip_port, flag in data.items():
+                if 'replica' in flag.get('flags', []):  # Using 'replica' instead of 'slave'
+                    host, port = ip_port.split(':')
+                    result.append((host, int(port)))  # Convert port to int for consistency
+            return result
+        else:
+            raise ValueError(f"Unsupported Redis mode: {redis_mode}")
-        redis_mode= self.connection.execute_command("info")['redis_mode']
-        if redis_mode == "standalone":
-            replica_hostnames = self.sentinel.discover_slaves(service_name=self.service_name)
-            result = [(host,port) for host, port in replica_hostnames]
-            return result
-        elif redis_mode == "cluster":
-            data = self.connection.cluster_nodes()
-            # List comprehension to get a list of (ip, port, hostname) tuples
-            host_port_list = [(ip_port.split(':')[0], ip_port.split(':')[1], flag['hostname']) for ip_port, flag in data.items() if 'slave' in flag["flags"]]
-            result = [tup for tup in host_port_list]
-            return result
+        redis_mode = self.connection.execute_command("info", section="server").get('redis_mode')
+        if not redis_mode:
+            raise ConnectionError("Unable to determine Redis mode")
+
+        if redis_mode == "standalone":
+            replica_hostnames = self.sentinel.discover_replicas(service_name=self.service_name)
+            result = [(host,port) for host, port in replica_hostnames]
+            return result
+        elif redis_mode == "cluster":
+            data = self.connection.cluster_nodes()
+            result = []
+            for ip_port, flag in data.items():
+                if 'replica' in flag.get('flags', []):  # Using 'replica' instead of 'slave'
+                    host, port = ip_port.split(':')
+                    result.append((host, int(port)))  # Convert port to int for consistency
+            return result
+        else:
+            raise ValueError(f"Unsupported Redis mode: {redis_mode}")
+
+
     def config_set(self, name: str, value=None) -> None:
         """
         Update a DB level configuration.