fixed tests

Author: eavanvalkenburg

python/samples/concepts/memory/complex_memory.py

@@ -131,7 +131,7 @@ async def cleanup(record_collection):
         print("Skipping deletion.")
         return
     print_with_color("Deleting collection!", Colors.CBLUE)
-    await record_collection.delete_collection()
+    await record_collection.ensure_collection_deleted()
     print_with_color("Done!", Colors.CGREY)
 
 

python/samples/concepts/memory/simple_memory.py

@@ -85,7 +85,7 @@ async def main():
     ) as record_collection:
         # Create the collection after wiping it
         print_with_color("Creating test collection!", Colors.CGREY)
-        await record_collection.delete_collection()
+        await record_collection.ensure_collection_deleted()
         await record_collection.create_collection_if_not_exists()
 
         # First add vectors to the records
@@ -130,7 +130,7 @@ async def main():
 
         # lets cleanup!
         print_with_color("Deleting collection!", Colors.CBLUE)
-        await record_collection.delete_collection()
+        await record_collection.ensure_collection_deleted()
         print_with_color("Done!", Colors.CGREY)
 
 

python/semantic_kernel/data/vectors.py

@@ -958,7 +958,7 @@ async def does_collection_exist(self, collection_name: str) -> bool:
         except VectorStoreOperationException:
             return False
 
