update ranx imports and fix for mypy

Author: tylerhutcherson

poetry.lock

@@ -24,34 +24,33 @@ python = ">=3.9,<3.14"
 numpy = ">=1.26.0,<3"
 pyyaml = ">=5.4,<7.0"
 redis = ">=5.0,<7.0"
-pydantic = "^2"
+pydantic = ">=2,<3"
 tenacity = ">=8.2.2"
 ml-dtypes = ">=0.4.0,<1.0.0"
-python-ulid = "^3.0.0"
+python-ulid = ">=3.0.0"
+jsonpath-ng = ">=1.5.0"
 nltk = { version = "^3.8.1", optional = true }
-jsonpath-ng = "^1.5.0"
 openai = { version = "^1.13.0", optional = true }
-sentence-transformers = { version = "^3.4.0", optional = true }
 google-cloud-aiplatform = { version = "^1.26", optional = true }
 protobuf = { version = "^5.29.1", optional = true }
 cohere = { version = ">=4.44", optional = true }
 mistralai = { version = ">=1.0.0", optional = true }
 voyageai = { version = ">=0.2.2", optional = true }
-ranx = { version = "^0.3.0", python=">=3.10", optional = true }
-boto3 = {version = "1.36.0", optional = true, extras = ["bedrock"]}
-scipy = {version = "^1.15", optional = true, python=">=3.10"}
-
+sentence-transformers = { version = "^3.4.0", optional = true }
+scipy = [
+  { version = ">=1.9.0,<1.14", python = "<3.10", optional = true },
+  { version = ">=1.14.0,<1.16", python = ">=3.10", optional = true }
+]
+ranx = {version = "^0.3.0", optional = true}
 
 [tool.poetry.extras]
 openai = ["openai"]
-sentence-transformers = ["sentence-transformers", "scipy"]
-vertexai = ["google-cloud-aiplatform", "protobuf"]
+vertexai = ["google-cloud-aiplatform"]
 cohere = ["cohere"]
 mistralai = ["mistralai"]
 voyageai = ["voyageai"]
-ranx = ["ranx", "scipy"]
-bedrock = ["boto3"]
 nltk = ["nltk"]
+sentence-transformers = ["sentence-transformers"]
 
 [tool.poetry.group.dev.dependencies]
 black = "^25.1.0"
@@ -61,7 +60,7 @@ pytest = "^8.1.1"
 pytest-asyncio = "^0.23.6"
 pytest-xdist = {extras = ["psutil"], version = "^3.6.1"}
 pre-commit = "^4.1.0"
-mypy = "1.9.0"
+mypy = "^1.11.0"
 nbval = "^0.11.0"
 types-pyyaml = "*"
 types-pyopenssl = "*"

pyproject.toml

@@ -357,6 +357,9 @@ def sync_to_async_redis(
                 "RedisCluster is not supported for sync-to-async conversion."
             )
 
