Fix implementation and move to utils

Author: rohansingh

redis/asyncio/client.py

@@ -77,6 +77,7 @@
     get_lib_version,
     safe_str,
     str_if_bytes,
+    truncate_command_for_exception,
 )
 
 PubSubHandler = Callable[[Dict[str, str]], Awaitable[None]]
@@ -1509,16 +1510,11 @@ def annotate_exception(
     ) -> None:
         cmd = " ".join(map(safe_str, command))
         msg = (
-            f"Command # {number} ({self._truncate_command(cmd)}) "
+            f"Command # {number} ({truncate_command_for_exception(cmd)}) "
             "of pipeline caused error: {exception.args}"
         )
         exception.args = (msg,) + exception.args[1:]
 
-    def _truncate_command(self, command, max_length=100):
-        if len(command) > max_length:
-            return command[: max_length - 3] + "..."
-        return command
-
     async def parse_response(
         self, connection: Connection, command_name: Union[str, bytes], **options
     ):

redis/asyncio/cluster.py

@@ -64,7 +64,7 @@
     TryAgainError,
 )
 from redis.typing import AnyKeyT, EncodableT, KeyT
-from redis.utils import deprecated_function, get_lib_version, safe_str, str_if_bytes
+from redis.utils import deprecated_function, get_lib_version, safe_str, str_if_bytes, truncate_command_for_exception
 
 TargetNodesT = TypeVar(
     "TargetNodesT", str, "ClusterNode", List["ClusterNode"], Dict[Any, "ClusterNode"]
@@ -1601,7 +1601,7 @@ async def _execute(
                         command = " ".join(map(safe_str, cmd.args))
                         msg = (
                             f"Command # {cmd.position + 1} "
-                            f"({self._truncate_command(command)}) "
+                            f"({truncate_command_for_exception(command)}) "
                             f"of pipeline caused error: {result.args}"
                         )
                         result.args = (msg,) + result.args[1:]
@@ -1651,11 +1651,6 @@ def mset_nonatomic(
 
         return self
 
-    def _truncate_command(self, command, max_length=100):
-        if len(command) > max_length:
-            return command[: max_length - 3] + "..."
-        return command
-
 
 for command in PIPELINE_BLOCKED_COMMANDS:
     command = command.replace(" ", "_").lower()

redis/client.py

@@ -61,6 +61,7 @@
     get_lib_version,
     safe_str,
     str_if_bytes,
+    truncate_command_for_exception,
 )
 
 if TYPE_CHECKING:
@@ -1521,16 +1522,11 @@ def raise_first_error(self, commands, response):
     def annotate_exception(self, exception, number, command):
         cmd = " ".join(map(safe_str, command))
         msg = (
-            f"Command # {number} ({self._truncate_command(cmd)}) of pipeline "
+            f"Command # {number} ({truncate_command_for_exception(cmd)}) of pipeline "
             f"caused error: {exception.args[0]}"
         )
         exception.args = (msg,) + exception.args[1:]
 
-    def _truncate_command(self, command, max_length=100):
-        if len(command) > max_length:
-            return command[: max_length - 3] + "..."
-        return command
-
     def parse_response(self, connection, command_name, **options):
         result = Redis.parse_response(self, connection, command_name, **options)
         if command_name in self.UNWATCH_COMMANDS:

redis/cluster.py

@@ -46,6 +46,7 @@
     merge_result,
     safe_str,
     str_if_bytes,
+    truncate_command_for_exception,
 )
 
 
@@ -2054,16 +2055,11 @@ def annotate_exception(self, exception, number, command):
         """
         cmd = " ".join(map(safe_str, command))
         msg = (
-            f"Command # {number} ({self._truncate_command(cmd)}) of pipeline "
+            f"Command # {number} ({truncate_command_for_exception(cmd)}) of pipeline "
             f"caused error: {exception.args[0]}"
         )
         exception.args = (msg,) + exception.args[1:]
 
-    def _truncate_command(self, command, max_length=100):
-        if len(command) > max_length:
-            return command[: max_length - 3] + "x.."
-        return command
-
     def execute(self, raise_on_error: bool = True) -> List[Any]:
         """
         Execute all the commands in the current pipeline

redis/utils.py

@@ -257,3 +257,9 @@ def ensure_string(key):
         return key
     else:
         raise TypeError("Key must be either a string or bytes")
+
+
+def truncate_command_for_exception(self, command, max_length=100):
+    if len(command) > max_length:
+        return command[: max_length - 3] + "..."
+    return command