Fixing response parsing when RESP3 is used.

Author: petyaslavova

redis/commands/vectorset/__init__.py

@@ -24,12 +24,12 @@ def __init__(self, client, **kwargs):
         # 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

@@ -157,11 +157,10 @@ def vsim(
         """
         Compare a vector or element ``input``  with the other vectors in a vector set ``key``.
 
-        ``with_scores`` sets if returns, for each element, the JSON attribute associated
-        with the element or None when no attributes are present.
+        ``with_scores`` sets if similarity scores should be returned for each element in the result.
 
-        ``with_attribs`` sets if the results should be returned with the
-                attributes of the elements 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.
 
@@ -196,13 +195,17 @@ def vsim(
         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 with_attribs:
+                pieces.append("WITHATTRIBS")
+                options[CallbacksOptions.WITHATTRIBS.value] = True
 
         if count:
             pieces.extend(["COUNT", count])

redis/commands/vectorset/utils.py

@@ -88,11 +88,16 @@ def parse_vsim_result(response, **options):
     withscores = bool(options.get(CallbacksOptions.WITHSCORES.value))
     withattribs = bool(options.get(CallbacksOptions.WITHATTRIBS.value))
 
-    if withscores ^ withattribs:
+    # 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():
+        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:
@@ -103,13 +108,21 @@ def parse_vsim_result(response, **options):
     elif withscores and withattribs:
         it = iter(response)
         result_dict = {}
-        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}
+        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