From 5cbc87659391c510a6892e03c8fbad34e0c0eb66 Mon Sep 17 00:00:00 2001 From: Fedir Zadniprovskyi Date: Sat, 21 Sep 2024 10:47:38 -0700 Subject: [PATCH] test: switch to async openai client --- tests/api_model_test.py | 17 ++++++++++------- tests/conftest.py | 8 ++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/tests/api_model_test.py b/tests/api_model_test.py index fcb822db..c66659dd 100644 --- a/tests/api_model_test.py +++ b/tests/api_model_test.py @@ -1,5 +1,5 @@ import openai -from openai import OpenAI +from openai import AsyncOpenAI import pytest MODEL_THAT_EXISTS = "Systran/faster-whisper-tiny.en" @@ -7,16 +7,19 @@ MIN_EXPECTED_NUMBER_OF_MODELS = 70 # At the time of the test creation there are 89 models -def test_list_models(openai_client: OpenAI) -> None: - models = openai_client.models.list().data +@pytest.mark.asyncio() +async def test_list_models(openai_client: AsyncOpenAI) -> None: + models = (await openai_client.models.list()).data assert len(models) > MIN_EXPECTED_NUMBER_OF_MODELS -def test_model_exists(openai_client: OpenAI) -> None: - model = openai_client.models.retrieve(MODEL_THAT_EXISTS) +@pytest.mark.asyncio() +async def test_model_exists(openai_client: AsyncOpenAI) -> None: + model = await openai_client.models.retrieve(MODEL_THAT_EXISTS) assert model.id == MODEL_THAT_EXISTS -def test_model_does_not_exist(openai_client: OpenAI) -> None: +@pytest.mark.asyncio() +async def test_model_does_not_exist(openai_client: AsyncOpenAI) -> None: with pytest.raises(openai.NotFoundError): - openai_client.models.retrieve(MODEL_THAT_DOES_NOT_EXIST) + await openai_client.models.retrieve(MODEL_THAT_DOES_NOT_EXIST) diff --git a/tests/conftest.py b/tests/conftest.py index 658f20bd..316220a2 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,7 +5,7 @@ from fastapi.testclient import TestClient from faster_whisper_server.main import create_app from httpx import ASGITransport, AsyncClient -from openai import AsyncOpenAI, OpenAI +from openai import AsyncOpenAI import pytest import pytest_asyncio @@ -32,9 +32,9 @@ async def aclient() -> AsyncGenerator[AsyncClient, None]: yield aclient -@pytest.fixture() -def openai_client(client: TestClient) -> OpenAI: - return OpenAI(api_key="cant-be-empty", http_client=client) +@pytest_asyncio.fixture() +def openai_client(aclient: AsyncClient) -> AsyncOpenAI: + return AsyncOpenAI(api_key="cant-be-empty", http_client=aclient) @pytest.fixture()