coredis 5.0.0rc1__py3-none-any.whl → 5.0.1__py3-none-any.whl

coredis/response/_callbacks/vector_sets.py

@@ -1,36 +1,69 @@
 from __future__ import annotations
 
+from coredis._json import json
 from coredis._utils import nativestr
 from coredis.response._callbacks import ResponseCallback
 from coredis.response._utils import flat_pairs_to_dict
 from coredis.response.types import VectorData
-from coredis.typing import AnyStr, ResponsePrimitive, StringT
+from coredis.typing import AnyStr, JsonType, ResponsePrimitive, StringT
 
 
 class VSimCallback(
     ResponseCallback[
         list[AnyStr],
-        list[AnyStr] | dict[AnyStr, float],
-        tuple[AnyStr, ...] | dict[AnyStr, float],
+        list[AnyStr] | dict[AnyStr, float | list[float | JsonType]],
+        tuple[AnyStr, ...]
+        | dict[AnyStr, float]
+        | dict[AnyStr, JsonType]
+        | dict[AnyStr, tuple[float, JsonType]],
     ],
 ):
     def transform(
         self,
         response: list[AnyStr],
-    ) -> tuple[AnyStr, ...] | dict[AnyStr, float]:
-        if self.options.get("withscores"):
+    ) -> (
+        tuple[AnyStr, ...]
+        | dict[AnyStr, float]
+        | dict[AnyStr, JsonType]
+        | dict[AnyStr, tuple[float, JsonType]]
+    ):
+        withscores, withattribs = self.options.get("withscores"), self.options.get("withattribs")
+        if withscores or withattribs:
             it = iter(response)
-            return dict(list(zip(it, map(float, it))))
+            match withscores, withattribs:
+                case True, None | False:
+                    return dict(list(zip(it, map(float, it))))
+                case None | False, True:
+                    return dict(list(zip(it, map(json.loads, it))))
+                case True, True:
+                    return dict(
+                        list(zip(it, map(lambda x: (float(x[0]), json.loads(x[1])), zip(it, it))))
+                    )
         else:
-            return tuple(response)
+            return self.transform_3(response)
 
     def transform_3(
         self,
-        response: list[AnyStr] | dict[AnyStr, float],
-    ) -> tuple[AnyStr, ...] | dict[AnyStr, float]:
-        if self.options.get("withscores"):
+        response: list[AnyStr]
+        | dict[AnyStr, float]
+        | dict[AnyStr, AnyStr]
+        | dict[AnyStr, list[float | AnyStr]],
+    ) -> (
+        tuple[AnyStr, ...]
+        | dict[AnyStr, float]
+        | dict[AnyStr, JsonType]
+        | dict[AnyStr, tuple[float, JsonType]]
+    ):
+        withscores, withattribs = self.options.get("withscores"), self.options.get("withattribs")
+        if withscores or withattribs:
             assert isinstance(response, dict)
-            return response
+            match withscores, withattribs:
+                case None | False, True:
+                    return {k: json.loads(v) for k, v in response.items()}
+                case True, True:
+                    return {k: (v[0], json.loads(v[1])) for k, v in response.items()}
+                case _:
+                    return response
         else:
             return tuple(response)
 

coredis/retry.py

@@ -6,7 +6,7 @@ from abc import ABC, abstractmethod
 from functools import wraps
 from typing import Any
 
-from coredis.typing import Callable, Coroutine, P, R
+from coredis.typing import Awaitable, Callable, P, R
 
 logger = logging.getLogger(__name__)
 
