redis 6.3.0__py3-none-any.whl → 7.0.0b1__py3-none-any.whl

redis/commands/helpers.py

@@ -72,26 +72,6 @@ def parse_to_list(response):
     return res
 
 
-def parse_list_to_dict(response):
-    res = {}
-    for i in range(0, len(response), 2):
-        if isinstance(response[i], list):
-            res["Child iterators"].append(parse_list_to_dict(response[i]))
-            try:
-                if isinstance(response[i + 1], list):
-                    res["Child iterators"].append(parse_list_to_dict(response[i + 1]))
-            except IndexError:
-                pass
-        elif isinstance(response[i + 1], list):
-            res["Child iterators"] = [parse_list_to_dict(response[i + 1])]
-        else:
-            try:
-                res[response[i]] = float(response[i + 1])
-            except (TypeError, ValueError):
-                res[response[i]] = response[i + 1]
-    return res
-
-
 def random_string(length=10):
     """
     Returns a random N character long string.

redis/commands/json/_util.py

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

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/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/commands/search/query.py

@@ -9,7 +9,7 @@ class Query:
     the query string. The query string is set in the constructor, and other
     options have setter functions.
 
-    The setter functions return the query object, so they can be chained,
+    The setter functions return the query object so they can be chained.
     i.e. `Query("foo").verbatim().filter(...)` etc.
     """
 
@@ -95,12 +95,12 @@ class Query:
     ) -> "Query":
         """
         Return an abridged format of the field, containing only the segments of
-        the field which contain the matching term(s).
+        the field that contain the matching term(s).
 
         If `fields` is specified, then only the mentioned fields are
-        summarized; otherwise all results are summarized.
+        summarized; otherwise, all results are summarized.
 
-        Server side defaults are used for each option (except `fields`)
+        Server-side defaults are used for each option (except `fields`)
         if not specified
 
         - **fields** List of fields to summarize. All fields are summarized
@@ -130,7 +130,7 @@ class Query:
         """
         Apply specified markup to matched term(s) within the returned field(s).
 
-        - **fields** If specified then only those mentioned fields are
+        - **fields** If specified, then only those mentioned fields are
         highlighted, otherwise all fields are highlighted
         - **tags** A list of two strings to surround the match.
         """
@@ -154,7 +154,7 @@ class Query:
         return self
 
     def slop(self, slop: int) -> "Query":
-        """Allow a maximum of N intervening non matched terms between
+        """Allow a maximum of N intervening non-matched terms between
         phrase terms (0 means exact phrase).
         """
         self._slop = slop
@@ -169,7 +169,7 @@ class Query:
         """
         Match only documents where the query terms appear in
         the same order in the document.
-        i.e. for the query "hello world", we do not match "world hello"
+        i.e., for the query "hello world", we do not match "world hello"
         """
         self._in_order = True
         return self
@@ -258,7 +258,7 @@ class Query:
         return self
 
     def verbatim(self) -> "Query":
-        """Set the query to be verbatim, i.e. use no query expansion
+        """Set the query to be verbatim, i.e., use no query expansion
         or stemming.
         """
         self._verbatim = True
@@ -292,7 +292,7 @@ class Query:
         """
         Limit the search to specific TEXT fields only.
 
-        - **fields**: A list of strings, case sensitive field names
+        - **fields**: A list of strings; case-sensitive field names
         from the defined schema.
         """
         self._fields = fields
@@ -301,7 +301,7 @@ class Query:
     def add_filter(self, flt: "Filter") -> "Query":
         """
         Add a numeric or geo filter to the query.
-        **Currently only one of each filter is supported by the engine**
+        **Currently, only one of each filter is supported by the engine**
 
         - **flt**: A NumericFilter or GeoFilter object, used on a
         corresponding field
@@ -315,14 +315,14 @@ class Query:
         Add a sortby field to the query.
 
         - **field** - the name of the field to sort by
-        - **asc** - when `True`, sorting will be done in asceding order
+        - **asc** - when `True`, sorting will be done in ascending order
         """
         self._sortby = SortbyField(field, asc)
         return self
 
     def expander(self, expander: str) -> "Query":
         """
