Remove ambiguous redisvl.query import for HybridQuery

Author: vishal-bala

redisvl/query/__init__.py

@@ -1,7 +1,6 @@
 from redisvl.query.aggregate import (
     AggregateHybridQuery,
     AggregationQuery,
-    HybridQuery,
     MultiVectorQuery,
     Vector,
 )
@@ -27,7 +26,6 @@
     "TextQuery",
     "AggregationQuery",
     "AggregateHybridQuery",
-    "HybridQuery",
     "MultiVectorQuery",
     "Vector",
 ]

redisvl/query/hybrid.py

@@ -78,7 +78,9 @@ def __init__(
                 accuracy of the search.
             yield_vsim_score_as: The name of the field to yield the vector similarity score as.
             vector_filter_expression: The filter expression to use for the vector similarity search. Defaults to None.
-            combination_method: The combination method to use. Options are {RRF, LINEAR}. Defaults to None.
+            combination_method: The combination method to use. Options are {RRF, LINEAR}. Defaults to None. If "RRF" is
+                specified, then at least one of `rrf_window` or `rrf_constant` must be provided. If "LINEAR" is
+                specified, then at least one of `linear_alpha` or `linear_beta` must be provided.
             rrf_window: The window size to use for the reciprocal rank fusion (RRF) combination method. Limits
                 fusion scope.
             rrf_constant: The constant to use for the reciprocal rank fusion (RRF) combination method. Controls decay
@@ -102,10 +104,6 @@ def __init__(
                 within the query text. Defaults to None, as no modifications will be made to the
                 text_scorer score.
 
-        Notes:
-            If RRF combination method is used, then at least one of `rrf_window` or `rrf_constant` must be provided.
-            If LINEAR combination method is used, then at least one of `linear_alpha` or `linear_beta` must be provided.
-
         Raises:
             TypeError: If the stopwords are not a set, list, or tuple of strings.
             ValueError: If the text string is empty, or if the text string becomes empty after

tests/unit/test_hybrid_types.py

@@ -22,6 +22,7 @@
     from redisvl.query.hybrid import HybridQuery, build_combination_method
 
     REDIS_HYBRID_AVAILABLE = True
+    SKIP_REASON = ""
 except (ImportError, ModuleNotFoundError):
     REDIS_HYBRID_AVAILABLE = False
     SKIP_REASON = "Requires redis>=8.4.0 and redis-py>=7.1.0"