Merge branch 'valkey-io:main' into main

valkey-io · Dec 10, 2024 · 1bb0afe · 1bb0afe
2 parents 4fea0e4 + 1f6b63c
commit 1bb0afe
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/tests/test_commands.py b/tests/test_commands.py
@@ -1353,6 +1353,8 @@ def test_getdel(self, r):
     @skip_if_server_version_lt("6.2.0")
     def test_getex(self, r):
         r.set("a", 1)
+        with pytest.raises(valkey.DataError):
+            r.getex("a", ex=10, px=10)
         assert r.getex("a") == b"1"
         assert r.ttl("a") == -1
         assert r.getex("a", ex=60) == b"1"

diff --git a/valkey/commands/core.py b/valkey/commands/core.py
@@ -24,7 +24,10 @@
 from valkey.exceptions import ConnectionError, DataError, NoScriptError, ValkeyError
 from valkey.typing import (
     AbsExpiryT,
+    AnyEncodableT,
+    AnyFieldT,
     AnyKeyT,
+    AnyStreamIdT,
     BitfieldOffsetT,
     ChannelT,
     CommandsProtocol,
@@ -1859,8 +1862,8 @@ def getex(
         For more information see https://valkey.io/commands/getex
         """
 
-        opset = {ex, px, exat, pxat}
-        if len(opset) > 2 or len(opset) > 1 and persist:
+        opvs = sum(op is not None for op in [ex, px, exat, pxat])
+        if opvs > 1 or (opvs and persist):
             raise DataError(
                 "``ex``, ``px``, ``exat``, ``pxat``, "
                 "and ``persist`` are mutually exclusive."
@@ -3517,7 +3520,7 @@ def xack(self, name: KeyT, groupname: GroupT, *ids: StreamIdT) -> ResponseT:
     def xadd(
         self,
         name: KeyT,
-        fields: Dict[FieldT, EncodableT],
+        fields: Mapping[AnyFieldT, AnyEncodableT],
         id: StreamIdT = "*",
         maxlen: Union[int, None] = None,
         approximate: bool = True,
@@ -3942,7 +3945,7 @@ def xrange(
 
     def xread(
         self,
-        streams: Dict[KeyT, StreamIdT],
+        streams: Mapping[AnyKeyT, AnyStreamIdT],
         count: Union[int, None] = None,
         block: Union[int, None] = None,
     ) -> ResponseT:
@@ -3982,7 +3985,7 @@ def xreadgroup(
         self,
         groupname: str,
         consumername: str,
-        streams: Dict[KeyT, StreamIdT],
+        streams: Mapping[AnyKeyT, AnyStreamIdT],
         count: Union[int, None] = None,
         block: Union[int, None] = None,
         noack: bool = False,

diff --git a/valkey/typing.py b/valkey/typing.py
@@ -47,6 +47,8 @@
 AnyKeyT = TypeVar("AnyKeyT", bytes, str, memoryview)
 AnyFieldT = TypeVar("AnyFieldT", bytes, str, memoryview)
 AnyChannelT = TypeVar("AnyChannelT", bytes, str, memoryview)
+AnyStreamIdT = TypeVar("AnyStreamIdT", int, bytes, str, memoryview)
+AnyEncodableT = TypeVar("AnyEncodableT", int, float, bytes, str, memoryview)
 
 ExceptionMappingT = Mapping[str, Union[Type[Exception], Mapping[str, Type[Exception]]]]