From 3c42081154330d5f1f87e2baa18c3f4773b73936 Mon Sep 17 00:00:00 2001 From: Dttbd Date: Thu, 23 May 2024 17:48:58 +0800 Subject: [PATCH 1/2] fix: fix chat completion request schema --- taskingai/_version.py | 2 +- taskingai/client/models/schemas/chat_completion_request.py | 1 - test_requirements.txt | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/taskingai/_version.py b/taskingai/_version.py index d7951dc..635fd03 100644 --- a/taskingai/_version.py +++ b/taskingai/_version.py @@ -1,2 +1,2 @@ __title__ = "taskingai" -__version__ = "0.2.4" +__version__ = "0.2.5" diff --git a/taskingai/client/models/schemas/chat_completion_request.py b/taskingai/client/models/schemas/chat_completion_request.py index a9bbf8a..99b99b5 100644 --- a/taskingai/client/models/schemas/chat_completion_request.py +++ b/taskingai/client/models/schemas/chat_completion_request.py @@ -36,4 +36,3 @@ class ChatCompletionRequest(BaseModel): ] = Field(...) function_call: Optional[str] = Field(None) functions: Optional[List[ChatCompletionFunction]] = Field(None) - save_logs: bool = Field(False) diff --git a/test_requirements.txt b/test_requirements.txt index 75c5f70..e489799 100644 --- a/test_requirements.txt +++ b/test_requirements.txt @@ -9,7 +9,7 @@ pytest-ordering==0.6 pytest-xdist==3.6.1 PyYAML==6.0.1 pytest-assume==2.4.3 -pytest-asyncio==0.23.6 +pytest-asyncio==0.23.7 asyncio==3.4.3 pytest-tornasync>=0.6.0 pytest-trio==0.8.0 From 632ee348031d0a15a49942c06bef9958bd3b198f Mon Sep 17 00:00:00 2001 From: taskingaijc <150663083+taskingaijc@users.noreply.github.com> Date: Fri, 24 May 2024 11:53:54 +0800 Subject: [PATCH 2/2] test: fix test for record --- test/testcase/test_async/test_async_retrieval.py | 6 ++++-- test/testcase/test_sync/conftest.py | 2 +- test/testcase/test_sync/test_sync_retrieval.py | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/test/testcase/test_async/test_async_retrieval.py b/test/testcase/test_async/test_async_retrieval.py index 94ae677..277cdfd 100644 --- a/test/testcase/test_async/test_async_retrieval.py +++ b/test/testcase/test_async/test_async_retrieval.py @@ -1,6 +1,6 @@ import pytest import os - +import asyncio from taskingai.retrieval import * from taskingai.file import a_upload_file from taskingai.client.models import UploadFilePurpose @@ -393,6 +393,8 @@ async def test_update_chunk(self): async def test_delete_chunk(self): # List chunks. + await asyncio.sleep(Config.sleep_time) + chunks = await a_list_chunks(collection_id=self.collection_id, limit=5) old_nums = len(chunks) for index, chunk in enumerate(chunks): @@ -404,6 +406,6 @@ async def test_delete_chunk(self): # List chunks. - new_chunks = list_chunks(collection_id=self.collection_id) + new_chunks = await a_list_chunks(collection_id=self.collection_id) chunk_ids = [chunk.chunk_id for chunk in new_chunks] pytest.assume(chunk_id not in chunk_ids) diff --git a/test/testcase/test_sync/conftest.py b/test/testcase/test_sync/conftest.py index dbaa555..966cc8d 100644 --- a/test/testcase/test_sync/conftest.py +++ b/test/testcase/test_sync/conftest.py @@ -36,7 +36,7 @@ def collection_id(): @pytest.fixture(scope="session") def record_id(collection_id): res = list_records(str(collection_id)) - record_id = res[0].record_id + record_id = res[-1].record_id return record_id diff --git a/test/testcase/test_sync/test_sync_retrieval.py b/test/testcase/test_sync/test_sync_retrieval.py index 9255bbc..1937f21 100644 --- a/test/testcase/test_sync/test_sync_retrieval.py +++ b/test/testcase/test_sync/test_sync_retrieval.py @@ -1,6 +1,6 @@ import pytest import os - +import time from taskingai.retrieval import TokenTextSplitter, TextSplitter from taskingai.retrieval import ( list_collections, @@ -171,7 +171,7 @@ def test_create_record_by_web(self, collection_id): res_dict = vars(res) assume_record_result(create_record_data, res_dict) - @pytest.mark.run(order=31) + @pytest.mark.run(order=32) @pytest.mark.parametrize("upload_file_data", upload_file_data_list[:2]) def test_create_record_by_file(self, collection_id, upload_file_data): # upload file @@ -267,7 +267,7 @@ def test_update_record_by_web(self, collection_id, record_id, text_splitter): res_dict = vars(res) assume_record_result(update_record_data, res_dict) - @pytest.mark.run(order=34) + @pytest.mark.run(order=35) @pytest.mark.parametrize("upload_file_data", upload_file_data_list[2:3]) def test_update_record_by_file(self, collection_id, record_id, upload_file_data): # upload file @@ -295,7 +295,7 @@ def test_update_record_by_file(self, collection_id, record_id, upload_file_data) @pytest.mark.run(order=79) def test_delete_record(self, collection_id): # List records. - + time.sleep(Config.sleep_time) records = list_records(collection_id=collection_id, order="desc", limit=20, after=None, before=None) old_nums = len(records) for index, record in enumerate(records):