arpakitlib 1.5.18__tar.gz → 1.5.19__tar.gz

{arpakitlib-1.5.18 → arpakitlib-1.5.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: arpakitlib
-Version: 1.5.18
+Version: 1.5.19
 Summary: arpakitlib
 License: Apache-2.0
 Author: arpakit

{arpakitlib-1.5.18 → arpakitlib-1.5.19}/arpakitlib/ar_fastapi_util.py

@@ -53,13 +53,14 @@ class APIJSONResponse(fastapi.responses.JSONResponse):
         )
 
 
-class APIErrorSO(BaseAPISO):
-    class ErrorCodes(EasyEnumeration):
-        cannot_authorize = "CANNOT_AUTHORIZE"
-        unknown_error = "UNKNOWN_ERROR"
-        error_in_request = "ERROR_IN_REQUEST"
-        not_found = "NOT_FOUND"
+class APIErrorCodes(EasyEnumeration):
+    cannot_authorize = "CANNOT_AUTHORIZE"
+    unknown_error = "UNKNOWN_ERROR"
+    error_in_request = "ERROR_IN_REQUEST"
+    not_found = "NOT_FOUND"
+
 
+class APIErrorSO(BaseAPISO):
     has_error: bool = True
     error_code: str | None = None
     error_code_specification: str | None = None
@@ -72,7 +73,7 @@ class APIException(fastapi.exceptions.HTTPException):
             self,
             *,
             status_code: int = starlette.status.HTTP_400_BAD_REQUEST,
-            error_code: str | None = APIErrorSO.ErrorCodes.unknown_error,
+            error_code: str | None = APIErrorCodes.unknown_error,
             error_code_specification: str | None = None,
             error_description: str | None = None,
             error_data: dict[str, Any] | None = None
@@ -108,7 +109,7 @@ def from_exception_to_api_json_response(
 ) -> APIJSONResponse:
     easy_api_error_so = APIErrorSO(
         has_error=True,
-        error_code=APIErrorSO.ErrorCodes.unknown_error
+        error_code=APIErrorCodes.unknown_error
     )
 
     status_code = starlette.status.HTTP_500_INTERNAL_SERVER_ERROR
@@ -119,11 +120,11 @@ def from_exception_to_api_json_response(
     elif isinstance(exception, starlette.exceptions.HTTPException):
         status_code = exception.status_code
         if status_code in (starlette.status.HTTP_403_FORBIDDEN, starlette.status.HTTP_401_UNAUTHORIZED):
-            easy_api_error_so.error_code = APIErrorSO.ErrorCodes.cannot_authorize
+            easy_api_error_so.error_code = APIErrorCodes.cannot_authorize
         elif status_code == starlette.status.HTTP_404_NOT_FOUND:
-            easy_api_error_so.error_code = APIErrorSO.ErrorCodes.not_found
+            easy_api_error_so.error_code = APIErrorCodes.not_found
         else:
-            easy_api_error_so.error_code = APIErrorSO.ErrorCodes.unknown_error
+            easy_api_error_so.error_code = APIErrorCodes.unknown_error
         if (
                 isinstance(exception.detail, dict)
                 or isinstance(exception.detail, list)
@@ -136,12 +137,12 @@ def from_exception_to_api_json_response(
 
     elif isinstance(exception, fastapi.exceptions.RequestValidationError):
         status_code = starlette.status.HTTP_422_UNPROCESSABLE_ENTITY
-        easy_api_error_so.error_code = APIErrorSO.ErrorCodes.error_in_request
+        easy_api_error_so.error_code = APIErrorCodes.error_in_request
         easy_api_error_so.error_data["raw"] = str(exception.errors()) if exception.errors() else {}
 
     else:
         status_code = starlette.status.HTTP_500_INTERNAL_SERVER_ERROR
-        easy_api_error_so.error_code = APIErrorSO.ErrorCodes.unknown_error
+        easy_api_error_so.error_code = APIErrorCodes.unknown_error
         easy_api_error_so.error_data["raw"] = str(exception)
         _logger.exception(exception)
 

{arpakitlib-1.5.18 → arpakitlib-1.5.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "arpakitlib"
-version = "1.5.18"
+version = "1.5.19"
 description = "arpakitlib"
 authors = ["arpakit <arpakit@gmail.com>"]
 license = "Apache License 2.0"