-        Add a expander field to the query.
+        Add an expander field to the query.
 
         - **expander** - the name of the expander
         """

redis/commands/vectorset/__init__.py

@@ -24,12 +24,12 @@ class VectorSet(VectorSetCommands):
         # Set the module commands' callbacks
         self._MODULE_CALLBACKS = {
             VEMB_CMD: parse_vemb_result,
+            VSIM_CMD: parse_vsim_result,
             VGETATTR_CMD: lambda r: r and json.loads(r) or None,
         }
 
         self._RESP2_MODULE_CALLBACKS = {
             VINFO_CMD: lambda r: r and pairs_to_dict(r) or None,
-            VSIM_CMD: parse_vsim_result,
             VLINKS_CMD: parse_vlinks_result,
         }
         self._RESP3_MODULE_CALLBACKS = {}

redis/commands/vectorset/commands.py

@@ -1,6 +1,6 @@
 import json
 from enum import Enum
-from typing import Awaitable, Dict, List, Optional, Union
+from typing import Any, Awaitable, Dict, List, Optional, Union
 
 from redis.client import NEVER_DECODE
 from redis.commands.helpers import get_protocol_version
@@ -19,6 +19,15 @@ VSETATTR_CMD = "VSETATTR"
 VGETATTR_CMD = "VGETATTR"
 VRANDMEMBER_CMD = "VRANDMEMBER"
 
+# Return type for vsim command
+VSimResult = Optional[
+    List[
+        Union[
+            List[EncodableT], Dict[EncodableT, Number], Dict[EncodableT, Dict[str, Any]]
+        ]
+    ]
+]
+
 
 class QuantizationOptions(Enum):
     """Quantization options for the VADD command."""
@@ -33,6 +42,7 @@ class CallbacksOptions(Enum):
 
     RAW = "RAW"
     WITHSCORES = "WITHSCORES"
+    WITHATTRIBS = "WITHATTRIBS"
     ALLOW_DECODING = "ALLOW_DECODING"
     RESP3 = "RESP3"
 
@@ -77,7 +87,7 @@ class VectorSetCommands(CommandsProtocol):
         ``numlinks`` sets the number of links to create for the vector.
                 If not provided, the default number of links is used.
 
-        For more information see https://redis.io/commands/vadd
+        For more information, see https://redis.io/commands/vadd.
         """
         if not vector or not element:
             raise DataError("Both vector and element must be provided")
@@ -123,36 +133,40 @@ class VectorSetCommands(CommandsProtocol):
         key: KeyT,
         input: Union[List[float], bytes, str],
         with_scores: Optional[bool] = False,
+        with_attribs: Optional[bool] = False,
         count: Optional[int] = None,
         ef: Optional[Number] = None,
         filter: Optional[str] = None,
         filter_ef: Optional[str] = None,
         truth: Optional[bool] = False,
         no_thread: Optional[bool] = False,
-    ) -> Union[
-        Awaitable[Optional[List[Union[List[EncodableT], Dict[EncodableT, Number]]]]],
-        Optional[List[Union[List[EncodableT], Dict[EncodableT, Number]]]],
-    ]:
+        epsilon: Optional[Number] = None,
+    ) -> Union[Awaitable[VSimResult], VSimResult]:
         """
         Compare a vector or element ``input``  with the other vectors in a vector set ``key``.
 
-        ``with_scores`` sets if the results should be returned with the
-                similarity scores of the elements in the result.
+        ``with_scores`` sets if similarity scores should be returned for each element in the result.
+
+        ``with_attribs`` ``with_attribs`` sets if the results should be returned with the
+                attributes of the elements in the result, or None when no attributes are present.
 
         ``count`` sets the number of results to return.
 
         ``ef`` sets the exploration factor.
 
-        ``filter`` sets filter that should be applied for the search.
+        ``filter`` sets the filter that should be applied for the search.
 
         ``filter_ef`` sets the max filtering effort.
 
-        ``truth`` when enabled forces the command to perform linear scan.
+        ``truth`` when enabled, forces the command to perform a linear scan.
 
         ``no_thread`` when enabled forces the command to execute the search
                 on the data structure in the main thread.
 
-        For more information see https://redis.io/commands/vsim
+        ``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.
         """
 
         if not input:
@@ -169,13 +183,24 @@ class VectorSetCommands(CommandsProtocol):
         else:
             pieces.extend(["ELE", input])
 
-        if with_scores:
-            pieces.append("WITHSCORES")
-            options[CallbacksOptions.WITHSCORES.value] = True
+        if with_scores or with_attribs:
+            if get_protocol_version(self.client) in ["3", 3]:
+                options[CallbacksOptions.RESP3.value] = True
+
+            if with_scores:
+                pieces.append("WITHSCORES")
+                options[CallbacksOptions.WITHSCORES.value] = True
+
+            if with_attribs:
+                pieces.append("WITHATTRIBS")
+                options[CallbacksOptions.WITHATTRIBS.value] = True
 
         if count:
             pieces.extend(["COUNT", count])
 
+        if epsilon:
+            pieces.extend(["EPSILON", epsilon])
+
         if ef:
             pieces.extend(["EF", ef])
 
@@ -203,7 +228,7 @@ class VectorSetCommands(CommandsProtocol):
 
         Raises `redis.exceptions.ResponseError` if the vector set doesn't exist.
 
-        For more information see https://redis.io/commands/vdim
+        For more information, see https://redis.io/commands/vdim.
         """
         return self.execute_command(VDIM_CMD, key)
 
@@ -213,7 +238,7 @@ class VectorSetCommands(CommandsProtocol):
 
         Raises `redis.exceptions.ResponseError` if the vector set doesn't exist.
 
-        For more information see https://redis.io/commands/vcard
+        For more information, see https://redis.io/commands/vcard.
         """
         return self.execute_command(VCARD_CMD, key)
 