@@ -31,10 +31,10 @@ class RetryPolicy(ABC):
 
     async def call_with_retries(
         self,
-        func: Callable[..., Coroutine[Any, Any, R]],
-        before_hook: Callable[..., Coroutine[Any, Any, Any]] | None = None,
-        failure_hook: Callable[..., Coroutine[Any, Any, None]]
-        | dict[type[BaseException], Callable[..., Coroutine[Any, Any, None]]]
+        func: Callable[..., Awaitable[R]],
+        before_hook: Callable[..., Awaitable[Any]] | None = None,
+        failure_hook: Callable[..., Awaitable[Any]]
+        | dict[type[BaseException], Callable[..., Awaitable[None]]]
         | None = None,
     ) -> R:
         """
@@ -159,12 +159,11 @@ class CompositeRetryPolicy(RetryPolicy):
 
     async def call_with_retries(
         self,
-        func: Callable[..., Coroutine[Any, Any, R]],
-        before_hook: Callable[..., Coroutine[Any, Any, Any]] | None = None,
+        func: Callable[..., Awaitable[R]],
+        before_hook: Callable[..., Awaitable[Any]] | None = None,
         failure_hook: None
         | (
-            Callable[..., Coroutine[Any, Any, None]]
-            | dict[type[BaseException], Callable[..., Coroutine[Any, Any, None]]]
+            Callable[..., Awaitable[Any]] | dict[type[BaseException], Callable[..., Awaitable[Any]]]
         ) = None,
     ) -> R:
         """
@@ -214,15 +213,15 @@ class CompositeRetryPolicy(RetryPolicy):
 
 def retryable(
     policy: RetryPolicy,
-    failure_hook: Callable[..., Coroutine[Any, Any, None]] | None = None,
-) -> Callable[[Callable[P, Coroutine[Any, Any, R]]], Callable[P, Coroutine[Any, Any, R]]]:
+    failure_hook: Callable[..., Awaitable[Any]] | None = None,
+) -> Callable[[Callable[P, Awaitable[R]]], Callable[P, Awaitable[R]]]:
     """
     Decorator to be used to apply a retry policy to a coroutine
     """
 
     def inner(
-        func: Callable[P, Coroutine[Any, Any, R]],
-    ) -> Callable[P, Coroutine[Any, Any, R]]:
+        func: Callable[P, Awaitable[R]],
+    ) -> Callable[P, Awaitable[R]]:
         @wraps(func)
         async def _inner(*args: P.args, **kwargs: P.kwargs) -> R:
             return await policy.call_with_retries(

coredis/sentinel.py

@@ -23,7 +23,9 @@ from coredis.typing import (
     Generic,
     Iterable,
     Literal,
+    ResponsePrimitive,
     StringT,
+    TypeAdapter,
 )
 
 
@@ -195,6 +197,7 @@ class Sentinel(Generic[AnyStr]):
         sentinel_kwargs: dict[str, Any] | None = ...,
         decode_responses: Literal[False] = ...,
         cache: AbstractCache | None = None,
+        type_adapter: TypeAdapter | None = ...,
         **connection_kwargs: Any,
     ) -> None: ...
 
@@ -206,6 +209,7 @@ class Sentinel(Generic[AnyStr]):
         sentinel_kwargs: dict[str, Any] | None = ...,
         decode_responses: Literal[True] = ...,
         cache: AbstractCache | None = None,
+        type_adapter: TypeAdapter | None = None,
         **connection_kwargs: Any,
     ) -> None: ...
 
@@ -216,6 +220,7 @@ class Sentinel(Generic[AnyStr]):
         sentinel_kwargs: dict[str, Any] | None = None,
         decode_responses: bool = False,
         cache: AbstractCache | None = None,
