update tests - vector_stores out of beta (Azure#40046)

Author: kristapratico

sdk/openai/azure-openai/tests/conftest.py

@@ -21,7 +21,7 @@
 
 # for pytest.parametrize
 GA = "2024-10-21"
-PREVIEW = "2025-01-01-preview"
+PREVIEW = "2025-02-01-preview"
 LATEST = PREVIEW
 
 AZURE = "azure"
@@ -174,7 +174,7 @@ def build_kwargs(args, api_type):
             return {"model": ENV_AZURE_OPENAI_DALLE_NAME}
         elif api_type == "openai":
             return {"model": ENV_OPENAI_DALLE_MODEL}
-    if test_feature.startswith("test_assistants"):
+    if test_feature.startswith("test_assistants") or test_feature.startswith("test_vector_stores"):
         if api_type in ["asst_azure"]:
             return {"model": ENV_AZURE_OPENAI_CHAT_COMPLETIONS_GPT4_NAME}
         elif api_type == "gpt_4_openai":

sdk/openai/azure-openai/tests/test_assistants.py

@@ -339,146 +339,6 @@ def test_assistants_messages_crud(self, client, api_type, api_version, **kwargs)
             delete_file = client.files.delete(file.id)
             assert delete_file.deleted is True
 
-    @configure
-    @pytest.mark.parametrize("api_type, api_version", [(ASST_AZURE, PREVIEW), (GPT_4_OPENAI, "v1")])
-    def test_assistants_vector_stores_crud(self, client, api_type, api_version, **kwargs):
-        file_name = f"test{uuid.uuid4()}.txt"
-        with open(file_name, "w") as f:
-            f.write("test")
-
-        path = pathlib.Path(file_name)
-
-        file = client.files.create(
-            file=open(path, "rb"),
-            purpose="assistants"
-        )
-
-        try:
-            vector_store = client.beta.vector_stores.create(
-                name="Support FAQ"
-            )
-            assert vector_store.name == "Support FAQ"
-            assert vector_store.id
-            assert vector_store.object == "vector_store"
-            assert vector_store.created_at
-            assert vector_store.file_counts.total == 0
-
-            vectors = client.beta.vector_stores.list()
-            for vector in vectors:
-                assert vector.id
-                assert vector_store.object == "vector_store"
-                assert vector_store.created_at
-
-            vector_store = client.beta.vector_stores.update(
-                vector_store_id=vector_store.id,
-                name="Support FAQ and more",
-                metadata={"Q": "A"}
-            )
-            retrieved_vector = client.beta.vector_stores.retrieve(
-                vector_store_id=vector_store.id
-            )
-            assert retrieved_vector.id == vector_store.id
-            assert retrieved_vector.name == "Support FAQ and more"
-            assert retrieved_vector.metadata == {"Q": "A"}
-
-            vector_store_file = client.beta.vector_stores.files.create(
-                vector_store_id=vector_store.id,
-                file_id=file.id
-            )
-            assert vector_store_file.id
-            assert vector_store_file.object == "vector_store.file"
-            assert vector_store_file.created_at
-            assert vector_store_file.vector_store_id == vector_store.id
-
-            vector_store_files = client.beta.vector_stores.files.list(
-                vector_store_id=vector_store.id
-            )
-            for vector_file in vector_store_files:
-                assert vector_file.id
-                assert vector_file.object == "vector_store.file"
-                assert vector_store_file.created_at
-                assert vector_store_file.vector_store_id == vector_store.id
-
-            vector_store_file_2 = client.beta.vector_stores.files.retrieve(
-                vector_store_id=vector_store.id,
-                file_id=file.id
-            )
-            assert vector_store_file_2.id == vector_store_file.id
-            assert vector_store_file.vector_store_id == vector_store.id
-
-        finally:
-            os.remove(path)
-            deleted_vector_store_file = client.beta.vector_stores.files.delete(
-                vector_store_id=vector_store.id,
-                file_id=file.id
-            )
-            assert deleted_vector_store_file.deleted is True
-            deleted_vector_store = client.beta.vector_stores.delete(
-                vector_store_id=vector_store.id
-            )
-            assert deleted_vector_store.deleted is True
-
-    @configure
-    @pytest.mark.parametrize("api_type, api_version", [(ASST_AZURE, PREVIEW), (GPT_4_OPENAI, "v1")])
-    def test_assistants_vector_stores_batch_crud(self, client, api_type, api_version, **kwargs):
-        file_name = f"test{uuid.uuid4()}.txt"
-        file_name_2 = f"test{uuid.uuid4()}.txt"
-        with open(file_name, "w") as f:
-            f.write("test")
-
-        path = pathlib.Path(file_name)
-
-        file = client.files.create(
-            file=open(path, "rb"),
-            purpose="assistants"
-        )
-        with open(file_name_2, "w") as f:
-            f.write("test")
-        path_2 = pathlib.Path(file_name_2)
-
-        file_2 = client.files.create(
-            file=open(path_2, "rb"),
-            purpose="assistants"
-        )
-        try:
-            vector_store = client.beta.vector_stores.create(
-                name="Support FAQ"
-            )
-            vector_store_file_batch = client.beta.vector_stores.file_batches.create(
-                vector_store_id=vector_store.id,
-                file_ids=[file.id, file_2.id]
-            )
-            assert vector_store_file_batch.id
-            assert vector_store_file_batch.object == "vector_store.file_batch"
-            assert vector_store_file_batch.created_at is not None
-            assert vector_store_file_batch.status
-
-            vectors = client.beta.vector_stores.file_batches.list_files(
-                vector_store_id=vector_store.id,
-                batch_id=vector_store_file_batch.id
-            )
-            for vector in vectors:
-                assert vector.id
-                assert vector.object == "vector_store.file"
-                assert vector.created_at is not None
-
-            retrieved_vector_store_file_batch = client.beta.vector_stores.file_batches.retrieve(
-                vector_store_id=vector_store.id,
-                batch_id=vector_store_file_batch.id
-            )
-            assert retrieved_vector_store_file_batch.id == vector_store_file_batch.id
-
-        finally:
-            os.remove(path)
-            os.remove(path_2)
-            delete_file = client.files.delete(file.id)
-            assert delete_file.deleted is True
-            delete_file = client.files.delete(file_2.id)
-            assert delete_file.deleted is True
-            deleted_vector_store = client.beta.vector_stores.delete(
-                vector_store_id=vector_store.id
-            )
-            assert deleted_vector_store.deleted is True
 
     @configure
     @pytest.mark.parametrize("api_type, api_version", [(ASST_AZURE, PREVIEW), (GPT_4_OPENAI, "v1")])
@@ -543,10 +403,10 @@ def test_assistants_runs_file_search(self, client, api_type, api_version, **kwar
         path = pathlib.Path(file_name)
 
         try:
-            vector_store = client.beta.vector_stores.create(
+            vector_store = client.vector_stores.create(
                 name="Support FAQ"
             )
-            client.beta.vector_stores.files.upload_and_poll(
+            client.vector_stores.files.upload_and_poll(
                 vector_store_id=vector_store.id,
                 file=path
             )
@@ -605,7 +465,7 @@ def test_assistants_runs_file_search(self, client, api_type, api_version, **kwar
             )
             assert delete_thread.id
             assert delete_thread.deleted is True
-            deleted_vector_store = client.beta.vector_stores.delete(
+            deleted_vector_store = client.vector_stores.delete(
                 vector_store_id=vector_store.id
             )
             assert deleted_vector_store.deleted is True

sdk/openai/azure-openai/tests/test_assistants_async.py

@@ -340,149 +340,6 @@ async def test_assistants_messages_crud(self, client_async, api_type, api_versio
             delete_file = await client_async.files.delete(file.id)
             assert delete_file.deleted is True
 
-    @configure_async
-    @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_type, api_version", [(ASST_AZURE, PREVIEW), (GPT_4_OPENAI, "v1")])
-    async def test_assistants_vector_stores_crud(self, client_async, api_type, api_version, **kwargs):
-        file_name = f"test{uuid.uuid4()}.txt"
-        with open(file_name, "w") as f:
-            f.write("test")
-
-        path = pathlib.Path(file_name)
-
-        file = await client_async.files.create(
-            file=open(path, "rb"),
-            purpose="assistants"
-        )
-
-        try:
-            vector_store = await client_async.beta.vector_stores.create(
-                name="Support FAQ"
-            )
-            assert vector_store.name == "Support FAQ"
-            assert vector_store.id
-            assert vector_store.object == "vector_store"
-            assert vector_store.created_at
-            assert vector_store.file_counts.total == 0
-
-            vectors = client_async.beta.vector_stores.list()
-            async for vector in vectors:
-                assert vector.id
-                assert vector_store.object == "vector_store"
-                assert vector_store.created_at
-
-            vector_store = await client_async.beta.vector_stores.update(
-                vector_store_id=vector_store.id,
-                name="Support FAQ and more",
-                metadata={"Q": "A"}
-            )
-            retrieved_vector = await client_async.beta.vector_stores.retrieve(
-                vector_store_id=vector_store.id
-            )
-            assert retrieved_vector.id == vector_store.id
-            assert retrieved_vector.name == "Support FAQ and more"
-            assert retrieved_vector.metadata == {"Q": "A"}
-
-            vector_store_file = await client_async.beta.vector_stores.files.create(
-                vector_store_id=vector_store.id,
-                file_id=file.id
-            )
-            assert vector_store_file.id
-            assert vector_store_file.object == "vector_store.file"
-            assert vector_store_file.created_at
-            assert vector_store_file.vector_store_id == vector_store.id
-
-            vector_store_files = client_async.beta.vector_stores.files.list(
-                vector_store_id=vector_store.id
-            )
-            async for vector_file in vector_store_files:
-                assert vector_file.id
-                assert vector_file.object == "vector_store.file"
-                assert vector_store_file.created_at
-                assert vector_store_file.vector_store_id == vector_store.id
-
-            vector_store_file_2 = await client_async.beta.vector_stores.files.retrieve(
-                vector_store_id=vector_store.id,
-                file_id=file.id
-            )
-            assert vector_store_file_2.id == vector_store_file.id
-            assert vector_store_file.vector_store_id == vector_store.id
-
-        finally:
-            os.remove(path)
-            deleted_vector_store_file = await client_async.beta.vector_stores.files.delete(
-                vector_store_id=vector_store.id,
-                file_id=file.id
-            )
-            assert deleted_vector_store_file.deleted is True
-            deleted_vector_store = await client_async.beta.vector_stores.delete(
-                vector_store_id=vector_store.id
-            )
-            assert deleted_vector_store.deleted is True
-
-    @configure_async
-    @pytest.mark.asyncio
-    @pytest.mark.parametrize("api_type, api_version", [(ASST_AZURE, PREVIEW), (GPT_4_OPENAI, "v1")])
-    async def test_assistants_vector_stores_batch_crud(self, client_async, api_type, api_version, **kwargs):
-        file_name = f"test{uuid.uuid4()}.txt"
-        file_name_2 = f"test{uuid.uuid4()}.txt"
-        with open(file_name, "w") as f:
-            f.write("test")
-
-        path = pathlib.Path(file_name)
-
-        file = await client_async.files.create(
-            file=open(path, "rb"),
-            purpose="assistants"
-        )
-        with open(file_name_2, "w") as f:
-            f.write("test")
-        path_2 = pathlib.Path(file_name_2)
-
-        file_2 = await client_async.files.create(
-            file=open(path_2, "rb"),
-            purpose="assistants"
-        )
-        try:
-            vector_store = await client_async.beta.vector_stores.create(
-                name="Support FAQ"
-            )
-            vector_store_file_batch = await client_async.beta.vector_stores.file_batches.create(
-                vector_store_id=vector_store.id,
-                file_ids=[file.id, file_2.id]
-            )
-            assert vector_store_file_batch.id
-            assert vector_store_file_batch.object == "vector_store.file_batch"
-            assert vector_store_file_batch.created_at is not None
-            assert vector_store_file_batch.status
-
-            vectors = await client_async.beta.vector_stores.file_batches.list_files(
-                vector_store_id=vector_store.id,
-                batch_id=vector_store_file_batch.id
-            )
-            async for vector in vectors:
-                assert vector.id
-                assert vector.object == "vector_store.file"
-                assert vector.created_at is not None
-
-            retrieved_vector_store_file_batch = await client_async.beta.vector_stores.file_batches.retrieve(
-                vector_store_id=vector_store.id,
-                batch_id=vector_store_file_batch.id
-            )
-            assert retrieved_vector_store_file_batch.id == vector_store_file_batch.id
-
-        finally:
-            os.remove(path)
-            os.remove(path_2)
-            delete_file = await client_async.files.delete(file.id)
-            assert delete_file.deleted is True
-            delete_file = await client_async.files.delete(file_2.id)
-            assert delete_file.deleted is True
-            deleted_vector_store = await client_async.beta.vector_stores.delete(
-                vector_store_id=vector_store.id
-            )
-            assert deleted_vector_store.deleted is True
-
     @configure_async
     @pytest.mark.asyncio
     @pytest.mark.parametrize("api_type, api_version", [(ASST_AZURE, PREVIEW), (GPT_4_OPENAI, "v1")])
@@ -547,10 +404,10 @@ async def test_assistants_runs_file_search(self, client_async, api_type, api_ver
         path = pathlib.Path(file_name)
 
         try:
-            vector_store = await client_async.beta.vector_stores.create(
+            vector_store = await client_async.vector_stores.create(
                 name="Support FAQ",
             )
-            await client_async.beta.vector_stores.files.upload_and_poll(
+            await client_async.vector_stores.files.upload_and_poll(
                 vector_store_id=vector_store.id,
                 file=path
             )
@@ -607,7 +464,7 @@ async def test_assistants_runs_file_search(self, client_async, api_type, api_ver
             )
             assert delete_thread.id
             assert delete_thread.deleted is True
-            deleted_vector_store = await client_async.beta.vector_stores.delete(
+            deleted_vector_store = await client_async.vector_stores.delete(
                 vector_store_id=vector_store.id
             )
             assert deleted_vector_store.deleted is True