|
5 | 5 | if sys.version_info.major == 3 and sys.version_info.minor < 10:
|
6 | 6 | pytest.skip("Test requires Python 3.10 or higher", allow_module_level=True)
|
7 | 7 |
|
| 8 | +from redis import Redis |
| 9 | + |
8 | 10 | from redisvl.extensions.cache.llm import SemanticCache
|
9 | 11 | from redisvl.extensions.router import Route, SemanticRouter
|
10 | 12 | from redisvl.extensions.router.schema import RoutingConfig
|
@@ -35,13 +37,13 @@ def routes():
|
35 | 37 |
|
36 | 38 |
|
37 | 39 | @pytest.fixture
|
38 |
| -def semantic_router(client, routes, hf_vectorizer): |
| 40 | +def semantic_router(redis_url, routes, hf_vectorizer): |
39 | 41 | router = SemanticRouter(
|
40 | 42 | name="test-router",
|
41 | 43 | routes=routes,
|
42 | 44 | vectorizer=hf_vectorizer,
|
43 | 45 | routing_config=RoutingConfig(max_k=2),
|
44 |
| - redis_client=client, |
| 46 | + redis_url=redis_url, |
45 | 47 | overwrite=False,
|
46 | 48 | )
|
47 | 49 | yield router
|
@@ -87,9 +89,10 @@ def test_data_optimization():
|
87 | 89 |
|
88 | 90 |
|
89 | 91 | def test_routes_different_distance_thresholds_optimizer_default(
|
90 |
| - semantic_router, routes, redis_url, test_data_optimization, hf_vectorizer |
| 92 | + routes, redis_url, test_data_optimization, hf_vectorizer |
91 | 93 | ):
|
92 |
| - redis_version = semantic_router._index.client.info()["redis_version"] |
| 94 | + redis = Redis.from_url(redis_url) |
| 95 | + redis_version = redis.info()["redis_version"] |
93 | 96 | if not compare_versions(redis_version, "7.0.0"):
|
94 | 97 | pytest.skip("Not using a late enough version of Redis")
|
95 | 98 |
|
@@ -121,10 +124,10 @@ def test_routes_different_distance_thresholds_optimizer_default(
|
121 | 124 |
|
122 | 125 |
|
123 | 126 | def test_routes_different_distance_thresholds_optimizer_precision(
|
124 |
| - semantic_router, routes, redis_url, test_data_optimization, hf_vectorizer |
| 127 | + routes, redis_url, test_data_optimization, hf_vectorizer |
125 | 128 | ):
|
126 |
| - |
127 |
| - redis_version = semantic_router._index.client.info()["redis_version"] |
| 129 | + redis = Redis.from_url(redis_url) |
| 130 | + redis_version = redis.info()["redis_version"] |
128 | 131 | if not compare_versions(redis_version, "7.0.0"):
|
129 | 132 | pytest.skip("Not using a late enough version of Redis")
|
130 | 133 |
|
@@ -158,9 +161,10 @@ def test_routes_different_distance_thresholds_optimizer_precision(
|
158 | 161 |
|
159 | 162 |
|
160 | 163 | def test_routes_different_distance_thresholds_optimizer_recall(
|
161 |
| - semantic_router, routes, redis_url, test_data_optimization, hf_vectorizer |
| 164 | + routes, redis_url, test_data_optimization, hf_vectorizer, client |
162 | 165 | ):
|
163 |
| - redis_version = semantic_router._index.client.info()["redis_version"] |
| 166 | + redis = Redis.from_url(redis_url) |
| 167 | + redis_version = redis.info()["redis_version"] |
164 | 168 | if not compare_versions(redis_version, "7.0.0"):
|
165 | 169 | pytest.skip("Not using a late enough version of Redis")
|
166 | 170 |
|
|
0 commit comments