+        # At this point, redis_client is guaranteed to be Redis type
+        assert isinstance(redis_client, Redis)  # Type narrowing for MyPy
+
         # pick the right connection class
         connection_class: Type[AsyncAbstractConnection] = (
             AsyncSSLConnection

redisvl/redis/connection.py

@@ -1,9 +1,15 @@
-from typing import Any, Callable, Dict, List
+from typing import TYPE_CHECKING, Any, Callable, Dict, List
 
 from redisvl.utils.utils import lazy_import
 
+if TYPE_CHECKING:
+    from ranx import Qrels, Run, evaluate
+else:
+    Qrels = lazy_import("ranx.Qrels")
+    Run = lazy_import("ranx.Run")
+    evaluate = lazy_import("ranx.evaluate")
+
 np = lazy_import("numpy")
-from ranx import Qrels, Run, evaluate
 
 from redisvl.extensions.cache.llm.semantic import SemanticCache
 from redisvl.query import RangeQuery
@@ -12,7 +18,7 @@
 from redisvl.utils.optimize.utils import NULL_RESPONSE_KEY, _format_qrels
 
 
-def _generate_run_cache(test_data: List[LabeledData], threshold: float) -> Run:
+def _generate_run_cache(test_data: List[LabeledData], threshold: float) -> "Run":
     """Format observed data for evaluation with ranx"""
     run_dict: Dict[str, Dict[str, int]] = {}
 
@@ -32,7 +38,7 @@ def _generate_run_cache(test_data: List[LabeledData], threshold: float) -> Run:
 
 
 def _eval_cache(
-    test_data: List[LabeledData], threshold: float, qrels: Qrels, metric: str
+    test_data: List[LabeledData], threshold: float, qrels: "Qrels", metric: str
 ) -> float:
     """Formats run data and evaluates supported metric"""
     run = _generate_run_cache(test_data, threshold)

redisvl/utils/optimize/cache.py

@@ -1,18 +1,24 @@
 import random
-from typing import Any, Callable, Dict, List
+from typing import TYPE_CHECKING, Any, Callable, Dict, List
 
 from redisvl.utils.utils import lazy_import
 
+if TYPE_CHECKING:
+    from ranx import Qrels, Run, evaluate
+else:
+    Qrels = lazy_import("ranx.Qrels")
+    Run = lazy_import("ranx.Run")
+    evaluate = lazy_import("ranx.evaluate")
+
 np = lazy_import("numpy")
-from ranx import Qrels, Run, evaluate
 
 from redisvl.extensions.router.semantic import SemanticRouter
 from redisvl.utils.optimize.base import BaseThresholdOptimizer, EvalMetric
 from redisvl.utils.optimize.schema import LabeledData
 from redisvl.utils.optimize.utils import NULL_RESPONSE_KEY, _format_qrels
 
 
-def _generate_run_router(test_data: List[LabeledData], router: SemanticRouter) -> Run:
+def _generate_run_router(test_data: List[LabeledData], router: SemanticRouter) -> "Run":
     """Format router results into format for ranx Run"""
     run_dict: Dict[Any, Any] = {}
 
@@ -28,7 +34,10 @@ def _generate_run_router(test_data: List[LabeledData], router: SemanticRouter) -
 
 
 def _eval_router(
-    router: SemanticRouter, test_data: List[LabeledData], qrels: Qrels, eval_metric: str
+    router: SemanticRouter,
+    test_data: List[LabeledData],
+    qrels: "Qrels",
+    eval_metric: str,
 ) -> float:
     """Evaluate acceptable metric given run and qrels data"""
     run = _generate_run_router(test_data, router)
@@ -58,7 +67,7 @@ def _router_random_search(
 def _random_search_opt_router(
     router: SemanticRouter,
     test_data: List[LabeledData],
-    qrels: Qrels,
+    qrels: "Qrels",
     eval_metric: EvalMetric,
     **kwargs: Any,
 ):

redisvl/utils/optimize/router.py

@@ -1,16 +1,20 @@
-from typing import List
+from typing import TYPE_CHECKING, List
 
 from redisvl.utils.utils import lazy_import
 
+if TYPE_CHECKING:
+    from ranx import Qrels
+else:
+    Qrels = lazy_import("ranx.Qrels")
+
 np = lazy_import("numpy")
-from ranx import Qrels
 
 from redisvl.utils.optimize.schema import LabeledData
 
 NULL_RESPONSE_KEY = "no_match"
 
 
-def _format_qrels(test_data: List[LabeledData]) -> Qrels:
+def _format_qrels(test_data: List[LabeledData]) -> "Qrels":
     """Utility function for creating qrels for evaluation with ranx"""
     qrels_dict = {}
 

redisvl/utils/optimize/utils.py

@@ -5,7 +5,9 @@
 if sys.version_info.major == 3 and sys.version_info.minor < 10:
     pytest.skip("Test requires Python 3.10 or higher", allow_module_level=True)
 
-from ranx import evaluate
+from redisvl.utils.utils import lazy_import
+
+evaluate = lazy_import("ranx.evaluate")
 
 from redisvl.utils.optimize import LabeledData
 from redisvl.utils.optimize.cache import _generate_run_cache