Cleanup for review

Author: abrookins

redisvl/query/query.py

@@ -319,7 +319,7 @@ def _build_query_string(self) -> str:
 
         # Add EF_RUNTIME parameter if specified
         if self._ef_runtime:
-            knn_query += f" EF_RUNTIME {self._ef_runtime}"
+            knn_query += f" {self.EF_RUNTIME_PARAM} {self._ef_runtime}"
 
         # Add distance field alias
         knn_query += f" AS {self.DISTANCE_ID}"
@@ -424,11 +424,11 @@ def params(self) -> Dict[str, Any]:
         else:
             vector = array_to_buffer(self._vector, dtype=self._dtype)
 
-        params: Dict[str, Union[bytes, str]] = {self.VECTOR_PARAM: vector}
+        params: Dict[str, Any] = {self.VECTOR_PARAM: vector}
 
         # Add EF_RUNTIME parameter if specified
         if self._ef_runtime is not None:
-            params[self.EF_RUNTIME_PARAM] = str(self._ef_runtime)
+            params[self.EF_RUNTIME_PARAM] = self._ef_runtime
 
         return params
 
@@ -757,19 +757,20 @@ def params(self) -> Dict[str, Any]:
 
         # Add EPSILON parameter if specified
         if self._epsilon is not None:
-            params[self.EPSILON_PARAM] = str(self._epsilon)
+            params[self.EPSILON_PARAM] = self._epsilon
 
-        # Add HYBRID_POLICY parameter if specified
+        # Add hybrid policy and batch size as query parameters (not in query string)
         if self._hybrid_policy is not None:
             params[self.HYBRID_POLICY_PARAM] = self._hybrid_policy.value
-
-        # Add BATCH_SIZE parameter if specified
-        if self._batch_size is not None:
-            params[self.BATCH_SIZE_PARAM] = str(self._batch_size)
+            if (
+                self._hybrid_policy == HybridPolicy.BATCHES
+                and self._batch_size is not None
+            ):
+                params[self.BATCH_SIZE_PARAM] = self._batch_size
 
         # Add EF_RUNTIME parameter if specified
         if self._ef_runtime is not None:
-            params[self.EF_RUNTIME_PARAM] = str(self._ef_runtime)
+            params[self.EF_RUNTIME_PARAM] = self._ef_runtime
 
         return params
 
@@ -936,7 +937,7 @@ def _tokenize_and_escape_query(self, user_query: str) -> str:
 
         tokens = [
             escaper.escape(
-                token.strip().strip(",").replace(""", "").replace(""", "").lower()
+                token.strip().strip(",").replace("“", "").replace("”", "").lower()
             )
             for token in user_query.split()
         ]

tests/unit/test_query_types.py

@@ -535,7 +535,7 @@ def test_vector_range_query_construction():
     assert "$YIELD_DISTANCE_AS: vector_distance" in query_string
     assert "$EPSILON: 0.05" in query_string
     assert epsilon_query.epsilon == 0.05
-    assert epsilon_query.params.get("EPSILON") == "0.05"
+    assert epsilon_query.params.get("EPSILON") == 0.05
 
     # Range query with hybrid policy
     hybrid_query = VectorRangeQuery(
@@ -569,7 +569,7 @@ def test_vector_range_query_construction():
     assert batch_query.hybrid_policy == "BATCHES"
     assert batch_query.batch_size == 50
     assert batch_query.params["HYBRID_POLICY"] == "BATCHES"
-    assert batch_query.params["BATCH_SIZE"] == "50"
+    assert batch_query.params["BATCH_SIZE"] == 50
 
 
 def test_vector_range_query_setter_methods():
@@ -602,7 +602,7 @@ def test_vector_range_query_setter_methods():
     # Set batch size
     query.set_batch_size(25)
     assert query.batch_size == 25
-    assert query.params["BATCH_SIZE"] == "25"
+    assert query.params["BATCH_SIZE"] == 25
 
 
 def test_vector_range_query_error_handling():
@@ -649,7 +649,7 @@ def test_vector_query_ef_runtime():
     assert "EF_RUNTIME 100" in query_string
 
     # Check params dictionary
-    assert vector_query.params.get("EF_RUNTIME") == "100"
+    assert vector_query.params.get("EF_RUNTIME") == 100
 
     # Test with different value
     vector_query = VectorQuery([0.1, 0.2, 0.3, 0.4], "vector_field", ef_runtime=50)
@@ -682,7 +682,7 @@ def test_vector_query_set_ef_runtime():
     assert "EF_RUNTIME 200" in query_string
 
     # Check params dictionary
-    assert vector_query.params.get("EF_RUNTIME") == "200"
+    assert vector_query.params.get("EF_RUNTIME") == 200
 
 
 def test_vector_query_invalid_ef_runtime():
@@ -726,9 +726,9 @@ def test_vector_range_query_ef_runtime():
 
     # EF_RUNTIME should be in params but not in query string (like hybrid_policy)
     assert "EF_RUNTIME" not in str(range_query)
-    assert range_query.params.get("EF_RUNTIME") == "100"
+    assert range_query.params.get("EF_RUNTIME") == 100
 
     # Test setting ef_runtime
     range_query.set_ef_runtime(150)
     assert range_query.ef_runtime == 150
-    assert range_query.params.get("EF_RUNTIME") == "150"
+    assert range_query.params.get("EF_RUNTIME") == 150