+        type_adapter: TypeAdapter | None = None,
         **connection_kwargs: Any,
     ) -> None:
         """
@@ -236,6 +241,9 @@ class Sentinel(Generic[AnyStr]):
          and ``protocol_version`` options specified in :paramref:`connection_kwargs` will be used.
         :param cache: If provided the cache will be shared between both primaries and replicas
          returned by this sentinel.
+        :param type_adapter: The adapter to use for serializing / deserializing customs types
+         when interacting with redis commands. If provided this adapter will be used for both
+         primaries and replicas returned by this sentinel.
         :param connection_kwargs: are keyword arguments that will be used when
          establishing a connection to a Redis server (i.e. are passed on to the
          constructor of :class:`Redis` for all primary and replicas).
@@ -260,6 +268,7 @@ class Sentinel(Generic[AnyStr]):
         self.min_other_sentinels = min_other_sentinels
         self.connection_kwargs = connection_kwargs
         self.__cache = cache
+        self.__type_adapter = type_adapter
         self.connection_kwargs["decode_responses"] = self.sentinel_kwargs["decode_responses"] = (
             decode_responses
         )
@@ -283,18 +292,18 @@ class Sentinel(Generic[AnyStr]):
 
     def __check_primary_state(
         self,
-        state: dict[str, int | bool | str],
+        state: dict[str, ResponsePrimitive],
     ) -> bool:
         if not state["is_master"] or state["is_sdown"] or state["is_odown"]:
             return False
 
-        if int(state["num-other-sentinels"]) < self.min_other_sentinels:
+        if int(state["num-other-sentinels"] or 0) < self.min_other_sentinels:
             return False
 
         return True
 
     def __filter_replicas(
-        self, replicas: Iterable[dict[str, str | int | bool]]
+        self, replicas: Iterable[dict[str, ResponsePrimitive]]
     ) -> list[tuple[str, int]]:
         """Removes replicas that are in an ODOWN or SDOWN state"""
         replicas_alive: list[tuple[str, int]] = []
@@ -302,7 +311,9 @@ class Sentinel(Generic[AnyStr]):
         for replica in replicas:
             if replica["is_odown"] or replica["is_sdown"]:
                 continue
-            replicas_alive.append((nativestr(replica["ip"]), int(replica["port"])))
+            ip, port = replica["ip"], replica["port"]
+            assert ip and port
+            replicas_alive.append((nativestr(ip), int(port)))
 
         return replicas_alive
 
@@ -329,7 +340,7 @@ class Sentinel(Generic[AnyStr]):
                     self.sentinels[0],
                 )
 
-                return nativestr(state["ip"]), int(state["port"])
+                return nativestr(state["ip"]), int(state["port"] or -1)
         raise PrimaryNotFoundError(f"No primary found for {service_name!r}")
 
     async def discover_replicas(self, service_name: str) -> list[tuple[str, int]]:
@@ -406,6 +417,7 @@ class Sentinel(Generic[AnyStr]):
                 **connection_kwargs,
             ),
             cache=self.__cache,
+            type_adapter=self.__type_adapter,
         )
 
     @overload
@@ -461,4 +473,5 @@ class Sentinel(Generic[AnyStr]):
                 **connection_kwargs,
             ),
             cache=self.__cache,
+            type_adapter=self.__type_adapter,
         )

coredis/tokens.py

@@ -771,6 +771,11 @@ class PureToken(CaseAndEncodingInsensitiveEnum):
     #:  - ``VSIM``
     TRUTH = b"TRUTH"
 
+    #: Used by:
+    #:
+    #:  - ``VSIM``
+    WITHATTRIBS = b"WITHATTRIBS"
+
     #: Used by:
     #:
     #:  - ``VEMB``

coredis/typing.py

@@ -53,8 +53,6 @@ from typing_extensions import (
 
 from coredis.config import Config
 
-_runtime_checks = False
-
 RUNTIME_TYPECHECKS = Config.runtime_checks and not TYPE_CHECKING
 
 P = ParamSpec("P")
@@ -63,7 +61,7 @@ R = TypeVar("R")
 
 
 def safe_beartype(func: Callable[P, R]) -> Callable[P, R]:
-    return beartype(func) if RUNTIME_TYPECHECKS else func
+    return beartype(func)
 
 
 def add_runtime_checks(func: Callable[P, R]) -> Callable[P, R]:

{coredis-5.0.0rc1.dist-info → coredis-5.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coredis
-Version: 5.0.0rc1
+Version: 5.0.1
 Summary: Python async client for Redis key-value store
 Home-page: https://github.com/alisaifee/coredis
 Author: Ali-Akber Saifee
@@ -14,7 +14,6 @@ Project-URL: Documentation, https://coredis.readthedocs.org
 Keywords: Redis,key-value store,asyncio
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.10
@@ -80,9 +79,6 @@ coredis is an async redis client with support for redis server, cluster & sentin
   and the [API Documentation](https://coredis.readthedocs.io/en/latest/api/index.html)
   for more details.
 
-> **Warning**
-> The command API does NOT mirror the official python [redis client](https://github.com/redis/redis-py). For details about the high level differences refer to [Divergence from aredis & redis-py](https://coredis.readthedocs.io/en/latest/history.html#divergence-from-aredis-redis-py)
-
 ______________________________________________________________________
 
 <!-- TOC depthFrom:2 depthTo:6 withLinks:1 updateOnSave:1 orderedList:0 -->

{coredis-5.0.0rc1.dist-info → coredis-5.0.1.dist-info}/RECORD

@@ -1,12 +1,12 @@
 coredis/__init__.py,sha256=SMfOaj8prRC4xyBZycECI-uHL8pP6keNZiqqboh6_ik,951
 coredis/_json.py,sha256=XjrTlG6Up6BjzfIxk-KSU7IhYeD0fLvXdOPpsMZ6Ff8,186
 coredis/_packer.py,sha256=iXaIKyVJiPiNtB5Hryz4nkjhjLeB-xUWqZdyM7oDpk0,2726
-coredis/_protocols.py,sha256=wx2O8JuN1tayprUlxPLtK4jS5p4EYMxKExbLn2JNGyE,1617
+coredis/_protocols.py,sha256=dzn0W-RCxMGQ4xBDop4FV5Ez4dF6i0QDmmDRRazwJNQ,1059
 coredis/_py_311_typing.py,sha256=QTh0tPRnwd7E39FXlh0RrWqloFWTeidOkfr4mRnp4K8,557
 coredis/_py_312_typing.py,sha256=zB6scCVDNdSu3YBujf3Hq3rn-i-i8DcsbwbmcT-HrcQ,517
 coredis/_sidecar.py,sha256=ci3hx7RojTdodMqe_zf07HL-E6DlqSliscENTa3dbzI,4404
-coredis/_utils.py,sha256=CWb5T-CUPFX9bozunBCrJIgrTErXydpU2G9uoteiB2E,9998
-coredis/_version.py,sha256=rzh24UEmx_s_DgCOvtV-vrrnwKL8kq20sbeuk5w5bJw,500
+coredis/_utils.py,sha256=gf0TvLa4lZCRsNjYB98nV1IIQt3sxuwUSo-yRIg7vp4,10205
+coredis/_version.py,sha256=f3A0WQ-A7fLk9D-rmdWpzTqamBNSUiriXvZIQJPKky8,497
 coredis/cache.py,sha256=entnV__Bpv4DjqK9BmejuyEgknLBWQnz-Sp8p1CwjQw,26308
 coredis/config.py,sha256=Ni2uXMNzdfSRDEJl0KxrS78shLszfYM-ZbE7GK_O7Pk,1368
 coredis/connection.py,sha256=0GbYjcBZizz-1fscoXG3fQRHOvh6c4Flc3yDrMNzJV8,30899
@@ -15,14 +15,14 @@ coredis/credentials.py,sha256=iVSZEyMfd6nEePpVRrx3Ora-EuCCwJ9G9NshEI5Qs2A,1102
 coredis/exceptions.py,sha256=8P3npdmixnUso9GdcKit6FzXywSWFJhj6EEyiGja8As,8709
 coredis/globals.py,sha256=R0Ys_wd3v29cMiojSwlyyflA3GK2lFNCjnVL4PMANag,678
 coredis/parser.py,sha256=9pzxtIOqyj1O91DwKGCMCWf807qsJThDBtD5qslBwkY,11754
-coredis/pipeline.py,sha256=SR3zcwOAP37sfEJ7ZljDYbNPt50GpWEtHbu4jyWJkZ0,46046
+coredis/pipeline.py,sha256=_cCyBHTjFHq1K5MOJAlAxBNSiobiKua7H2v1DXjLosA,43613
 coredis/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-coredis/retry.py,sha256=WG4FA-lG2ksc2EGOnKmAAUwa-LrdxG06SSYUXZlPycA,8350
-coredis/sentinel.py,sha256=AE0jzHaaDziroxzR-_x9tmCw954Ui3QJ8Jl8c0GL4m8,16293
+coredis/retry.py,sha256=Ia-dajjrUK8OcSALL7RBz4rinJKuaG5lc0zfOuUa4aE,8204
+coredis/sentinel.py,sha256=ljUrQB23a1fspWlNMi0ExrwpACaBHTSE7RFTY4x542E,16937
 coredis/speedups.pyi,sha256=cUYJLKVGVgyGisMNUExWnnoLTYleCuH2v3XwTXOwnFM,109
 coredis/stream.py,sha256=tQStAfamoGr3OTkWLTqxyEV60epVRPBxwaGwPVW6tzc,14935
-coredis/tokens.py,sha256=t8a3Rosho77jMD6rUO15A0qw3WoWOJe-CW-z_DunPpA,36586
-coredis/typing.py,sha256=m2P1982NIvtAtkTVHhB6DiOglUMvweolEBXq6_5pCKE,20684
+coredis/tokens.py,sha256=LDJbgl2UnrTAF6Iy9xW4OvD4UAMpPaISaJYQ368xVS0,36662
+coredis/typing.py,sha256=0oEm8aP4QkH6z_m3WVf6rhTTCJ6Rby7U2XspZuW4Awk,20627
 coredis/client/__init__.py,sha256=J4r1pi5r68EwodMV8-eHvzM83tkz2mTlWayKy-JScrg,150
 coredis/client/basic.py,sha256=kg9k0pMfIuzVCIhnL_wjJxixzh0NW0sEreJi9N_ycSA,46241
 coredis/client/cluster.py,sha256=EszhB5qxLGZCdEEzmRYKedSMMfr8Vokhf36grdATnwc,50609
@@ -33,13 +33,13 @@ coredis/commands/_validators.py,sha256=yo0I81uMpy7FMvPxMheqdMPved-ujkpaWUs0WpuOP
 coredis/commands/_wrappers.py,sha256=rw-HF3XxsImRRB0ptK1zrgOyMlRXLyz6wbfViblK5e8,5653
 coredis/commands/bitfield.py,sha256=aB-m4KoUbGpI4zxzNU0VCfmPt7HGhB5kt4g8KX5CoRo,3405
 coredis/commands/constants.py,sha256=KZs05uSnn7cg3K723UrqEOGDcClWNAc29EbDPyPk4gQ,30312
-coredis/commands/core.py,sha256=UJr6mDLVPM__HPXHTLhOsOpTFoGuLEAS0hUZSZDHVA4,278545
+coredis/commands/core.py,sha256=Fx2BiCK1EOAng6W9VIOnaLlCwpMYLmlNtQlxaUwnGQE,280022
 coredis/commands/function.py,sha256=mznJds0S09qAAjII8Jw1TjkS8maljAc65QzEtWDhrgk,16301
 coredis/commands/monitor.py,sha256=Zu_PmUggLkRke5XFTE3cb5-5ocCxhfrKjlm_e00-kvI,5766
 coredis/commands/pubsub.py,sha256=_svI6BK5F9MIF7DHKmpW1ob7ypN13O9BFDpwSrLBYKs,34371
 coredis/commands/request.py,sha256=9tMw5q6KdF4y6SyHfcguRe6P7mjArqE8Djk9FSvxKts,3663
-coredis/commands/script.py,sha256=Ld6NiOD2ILeOoIQDUMAm6WVA9fZOvQlubS2qCyu40dk,12223
-coredis/commands/sentinel.py,sha256=9giNW1QyhRD5SaAkPSgiBFEnm9XnGa2QM6vBQDZEwp0,7789
+coredis/commands/script.py,sha256=6cb_JhaM49-Kjb6iuSTAU0boOFw9CuHIMa5HRnGosJs,12135
+coredis/commands/sentinel.py,sha256=y2t9PO89qs3d5SUCs1Plsgtg-RAqxWBsygXGatsELGI,7818
 coredis/experimental/__init__.py,sha256=U4S_2y3zgLZVfMenHRaJFBW8yqh2mUBuI291LGQVOJ8,35
 coredis/modules/__init__.py,sha256=eqWwEYNI-B7Lc19R23n6NQaQoKHmpj8mrtkYBcQ2fCA,2917
 coredis/modules/autocomplete.py,sha256=ZqT9wcmuP7_FNdQq4ZrYy3Dv_iStVCUc2LUtQ7cyikc,4945
@@ -81,15 +81,15 @@ coredis/response/_callbacks/hash.py,sha256=lDjxEZ_YO36IJJ4JIZaF1I5ZRoeDURxRCYSMV
 coredis/response/_callbacks/keys.py,sha256=fKfzvN91Wwk2TsJ65tDUWFa2_--SVrOaAj5C-3Tlxqg,1546
 coredis/response/_callbacks/module.py,sha256=WLJwHw0Kq3X5HafRrGGNBmxB8eCyThqV4YK1tSDg3DU,886
 coredis/response/_callbacks/script.py,sha256=o_chD_GOj59ObuKvFgMglTheQOFpmOJPjOUBjsAG8C8,3063
-coredis/response/_callbacks/sentinel.py,sha256=xwgbztFRuT3TI2_tSWKROlwme977Cg7YoSXj1RY1z0Y,4721
+coredis/response/_callbacks/sentinel.py,sha256=qPoz3K_gb0gQX9YV2_fIuqckX-vTuLnUPaztRjcjDM4,4904
 coredis/response/_callbacks/server.py,sha256=2bEPZi2nq7X417Ua0qH8vSnawT2TqHl5sc67xnd0pu4,7520
 coredis/response/_callbacks/sets.py,sha256=aaGh3BF0TkW_jGnpFENipAzWA-R9TgnioKudf_6Dk2w,1310
 coredis/response/_callbacks/sorted_set.py,sha256=LrqHBMPluR2MufkCoE8y_FRO4_WrfGq5wsdri4Sxkqo,6335
 coredis/response/_callbacks/streams.py,sha256=vq4C8sidFam32n7rlfUrt1XzkOdmeTtFv0tl0mLRcYA,6241
 coredis/response/_callbacks/strings.py,sha256=sjHY2JwxHl4ndIl9WhHD48VKuGn39FArE8XnRUparu4,1955
-coredis/response/_callbacks/vector_sets.py,sha256=nErA6NvtwObdE8NVirCNeB3nDNw3EkNnQkNdAO72Uq8,3993
-coredis-5.0.0rc1.dist-info/licenses/LICENSE,sha256=pTSTkaH3iX2r6C88El9edMoi6r_Og6Wf4b6Zgq-LSOQ,1107
-coredis-5.0.0rc1.dist-info/METADATA,sha256=pyll4nXS4RM8mi-mViEP9U2A72Uy4eXLm07gSsDi-98,9119
-coredis-5.0.0rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-coredis-5.0.0rc1.dist-info/top_level.txt,sha256=PWp3SlvenceLQUL9VJ1_rKwKoi-U9g3KDJS5ws8tOG8,8
-coredis-5.0.0rc1.dist-info/RECORD,,
+coredis/response/_callbacks/vector_sets.py,sha256=z1fUPaGjui9f4hVDIPLu6iA3R2EIG-np6hS8ZmCaGOQ,5334
+coredis-5.0.1.dist-info/licenses/LICENSE,sha256=pTSTkaH3iX2r6C88El9edMoi6r_Og6Wf4b6Zgq-LSOQ,1107
+coredis-5.0.1.dist-info/METADATA,sha256=va27ao_ErNx1-Z8ITIdg412gbbswUl9cyzO1j1xe_GY,8768
+coredis-5.0.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+coredis-5.0.1.dist-info/top_level.txt,sha256=PWp3SlvenceLQUL9VJ1_rKwKoi-U9g3KDJS5ws8tOG8,8
+coredis-5.0.1.dist-info/RECORD,,