Remove deprecated HybridQuery class

Author: vishal-bala

redisvl/query/aggregate.py

@@ -242,26 +242,6 @@ def __str__(self) -> str:
         return " ".join([str(x) for x in self.build_args()])
 
 
-class HybridQuery(AggregateHybridQuery):
-    """Backward compatibility wrapper for AggregateHybridQuery.
-
-    .. deprecated::
-        This class is deprecated and will be removed in a future version.
-        Please use the new HybridQuery from redisvl.query.hybrid instead.
-        For maintaining current AggregateHybridQuery functionality, use AggregateHybridQuery directly.
-    """
-
-    def __init__(self, *args, **kwargs):
-        warnings.warn(
-            "This HybridQuery class is deprecated and will be removed in a future version. "
-            "Please use the new HybridQuery from redisvl.query.hybrid instead. "
-            "For maintaining current AggregateHybridQuery functionality, use AggregateHybridQuery directly.",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        super().__init__(*args, **kwargs)
-
-
 class MultiVectorQuery(AggregationQuery):
     """
     MultiVectorQuery allows for search over multiple vector fields in a document simultaneously.

redisvl/query/hybrid.py

@@ -18,7 +18,9 @@
         VectorSearchMethods,
     )
 except ImportError:
-    raise ImportError("Hybrid queries require redis>=7.1.0")
+    raise ImportError(
+        "Hybrid queries require Redis Open Source >= 8.4.0 and redis-py>=7.1.0"
+    )
 
 from redisvl.query.filter import FilterExpression
 

tests/integration/test_aggregation.py

@@ -2,7 +2,6 @@
 
 from redisvl.index import SearchIndex
 from redisvl.query import AggregateHybridQuery, MultiVectorQuery, Vector
-from redisvl.query.aggregate import HybridQuery
 from redisvl.query.filter import Geo, GeoRadius, Num, Tag, Text
 from redisvl.redis.utils import array_to_buffer
 from tests.conftest import skip_if_redis_version_below
@@ -744,44 +743,3 @@ def test_multivector_query_mixed_index(index):
         assert (
             float(r["combined_score"]) - score <= 0.0001
         )  # allow for small floating point error
-
-
-def test_hybrid_query_backward_compatibility(index):
-    skip_if_redis_version_below(index.client, "7.2.0")
-
-    text = "a medical professional with expertise in lung cancer"
-    text_field = "description"
-    vector = [0.1, 0.1, 0.5]
-    vector_field = "user_embedding"
-    return_fields = ["user", "credit_score", "age", "job", "location", "description"]
-
-    hybrid_query = AggregateHybridQuery(
-        text=text,
-        text_field_name=text_field,
-        vector=vector,
-        vector_field_name=vector_field,
-        return_fields=return_fields,
-    )
-
-    results = index.query(hybrid_query)
-    assert len(results) == 7
-    for result in results:
-        assert result["user"] in [
-            "john",
-            "derrick",
-            "nancy",
-            "tyler",
-            "tim",
-            "taimur",
-            "joe",
-            "mary",
-        ]
-
-    with pytest.warns(DeprecationWarning):
-        _ = HybridQuery(
-            text=text,
-            text_field_name=text_field,
-            vector=vector,
-            vector_field_name=vector_field,
-            return_fields=return_fields,
-        )

tests/unit/test_aggregation_types.py

@@ -4,12 +4,7 @@
 import pytest
 from redis.commands.search.aggregation import AggregateRequest
 
-from redisvl.query.aggregate import (
-    AggregateHybridQuery,
-    HybridQuery,
-    MultiVectorQuery,
-    Vector,
-)
+from redisvl.query.aggregate import AggregateHybridQuery, MultiVectorQuery, Vector
 from redisvl.query.filter import Tag
 from redisvl.redis.utils import array_to_buffer
 
@@ -432,35 +427,3 @@ def test_vector_object_handles_byte_conversion():
         byte_string = array_to_buffer(sample_vector, datatype)
         vec = Vector(vector=byte_string, field_name="field 1")
         assert vec.vector == byte_string
-
-
-def test_hybrid_query_backward_compatibility():
-    # test that HybridQuery is a backward compatibility wrapper for AggregateHybridQuery
-    with pytest.warns(DeprecationWarning):
-        hybrid_query = HybridQuery(
-            text="sample text query",
-            text_field_name="description",
-            vector=sample_vector,
-            vector_field_name="embedding",
-        )
-
-    # Verify HybridQuery is actually an instance of AggregateHybridQuery
-    assert isinstance(hybrid_query, AggregateHybridQuery)
-
-    # Verify AggregateHybridQuery does not emit warnings
-    with assert_no_warnings():
-        aggregate_query = AggregateHybridQuery(
-            text="sample text query",
-            text_field_name="description",
-            vector=sample_vector,
-            vector_field_name="embedding",
-        )
-
-    # Verify that creating another HybridQuery also warns
-    with pytest.warns(DeprecationWarning):
-        another_hybrid_query = HybridQuery(
-            text="sample text query",
-            text_field_name="description",
-            vector=sample_vector,
-            vector_field_name="embedding",
-        )