Update list concatenation to use extend. Fix spelling error in tests.Extend a test to use two reducers.

Author: petyaslavova

redis/commands/search/hybrid_query.py

@@ -235,10 +235,10 @@ def group_by(self, fields: List[str], *reducers: Reducer) -> Self:
 
         ret = ["GROUPBY", str(len(fields)), *fields]
         for reducer in reducers:
-            ret += ["REDUCE", reducer.NAME, str(len(reducer.args))]
+            ret.extend(("REDUCE", reducer.NAME, str(len(reducer.args))))
             ret.extend(reducer.args)
             if reducer._alias is not None:
-                ret += ["AS", reducer._alias]
+                ret.extend(("AS", reducer._alias))
 
         self._groupby.extend(ret)
         return self
@@ -255,7 +255,7 @@ def apply(self, **kwexpr) -> Self:
         for alias, expr in kwexpr.items():
             ret = ["APPLY", expr]
             if alias is not None:
-                ret += ["AS", alias]
+                ret.extend(("AS", alias))
             self._apply.extend(ret)
 
         return self

tests/test_asyncio/test_search.py

@@ -2344,16 +2344,16 @@ async def test_hybrid_search_query_with_scorer(self, decoded_r):
             CombinationMethods.LINEAR, ALPHA=1, BETA=0
         )
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.load(
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.load(
             "@description", "@color", "@price", "@size", "@__score", "@__item"
         )
-        posprocessing_config.limit(0, 2)
+        postprocessing_config.limit(0, 2)
 
         res = await decoded_r.ft().hybrid_search(
             query=hybrid_query,
             combine_method=combine_method,
-            post_processing=posprocessing_config,
+            post_processing=postprocessing_config,
             timeout=10,
         )
 
@@ -2391,7 +2391,7 @@ async def test_hybrid_search_query_with_scorer(self, decoded_r):
         res = await decoded_r.ft().hybrid_search(
             query=hybrid_query,
             combine_method=combine_method,
-            post_processing=posprocessing_config,
+            post_processing=postprocessing_config,
             timeout=10,
         )
         expected_results_bm25 = [
@@ -2442,11 +2442,11 @@ async def test_hybrid_search_query_with_vsim_filter(self, decoded_r):
 
         hybrid_query = HybridQuery(search_query, vsim_query)
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.load("@price", "@size")
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.load("@price", "@size")
 
         res = await decoded_r.ft().hybrid_search(
-            query=hybrid_query, post_processing=posprocessing_config, timeout=10
+            query=hybrid_query, post_processing=postprocessing_config, timeout=10
         )
         if is_resp2_connection(decoded_r):
             assert len(res.results) > 0
@@ -2481,10 +2481,10 @@ async def test_hybrid_search_query_with_vsim_knn(self, decoded_r):
 
         hybrid_query = HybridQuery(search_query, vsim_query)
 
-        posprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config = HybridPostProcessingConfig()
 
         res = await decoded_r.ft().hybrid_search(
-            query=hybrid_query, post_processing=posprocessing_config, timeout=10
+            query=hybrid_query, post_processing=postprocessing_config, timeout=10
         )
         expected_results = [
             {"__key": b"item:2", "__score": b"0.016393442623"},
@@ -2557,11 +2557,11 @@ async def test_hybrid_search_query_with_vsim_range(self, decoded_r):
 
         hybrid_query = HybridQuery(search_query, vsim_query)
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.limit(0, 3)
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.limit(0, 3)
 
         res = await decoded_r.ft().hybrid_search(
-            query=hybrid_query, post_processing=posprocessing_config, timeout=10
+            query=hybrid_query, post_processing=postprocessing_config, timeout=10
         )
 
         expected_results = [
@@ -2595,7 +2595,7 @@ async def test_hybrid_search_query_with_vsim_range(self, decoded_r):
 
         res = await decoded_r.ft().hybrid_search(
             query=hybrid_query_with_hnsw,
-            post_processing=posprocessing_config,
+            post_processing=postprocessing_config,
             timeout=10,
         )
 
@@ -2707,13 +2707,13 @@ async def test_hybrid_search_query_with_combine(self, decoded_r):
             CombinationMethods.LINEAR, ALPHA=0.5, BETA=0.5
         )
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.limit(0, 3)
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.limit(0, 3)
 
         res = await decoded_r.ft().hybrid_search(
             query=hybrid_query,
             combine_method=combine_method_linear,
-            post_processing=posprocessing_config,
+            post_processing=postprocessing_config,
             timeout=10,
         )
 
@@ -2742,7 +2742,7 @@ async def test_hybrid_search_query_with_combine(self, decoded_r):
         res = await decoded_r.ft().hybrid_search(
             query=hybrid_query,
             combine_method=combine_method_rrf,
-            post_processing=posprocessing_config,
+            post_processing=postprocessing_config,
             timeout=10,
         )
 
@@ -2769,7 +2769,7 @@ async def test_hybrid_search_query_with_combine(self, decoded_r):
         res = await decoded_r.ft().hybrid_search(
             query=hybrid_query,
             combine_method=combine_method_rrf_2,
-            post_processing=posprocessing_config,
+            post_processing=postprocessing_config,
             timeout=10,
         )
 
@@ -2812,16 +2812,16 @@ async def test_hybrid_search_query_with_load(self, decoded_r):
             CombinationMethods.LINEAR, ALPHA=0.5, BETA=0.5
         )
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.load(
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.load(
             "@description", "@color", "@price", "@size", "@__key AS item_key"
         )
-        posprocessing_config.limit(0, 1)
+        postprocessing_config.limit(0, 1)
 
         res = await decoded_r.ft().hybrid_search(
             query=hybrid_query,
             combine_method=combine_method,
-            post_processing=posprocessing_config,
+            post_processing=postprocessing_config,
             timeout=10,
         )
 
@@ -2866,16 +2866,16 @@ async def test_hybrid_search_query_with_load_and_apply(self, decoded_r):
 
         hybrid_query = HybridQuery(search_query, vsim_query)
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.load("@color", "@price", "@size")
-        posprocessing_config.apply(
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.load("@color", "@price", "@size")
+        postprocessing_config.apply(
             price_discount="@price - (@price * 0.1)",
             tax_discount="@price_discount * 0.2",
         )
-        posprocessing_config.limit(0, 3)
+        postprocessing_config.limit(0, 3)
 
         res = await decoded_r.ft().hybrid_search(
-            query=hybrid_query, post_processing=posprocessing_config, timeout=10
+            query=hybrid_query, post_processing=postprocessing_config, timeout=10
         )
 
         expected_results = [
@@ -2931,16 +2931,16 @@ async def test_hybrid_search_query_with_load_and_filter(self, decoded_r):
 
         hybrid_query = HybridQuery(search_query, vsim_query)
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.load("@description", "@color", "@price", "@size")
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.load("@description", "@color", "@price", "@size")
         # for the postprocessing filter we need to filter on the loaded fields
         # expecting all of them to be interpreted as strings - the initial filed types
         # are not preserved
-        posprocessing_config.filter(HybridFilter('@price=="15"'))
-        posprocessing_config.limit(0, 3)
+        postprocessing_config.filter(HybridFilter('@price=="15"'))
+        postprocessing_config.limit(0, 3)
 
         res = await decoded_r.ft().hybrid_search(
-            query=hybrid_query, post_processing=posprocessing_config, timeout=10
+            query=hybrid_query, post_processing=postprocessing_config, timeout=10
         )
 
         if is_resp2_connection(decoded_r):
@@ -2975,10 +2975,10 @@ async def test_hybrid_search_query_with_load_apply_and_params(self, decoded_r):
 
         hybrid_query = HybridQuery(search_query, vsim_query)
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.load("@description", "@color", "@price")
-        posprocessing_config.apply(price_discount="@price - (@price * 0.1)")
-        posprocessing_config.limit(0, 3)
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.load("@description", "@color", "@price")
+        postprocessing_config.apply(price_discount="@price - (@price * 0.1)")
+        postprocessing_config.limit(0, 3)
 
         params_substitution = {
             "vector": "abcd1234abcd5678",
@@ -2987,7 +2987,7 @@ async def test_hybrid_search_query_with_load_apply_and_params(self, decoded_r):
 
         res = await decoded_r.ft().hybrid_search(
             query=hybrid_query,
-            post_processing=posprocessing_config,
+            post_processing=postprocessing_config,
             params_substitution=params_substitution,
             timeout=10,
         )
@@ -3040,11 +3040,11 @@ async def test_hybrid_search_query_with_limit(self, decoded_r):
 
         hybrid_query = HybridQuery(search_query, vsim_query)
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.limit(0, 3)
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.limit(0, 3)
 
         res = await decoded_r.ft().hybrid_search(
-            query=hybrid_query, post_processing=posprocessing_config, timeout=10
+            query=hybrid_query, post_processing=postprocessing_config, timeout=10
         )
 
         if is_resp2_connection(decoded_r):
@@ -3071,16 +3071,16 @@ async def test_hybrid_search_query_with_load_apply_and_sortby(self, decoded_r):
 
         hybrid_query = HybridQuery(search_query, vsim_query)
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.load("@color", "@price")
-        posprocessing_config.apply(price_discount="@price - (@price * 0.1)")
-        posprocessing_config.sort_by(
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.load("@color", "@price")
+        postprocessing_config.apply(price_discount="@price - (@price * 0.1)")
+        postprocessing_config.sort_by(
             SortbyField("@price_discount", asc=False), SortbyField("@color", asc=True)
         )
-        posprocessing_config.limit(0, 5)
+        postprocessing_config.limit(0, 5)
 
         res = await decoded_r.ft().hybrid_search(
-            query=hybrid_query, post_processing=posprocessing_config, timeout=10
+            query=hybrid_query, post_processing=postprocessing_config, timeout=10
         )
 
         expected_results = [
@@ -3181,19 +3181,19 @@ async def test_hybrid_search_query_with_load_and_groupby(self, decoded_r):
 
         hybrid_query = HybridQuery(search_query, vsim_query)
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.load("@color", "@price", "@size", "@item_type")
-        posprocessing_config.limit(0, 4)
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.load("@color", "@price", "@size", "@item_type")
+        postprocessing_config.limit(0, 4)
 
-        posprocessing_config.group_by(
+        postprocessing_config.group_by(
             ["@price"],
             reducers.count_distinct("@color").alias("colors_count"),
         )
 
-        posprocessing_config.sort_by(SortbyField("@price", asc=True))
+        postprocessing_config.sort_by(SortbyField("@price", asc=True))
 
         res = await decoded_r.ft().hybrid_search(
-            query=hybrid_query, post_processing=posprocessing_config, timeout=10
+            query=hybrid_query, post_processing=postprocessing_config, timeout=10
         )
 
         expected_results = [
@@ -3212,21 +3212,21 @@ async def test_hybrid_search_query_with_load_and_groupby(self, decoded_r):
             assert res["results"] == self._convert_dict_values_to_str(expected_results)
             assert res["warnings"] == []
 
-        posprocessing_config = HybridPostProcessingConfig()
-        posprocessing_config.load("@color", "@price", "@size", "@item_type")
-        posprocessing_config.limit(0, 6)
-        posprocessing_config.sort_by(
+        postprocessing_config = HybridPostProcessingConfig()
+        postprocessing_config.load("@color", "@price", "@size", "@item_type")
+        postprocessing_config.limit(0, 6)
+        postprocessing_config.sort_by(
             SortbyField("@price", asc=True),
             SortbyField("@item_type", asc=True),
         )
 
-        posprocessing_config.group_by(
+        postprocessing_config.group_by(
             ["@price", "@item_type"],
             reducers.count_distinct("@color").alias("unique_colors_count"),
         )
 
         res = await decoded_r.ft().hybrid_search(
-            query=hybrid_query, post_processing=posprocessing_config, timeout=1000
+            query=hybrid_query, post_processing=postprocessing_config, timeout=1000
         )
 
         expected_results = [