Skip to content

Commit

Permalink
run tests are async
Browse files Browse the repository at this point in the history
  • Loading branch information
@phact
phact committed Mar 15, 2024
1 parent d6a562f commit 30c7752
Show file tree
Hide file tree
Showing 3 changed files with 115 additions and 163 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/run-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,40 @@ jobs:
- name: run tests
run: |
poetry run pytest -s --disable-warnings tests/http/
run-async-http-tests:
runs-on: ubuntu-latest
name: run async http tests
env:
ASTRA_DB_APPLICATION_TOKEN: ${{ secrets.ASTRA_DB_APPLICATION_TOKEN }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_REGION_NAME: ${{ secrets.AWS_REGION_NAME }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
base_url: ${{ secrets.BASE_URL }}
COHERE_API_KEY: ${{ secrets.COHERE_API_KEY }}
GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
PERPLEXITYAI_API_KEY: ${{ secrets.PERPLEXITYAI_API_KEY }}

steps:
- name: Git checkout
uses: actions/checkout@v3
- name: Set up Python 3.10.12
uses: actions/setup-python@v2
with:
python-version: '3.10.12'
- name: Install Poetry
run: |
curl -sSL https://install.python-poetry.org | python3 -
- name: Check Poetry Version
run: poetry --version
- name: Configure Poetry to Use Python 3.10.12
run: poetry env use python3.10
- name: get dependencies
run: |
poetry install
- name: run tests
run: |
poetry run pytest -s --disable-warnings tests/async_http/
run-openai-sdk-tests:
runs-on: ubuntu-latest
name: run openai-sdk tests
Expand Down
82 changes: 81 additions & 1 deletion tests/async_http/test_async_assistants_api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@
import logging
import os

import httpx
import pytest
from dotenv import load_dotenv
from httpx import AsyncClient
from litellm import utils

from impl.main import app
from impl.model.create_run_request import CreateRunRequest
from impl.model.run_object import RunObject
from openapi_server.models.assistant_object import AssistantObject
from openapi_server.models.create_assistant_request import CreateAssistantRequest
from openapi_server.models.create_thread_and_run_request import CreateThreadAndRunRequest
from openapi_server.models.create_thread_request import CreateThreadRequest
from openapi_server.models.thread_object import ThreadObject

Expand Down Expand Up @@ -108,3 +109,82 @@ async def test_streaming_run():
for line in response.iter_lines():
if line:
print(f"Received: {line}")

create_thread_and_run_request = {"instructions":"instructions","metadata":{},"assistant_id": assistant.id,"model":MODEL,"thread":{"metadata":{},"messages":[{"metadata":{},"role":"user","file_ids":[],"content":"content"},{"metadata":{},"role":"user","file_ids":[],"content":"content"}]},"tools":[]}

parsed_create_thread_and_run_request = CreateThreadAndRunRequest.parse_obj(create_thread_and_run_request)
logger.info(parsed_create_thread_and_run_request)

response = await client.request(
"POST",
"/threads/runs",
headers=headers,
json=create_thread_and_run_request,
)

# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200

run = RunObject.parse_raw(response.content)

response = await client.request(
"GET",
"/threads/{thread_id}/runs/{run_id}".format(thread_id=run.thread_id, run_id=run.id),
headers=headers,
)
logger.info(response)

# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200

params = [("limit", 20), ("order", 'desc')]
response = await client.request(
"GET",
"/threads/{thread_id}/runs".format(thread_id=run.thread_id),
headers=headers,
params=params,
)

logger.info(response)
# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200

submit_tool_outputs_run_request = {"tool_outputs":[{"output":"output","tool_call_id":"tool_call_id"},{"output":"output","tool_call_id":"tool_call_id"}]}

response = await client.request(
"POST",
"/threads/{thread_id}/runs/{run_id}/submit_tool_outputs".format(thread_id=run.thread_id, run_id=run.id),
headers=headers,
json=submit_tool_outputs_run_request,
)

# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200

# TODO: Cancel run test
# headers = {
# "Authorization": "Bearer special-key",
# }
# response = client.request(
# "POST",
# "/threads/{thread_id}/runs/{run_id}/cancel".format(thread_id=run.thread_id, run_id=run.id),
# headers=headers,
# )
#
# # uncomment below to assert the status code of the HTTP response
# assert response.status_code == 200

# TODO: Modify run test
# modify_run_request = {"metadata":{}}
#
# headers = get_headers(MODEL)
# response = client.request(
# "POST",
# "/threads/{thread_id}/runs/{run_id}".format(thread_id=run.thread_id, run_id=run.id),
# headers=headers,
# json=modify_run_request,
# )
#
# logger.info(response)
# # uncomment below to assert the status code of the HTTP response
# assert response.status_code == 200
162 changes: 0 additions & 162 deletions tests/http/test_assistants_api.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,6 @@

model="gpt-3.5-turbo"

@pytest.mark.skip(reason="Not implemented")
def test_cancel_run(client: TestClient):
"""Test case for cancel_run
Cancels a run that is `in_progress`.
"""

run = test_create_run(client)

headers = {
"Authorization": "Bearer special-key",
}
response = client.request(
"POST",
"/threads/{thread_id}/runs/{run_id}/cancel".format(thread_id=run.thread_id, run_id=run.id),
headers=headers,
)

# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200


@pytest.mark.skip(reason="Other tests use this function")
def test_create_assistant(client: TestClient):
Expand Down Expand Up @@ -144,34 +123,6 @@ def test_create_message(client: TestClient):



def test_create_run(client: TestClient):
"""Test case for create_run
Create a run.
"""
thread = test_create_thread(client)
assistant = test_create_assistant(client)
create_run_request = {"instructions":"instructions","metadata":{},"assistant_id":assistant.id,"model":MODEL,"tools":[]}

parsed_create_run_request = CreateRunRequest.parse_obj(create_run_request)

logger.info(parsed_create_run_request)

headers = get_headers(MODEL)

response = client.request(
"POST",
"/threads/{thread_id}/runs".format(thread_id=thread.id),
headers=headers,
json=create_run_request,
)

# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200

run = RunObject.parse_raw(response.content)
return run


def test_create_thread(client: TestClient):
"""Test case for create_thread
Expand Down Expand Up @@ -200,34 +151,6 @@ def test_create_thread(client: TestClient):
return thread


def test_create_thread_and_run(client: TestClient):
"""Test case for create_thread_and_run
Create a thread and run it in one request.
"""

assistant = test_create_assistant(client)
create_thread_and_run_request = {"instructions":"instructions","metadata":{},"assistant_id": assistant.id,"model":MODEL,"thread":{"metadata":{},"messages":[{"metadata":{},"role":"user","file_ids":[],"content":"content"},{"metadata":{},"role":"user","file_ids":[],"content":"content"}]},"tools":[]}

parsed_create_thread_and_run_request = CreateThreadAndRunRequest.parse_obj(create_thread_and_run_request)
logger.info(parsed_create_thread_and_run_request)

headers = get_headers(MODEL)

response = client.request(
"POST",
"/threads/runs",
headers=headers,
json=create_thread_and_run_request,
)

# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200

run = RunObject.parse_raw(response.content)
return run


def test_delete_assistant(client: TestClient):
"""Test case for delete_assistant
Expand Down Expand Up @@ -364,24 +287,6 @@ def test_get_message_file(client: TestClient):
#assert response.status_code == 200


def test_get_run(client: TestClient):
"""Test case for get_run
Retrieves a run.
"""

run = test_create_run(client)
headers = get_headers(MODEL)
response = client.request(
"GET",
"/threads/{thread_id}/runs/{run_id}".format(thread_id=run.thread_id, run_id=run.id),
headers=headers,
)
logger.info(response)

# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200


@pytest.mark.skip(reason="Not implemented")
def test_get_run_step(client: TestClient):
Expand Down Expand Up @@ -523,28 +428,6 @@ def test_list_run_steps(client: TestClient):
#assert response.status_code == 200


def test_list_runs(client: TestClient):
"""Test case for list_runs
Returns a list of runs belonging to a thread.
"""
run = test_create_thread_and_run(client)

#params = [("limit", 20), ("order", 'desc'), ("after", 'after_example'), ("before", 'before_example')]
params = [("limit", 20), ("order", 'desc')]
headers = get_headers(MODEL)
response = client.request(
"GET",
"/threads/{thread_id}/runs".format(thread_id=run.thread_id),
headers=headers,
params=params,
)

logger.info(response)
# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200


def test_modify_assistant(client: TestClient):
"""Test case for modify_assistant
Expand Down Expand Up @@ -587,28 +470,6 @@ def test_modify_message(client: TestClient):
# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200

@pytest.mark.skip(reason="Not implemented")
def test_modify_run(client: TestClient):
"""Test case for modify_run
Modifies a run.
"""
run = test_create_run(client)

modify_run_request = {"metadata":{}}

headers = get_headers(MODEL)
response = client.request(
"POST",
"/threads/{thread_id}/runs/{run_id}".format(thread_id=run.thread_id, run_id=run.id),
headers=headers,
json=modify_run_request,
)

logger.info(response)
# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200


def test_modify_thread(client: TestClient):
"""Test case for modify_thread
Expand All @@ -633,28 +494,6 @@ def test_modify_thread(client: TestClient):
assert response.status_code == 200


def test_submit_tool_ouputs_to_run(client: TestClient):
"""Test case for submit_tool_ouputs_to_run
When a run has the `status: \"requires_action\"` and `required_action.type` is `submit_tool_outputs`, this endpoint can be used to submit the outputs from the tool calls once they're all completed. All outputs must be submitted in a single request.
"""
run = test_create_thread_and_run(client)

submit_tool_outputs_run_request = {"tool_outputs":[{"output":"output","tool_call_id":"tool_call_id"},{"output":"output","tool_call_id":"tool_call_id"}]}

headers = get_headers(MODEL)
response = client.request(
"POST",
"/threads/{thread_id}/runs/{run_id}/submit_tool_outputs".format(thread_id=run.thread_id, run_id=run.id),
headers=headers,
json=submit_tool_outputs_run_request,
)

# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200



def test_modify_assistant(client: TestClient):
"""Test case for modify_assistant
Expand All @@ -674,4 +513,3 @@ def test_modify_assistant(client: TestClient):
logger.info(response)
# uncomment below to assert the status code of the HTTP response
assert response.status_code == 200

0 comments on commit 30c7752

Please sign in to comment.