From ba146d2abb9be61cd97d1ff6511ca493ba15186c Mon Sep 17 00:00:00 2001 From: rex <1073853456@qq.com> Date: Tue, 22 Aug 2023 21:07:01 +0800 Subject: [PATCH] fix error of githubaction --- openai_api_call/response.py | 17 +++++++++++++---- tests/__init__.py | 3 ++- tests/test_openai_api_call.py | 2 -- tests/test_request.py | 8 ++++++-- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/openai_api_call/response.py b/openai_api_call/response.py index 95929ea..2b61aab 100644 --- a/openai_api_call/response.py +++ b/openai_api_call/response.py @@ -59,25 +59,34 @@ def content(self): """Content of the response""" return self.message['content'] + @property + def object(self): + return self.response['object'] + + @property + def error(self): + """Error""" + return self.response['error'] + @property def error_message(self): """Error message""" - return self.response['error']['message'] + return self.error['message'] @property def error_type(self): """Error type""" - return self.response['error']['type'] + return self.error['type'] @property def error_param(self): """Error parameter""" - return self.response['error']['param'] + return self.error['param'] @property def error_code(self): """Error code""" - return self.response['error']['code'] + return self.error['code'] @property def finish_reason(self): diff --git a/tests/__init__.py b/tests/__init__.py index 02f2ceb..1dd40e0 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -9,4 +9,5 @@ def test_simple(): chat.getresponse() chat.print_log() assert chat.chat_log[0] == {"role": "user", "content": "Hello!"} - assert len(chat.chat_log) == 2 \ No newline at end of file + assert len(chat.chat_log) == 2 + \ No newline at end of file diff --git a/tests/test_openai_api_call.py b/tests/test_openai_api_call.py index 358258a..db8421a 100644 --- a/tests/test_openai_api_call.py +++ b/tests/test_openai_api_call.py @@ -180,7 +180,6 @@ def test_with_template(): chat = Chat("hello!") assert chat.chat_log == [{"role": "user", "content": "hello!"}] - def test_error_message(): resp = Resp(response=err_api_key_resp) assert resp.error_message == "Incorrect API key provided: sk-132. You can find your API key at https://platform.openai.com/account/api-keys." @@ -190,7 +189,6 @@ def test_error_message(): assert resp.is_valid() == False - def test_usage(): resp = Resp(response=response) assert resp.total_tokens == 18 diff --git a/tests/test_request.py b/tests/test_request.py index b8ff74d..3b1da5d 100644 --- a/tests/test_request.py +++ b/tests/test_request.py @@ -1,6 +1,10 @@ -from openai_api_call import debug_log, api_key, Resp +from openai_api_call import debug_log, Resp from openai_api_call.request import normalize_url, is_valid_url, valid_models - +import openai_api_call +openai_api_call.api_key="free-123" +openai_api_call.request.base_url = "api.wzhecnu.cn" +api_key = openai_api_call.api_key + def test_valid_models(): models = valid_models(api_key=api_key, gpt_only=False) assert len(models) >= 1