Python: move the commands return value to bytes

examples/python/client_example.py

@@ -13,7 +13,6 @@
     NodeAddress,
 )
 
-
 def set_console_logger(level: LogLevel = LogLevel.WARN):
     Logger.set_logger_config(level)
 
@@ -52,7 +51,8 @@ async def test_standalone_client(host: str = "localhost", port: int = 6379):
     await send_set_and_get(client)
     # Send PING to the primary node
     pong = await client.custom_command(["PING"])
-    print(f"PONG response is = {pong}")
+    assert isinstance(pong, bytes)
+    print(f"PONG response is = {pong.decode()}")
 
 
 async def test_cluster_client(host: str = "localhost", port: int = 6379):
@@ -71,10 +71,11 @@ async def test_cluster_client(host: str = "localhost", port: int = 6379):
     await send_set_and_get(client)
     # Send PING to all primaries (according to Redis's PING request_policy)
     pong = await client.custom_command(["PING"])
-    print(f"PONG response is = {pong}")
+    assert isinstance(pong, bytes)
+    print(f"PONG response is = {pong.decode()}")
     # Send INFO REPLICATION with routing option to all nodes
     info_repl_resps = await client.custom_command(["INFO", "REPLICATION"], AllNodes())
-    print(f"INFO REPLICATION responses to all nodes are = {info_repl_resps}")
+    print(f"INFO REPLICATION responses from all nodes are = {info_repl_resps!r}")
 
 
 async def main():

python/python/glide/async_commands/cluster_commands.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Dict, List, Mapping, Optional, cast
+from typing import Dict, List, Mapping, Optional, Union, cast
 
 from glide.async_commands.command_args import Limit, OrderBy
 from glide.async_commands.core import (
@@ -46,7 +46,7 @@ async def info(
         self,
         sections: Optional[List[InfoSection]] = None,
         route: Optional[Route] = None,
-    ) -> TClusterResponse[str]:
+    ) -> TClusterResponse[bytes]:
         """
         Get information and statistics about the Redis server.
         See https://redis.io/commands/info/ for details.
@@ -65,7 +65,7 @@ async def info(
         args = [section.value for section in sections] if sections else []
 
         return cast(
-            TClusterResponse[str],
+            TClusterResponse[bytes],
             await self._execute_command(RequestType.Info, args, route),
         )
 

python/python/glide/async_commands/standalone_commands.py

@@ -12,6 +12,7 @@
     _build_sort_args,
 )
 from glide.async_commands.transaction import BaseTransaction, Transaction
+from glide.async_commands.utils.utils import convert_bytes_to_string_dict
 from glide.constants import OK, TOK, TResult
 from glide.protobuf.redis_request_pb2 import RequestType
 
@@ -38,7 +39,7 @@ async def custom_command(self, command_args: List[str]) -> TResult:
     async def info(
         self,
         sections: Optional[List[InfoSection]] = None,
-    ) -> str:
+    ) -> bytes:
         """
         Get information and statistics about the Redis server.
         See https://redis.io/commands/info/ for details.
@@ -52,7 +53,7 @@ async def info(
             str: Returns a string containing the information for the sections requested.
         """
         args = [section.value for section in sections] if sections else []
-        return cast(str, await self._execute_command(RequestType.Info, args))
+        return cast(bytes, await self._execute_command(RequestType.Info, args))
 
     async def exec(
         self,

python/python/glide/async_commands/utils/utils.py

@@ -0,0 +1,61 @@
+from typing import Any, Dict, Mapping, Optional, Union
+
+from glide.constants import TClusterDecodedResponse, TClusterResponse
+
+
+def convert_bytes_to_string_dict(
+    # TODO: remove the str options
+    byte_string_dict: Optional[
+        Union[Mapping[bytes, Any], Dict[bytes, Any], Mapping[str, Any], Dict[str, Any]]
+    ]
+) -> Optional[Dict[str, Any]]:
+    """
+    Recursively convert the keys and values of a dictionary from byte strings to regular strings,
+    handling nested dictionaries of any depth.
+
+    Args:
+        byte_string_dict (Optional[Union[Mapping[bytes, Any], Dict[bytes, Any]]]):
+        A dictionary where keys and values can be byte strings or nested dictionaries.
+
+    Returns:
+        Optional[Dict[str, Any]]:
+        A dictionary with keys and values converted to regular strings, or None if input is None.
+    """
+    if byte_string_dict is None:
+        return None
+
+    def convert(item: Any) -> Any:
+        if isinstance(item, dict):
+            return {convert(key): convert(value) for key, value in item.items()}
+        elif isinstance(item, bytes):
+            return item.decode("utf-8")
+        elif isinstance(item, list):
+            return [convert(elem) for elem in item]
+        else:
+            return item
+
+    return convert(byte_string_dict)
+
+
+def convert_bytes_to_string_cluster_response(
+    cluster_response: Optional[TClusterResponse],
+) -> Optional[TClusterDecodedResponse]:
+    """
+    Convert a TClusterResponse type with byte strings to a TClusterResponse type with regular strings,
+    handling nested dictionaries of any depth.
+
+    Args:
+        cluster_response (Optional[Union[T, Dict[bytes, T]]]):
+        A cluster response which can be of type T or a dictionary with byte string keys and values.
+
+    Returns:
+        Optional[TClusterResponse]:
+        A cluster response with all byte strings converted to regular strings.
+    """
+    if cluster_response is None:
+        return None
+
+    if isinstance(cluster_response, dict):
+        return convert_bytes_to_string_dict(cluster_response)
+
+    return cluster_response

python/python/glide/constants.py

@@ -22,11 +22,15 @@
     float,
     Set[T],
     List[T],
+    bytes,
+    Dict[bytes, "TResult"],
+    Mapping[bytes, "TResult"],
 ]
 TRequest = Union[RedisRequest, ConnectionRequest]
 # When routing to a single node, response will be T
 # Otherwise, response will be : {Address : response , ... } with type of Dict[str, T].
-TClusterResponse = Union[T, Dict[str, T]]
+TClusterResponse = Union[T, Dict[bytes, T]]
+TClusterDecodedResponse = Union[T, Dict[str, T]]
 TSingleNodeRoute = Union[RandomNode, SlotKeyRoute, SlotIdRoute, ByAddressRoute]
 # When specifying legacy path (path doesn't start with `$`), response will be T
 # Otherwise, (when specifying JSONPath), response will be List[Optional[T]].

python/python/glide/glide_client.py

@@ -250,6 +250,9 @@ async def _execute_command(
         request = RedisRequest()
         request.callback_idx = self._get_callback_index()
         request.single_command.request_type = request_type
+        request.single_command.args_array.args[:] = [
+            bytes(elem, encoding="utf8") for elem in args if isinstance(elem, str)
+        ]  # TODO - use arg pointer
         (encoded_args, args_size) = self._encode_and_sum_size(args)
         if args_size < MAX_REQUEST_ARGS_LEN:
             request.single_command.args_array.args[:] = encoded_args