redis 6.3.0__tar.gz → 6.4.0__tar.gz

{redis-6.3.0 → redis-6.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: redis
-Version: 6.3.0
+Version: 6.4.0
 Summary: Python client for Redis database and key-value store
 Project-URL: Changes, https://github.com/redis/redis-py/releases
 Project-URL: Code, https://github.com/redis/redis-py

{redis-6.3.0 → redis-6.4.0}/redis/__init__.py

@@ -46,8 +46,7 @@ def int_or_str(value):
         return value
 
 
-# This version is used when building the package for publishing
-__version__ = "6.3.0"
+__version__ = "6.4.0"
 VERSION = tuple(map(int_or_str, __version__.split(".")))
 
 

{redis-6.3.0 → redis-6.4.0}/redis/asyncio/cluster.py

@@ -1587,15 +1587,6 @@ class ClusterPipeline(AbstractRedis, AbstractRedisCluster, AsyncRedisClusterComm
     def __await__(self) -> Generator[Any, None, "ClusterPipeline"]:
         return self.initialize().__await__()
 
-    def __enter__(self) -> "ClusterPipeline":
-        # TODO: Remove this method before 7.0.0
-        self._execution_strategy._command_queue = []
-        return self
-
-    def __exit__(self, exc_type: None, exc_value: None, traceback: None) -> None:
-        # TODO: Remove this method before 7.0.0
-        self._execution_strategy._command_queue = []
-
     def __bool__(self) -> bool:
         "Pipeline instances should  always evaluate to True on Python 3+"
         return True

{redis-6.3.0 → redis-6.4.0}/redis/client.py

@@ -368,9 +368,7 @@ class Redis(RedisModuleCommands, CoreCommands, SentinelCommands):
         ]:
             raise RedisError("Client caching is only supported with RESP version 3")
 
-        # TODO: To avoid breaking changes during the bug fix, we have to keep non-reentrant lock.
-        # TODO: Remove this before next major version (7.0.0)
-        self.single_connection_lock = threading.Lock()
+        self.single_connection_lock = threading.RLock()
         self.connection = None
         self._single_connection_client = single_connection_client
         if self._single_connection_client:
@@ -776,9 +774,7 @@ class PubSub:
         else:
             self._event_dispatcher = event_dispatcher
 
-        # TODO: To avoid breaking changes during the bug fix, we have to keep non-reentrant lock.
-        # TODO: Remove this before next major version (7.0.0)
-        self._lock = threading.Lock()
+        self._lock = threading.RLock()
         if self.encoder is None:
             self.encoder = self.connection_pool.get_encoder()
         self.health_check_response_b = self.encoder.encode(self.HEALTH_CHECK_MESSAGE)

redis-6.4.0/redis/commands/json/_util.py

@@ -0,0 +1,5 @@
+from typing import List, Mapping, Union
+
+JsonType = Union[
+    str, int, float, bool, None, Mapping[str, "JsonType"], List["JsonType"]
+]

{redis-6.3.0 → redis-6.4.0}/redis/commands/search/aggregation.py

@@ -26,7 +26,7 @@ class Reducer:
 
     NAME = None
 
-    def __init__(self, *args: List[str]) -> None:
+    def __init__(self, *args: str) -> None:
         self._args = args
         self._field = None
         self._alias = None
@@ -116,7 +116,7 @@ class AggregateRequest:
         self._add_scores = False
         self._scorer = "TFIDF"
 
-    def load(self, *fields: List[str]) -> "AggregateRequest":
+    def load(self, *fields: str) -> "AggregateRequest":
         """
         Indicate the fields to be returned in the response. These fields are
         returned in addition to any others implicitly specified.
@@ -223,7 +223,7 @@ class AggregateRequest:
         self._aggregateplan.extend(_limit.build_args())
         return self
 
-    def sort_by(self, *fields: List[str], **kwargs) -> "AggregateRequest":
+    def sort_by(self, *fields: str, **kwargs) -> "AggregateRequest":
         """
         Indicate how the results should be sorted. This can also be used for
         *top-N* style queries

{redis-6.3.0 → redis-6.4.0}/redis/commands/search/commands.py

@@ -542,7 +542,7 @@ class SearchCommands:
 
     def aggregate(
         self,
-        query: Union[str, Query],
+        query: Union[AggregateRequest, Cursor],
         query_params: Dict[str, Union[str, int, float]] = None,
     ):
         """
@@ -573,7 +573,7 @@ class SearchCommands:
         )
 
     def _get_aggregate_result(
-        self, raw: List, query: Union[str, Query, AggregateRequest], has_cursor: bool
+        self, raw: List, query: Union[AggregateRequest, Cursor], has_cursor: bool
     ):
         if has_cursor:
             if isinstance(query, Cursor):
@@ -967,7 +967,7 @@ class AsyncSearchCommands(SearchCommands):
 
     async def aggregate(
         self,
-        query: Union[str, Query],
+        query: Union[AggregateResult, Cursor],
         query_params: Dict[str, Union[str, int, float]] = None,
     ):
         """

{redis-6.3.0 → redis-6.4.0}/redis/commands/vectorset/commands.py

@@ -129,6 +129,7 @@ class VectorSetCommands(CommandsProtocol):
         filter_ef: Optional[str] = None,
         truth: Optional[bool] = False,
         no_thread: Optional[bool] = False,
+        epsilon: Optional[Number] = None,
     ) -> Union[
         Awaitable[Optional[List[Union[List[EncodableT], Dict[EncodableT, Number]]]]],
         Optional[List[Union[List[EncodableT], Dict[EncodableT, Number]]]],
@@ -152,6 +153,9 @@ class VectorSetCommands(CommandsProtocol):
         ``no_thread`` when enabled forces the command to execute the search
                 on the data structure in the main thread.
 
+        ``epsilon`` floating point between 0 and 1, if specified will return
+                only elements with distance no further than the specified one.
+
         For more information see https://redis.io/commands/vsim
         """
 
@@ -176,6 +180,9 @@ class VectorSetCommands(CommandsProtocol):
         if count:
             pieces.extend(["COUNT", count])
 
+        if epsilon:
+            pieces.extend(["EPSILON", epsilon])
+
         if ef:
             pieces.extend(["EF", ef])
 

{redis-6.3.0 → redis-6.4.0}/redis/connection.py

@@ -816,7 +816,7 @@ class CacheProxyConnection(ConnectionInterface):
         self,
         conn: ConnectionInterface,
         cache: CacheInterface,
-        pool_lock: threading.Lock,
+        pool_lock: threading.RLock,
     ):
         self.pid = os.getpid()
         self._conn = conn
@@ -1429,13 +1429,7 @@ class ConnectionPool:
         # release the lock.
 
         self._fork_lock = threading.RLock()
-
-        if self.cache is None:
-            self._lock = threading.RLock()
-        else:
-            # TODO: To avoid breaking changes during the bug fix, we have to keep non-reentrant lock.
-            # TODO: Remove this before next major version (7.0.0)
-            self._lock = threading.Lock()
+        self._lock = threading.RLock()
 
         self.reset()
 

{redis-6.3.0 → redis-6.4.0}/redis/event.py

@@ -152,7 +152,7 @@ class AfterSingleConnectionInstantiationEvent:
         self,
         connection,
         client_type: ClientType,
-        connection_lock: Union[threading.Lock, asyncio.Lock],
+        connection_lock: Union[threading.RLock, asyncio.Lock],
     ):
         self._connection = connection
         self._client_type = client_type
@@ -167,7 +167,7 @@ class AfterSingleConnectionInstantiationEvent:
         return self._client_type
 
     @property
-    def connection_lock(self) -> Union[threading.Lock, asyncio.Lock]:
+    def connection_lock(self) -> Union[threading.RLock, asyncio.Lock]:
         return self._connection_lock
 
 
@@ -177,7 +177,7 @@ class AfterPubSubConnectionInstantiationEvent:
         pubsub_connection,
         connection_pool,
         client_type: ClientType,
-        connection_lock: Union[threading.Lock, asyncio.Lock],
+        connection_lock: Union[threading.RLock, asyncio.Lock],
     ):
         self._pubsub_connection = pubsub_connection
         self._connection_pool = connection_pool
@@ -197,7 +197,7 @@ class AfterPubSubConnectionInstantiationEvent:
         return self._client_type
 
     @property
-    def connection_lock(self) -> Union[threading.Lock, asyncio.Lock]:
+    def connection_lock(self) -> Union[threading.RLock, asyncio.Lock]:
         return self._connection_lock
 
 

{redis-6.3.0 → redis-6.4.0}/tests/test_asyncio/test_vsets.py

@@ -423,6 +423,21 @@ async def test_vsim_truth_no_thread_enabled(d_client):
     assert isinstance(sim_no_thread, dict)
 
 
+@skip_if_server_version_lt("8.2.0")
+async def test_vsim_epsilon(d_client):
+    await d_client.vset().vadd("myset", [2, 1, 1], "a")
+    await d_client.vset().vadd("myset", [2, 0, 1], "b")
+    await d_client.vset().vadd("myset", [2, 0, 0], "c")
+    await d_client.vset().vadd("myset", [2, 0, -1], "d")
+    await d_client.vset().vadd("myset", [2, -1, -1], "e")
+
+    res1 = await d_client.vset().vsim("myset", [2, 1, 1])
+    assert 5 == len(res1)
+
+    res2 = await d_client.vset().vsim("myset", [2, 1, 1], epsilon=0.5)
+    assert 4 == len(res2)
+
+
 @skip_if_server_version_lt("7.9.0")
 async def test_vdim(d_client):
     float_array = [1, 4.32, 0.11, 0.5, 0.9, 0.1, 0.2]

{redis-6.3.0 → redis-6.4.0}/tests/test_cluster_transaction.py

@@ -285,7 +285,7 @@ class TestClusterTransaction:
         mock_pool = Mock(spec=ConnectionPool)
         mock_pool.get_connection.return_value = mock_connection
         mock_pool._available_connections = [mock_connection]
-        mock_pool._lock = threading.Lock()
+        mock_pool._lock = threading.RLock()
 
         _node_migrating, node_importing = _find_source_and_target_node_for_slot(r, slot)
         node_importing.redis_connection.connection_pool = mock_pool
@@ -310,7 +310,7 @@ class TestClusterTransaction:
         mock_pool = Mock(spec=ConnectionPool)
         mock_pool.get_connection.return_value = mock_connection
         mock_pool._available_connections = [mock_connection]
-        mock_pool._lock = threading.Lock()
+        mock_pool._lock = threading.RLock()
 
         _node_migrating, node_importing = _find_source_and_target_node_for_slot(r, slot)
         node_importing.redis_connection.connection_pool = mock_pool

{redis-6.3.0 → redis-6.4.0}/tests/test_connection.py

@@ -442,7 +442,7 @@ class TestUnitCacheProxyConnection:
         mock_connection.credential_provider = UsernamePasswordCredentialProvider()
 
         proxy_connection = CacheProxyConnection(
-            mock_connection, cache, threading.Lock()
+            mock_connection, cache, threading.RLock()
         )
         proxy_connection.disconnect()
 
@@ -492,7 +492,7 @@ class TestUnitCacheProxyConnection:
         mock_connection.can_read.return_value = False
 
         proxy_connection = CacheProxyConnection(
-            mock_connection, mock_cache, threading.Lock()
+            mock_connection, mock_cache, threading.RLock()
         )
         proxy_connection.send_command(*["GET", "foo"], **{"keys": ["foo"]})
         assert proxy_connection.read_response() == b"bar"
@@ -554,7 +554,7 @@ class TestUnitCacheProxyConnection:
         mock_connection.can_read.return_value = False
 
         proxy_connection = CacheProxyConnection(
-            mock_connection, mock_cache, threading.Lock()
+            mock_connection, mock_cache, threading.RLock()
         )
         proxy_connection.send_command(*["GET", "foo"], **{"keys": ["foo"]})
 

{redis-6.3.0 → redis-6.4.0}/tests/test_credentials.py

@@ -323,7 +323,7 @@ class TestStreamingCredentialProvider:
         }
         mock_pool.get_connection.return_value = mock_connection
         mock_pool._available_connections = [mock_connection, mock_another_connection]
-        mock_pool._lock = threading.Lock()
+        mock_pool._lock = threading.RLock()
         auth_token = None
 
         def re_auth_callback(token):
@@ -382,7 +382,7 @@ class TestStreamingCredentialProvider:
             mock_another_connection,
             mock_failed_connection,
         ]
-        mock_pool._lock = threading.Lock()
+        mock_pool._lock = threading.RLock()
 
         def _raise(error: RedisError):
             pass
@@ -442,7 +442,7 @@ class TestStreamingCredentialProvider:
             mock_another_connection,
         ]
         mock_pool._available_connections = [mock_another_connection]
-        mock_pool._lock = threading.Lock()
+        mock_pool._lock = threading.RLock()
         auth_token = None
 
         def re_auth_callback(token):
@@ -502,7 +502,7 @@ class TestStreamingCredentialProvider:
             mock_another_connection,
         ]
         mock_pool._available_connections = [mock_another_connection]
-        mock_pool._lock = threading.Lock()
+        mock_pool._lock = threading.RLock()
         auth_token = None
 
         def re_auth_callback(token):
@@ -560,7 +560,7 @@ class TestStreamingCredentialProvider:
         }
         mock_pool.get_connection.return_value = mock_connection
         mock_pool._available_connections = [mock_connection, mock_another_connection]
-        mock_pool._lock = threading.Lock()
+        mock_pool._lock = threading.RLock()
 
         Redis(
             connection_pool=mock_pool,

{redis-6.3.0 → redis-6.4.0}/tests/test_search.py

@@ -3802,3 +3802,52 @@ def test_svs_vamana_vector_search_with_parameters(client):
     else:
         assert res["total_results"] == 3
         assert "doc0" == res["results"][0]["id"]
+
+
+@pytest.mark.redismod
+@skip_ifmodversion_lt("2.4.3", "search")
+@skip_if_server_version_lt("8.1.224")
+def test_svs_vamana_vector_search_with_parameters_leanvec(client):
+    client.ft().create_index(
+        (
+            VectorField(
+                "v",
+                "SVS-VAMANA",
+                {
+                    "TYPE": "FLOAT32",
+                    "DIM": 8,
+                    "DISTANCE_METRIC": "L2",
+                    "COMPRESSION": "LeanVec8x8",  # LeanVec compression required for REDUCE
+                    "CONSTRUCTION_WINDOW_SIZE": 200,
+                    "GRAPH_MAX_DEGREE": 32,
+                    "SEARCH_WINDOW_SIZE": 15,
+                    "EPSILON": 0.01,
+                    "TRAINING_THRESHOLD": 1024,
+                    "REDUCE": 4,  # Half of DIM (8/2 = 4)
+                },
+            ),
+        )
+    )
+
+    # Create test vectors (8-dimensional to match DIM)
+    vectors = [
+        [1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0],
+        [2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0],
+        [3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0],
+        [4.0, 5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0],
+        [5.0, 6.0, 7.0, 8.0, 9.0, 10.0, 11.0, 12.0],
+    ]
+
+    for i, vec in enumerate(vectors):
+        client.hset(f"doc{i}", "v", np.array(vec, dtype=np.float32).tobytes())
+
+    query = Query("*=>[KNN 3 @v $vec as score]").no_content()
+    query_params = {"vec": np.array(vectors[0], dtype=np.float32).tobytes()}
+
+    res = client.ft().search(query, query_params=query_params)
+    if is_resp2_connection(client):
+        assert res.total == 3
+        assert "doc0" == res.docs[0].id
+    else:
+        assert res["total_results"] == 3
+        assert "doc0" == res["results"][0]["id"]

{redis-6.3.0 → redis-6.4.0}/tests/test_vsets.py

@@ -425,6 +425,21 @@ def test_vsim_truth_no_thread_enabled(d_client):
     assert isinstance(sim_no_thread, dict)
 
 
+@skip_if_server_version_lt("8.2.0")
+def test_vsim_epsilon(d_client):
+    d_client.vset().vadd("myset", [2, 1, 1], "a")
+    d_client.vset().vadd("myset", [2, 0, 1], "b")
+    d_client.vset().vadd("myset", [2, 0, 0], "c")
+    d_client.vset().vadd("myset", [2, 0, -1], "d")
+    d_client.vset().vadd("myset", [2, -1, -1], "e")
+
+    res1 = d_client.vset().vsim("myset", [2, 1, 1])
+    assert 5 == len(res1)
+
+    res2 = d_client.vset().vsim("myset", [2, 1, 1], epsilon=0.5)
+    assert 4 == len(res2)
+
+
 @skip_if_server_version_lt("7.9.0")
 def test_vdim(d_client):
     float_array = [1, 4.32, 0.11, 0.5, 0.9, 0.1, 0.2]

redis-6.3.0/redis/commands/json/_util.py

@@ -1,3 +0,0 @@
-from typing import Any, Dict, List, Union
-
-JsonType = Union[str, int, float, bool, None, Dict[str, Any], List[Any]]