Fix tests

Author: dishaprakash

tests/test_async_vectorstore_search.py

@@ -114,7 +114,34 @@ async def engine(self, db_project, db_region, db_cluster, db_instance, db_name):
         await engine.close()
 
     @pytest_asyncio.fixture(scope="class")
-    async def vs_custom_scann_query_option(self, engine):
+    async def vs_custom(self, engine):
+        await engine._ainit_vectorstore_table(
+            CUSTOM_TABLE,
+            VECTOR_SIZE,
+            id_column="myid",
+            content_column="mycontent",
+            embedding_column="myembedding",
+            metadata_columns=[
+                Column("page", "TEXT"),
+                Column("source", "TEXT"),
+            ],
+            store_metadata=False,
+        )
+
+        vs_custom = await AsyncAlloyDBVectorStore.create(
+            engine,
+            embedding_service=embeddings_service,
+            table_name=CUSTOM_TABLE,
+            id_column="myid",
+            content_column="mycontent",
+            embedding_column="myembedding",
+            index_query_options=HNSWQueryOptions(ef_search=1),
+        )
+        await vs_custom.aadd_documents(docs, ids=ids)
+        yield vs_custom
+
+    @pytest_asyncio.fixture(scope="class")
+    async def vs_custom_scann_query_option(self, engine, vs_custom):
         vs_custom_scann_query_option = await AsyncAlloyDBVectorStore.create(
             engine,
             embedding_service=embeddings_service,

tests/test_vectorstore.py

@@ -194,7 +194,7 @@ async def test_aadd_images(self, engine_sync, image_uris):
         await aexecute(engine_sync, f'DROP TABLE IF EXISTS "{IMAGE_TABLE}"')
 
     async def test_aadd_images_store_uri_only(self, engine_sync, image_uris):
-        table_name = IMAGE_TABLE_SYNC + "_store_uri_only"
+        table_name = IMAGE_TABLE_SYNC + "_uri"
         engine_sync.init_vectorstore_table(
             table_name,
             VECTOR_SIZE,
@@ -254,7 +254,7 @@ async def test_add_images(self, engine_sync, image_uris):
         await aexecute(engine_sync, f'DROP TABLE IF EXISTS "{IMAGE_TABLE_SYNC}"')
 
     async def test_add_images_store_uri_only(self, engine_sync, image_uris):
-        table_name = IMAGE_TABLE_SYNC + "_store_uri_only"
+        table_name = IMAGE_TABLE_SYNC + "_uri"
         engine_sync.init_vectorstore_table(
             table_name,
             VECTOR_SIZE,

tests/test_vectorstore_embeddings.py

@@ -183,7 +183,7 @@ async def test_asimilarity_search(self, vs):
         results = await vs.asimilarity_search("foo", k=1)
         assert len(results) == 1
         assert results == [Document(page_content="foo", id=ids[0])]
-        results = await vs.asimilarity_search("foo", k=1, filter={"mycontent": "bar"})
+        results = await vs.asimilarity_search("foo", k=1, filter={"content": "bar"})
         assert results == [Document(page_content="bar", id=ids[1])]
 
     async def test_asimilarity_search_score(self, vs):
@@ -242,7 +242,7 @@ async def test_amax_marginal_relevance_search(self, vs):
         results = await vs.amax_marginal_relevance_search("bar")
         assert results[0] == Document(page_content="bar", id=ids[1])
         results = await vs.amax_marginal_relevance_search(
-            "bar", filter={"mycontent": "boo"}
+            "bar", filter={"content": "boo"}
         )
         assert results[0] == Document(page_content="boo", id=ids[3])
 
@@ -343,7 +343,7 @@ def test_similarity_search(self, vs_custom):
         assert len(results) == 1
         assert results == [Document(page_content="foo", id=ids[0])]
         results = vs_custom.similarity_search("foo", k=1, filter={"mycontent": "boo"})
-        assert results == [Document(page_content="bar", id=ids[1])]
+        assert results == [Document(page_content="boo", id=ids[3])]
 
     def test_similarity_search_score(self, vs_custom):
         results = vs_custom.similarity_search_with_score("foo")