@@ -221,7 +246,7 @@ class VectorSetCommands(CommandsProtocol):
         """
         Remove an element from a vector set.
 
-        For more information see https://redis.io/commands/vrem
+        For more information, see https://redis.io/commands/vrem.
         """
         return self.execute_command(VREM_CMD, key, element)
 
@@ -235,10 +260,10 @@ class VectorSetCommands(CommandsProtocol):
         Get the approximated vector of an element ``element`` from vector set ``key``.
 
         ``raw`` is a boolean flag that indicates whether to return the
-                interal representation used by the vector.
+                internal representation used by the vector.
 
 
-        For more information see https://redis.io/commands/vembed
+        For more information, see https://redis.io/commands/vemb.
         """
         options = {}
         pieces = []
@@ -286,7 +311,7 @@ class VectorSetCommands(CommandsProtocol):
         If the ``WITHSCORES`` option is provided, the result is a list of dicts,
         where each dict contains the neighbors for one level, with the scores as values.
 
-        For more information see https://redis.io/commands/vlinks
+        For more information, see https://redis.io/commands/vlinks
         """
         options = {}
         pieces = []
@@ -302,7 +327,7 @@ class VectorSetCommands(CommandsProtocol):
         """
         Get information about a vector set.
 
-        For more information see https://redis.io/commands/vinfo
+        For more information, see https://redis.io/commands/vinfo.
         """
         return self.execute_command(VINFO_CMD, key)
 
@@ -313,7 +338,7 @@ class VectorSetCommands(CommandsProtocol):
         Associate or remove JSON attributes ``attributes`` of element ``element``
         for vector set ``key``.
 
-        For more information see https://redis.io/commands/vsetattr
+        For more information, see https://redis.io/commands/vsetattr
         """
         if attributes is None:
             attributes_json = "{}"
@@ -329,12 +354,12 @@ class VectorSetCommands(CommandsProtocol):
         self, key: KeyT, element: str
     ) -> Union[Optional[Awaitable[dict]], Optional[dict]]:
         """
-        Retrieve the JSON attributes of an element ``elemet`` for vector set ``key``.
+        Retrieve the JSON attributes of an element ``element `` for vector set ``key``.
 
         If the element does not exist, or if the vector set does not exist, None is
         returned.
 
-        For more information see https://redis.io/commands/vgetattr
+        For more information, see https://redis.io/commands/vgetattr.
         """
         return self.execute_command(VGETATTR_CMD, key, element)
 
@@ -358,7 +383,7 @@ class VectorSetCommands(CommandsProtocol):
 
         If the vector set does not exist, ``None`` is returned.
 
-        For more information see https://redis.io/commands/vrandmember
+        For more information, see https://redis.io/commands/vrandmember.
         """
         pieces = []
         pieces.append(key)

redis/commands/vectorset/utils.py

@@ -1,3 +1,5 @@
+import json
+
 from redis._parsers.helpers import pairs_to_dict
 from redis.commands.vectorset.commands import CallbacksOptions
 
@@ -75,19 +77,53 @@ def parse_vsim_result(response, **options):
     structures depending on input options.
     Parsing VSIM result into:
     - List[List[str]]
-    - List[Dict[str, Number]]
+    - List[Dict[str, Number]] - when with_scores is used (without attributes)
+    - List[Dict[str, Mapping[str, Any]]] - when with_attribs is used (without scores)
+    - List[Dict[str, Union[Number, Mapping[str, Any]]]] - when with_scores and with_attribs are used
+
     """
     if response is None:
         return response
 
-    if options.get(CallbacksOptions.WITHSCORES.value):
+    withscores = bool(options.get(CallbacksOptions.WITHSCORES.value))
+    withattribs = bool(options.get(CallbacksOptions.WITHATTRIBS.value))
+
+    # Exactly one of withscores or withattribs is True
+    if (withscores and not withattribs) or (not withscores and withattribs):
         # Redis will return a list of list of pairs.
         # This list have to be transformed to dict
         result_dict = {}
-        for key, value in pairs_to_dict(response).items():
-            value = float(value)
+        if options.get(CallbacksOptions.RESP3.value):
+            resp_dict = response
+        else:
+            resp_dict = pairs_to_dict(response)
+        for key, value in resp_dict.items():
+            if withscores:
+                value = float(value)
+            else:
+                value = json.loads(value) if value else None
+
             result_dict[key] = value
         return result_dict
+    elif withscores and withattribs:
+        it = iter(response)
+        result_dict = {}
+        if options.get(CallbacksOptions.RESP3.value):
+            for elem, data in response.items():
+                if data[1] is not None:
+                    attribs_dict = json.loads(data[1])
+                else:
+                    attribs_dict = None
+                result_dict[elem] = {"score": data[0], "attributes": attribs_dict}
+        else:
+            for elem, score, attribs in zip(it, it, it):
+                if attribs is not None:
+                    attribs_dict = json.loads(attribs)
+                else:
+                    attribs_dict = None
+
+                result_dict[elem] = {"score": float(score), "attributes": attribs_dict}
+        return result_dict
     else:
         # return the list of elements for each level
         # list of lists