From a440709a7df2f94553c95f7ebbcf5ed6be7ef719 Mon Sep 17 00:00:00 2001 From: ox01024 Date: Sat, 14 Sep 2024 00:19:19 +0800 Subject: [PATCH] refactor(model_runtime/zhipuai_sdk): syntax style --- .../zhipuai/zhipuai_sdk/__init__.py | 13 ++++++------- .../zhipuai/zhipuai_sdk/_client.py | 16 +++++++--------- .../zhipuai/zhipuai_sdk/core/_sse_client.py | 2 +- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__init__.py b/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__init__.py index 8b4faf42189b70..fc71d64714bd96 100644 --- a/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__init__.py +++ b/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/__init__.py @@ -1,16 +1,15 @@ from .__version__ import __version__ from ._client import ZhipuAI - from .core import ( - ZhipuAIError, - APIStatusError, - APIRequestFailedError, APIAuthenticationError, - APIReachLimitError, + APIConnectionError, APIInternalError, - APIServerFlowExceedError, + APIReachLimitError, + APIRequestFailedError, APIResponseError, APIResponseValidationError, - APIConnectionError, + APIServerFlowExceedError, + APIStatusError, APITimeoutError, + ZhipuAIError, ) diff --git a/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py b/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py index 5d099afeee0277..705d371e628f08 100644 --- a/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py +++ b/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/_client.py @@ -1,17 +1,15 @@ from __future__ import annotations -from typing import Union, Mapping +import os +from collections.abc import Mapping +from typing import Union +import httpx +from httpx import Timeout from typing_extensions import override -from .core import _jwt_token -from .core import ZhipuAIError -from .core import HttpClient, ZHIPUAI_DEFAULT_MAX_RETRIES -from .core import NotGiven, NOT_GIVEN from . import api_resource -import os -import httpx -from httpx import Timeout +from .core import NOT_GIVEN, ZHIPUAI_DEFAULT_MAX_RETRIES, HttpClient, NotGiven, ZhipuAIError, _jwt_token class ZhipuAI(HttpClient): @@ -41,7 +39,7 @@ def __init__( if base_url is None: base_url = os.environ.get("ZHIPUAI_BASE_URL") if base_url is None: - base_url = f"https://open.bigmodel.cn/api/paas/v4" + base_url = "https://open.bigmodel.cn/api/paas/v4" from .__version__ import __version__ super().__init__( diff --git a/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py b/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py index 37bf1742377fbd..0e788d5733b1a0 100644 --- a/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py +++ b/api/core/model_runtime/model_providers/zhipuai/zhipuai_sdk/core/_sse_client.py @@ -107,7 +107,7 @@ def __init__( def __repr__(self): data_len = len(self._data) if self._data else 0 return ( - f"Event(event={self._event}, data={self._data} ,data_length={data_len}, id={self._id}, retry={self._retry}" # noqa: E501 + f"Event(event={self._event}, data={self._data} ,data_length={data_len}, id={self._id}, retry={self._retry}" ) @property