Fix tests

Author: dishaprakash

src/langchain_google_alloydb_pg/async_vectorstore.py

@@ -94,7 +94,9 @@ async def aadd_images(
         ids = await self.aadd_embeddings(
             texts_for_content_column, embeddings, metadatas=metadatas, ids=ids, **kwargs
         )
-        return ids
+        if ids:
+            return ids
+        return []
 
     def _images_embedding_helper(self, image_uris: list[str]) -> list[list[float]]:
         # check if either `embed_images()` or `embed_image()` API is supported by the embedding service used

src/langchain_google_alloydb_pg/vectorstore.py

@@ -176,9 +176,7 @@ async def aadd_images(
     ) -> list[str]:
         """Embed images and add to the table."""
         return await self._engine._run_as_async(
-            self.__vs.aadd_images(
-                uris, metadatas, ids, store_uri_only=store_uri_only, **kwargs
-            )
+            self._PGVectorStore__vs.aadd_images(uris, metadatas, ids, **kwargs)  # type: ignore
         )
 
     def add_images(
@@ -191,9 +189,7 @@ def add_images(
     ) -> list[str]:
         """Embed images and add to the table."""
         return self._engine._run_as_sync(
-            self.__vs.aadd_images(
-                uris, metadatas, ids, store_uri_only=store_uri_only, **kwargs
-            )
+            self._PGVectorStore__vs.aadd_images(uris, metadatas, ids, **kwargs)  # type: ignore
         )
 
     def similarity_search_image(
@@ -205,7 +201,7 @@ def similarity_search_image(
     ) -> list[Document]:
         """Return docs selected by similarity search on image."""
         return self._engine._run_as_sync(
-            self.__vs.asimilarity_search_image(image_uri, k, filter, **kwargs)
+            self._PGVectorStore__vs.asimilarity_search_image(image_uri, k, filter, **kwargs)  # type: ignore
         )
 
     async def asimilarity_search_image(
@@ -217,19 +213,19 @@ async def asimilarity_search_image(
     ) -> list[Document]:
         """Return docs selected by similarity search on image_uri."""
         return await self._engine._run_as_async(
-            self.__vs.asimilarity_search_image(image_uri, k, filter, **kwargs)
+            self._PGVectorStore__vs.asimilarity_search_image(image_uri, k, filter, **kwargs)  # type: ignore
         )
 
     async def aset_maintenance_work_mem(
         self, num_leaves: int, vector_size: int
     ) -> None:
         """Set database maintenance work memory (for ScaNN index creation)."""
         await self._engine._run_as_async(
-            self.__vs.set_maintenance_work_mem(num_leaves, vector_size)
+            self._PGVectorStore__vs.set_maintenance_work_mem(num_leaves, vector_size)  # type: ignore
         )
 
     def set_maintenance_work_mem(self, num_leaves: int, vector_size: int) -> None:
         """Set database maintenance work memory (for ScaNN index creation)."""
         self._engine._run_as_sync(
-            self.__vs.set_maintenance_work_mem(num_leaves, vector_size)
+            self._PGVectorStore__vs.set_maintenance_work_mem(num_leaves, vector_size)  # type: ignore
         )

tests/test_async_vectorstore_search.py

@@ -116,7 +116,7 @@ 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, vs_custom):
+    async def vs_custom_scann_query_option(self, engine):
         vs_custom_scann_query_option = await AsyncAlloyDBVectorStore.create(
             engine,
             embedding_service=embeddings_service,

tests/test_vectorstore.py

@@ -32,8 +32,8 @@
 
 from langchain_google_alloydb_pg import AlloyDBEngine, AlloyDBVectorStore
 
-IMAGE_TABLE = "test_image_table" + str(uuid.uuid4())
-IMAGE_TABLE_SYNC = "test_image_table_sync" + str(uuid.uuid4())
+IMAGE_TABLE = "test_table" + str(uuid.uuid4())
+IMAGE_TABLE_SYNC = "test_table_sync" + str(uuid.uuid4())
 VECTOR_SIZE = 768
 
 embeddings_service = DeterministicFakeEmbedding(size=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={"content": "bar"})
+        results = await vs.asimilarity_search("foo", k=1, filter={"mycontent": "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={"content": "boo"}
+            "bar", filter={"mycontent": "boo"}
         )
         assert results[0] == Document(page_content="boo", id=ids[3])
 
@@ -342,7 +342,7 @@ def test_similarity_search(self, vs_custom):
         results = vs_custom.similarity_search("foo", k=1)
         assert len(results) == 1
         assert results == [Document(page_content="foo", id=ids[0])]
-        results = vs_custom.similarity_search("foo", k=1, filter={"content": "boo"})
+        results = vs_custom.similarity_search("foo", k=1, filter={"mycontent": "boo"})
         assert results == [Document(page_content="bar", id=ids[1])]
 
     def test_similarity_search_score(self, vs_custom):
@@ -364,7 +364,7 @@ def test_max_marginal_relevance_search(self, vs_custom):
         results = vs_custom.max_marginal_relevance_search("bar")
         assert results[0] == Document(page_content="bar", id=ids[1])
         results = vs_custom.max_marginal_relevance_search(
-            "bar", filter={"content": "boo"}
+            "bar", filter={"mycontent": "boo"}
         )
         assert results[0] == Document(page_content="boo", id=ids[3])