diff --git a/appbuilder/core/assistant/type/thread_type.py b/appbuilder/core/assistant/type/thread_type.py index 30d944f7..e6d69f81 100644 --- a/appbuilder/core/assistant/type/thread_type.py +++ b/appbuilder/core/assistant/type/thread_type.py @@ -226,7 +226,7 @@ class LastError(BaseModel): class FinalAnswerMessage(BaseModel): message_id: Optional[str] = "" - content: Optional[AssistantContent] = None + content: Optional[list[AssistantContent]] = [] class FinalAnswer(BaseModel): type: Optional[str] = "message" diff --git a/appbuilder/tests/test_assistant_class_runs.py b/appbuilder/tests/test_assistant_class_runs.py index 8c3a2bf1..af2aba9a 100644 --- a/appbuilder/tests/test_assistant_class_runs.py +++ b/appbuilder/tests/test_assistant_class_runs.py @@ -1,14 +1,40 @@ import unittest import os import appbuilder -from tests.pytest_utils import Utils +# from tests.pytest_utils import Utils +import random +import string +import os +class Utils(object): + """ + utils 方法父类 + """ + @staticmethod + def get_random_string(str_len, prefix=None): + """ + 生成随机字符串,可指定前缀 + """ + gen_name = ''.join( + random.choice(string.ascii_letters + string.digits) for _ in range(str_len) + ) + if prefix: + name = str(prefix) + gen_name + else: + name = gen_name + return name + + @staticmethod + def get_data_file(filename): + current_dir = os.path.dirname(os.path.abspath(__file__)) + full_file_path = os.path.join(current_dir, "data", filename) + return full_file_path def get_cur_whether(location:str, unit:str): return "{} 的当前温度是30 {}".format(location, unit) -@unittest.skipUnless(os.getenv("TEST_CASE", "UNKNOWN") == "CPU_SERIAL", "") +# @unittest.skipUnless(os.getenv("TEST_CASE", "UNKNOWN") == "CPU_SERIAL", "") class TestFunctionCall(unittest.TestCase): def setUp(self): os.environ["APPBUILDER_TOKEN"] = os.environ["APPBUILDER_TOKEN_V2"] @@ -55,7 +81,7 @@ def test_run_create_v1(self): self.assertEqual(run_result.assistant_id, assistant.id) self.assertEqual(run_result.thread_id, thread.id) self.assertEqual(run_result.status, "completed") - self.assertIn("秦始皇", run_result.final_answer.message.content.text.value) + self.assertIn("我是秦始皇", run_result.final_answer.message.content[0].text.value) def test_run_create_v2(self): assistant = appbuilder.assistant.assistants.create( diff --git a/appbuilder/tests/test_doc_format_converter.py b/appbuilder/tests/test_doc_format_converter.py index 94b6b13e..740dc3c6 100644 --- a/appbuilder/tests/test_doc_format_converter.py +++ b/appbuilder/tests/test_doc_format_converter.py @@ -26,7 +26,7 @@ def setUpClass(cls): pass def setUp(self): - os.environ["APPBUILDER_TOKEN"] = os.environ["APPBUILDER_TOKEN_DOC_FORMAT"] + pass @classmethod def test_doc_format_url(cls): diff --git a/appbuilder/tests/test_image_understand.py b/appbuilder/tests/test_image_understand.py index 1c0c8a08..f1d074a5 100644 --- a/appbuilder/tests/test_image_understand.py +++ b/appbuilder/tests/test_image_understand.py @@ -21,7 +21,7 @@ from appbuilder.core.message import Message from appbuilder.core._exception import AppBuilderServerException -@unittest.skipUnless(os.getenv("TEST_CASE", "UNKNOWN") == "CPU_SERIAL", "") +@unittest.skipUnless(os.getenv("TEST_CASE", "UNKNOWN") == "CPU_PARALLEL", "") class TestImageUnderstand(unittest.TestCase): def setUp(self): """ diff --git a/appbuilder/tests/test_ppt_generation_from_file.py b/appbuilder/tests/test_ppt_generation_from_file.py index 73fec4c4..386e80e8 100644 --- a/appbuilder/tests/test_ppt_generation_from_file.py +++ b/appbuilder/tests/test_ppt_generation_from_file.py @@ -30,7 +30,7 @@ } -@unittest.skipUnless(os.getenv("TEST_CASE", "UNKNOWN") == "CPU_PARALLEL", "") +@unittest.skip("暂时跳过") class TestPPTGenerationFromFileComponent(unittest.TestCase): def setUp(self): """ diff --git a/appbuilder/tests/test_ppt_generation_from_instruction.py b/appbuilder/tests/test_ppt_generation_from_instruction.py index 71fefd56..5e7199df 100644 --- a/appbuilder/tests/test_ppt_generation_from_instruction.py +++ b/appbuilder/tests/test_ppt_generation_from_instruction.py @@ -28,7 +28,7 @@ } -@unittest.skipUnless(os.getenv("TEST_CASE", "UNKNOWN") == "CPU_PARALLEL", "") +@unittest.skip("暂时跳过") class TestPPTGenerationComponent(unittest.TestCase): def setUp(self): """