-    async def delete_collection(self, collection_name: str) -> None:
+    async def ensure_collection_deleted(self, collection_name: str) -> None:
         """Delete a collection.
 
         This is a wrapper around the get_collection method of a collection,

python/tests/integration/memory/azure_cosmos_db/test_azure_cosmos_db_no_sql.py

@@ -38,7 +38,7 @@ async def test_list_collection_names(
             collection_names = await store.list_collection_names()
             assert collection_name in collection_names
 
-            await collection.delete_collection()
+            await collection.ensure_collection_deleted()
             assert await collection.does_collection_exist() is False
             collection_names = await store.list_collection_names()
             assert collection_name not in collection_names
@@ -73,7 +73,7 @@ async def test_collection_not_created(
                 await collection.delete(data_record["id"])
 
             with pytest.raises(MemoryConnectorException, match="Container could not be deleted."):
-                await collection.delete_collection()
+                await collection.ensure_collection_deleted()
 
     async def test_custom_partition_key(
         self,
@@ -109,7 +109,7 @@ async def test_custom_partition_key(
             assert record is None
 
             # Remove collection
-            await collection.delete_collection()
+            await collection.ensure_collection_deleted()
             assert await collection.does_collection_exist() is False
 
     async def test_get_include_vector(
@@ -139,7 +139,7 @@ async def test_get_include_vector(
             assert record is None
 
             # Remove collection
-            await collection.delete_collection()
+            await collection.ensure_collection_deleted()
             assert await collection.does_collection_exist() is False
 
     async def test_get_not_include_vector(
@@ -169,7 +169,7 @@ async def test_get_not_include_vector(
             assert record is None
 
             # Remove collection
-            await collection.delete_collection()
+            await collection.ensure_collection_deleted()
             assert await collection.does_collection_exist() is False
 
     async def test_collection_with_key_as_key_field(
@@ -200,7 +200,7 @@ async def test_collection_with_key_as_key_field(
             assert record is None
 
             # Remove collection
-            await collection.delete_collection()
+            await collection.ensure_collection_deleted()
             assert await collection.does_collection_exist() is False
 
     async def test_custom_client(
@@ -228,7 +228,7 @@ async def test_custom_client(
             collection_names = await store.list_collection_names()
             assert collection_name in collection_names
 
-            await collection.delete_collection()
+            await collection.ensure_collection_deleted()
             assert await collection.does_collection_exist() is False
             collection_names = await store.list_collection_names()
             assert collection_name not in collection_names

python/tests/integration/memory/postgres/test_postgres_int.py

@@ -134,7 +134,7 @@ async def test_create_does_collection_exist_and_delete(vector_store: PostgresSto
     does_exist_2 = await collection.does_collection_exist()
     assert does_exist_2 is True
 
-    await collection.delete_collection()
+    await collection.ensure_collection_deleted()
     does_exist_3 = await collection.does_collection_exist()
     assert does_exist_3 is False
 
@@ -200,7 +200,7 @@ async def test_upsert_get_and_delete_pandas(vector_store):
         result_after_delete = await collection.get(1)
         assert result_after_delete is None
     finally:
-        await collection.delete_collection()
+        await collection.ensure_collection_deleted()
 
 
 async def test_upsert_get_and_delete_batch(vector_store: PostgresStore):

python/tests/integration/memory/test_vector_store.py

@@ -458,7 +458,7 @@ async def test_vector_store(
                 ) as collection,
             ):
                 try:
-                    await collection.delete_collection()
+                    await collection.ensure_collection_deleted()
                 except Exception as exc:
                     logger.warning(f"Failed to delete collection: {exc}")
 
@@ -479,7 +479,7 @@ async def test_vector_store(
                 assert result is None
 
                 try:
-                    await collection.delete_collection()
+                    await collection.ensure_collection_deleted()
                 except Exception as exc:
                     pytest.fail(f"Failed to delete collection: {exc}")
         except MemoryConnectorConnectionException as exc:

python/tests/unit/connectors/memory/test_azure_ai_search.py

@@ -229,7 +229,7 @@ async def test_does_collection_exist(collection, mock_list_collection_names):
 
 
 async def test_delete_collection(collection, mock_delete_collection):
-    await collection.delete_collection()
+    await collection.ensure_collection_deleted()
 
 
 async def test_create_index_from_index(collection, mock_create_collection):
@@ -285,7 +285,7 @@ async def test_vector_store_does_collection_exists(vector_store, mock_list_colle
 
 async def test_vector_store_delete_collection(vector_store, mock_delete_collection):
     assert vector_store.search_index_client is not None
-    await vector_store.delete_collection("test")
+    await vector_store.ensure_collection_deleted("test")
     mock_delete_collection.assert_called_once()
 
 

python/tests/unit/connectors/memory/test_chroma.py

@@ -72,7 +72,7 @@ async def test_chroma_collection_create_collection(chroma_collection, mock_clien
 
 
 async def test_chroma_collection_delete_collection(chroma_collection, mock_client):
-    await chroma_collection.delete_collection()
+    await chroma_collection.ensure_collection_deleted()
     mock_client.delete_collection.assert_called_once_with(name="test_collection")
 
 

python/tests/unit/connectors/memory/test_faiss.py

@@ -85,7 +85,7 @@ async def test_create_collection_custom(store, data_model_def):
     assert collection.indexes["vector"] is not None
     assert collection.indexes["vector"] == index
     assert collection.indexes["vector"].is_trained is True
-    await collection.delete_collection()
+    await collection.ensure_collection_deleted()
 
 
 async def test_create_collection_custom_untrained(store, data_model_def):
@@ -104,7 +104,7 @@ async def test_create_collection_custom_dict(store, data_model_def):
     assert collection.indexes
     assert collection.indexes["vector"] is not None
     assert collection.indexes["vector"] == index
-    await collection.delete_collection()
+    await collection.ensure_collection_deleted()
 
 
 async def test_upsert(faiss_collection):
@@ -113,7 +113,7 @@ async def test_upsert(faiss_collection):
     key = await faiss_collection.upsert(record)
     assert key == "testid"
     assert faiss_collection.inner_storage == {"testid": record}
-    await faiss_collection.delete_collection()
+    await faiss_collection.ensure_collection_deleted()
 
 
 async def test_get(faiss_collection):
@@ -123,14 +123,14 @@ async def test_get(faiss_collection):
     result = await faiss_collection.get("testid")
     assert result["id"] == record["id"]
     assert result["content"] == record["content"]
-    await faiss_collection.delete_collection()
+    await faiss_collection.ensure_collection_deleted()
 
 
 async def test_get_missing(faiss_collection):
     await faiss_collection.create_collection()
     result = await faiss_collection.get("testid")
     assert result is None
-    await faiss_collection.delete_collection()
+    await faiss_collection.ensure_collection_deleted()
 
 
 async def test_delete(faiss_collection):
@@ -139,22 +139,22 @@ async def test_delete(faiss_collection):
     await faiss_collection.upsert(record)
     await faiss_collection.delete("testid")
     assert faiss_collection.inner_storage == {}
-    await faiss_collection.delete_collection()
+    await faiss_collection.ensure_collection_deleted()
 
 
 async def test_does_collection_exist(faiss_collection):
     assert await faiss_collection.does_collection_exist() is False
     await faiss_collection.create_collection()
     assert await faiss_collection.does_collection_exist() is True
-    await faiss_collection.delete_collection()
+    await faiss_collection.ensure_collection_deleted()
 
 
 async def test_delete_collection(faiss_collection):
     await faiss_collection.create_collection()
     record = {"id": "testid", "content": "test content", "vector": [0.1, 0.2, 0.3, 0.4, 0.5]}
     await faiss_collection.upsert(record)
     assert faiss_collection.inner_storage == {"testid": record}
-    await faiss_collection.delete_collection()
+    await faiss_collection.ensure_collection_deleted()
     assert faiss_collection.inner_storage == {}
 
 
@@ -178,4 +178,4 @@ async def test_create_collection_and_search(faiss_collection, dist):
     async for res in results.results:
         assert res.record == record1 if idx == 0 else record2
         idx += 1
-    await faiss_collection.delete_collection()
+    await faiss_collection.ensure_collection_deleted()

python/tests/unit/connectors/memory/test_in_memory.py

@@ -60,7 +60,7 @@ async def test_delete_collection(collection):
     record = {"id": "testid", "content": "test content", "vector": [0.1, 0.2, 0.3, 0.4, 0.5]}
     await collection.upsert(record)
     assert collection.inner_storage == {"testid": record}
-    await collection.delete_collection()
+    await collection.ensure_collection_deleted()
     assert collection.inner_storage == {}
 
 

python/tests/unit/connectors/memory/test_pinecone.py

@@ -196,7 +196,7 @@ async def test_create_collection_integrated(collection, mock_create_index_for_mo
 
 async def test_delete_collection(collection):
     # Test deleting the collection
-    await collection.delete_collection()
+    await collection.ensure_collection_deleted()
     assert collection.index is None
     assert collection.index_client is None
 

python/tests/unit/connectors/memory/test_qdrant.py

@@ -240,7 +240,7 @@ async def test_does_collection_exist(collection):
 
 
 async def test_delete_collection(collection):
-    await collection.delete_collection()
+    await collection.ensure_collection_deleted()
 
 
 @mark.parametrize(

python/tests/unit/connectors/memory/test_redis_store.py

@@ -287,8 +287,8 @@ async def test_does_collection_exist_false(collection_hash, mock_does_collection
 
 
 async def test_delete_collection(collection_hash, mock_delete_collection):
-    await collection_hash.delete_collection()
-    await collection_hash.delete_collection()
+    await collection_hash.ensure_collection_deleted()
+    await collection_hash.ensure_collection_deleted()
 
 
 async def test_create_index(collection_hash, mock_create_collection):

python/tests/unit/data/test_vector_store_record_collection.py

@@ -63,9 +63,9 @@ async def test_collection_operations(vector_store_record_collection):
     record = {"id": "id", "content": "test_content", "vector": [1.0, 2.0, 3.0]}
     await vector_store_record_collection.upsert(record)
     assert len(vector_store_record_collection.inner_storage) == 1
-    await vector_store_record_collection.delete_collection()
+    await vector_store_record_collection.ensure_collection_deleted()
     assert vector_store_record_collection.inner_storage == {}
-    await vector_store_record_collection.create_collection_if_not_exists()
+    await vector_store_record_collection.ensure_collection_exists()
 
 
 async def test_collection_create_if_not_exists(DictVectorStoreRecordCollection, definition):
@@ -77,7 +77,7 @@ async def test_collection_create_if_not_exists(DictVectorStoreRecordCollection,
         record_type=dict,
         definition=definition,
     )
-    await vector_store_record_collection.create_collection_if_not_exists()
+    await vector_store_record_collection.ensure_collection_exists()
     create_mock.assert_called_once()
 
 
@@ -276,7 +276,7 @@ async def test_get_fail_multiple(DictVectorStoreRecordCollection, definition):
     await vector_store_record_collection.upsert(record)
     assert len(vector_store_record_collection.inner_storage) == 1
     with (
-        patch("semantic_kernel.data.vector_storage.VectorStoreRecordCollection.deserialize") as deserialize_mock,
+        patch("semantic_kernel.data.vectors.VectorStoreRecordCollection.deserialize") as deserialize_mock,
         raises(
             VectorStoreModelDeserializationException, match="Error deserializing record, multiple records returned:"
         ),