RESP3 response-callbacks cleanup (#2841)

* cluenup * sentinel callbacks * move callbacks * fix async cluster tests * _parsers and import fix in tests * linters * make modules callbacks private * fix async search * fix --------- Co-authored-by: Chayim I. Kirshen <[email protected]>
redis · Jul 13, 2023 · fb10367 · fb10367
1 parent f2f8c34
commit fb10367
Show file tree

Hide file tree

Showing 33 changed files with 1,460 additions and 1,131 deletions.
diff --git a/redis/parsers/__init__.py → redis/_parsers/__init__.py b/redis/parsers/__init__.py → redis/_parsers/__init__.py
diff --git a/redis/parsers/base.py → redis/_parsers/base.py b/redis/parsers/base.py → redis/_parsers/base.py
diff --git a/redis/parsers/commands.py → redis/_parsers/commands.py b/redis/parsers/commands.py → redis/_parsers/commands.py
diff --git a/redis/parsers/encoders.py → redis/_parsers/encoders.py b/redis/parsers/encoders.py → redis/_parsers/encoders.py
diff --git a/redis/_parsers/helpers.py b/redis/_parsers/helpers.py
diff --git a/redis/parsers/hiredis.py → redis/_parsers/hiredis.py b/redis/parsers/hiredis.py → redis/_parsers/hiredis.py
diff --git a/redis/parsers/resp2.py → redis/_parsers/resp2.py b/redis/parsers/resp2.py → redis/_parsers/resp2.py
diff --git a/redis/parsers/resp3.py → redis/_parsers/resp3.py b/redis/parsers/resp3.py → redis/_parsers/resp3.py
diff --git a/redis/parsers/socket.py → redis/_parsers/socket.py b/redis/parsers/socket.py → redis/_parsers/socket.py
diff --git a/redis/asyncio/client.py b/redis/asyncio/client.py
@@ -24,6 +24,12 @@
  cast,
 )
 
+from redis._parsers.helpers import (
+ _RedisCallbacks,
+ _RedisCallbacksRESP2,
+ _RedisCallbacksRESP3,
+ bool_ok,
+)
 from redis.asyncio.connection import (
  Connection,
  ConnectionPool,
@@ -37,7 +43,6 @@
  NEVER_DECODE,
  AbstractRedis,
  CaseInsensitiveDict,
- bool_ok,
 )
 from redis.commands import (
  AsyncCoreCommands,
@@ -257,12 +262,12 @@ def __init__(
  self.single_connection_client = single_connection_client
  self.connection: Optional[Connection] = None
 
- self.response_callbacks = CaseInsensitiveDict(self.__class__.RESPONSE_CALLBACKS)
+ self.response_callbacks = CaseInsensitiveDict(_RedisCallbacks)
 
  if self.connection_pool.connection_kwargs.get("protocol") in ["3", 3]:
- self.response_callbacks.update(self.__class__.RESP3_RESPONSE_CALLBACKS)
+ self.response_callbacks.update(_RedisCallbacksRESP3)
  else:
- self.response_callbacks.update(self.__class__.RESP2_RESPONSE_CALLBACKS)
+ self.response_callbacks.update(_RedisCallbacksRESP2)
 
  # If using a single connection client, we need to lock creation-of and use-of
  # the client in order to avoid race conditions such as using asyncio.gather

diff --git a/redis/asyncio/cluster.py b/redis/asyncio/cluster.py
@@ -18,6 +18,12 @@
  Union,
 )
 
+from redis._parsers import AsyncCommandsParser, Encoder
+from redis._parsers.helpers import (
+ _RedisCallbacks,
+ _RedisCallbacksRESP2,
+ _RedisCallbacksRESP3,
+)
 from redis.asyncio.client import ResponseCallbackT
 from redis.asyncio.connection import Connection, DefaultParser, SSLConnection, parse_url
 from redis.asyncio.lock import Lock
@@ -55,7 +61,6 @@
  TimeoutError,
  TryAgainError,
 )
-from redis.parsers import AsyncCommandsParser, Encoder
 from redis.typing import AnyKeyT, EncodableT, KeyT
 from redis.utils import dict_merge, safe_str, str_if_bytes
 
@@ -327,11 +332,11 @@ def __init__(
  self.retry.update_supported_errors(retry_on_error)
  kwargs.update({"retry": self.retry})
 
- kwargs["response_callbacks"] = self.__class__.RESPONSE_CALLBACKS.copy()
+ kwargs["response_callbacks"] = _RedisCallbacks.copy()
  if kwargs.get("protocol") in ["3", 3]:
- kwargs["response_callbacks"].update(self.__class__.RESP3_RESPONSE_CALLBACKS)
+ kwargs["response_callbacks"].update(_RedisCallbacksRESP3)
  else:
- kwargs["response_callbacks"].update(self.__class__.RESP2_RESPONSE_CALLBACKS)
+ kwargs["response_callbacks"].update(_RedisCallbacksRESP2)
  self.connection_kwargs = kwargs
 
  if startup_nodes:

diff --git a/redis/asyncio/connection.py b/redis/asyncio/connection.py
@@ -51,7 +51,7 @@
 from redis.typing import EncodableT
 from redis.utils import HIREDIS_AVAILABLE, str_if_bytes
 
-from ..parsers import (
+from .._parsers import (
  BaseParser,
  Encoder,
  _AsyncHiredisParser,