fix more flaky tests

Author: tylerhutcherson

redisvl/redis/connection.py

@@ -17,7 +17,7 @@
 from redisvl.version import __version__
 
 
-def compare_versions(version1, version2):
+def compare_versions(version1: str, version2: str):
     """
     Compare two Redis version strings numerically.
 

tests/docker-compose.yml

@@ -1,7 +1,6 @@
-version: "3.9"
 services:
   redis:
-    image: "${REDIS_IMAGE}"
+    image: "${REDIS_IMAGE:-redis/redis-stack-server:latest}"
     ports:
       - "6379"
     environment:

tests/integration/test_async_search_index.py

@@ -22,8 +22,10 @@
 
 
 @pytest.fixture
-def index_schema():
-    return IndexSchema.from_dict({"index": {"name": "my_index"}, "fields": fields})
+def index_schema(worker_id):
+    return IndexSchema.from_dict(
+        {"index": {"name": f"my_index_{worker_id}"}, "fields": fields}
+    )
 
 
 @pytest.fixture
@@ -55,7 +57,8 @@ def async_index_from_yaml(worker_id):
 def test_search_index_properties(index_schema, async_index):
     assert async_index.schema == index_schema
     # custom settings
-    assert async_index.name == index_schema.index.name == "my_index"
+    assert async_index.name == index_schema.index.name
+    assert async_index.name.startswith("my_index_")
     assert async_index.client
     # default settings
     assert async_index.prefix == index_schema.index.prefix == "rvl"

tests/integration/test_connection.py

@@ -8,7 +8,6 @@
 from redisvl.exceptions import RedisModuleVersionError
 from redisvl.redis.connection import (
     RedisConnectionFactory,
-    compare_versions,
     convert_index_info_to_schema,
     unpack_redis_modules,
     validate_modules,

tests/integration/test_llmcache.py

@@ -913,23 +913,25 @@ def test_no_key_collision_on_identical_prompts(redis_url, worker_id):
     assert len(filtered_results) == 2
 
 
-def test_create_cache_with_different_vector_types(worker_id):
+def test_create_cache_with_different_vector_types(worker_id, redis_url):
     try:
-        bfloat_cache = SemanticCache(name=f"bfloat_cache_{worker_id}", dtype="bfloat16")
+        bfloat_cache = SemanticCache(
+            name=f"bfloat_cache_{worker_id}", dtype="bfloat16", redis_url=redis_url
+        )
         bfloat_cache.store("bfloat16 prompt", "bfloat16 response")
 
         float16_cache = SemanticCache(
-            name=f"float16_cache_{worker_id}", dtype="float16"
+            name=f"float16_cache_{worker_id}", dtype="float16", redis_url=redis_url
         )
         float16_cache.store("float16 prompt", "float16 response")
 
         float32_cache = SemanticCache(
-            name=f"float32_cache_{worker_id}", dtype="float32"
+            name=f"float32_cache_{worker_id}", dtype="float32", redis_url=redis_url
         )
         float32_cache.store("float32 prompt", "float32 response")
 
         float64_cache = SemanticCache(
-            name=f"float64_cache_{worker_id}", dtype="float64"
+            name=f"float64_cache_{worker_id}", dtype="float64", redis_url=redis_url
         )
         float64_cache.store("float64 prompt", "float64 response")
 

tests/integration/test_message_history.py

@@ -552,23 +552,32 @@ def test_semantic_drop(semantic_history):
     ]
 
 
-def test_different_vector_dtypes():
+def test_different_vector_dtypes(redis_url):
     try:
-        bfloat_sess = SemanticMessageHistory(name="bfloat_history", dtype="bfloat16")
+        bfloat_sess = SemanticMessageHistory(
+            name="bfloat_history", dtype="bfloat16", redis_url=redis_url
+        )
         bfloat_sess.add_message({"role": "user", "content": "bfloat message"})
 
-        float16_sess = SemanticMessageHistory(name="float16_history", dtype="float16")
+        float16_sess = SemanticMessageHistory(
+            name="float16_history", dtype="float16", redis_url=redis_url
+        )
         float16_sess.add_message({"role": "user", "content": "float16 message"})
 
-        float32_sess = SemanticMessageHistory(name="float32_history", dtype="float32")
+        float32_sess = SemanticMessageHistory(
+            name="float32_history", dtype="float32", redis_url=redis_url
+        )
         float32_sess.add_message({"role": "user", "content": "float32 message"})
 
-        float64_sess = SemanticMessageHistory(name="float64_history", dtype="float64")
+        float64_sess = SemanticMessageHistory(
+            name="float64_history", dtype="float64", redis_url=redis_url
+        )
         float64_sess.add_message({"role": "user", "content": "float64 message"})
 
         for sess in [bfloat_sess, float16_sess, float32_sess, float64_sess]:
             sess.set_distance_threshold(0.7)
             assert len(sess.get_relevant("float message")) == 1
+            sess.delete()  # Clean up
     except RedisModuleVersionError:
         pytest.skip("Required Redis modules not available or version too low")
 

tests/integration/test_query.py

@@ -22,7 +22,6 @@
     Text,
     Timestamp,
 )
-from redisvl.redis.connection import compare_versions
 from redisvl.redis.utils import array_to_buffer
 from tests.conftest import skip_if_redis_version_below
 
@@ -150,7 +149,7 @@ def index(sample_data, redis_url, worker_id):
     index = SearchIndex.from_dict(
         {
             "index": {
-                "name": "user_index",
+                "name": f"user_index_{worker_id}",
                 "prefix": f"v1_{worker_id}",
                 "storage_type": "hash",
             },
@@ -202,7 +201,7 @@ def L2_index(sample_data, redis_url, worker_id):
     index = SearchIndex.from_dict(
         {
             "index": {
-                "name": "L2_index",
+                "name": f"L2_index_{worker_id}",
                 "prefix": f"L2_index_{worker_id}",
                 "storage_type": "hash",
             },

tests/integration/test_search_index.py

@@ -32,8 +32,10 @@
 
 
 @pytest.fixture
-def index_schema():
-    return IndexSchema.from_dict({"index": {"name": "my_index"}, "fields": fields})
+def index_schema(worker_id):
+    return IndexSchema.from_dict(
+        {"index": {"name": f"my_index_{worker_id}"}, "fields": fields}
+    )
 
 
 @pytest.fixture
@@ -65,7 +67,8 @@ def index_from_yaml(worker_id):
 def test_search_index_properties(index_schema, index):
     assert index.schema == index_schema
     # custom settings
-    assert index.name == index_schema.index.name == "my_index"
+    assert index.name == index_schema.index.name
+    assert index.name.startswith("my_index_")
 
     # default settings
     assert index.prefix == index_schema.index.prefix == "rvl"