chore: apply pep8-naming rules for naming convention (#8261)

2024-09-11 16:40:52 +08:00
parent 53f37a6704
commit 292220c596
95 changed files with 287 additions and 258 deletions
--- a/api/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py
+++ b/api/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo.py
@@ -7,7 +7,7 @@ from requests import post
 from core.model_runtime.entities.message_entities import PromptMessageTool
 from core.model_runtime.model_providers.baichuan.llm.baichuan_turbo_errors import (
    BadRequestError,
-    InsufficientAccountBalance,
+    InsufficientAccountBalanceError,
    InternalServerError,
    InvalidAPIKeyError,
    InvalidAuthenticationError,
@@ -124,7 +124,7 @@ class BaichuanModel:
            if err == "invalid_api_key":
                raise InvalidAPIKeyError(msg)
            elif err == "insufficient_quota":
-                raise InsufficientAccountBalance(msg)
+                raise InsufficientAccountBalanceError(msg)
            elif err == "invalid_authentication":
                raise InvalidAuthenticationError(msg)
            elif err == "invalid_request_error":
--- a/api/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo_errors.py
+++ b/api/core/model_runtime/model_providers/baichuan/llm/baichuan_turbo_errors.py
@@ -10,7 +10,7 @@ class RateLimitReachedError(Exception):
    pass


-class InsufficientAccountBalance(Exception):
+class InsufficientAccountBalanceError(Exception):
    pass


--- a/api/core/model_runtime/model_providers/baichuan/llm/llm.py
+++ b/api/core/model_runtime/model_providers/baichuan/llm/llm.py
@@ -29,7 +29,7 @@ from core.model_runtime.model_providers.baichuan.llm.baichuan_tokenizer import B
 from core.model_runtime.model_providers.baichuan.llm.baichuan_turbo import BaichuanModel
 from core.model_runtime.model_providers.baichuan.llm.baichuan_turbo_errors import (
    BadRequestError,
-    InsufficientAccountBalance,
+    InsufficientAccountBalanceError,
    InternalServerError,
    InvalidAPIKeyError,
    InvalidAuthenticationError,
@@ -289,7 +289,7 @@ class BaichuanLanguageModel(LargeLanguageModel):
            InvokeRateLimitError: [RateLimitReachedError],
            InvokeAuthorizationError: [
                InvalidAuthenticationError,
-                InsufficientAccountBalance,
+                InsufficientAccountBalanceError,
                InvalidAPIKeyError,
            ],
            InvokeBadRequestError: [BadRequestError, KeyError],
--- a/api/core/model_runtime/model_providers/baichuan/text_embedding/text_embedding.py
+++ b/api/core/model_runtime/model_providers/baichuan/text_embedding/text_embedding.py
@@ -19,7 +19,7 @@ from core.model_runtime.model_providers.__base.text_embedding_model import TextE
 from core.model_runtime.model_providers.baichuan.llm.baichuan_tokenizer import BaichuanTokenizer
 from core.model_runtime.model_providers.baichuan.llm.baichuan_turbo_errors import (
    BadRequestError,
-    InsufficientAccountBalance,
+    InsufficientAccountBalanceError,
    InternalServerError,
    InvalidAPIKeyError,
    InvalidAuthenticationError,
@@ -109,7 +109,7 @@ class BaichuanTextEmbeddingModel(TextEmbeddingModel):
            if err == "invalid_api_key":
                raise InvalidAPIKeyError(msg)
            elif err == "insufficient_quota":
-                raise InsufficientAccountBalance(msg)
+                raise InsufficientAccountBalanceError(msg)
            elif err == "invalid_authentication":
                raise InvalidAuthenticationError(msg)
            elif err and "rate" in err:
@@ -166,7 +166,7 @@ class BaichuanTextEmbeddingModel(TextEmbeddingModel):
            InvokeRateLimitError: [RateLimitReachedError],
            InvokeAuthorizationError: [
                InvalidAuthenticationError,
-                InsufficientAccountBalance,
+                InsufficientAccountBalanceError,
                InvalidAPIKeyError,
            ],
            InvokeBadRequestError: [BadRequestError, KeyError],
--- a/api/core/model_runtime/model_providers/openai_api_compatible/_common.py
+++ b/api/core/model_runtime/model_providers/openai_api_compatible/_common.py
@@ -10,7 +10,7 @@ from core.model_runtime.errors.invoke import (
 )


-class _CommonOAI_API_Compat:
+class _CommonOaiApiCompat:
    @property
    def _invoke_error_mapping(self) -> dict[type[InvokeError], list[type[Exception]]]:
        """
--- a/api/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py
+++ b/api/core/model_runtime/model_providers/openai_api_compatible/llm/llm.py
@@ -35,13 +35,13 @@ from core.model_runtime.entities.model_entities import (
 from core.model_runtime.errors.invoke import InvokeError
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.large_language_model import LargeLanguageModel
-from core.model_runtime.model_providers.openai_api_compatible._common import _CommonOAI_API_Compat
+from core.model_runtime.model_providers.openai_api_compatible._common import _CommonOaiApiCompat
 from core.model_runtime.utils import helper

 logger = logging.getLogger(__name__)


-class OAIAPICompatLargeLanguageModel(_CommonOAI_API_Compat, LargeLanguageModel):
+class OAIAPICompatLargeLanguageModel(_CommonOaiApiCompat, LargeLanguageModel):
    """
    Model class for OpenAI large language model.
    """
--- a/api/core/model_runtime/model_providers/openai_api_compatible/speech2text/speech2text.py
+++ b/api/core/model_runtime/model_providers/openai_api_compatible/speech2text/speech2text.py
@@ -6,10 +6,10 @@ import requests
 from core.model_runtime.errors.invoke import InvokeBadRequestError
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.speech2text_model import Speech2TextModel
-from core.model_runtime.model_providers.openai_api_compatible._common import _CommonOAI_API_Compat
+from core.model_runtime.model_providers.openai_api_compatible._common import _CommonOaiApiCompat


-class OAICompatSpeech2TextModel(_CommonOAI_API_Compat, Speech2TextModel):
+class OAICompatSpeech2TextModel(_CommonOaiApiCompat, Speech2TextModel):
    """
    Model class for OpenAI Compatible Speech to text model.
    """
--- a/api/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py
+++ b/api/core/model_runtime/model_providers/openai_api_compatible/text_embedding/text_embedding.py
@@ -19,10 +19,10 @@ from core.model_runtime.entities.model_entities import (
 from core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
-from core.model_runtime.model_providers.openai_api_compatible._common import _CommonOAI_API_Compat
+from core.model_runtime.model_providers.openai_api_compatible._common import _CommonOaiApiCompat


-class OAICompatEmbeddingModel(_CommonOAI_API_Compat, TextEmbeddingModel):
+class OAICompatEmbeddingModel(_CommonOaiApiCompat, TextEmbeddingModel):
    """
    Model class for an OpenAI API-compatible text embedding model.
    """
--- a/api/core/model_runtime/model_providers/perfxcloud/text_embedding/text_embedding.py
+++ b/api/core/model_runtime/model_providers/perfxcloud/text_embedding/text_embedding.py
@@ -19,10 +19,10 @@ from core.model_runtime.entities.model_entities import (
 from core.model_runtime.entities.text_embedding_entities import EmbeddingUsage, TextEmbeddingResult
 from core.model_runtime.errors.validate import CredentialsValidateFailedError
 from core.model_runtime.model_providers.__base.text_embedding_model import TextEmbeddingModel
-from core.model_runtime.model_providers.openai_api_compatible._common import _CommonOAI_API_Compat
+from core.model_runtime.model_providers.openai_api_compatible._common import _CommonOaiApiCompat


-class OAICompatEmbeddingModel(_CommonOAI_API_Compat, TextEmbeddingModel):
+class OAICompatEmbeddingModel(_CommonOaiApiCompat, TextEmbeddingModel):
    """
    Model class for an OpenAI API-compatible text embedding model.
    """
--- a/api/core/model_runtime/model_providers/volcengine_maas/legacy/client.py
+++ b/api/core/model_runtime/model_providers/volcengine_maas/legacy/client.py
@@ -13,7 +13,7 @@ from core.model_runtime.entities.message_entities import (
    UserPromptMessage,
 )
 from core.model_runtime.model_providers.volcengine_maas.legacy.errors import wrap_error
-from core.model_runtime.model_providers.volcengine_maas.legacy.volc_sdk import ChatRole, MaasException, MaasService
+from core.model_runtime.model_providers.volcengine_maas.legacy.volc_sdk import ChatRole, MaasError, MaasService


 class MaaSClient(MaasService):
@@ -106,7 +106,7 @@ class MaaSClient(MaasService):
    def wrap_exception(fn: Callable[[], dict | Generator]) -> dict | Generator:
        try:
            resp = fn()
-        except MaasException as e:
+        except MaasError as e:
            raise wrap_error(e)

        return resp
--- a/api/core/model_runtime/model_providers/volcengine_maas/legacy/errors.py
+++ b/api/core/model_runtime/model_providers/volcengine_maas/legacy/errors.py
@@ -1,144 +1,144 @@
-from core.model_runtime.model_providers.volcengine_maas.legacy.volc_sdk import MaasException
+from core.model_runtime.model_providers.volcengine_maas.legacy.volc_sdk import MaasError


-class ClientSDKRequestError(MaasException):
+class ClientSDKRequestError(MaasError):
    pass


-class SignatureDoesNotMatch(MaasException):
+class SignatureDoesNotMatchError(MaasError):
    pass


-class RequestTimeout(MaasException):
+class RequestTimeoutError(MaasError):
    pass


-class ServiceConnectionTimeout(MaasException):
+class ServiceConnectionTimeoutError(MaasError):
    pass


-class MissingAuthenticationHeader(MaasException):
+class MissingAuthenticationHeaderError(MaasError):
    pass


-class AuthenticationHeaderIsInvalid(MaasException):
+class AuthenticationHeaderIsInvalidError(MaasError):
    pass


-class InternalServiceError(MaasException):
+class InternalServiceError(MaasError):
    pass


-class MissingParameter(MaasException):
+class MissingParameterError(MaasError):
    pass


-class InvalidParameter(MaasException):
+class InvalidParameterError(MaasError):
    pass


-class AuthenticationExpire(MaasException):
+class AuthenticationExpireError(MaasError):
    pass


-class EndpointIsInvalid(MaasException):
+class EndpointIsInvalidError(MaasError):
    pass


-class EndpointIsNotEnable(MaasException):
+class EndpointIsNotEnableError(MaasError):
    pass


-class ModelNotSupportStreamMode(MaasException):
+class ModelNotSupportStreamModeError(MaasError):
    pass


-class ReqTextExistRisk(MaasException):
+class ReqTextExistRiskError(MaasError):
    pass


-class RespTextExistRisk(MaasException):
+class RespTextExistRiskError(MaasError):
    pass


-class EndpointRateLimitExceeded(MaasException):
+class EndpointRateLimitExceededError(MaasError):
    pass


-class ServiceConnectionRefused(MaasException):
+class ServiceConnectionRefusedError(MaasError):
    pass


-class ServiceConnectionClosed(MaasException):
+class ServiceConnectionClosedError(MaasError):
    pass


-class UnauthorizedUserForEndpoint(MaasException):
+class UnauthorizedUserForEndpointError(MaasError):
    pass


-class InvalidEndpointWithNoURL(MaasException):
+class InvalidEndpointWithNoURLError(MaasError):
    pass


-class EndpointAccountRpmRateLimitExceeded(MaasException):
+class EndpointAccountRpmRateLimitExceededError(MaasError):
    pass


-class EndpointAccountTpmRateLimitExceeded(MaasException):
+class EndpointAccountTpmRateLimitExceededError(MaasError):
    pass


-class ServiceResourceWaitQueueFull(MaasException):
+class ServiceResourceWaitQueueFullError(MaasError):
    pass


-class EndpointIsPending(MaasException):
+class EndpointIsPendingError(MaasError):
    pass


-class ServiceNotOpen(MaasException):
+class ServiceNotOpenError(MaasError):
    pass


 AuthErrors = {
-    "SignatureDoesNotMatch": SignatureDoesNotMatch,
-    "MissingAuthenticationHeader": MissingAuthenticationHeader,
-    "AuthenticationHeaderIsInvalid": AuthenticationHeaderIsInvalid,
-    "AuthenticationExpire": AuthenticationExpire,
-    "UnauthorizedUserForEndpoint": UnauthorizedUserForEndpoint,
+    "SignatureDoesNotMatch": SignatureDoesNotMatchError,
+    "MissingAuthenticationHeader": MissingAuthenticationHeaderError,
+    "AuthenticationHeaderIsInvalid": AuthenticationHeaderIsInvalidError,
+    "AuthenticationExpire": AuthenticationExpireError,
+    "UnauthorizedUserForEndpoint": UnauthorizedUserForEndpointError,
 }

 BadRequestErrors = {
-    "MissingParameter": MissingParameter,
-    "InvalidParameter": InvalidParameter,
-    "EndpointIsInvalid": EndpointIsInvalid,
-    "EndpointIsNotEnable": EndpointIsNotEnable,
-    "ModelNotSupportStreamMode": ModelNotSupportStreamMode,
-    "ReqTextExistRisk": ReqTextExistRisk,
-    "RespTextExistRisk": RespTextExistRisk,
-    "InvalidEndpointWithNoURL": InvalidEndpointWithNoURL,
-    "ServiceNotOpen": ServiceNotOpen,
+    "MissingParameter": MissingParameterError,
+    "InvalidParameter": InvalidParameterError,
+    "EndpointIsInvalid": EndpointIsInvalidError,
+    "EndpointIsNotEnable": EndpointIsNotEnableError,
+    "ModelNotSupportStreamMode": ModelNotSupportStreamModeError,
+    "ReqTextExistRisk": ReqTextExistRiskError,
+    "RespTextExistRisk": RespTextExistRiskError,
+    "InvalidEndpointWithNoURL": InvalidEndpointWithNoURLError,
+    "ServiceNotOpen": ServiceNotOpenError,
 }

 RateLimitErrors = {
-    "EndpointRateLimitExceeded": EndpointRateLimitExceeded,
-    "EndpointAccountRpmRateLimitExceeded": EndpointAccountRpmRateLimitExceeded,
-    "EndpointAccountTpmRateLimitExceeded": EndpointAccountTpmRateLimitExceeded,
+    "EndpointRateLimitExceeded": EndpointRateLimitExceededError,
+    "EndpointAccountRpmRateLimitExceeded": EndpointAccountRpmRateLimitExceededError,
+    "EndpointAccountTpmRateLimitExceeded": EndpointAccountTpmRateLimitExceededError,
 }

 ServerUnavailableErrors = {
    "InternalServiceError": InternalServiceError,
-    "EndpointIsPending": EndpointIsPending,
-    "ServiceResourceWaitQueueFull": ServiceResourceWaitQueueFull,
+    "EndpointIsPending": EndpointIsPendingError,
+    "ServiceResourceWaitQueueFull": ServiceResourceWaitQueueFullError,
 }

 ConnectionErrors = {
    "ClientSDKRequestError": ClientSDKRequestError,
-    "RequestTimeout": RequestTimeout,
-    "ServiceConnectionTimeout": ServiceConnectionTimeout,
-    "ServiceConnectionRefused": ServiceConnectionRefused,
-    "ServiceConnectionClosed": ServiceConnectionClosed,
+    "RequestTimeout": RequestTimeoutError,
+    "ServiceConnectionTimeout": ServiceConnectionTimeoutError,
+    "ServiceConnectionRefused": ServiceConnectionRefusedError,
+    "ServiceConnectionClosed": ServiceConnectionClosedError,
 }

 ErrorCodeMap = {
@@ -150,7 +150,7 @@ ErrorCodeMap = {
 }


-def wrap_error(e: MaasException) -> Exception:
+def wrap_error(e: MaasError) -> Exception:
    if ErrorCodeMap.get(e.code):
        return ErrorCodeMap.get(e.code)(e.code_n, e.code, e.message, e.req_id)
    return e
--- a/api/core/model_runtime/model_providers/volcengine_maas/legacy/volc_sdk/init.py
+++ b/api/core/model_runtime/model_providers/volcengine_maas/legacy/volc_sdk/init.py
@@ -1,4 +1,4 @@
 from .common import ChatRole
-from .maas import MaasException, MaasService
+from .maas import MaasError, MaasService

-__all__ = ["MaasService", "ChatRole", "MaasException"]
+__all__ = ["MaasService", "ChatRole", "MaasError"]
--- a/api/core/model_runtime/model_providers/volcengine_maas/legacy/volc_sdk/maas.py
+++ b/api/core/model_runtime/model_providers/volcengine_maas/legacy/volc_sdk/maas.py
@@ -63,7 +63,7 @@ class MaasService(Service):
                        raise

                    if res.error is not None and res.error.code_n != 0:
-                        raise MaasException(
+                        raise MaasError(
                            res.error.code_n,
                            res.error.code,
                            res.error.message,
@@ -72,7 +72,7 @@ class MaasService(Service):
                    yield res

            return iter_fn()
-        except MaasException:
+        except MaasError:
            raise
        except Exception as e:
            raise new_client_sdk_request_error(str(e))
@@ -94,7 +94,7 @@ class MaasService(Service):
                resp["req_id"] = req_id
            return resp

-        except MaasException as e:
+        except MaasError as e:
            raise e
        except Exception as e:
            raise new_client_sdk_request_error(str(e), req_id)
@@ -147,14 +147,14 @@ class MaasService(Service):
                raise new_client_sdk_request_error(raw, req_id)

            if resp.error:
-                raise MaasException(resp.error.code_n, resp.error.code, resp.error.message, req_id)
+                raise MaasError(resp.error.code_n, resp.error.code, resp.error.message, req_id)
            else:
                raise new_client_sdk_request_error(resp, req_id)

        return res


-class MaasException(Exception):
+class MaasError(Exception):
    def __init__(self, code_n, code, message, req_id):
        self.code_n = code_n
        self.code = code
@@ -172,7 +172,7 @@ class MaasException(Exception):


 def new_client_sdk_request_error(raw, req_id=""):
-    return MaasException(1709701, "ClientSDKRequestError", "MaaS SDK request error: {}".format(raw), req_id)
+    return MaasError(1709701, "ClientSDKRequestError", "MaaS SDK request error: {}".format(raw), req_id)


 class BinaryResponseContent:
@@ -192,7 +192,7 @@ class BinaryResponseContent:

        if len(error_bytes) > 0:
            resp = json_to_object(str(error_bytes, encoding="utf-8"), req_id=self.request_id)
-            raise MaasException(resp.error.code_n, resp.error.code, resp.error.message, self.request_id)
+            raise MaasError(resp.error.code_n, resp.error.code, resp.error.message, self.request_id)

    def iter_bytes(self) -> Iterator[bytes]:
        yield from self.response
--- a/api/core/model_runtime/model_providers/volcengine_maas/llm/llm.py
+++ b/api/core/model_runtime/model_providers/volcengine_maas/llm/llm.py
@@ -35,7 +35,7 @@ from core.model_runtime.model_providers.volcengine_maas.legacy.errors import (
    AuthErrors,
    BadRequestErrors,
    ConnectionErrors,
-    MaasException,
+    MaasError,
    RateLimitErrors,
    ServerUnavailableErrors,
 )
@@ -85,7 +85,7 @@ class VolcengineMaaSLargeLanguageModel(LargeLanguageModel):
                },
                [UserPromptMessage(content="ping\nAnswer: ")],
            )
-        except MaasException as e:
+        except MaasError as e:
            raise CredentialsValidateFailedError(e.message)

    @staticmethod
--- a/api/core/model_runtime/model_providers/volcengine_maas/text_embedding/text_embedding.py
+++ b/api/core/model_runtime/model_providers/volcengine_maas/text_embedding/text_embedding.py
@@ -28,7 +28,7 @@ from core.model_runtime.model_providers.volcengine_maas.legacy.errors import (
    AuthErrors,
    BadRequestErrors,
    ConnectionErrors,
-    MaasException,
+    MaasError,
    RateLimitErrors,
    ServerUnavailableErrors,
 )
@@ -111,7 +111,7 @@ class VolcengineMaaSTextEmbeddingModel(TextEmbeddingModel):
    def _validate_credentials_v2(self, model: str, credentials: dict) -> None:
        try:
            self._invoke(model=model, credentials=credentials, texts=["ping"])
-        except MaasException as e:
+        except MaasError as e:
            raise CredentialsValidateFailedError(e.message)

    def _validate_credentials_v3(self, model: str, credentials: dict) -> None:
--- a/api/core/model_runtime/model_providers/wenxin/wenxin_errors.py
+++ b/api/core/model_runtime/model_providers/wenxin/wenxin_errors.py
@@ -23,7 +23,7 @@ def invoke_error_mapping() -> dict[type[InvokeError], list[type[Exception]]]:
        InvokeRateLimitError: [RateLimitReachedError],
        InvokeAuthorizationError: [
            InvalidAuthenticationError,
-            InsufficientAccountBalance,
+            InsufficientAccountBalanceError,
            InvalidAPIKeyError,
        ],
        InvokeBadRequestError: [BadRequestError, KeyError],
@@ -42,7 +42,7 @@ class RateLimitReachedError(Exception):
    pass


-class InsufficientAccountBalance(Exception):
+class InsufficientAccountBalanceError(Exception):
    pass