arpakitlib 1.8.237__tar.gz → 1.8.239__tar.gz

{arpakitlib-1.8.237 → arpakitlib-1.8.239}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.237
+Version: 1.8.239
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

arpakitlib-1.8.239/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -0,0 +1,4 @@
+{
+  "arpakitlib_project_template_version": "5",
+  "arpakitlib_project_template_subversion": "61"
+}

arpakitlib-1.8.239/arpakitlib/_arpakit_project_template_v_5/project/api/api_error_codes.py

@@ -0,0 +1,36 @@
+from arpakitlib.ar_enumeration_util import Enumeration
+
+
+class APIErrorCodes(Enumeration):
+    class Common(Enumeration):
+        cannot_authorize = "COMMON_CANNOT_AUTHORIZE".upper()
+        unknown_error = "COMMON_UNKNOWN_ERROR".upper()
+        error_in_request = "COMMON_ERROR_IN_REQUEST".upper()
+        not_found = "COMMON_NOT_FOUND".upper()
+        content_length_is_too_big = "content_length_is_too_big".upper()
+
+    cannot_authorize = Common.cannot_authorize
+    unknown_error = Common.unknown_error
+    error_in_request = Common.error_in_request
+    not_found = Common.not_found
+
+    class Global(Enumeration):
+        pass
+
+    class General(Enumeration):
+        pass
+
+    class Client(Enumeration):
+        error_use_referral_code = "client_error_use_referral_code"
+
+    class Admin(Enumeration):
+        error_raise_api_exception_1 = "error_admin_error_raise_api_exception_1".upper()
+        error_raise_api_exception_2 = "error_admin_error_raise_api_exception_2".upper()
+        error_raise_api_exception_3 = "error_admin_error_raise_api_exception_3".upper()
+        error_raise_fake_error = "error_admin_raise_fake_error".upper()
+        error_update_user = "error_admin_error_update_user".upper()
+        error_create_user = "error_create_user"
+
+
+if __name__ == '__main__':
+    print(APIErrorCodes.str_for_print())

arpakitlib-1.8.239/arpakitlib/_arpakit_project_template_v_5/project/api/api_exception.py

@@ -0,0 +1,75 @@
+from typing import Any
+
+import fastapi.security
+
+from project.api.api_error_codes import APIErrorCodes
+from project.api.schema.out.common.error import ErrorCommonSO
+
+
+class APIException(fastapi.exceptions.HTTPException):
+    def __init__(
+            self,
+            *,
+            status_code: int = fastapi.status.HTTP_400_BAD_REQUEST,
+            error_common_so: ErrorCommonSO | None = None,
+            error_code: str | None = APIErrorCodes.unknown_error,
+            error_specification_code: str | None = None,
+            error_description: str | None = None,
+            error_description_data: dict[str, Any] | None = None,
+            error_data: dict[str, Any] | None = None,
+            kwargs_: dict[str, Any] | None = None,
+            kwargs_create_story_log: bool | None = True,
+            kwargs_logging_full_error: bool | None = True,
+            kwargs_in_own_exception: dict[str, Any] = None,
+    ):
+        if error_description_data is None:
+            error_description_data = {}
+        if error_data is None:
+            error_data = {}
+        if kwargs_in_own_exception is None:
+            kwargs_in_own_exception = {}
+
+        self.status_code = status_code
+
+        if error_common_so is None:
+            error_common_so = ErrorCommonSO(
+                has_error=True,
+                error_code=error_code,
+                error_specification_code=error_specification_code,
+                error_description=error_description,
+                error_description_data=error_description_data,
+                error_data=error_data
+            )
+            self.error_common_so = error_common_so
+        else:
+            self.error_common_so = error_common_so
+
+        if kwargs_in_own_exception.get("raise_own_exception_if_exception_in_api_router") is True:
+            self.error_common_so.error_data["raise_own_exception_if_exception_in_api_router"] = True
+            self.error_common_so.error_data["caught_exception_type"] = kwargs_in_own_exception.get(
+                "caught_exception_type"
+            )
+            self.error_common_so.error_data["caught_exception_str"] = kwargs_in_own_exception.get(
+                "caught_exception_str"
+            )
+
+        if kwargs_ is None:
+            kwargs_ = {}
+        if "create_story_log" not in kwargs_ and kwargs_create_story_log is not None:
+            kwargs_["create_story_log"] = kwargs_create_story_log
+            self.error_common_so.error_data["create_story_log"] = kwargs_create_story_log
+        if "logging" not in kwargs_ and kwargs_logging_full_error is not None:
+            kwargs_["logging_full_error"] = kwargs_logging_full_error
+            self.error_common_so.error_data["logging_full_error"] = kwargs_logging_full_error
+        self.kwargs_ = kwargs_
+
+        super().__init__(
+            status_code=self.status_code,
+            detail=self.error_common_so.model_dump(mode="json")
+        )
+
+    def __str__(self) -> str:
+        return f"{self.status_code=}, {self.error_common_so.error_code=}, {self.error_common_so.error_specification_code=}"
+
+    def __repr__(self) -> str:
+        return f"{self.status_code=}, {self.error_common_so.error_code=}, {self.error_common_so.error_specification_code=}"

{arpakitlib-1.8.237 → arpakitlib-1.8.239}/arpakitlib/_arpakit_project_template_v_5/project/api/authorize.py

@@ -13,7 +13,7 @@ from sqlalchemy.orm import joinedload
 from arpakitlib.ar_func_util import is_async_func, is_sync_func
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
 from project.api.api_error_codes import APIErrorCodes
-from project.api.exception import APIException
+from project.api.api_exception import APIException
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM, UserTokenDBM

{arpakitlib-1.8.237 → arpakitlib-1.8.239}/arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py

@@ -12,7 +12,7 @@ from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_exception_util import exception_to_traceback_str
 from arpakitlib.ar_func_util import raise_if_not_async_func, is_async_func, is_sync_func
 from project.api.api_error_codes import APIErrorCodes
-from project.api.exception import APIException
+from project.api.api_exception import APIException
 from project.api.response import APIJSONResponse
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db

{arpakitlib-1.8.237 → arpakitlib-1.8.239}/arpakitlib/_arpakit_project_template_v_5/project/api/raise_own_exception_if_exception_in_api_router.py

@@ -3,7 +3,7 @@ from typing import Any
 import fastapi
 from arpakitlib.raise_own_exception_if_exception import raise_own_exception_if_exception
 
-from project.api.exception import APIException
+from project.api.api_exception import APIException
 from project.api.schema.out.common.error import ErrorCommonSO
 
 
@@ -22,12 +22,13 @@ def raise_own_exception_if_exception_in_api_router(
         return raise_own_exception_if_exception(
             catching_exceptions=Exception,
             own_exception=APIException,
+            kwargs_in_own_exception={raise_own_exception_if_exception_in_api_router.__name__: True},
             forward_kwargs_in_own_exception={
                 "status_code": status_code,
                 "error_common_so": error_common_so,
                 "kwargs_": kwargs_,
                 "kwargs_create_story_log": kwargs_create_story_log,
-                "kwargs_logging_full_error": kwargs_logging_full_error
+                "kwargs_logging_full_error": kwargs_logging_full_error,
             }
         )(func)
 

{arpakitlib-1.8.237 → arpakitlib-1.8.239}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_api_exception_1.py

@@ -3,7 +3,7 @@ from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
-from project.api.exception import APIException
+from project.api.api_exception import APIException
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 

{arpakitlib-1.8.237 → arpakitlib-1.8.239}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_api_exception_2.py

@@ -3,7 +3,7 @@ from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
-from project.api.exception import APIException
+from project.api.api_exception import APIException
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 

{arpakitlib-1.8.237 → arpakitlib-1.8.239}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_api_exception_3.py

@@ -3,7 +3,7 @@ from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
-from project.api.exception import APIException
+from project.api.api_exception import APIException
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 

{arpakitlib-1.8.237 → arpakitlib-1.8.239}/arpakitlib/raise_own_exception_if_exception.py

@@ -72,6 +72,7 @@ def raise_own_exception_if_exception(
                     if kwargs_in_own_exception is not None:
                         copied_kwargs_in_own_exception = kwargs_in_own_exception.copy()
                         copied_kwargs_in_own_exception["caught_exception"] = caught_exception
+                        copied_kwargs_in_own_exception["caught_exception_type"] = type(caught_exception)
                         copied_kwargs_in_own_exception["caught_exception_str"] = str(caught_exception)
                     try:
                         _kwargs = {}
@@ -96,6 +97,7 @@ def raise_own_exception_if_exception(
                 if kwargs_in_own_exception is not None:
                     copied_kwargs_in_own_exception = kwargs_in_own_exception.copy()
                     copied_kwargs_in_own_exception["caught_exception"] = caught_exception
+                    copied_kwargs_in_own_exception["caught_exception_type"] = type(caught_exception)
                     copied_kwargs_in_own_exception["caught_exception_str"] = str(caught_exception)
                 try:
                     _kwargs = {}

{arpakitlib-1.8.237 → arpakitlib-1.8.239}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.237"
+version = "1.8.239"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }

arpakitlib-1.8.237/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +0,0 @@
-{
-  "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "60"
-}

arpakitlib-1.8.237/arpakitlib/_arpakit_project_template_v_5/project/api/api_error_codes.py

@@ -1,21 +0,0 @@
-from arpakitlib.ar_enumeration_util import Enumeration
-
-
-class APIErrorCodes(Enumeration):
-    cannot_authorize = "CANNOT_AUTHORIZE"
-    unknown_error = "UNKNOWN_ERROR"
-    error_in_request = "ERROR_IN_REQUEST"
-    not_found = "NOT_FOUND"
-
-    class Common(Enumeration):
-        content_length_is_too_big = "content_length_is_too_big".upper()
-
-
-class APIErrorSpecificationCodes(Enumeration):
-    pass
-
-
-if __name__ == '__main__':
-    print(APIErrorCodes.str_for_print())
-    print()
-    print(APIErrorSpecificationCodes.str_for_print())

arpakitlib-1.8.237/arpakitlib/_arpakit_project_template_v_5/project/api/exception.py

@@ -1,63 +0,0 @@
-from typing import Any
-
-import fastapi.security
-
-from project.api.api_error_codes import APIErrorCodes
-from project.api.schema.out.common.error import ErrorCommonSO
-
-
-class APIException(fastapi.exceptions.HTTPException):
-    def __init__(
-            self,
-            *,
-            status_code: int = fastapi.status.HTTP_400_BAD_REQUEST,
-            error_common_so: ErrorCommonSO | None = None,
-            error_code: str | None = APIErrorCodes.unknown_error,
-            error_specification_code: str | None = None,
-            error_description: str | None = None,
-            error_description_data: dict[str, Any] | None = None,
-            error_data: dict[str, Any] | None = None,
-            kwargs_: dict[str, Any] | None = None,
-            kwargs_create_story_log: bool = True,
-            kwargs_logging_full_error: bool = True,
-    ):
-        self.status_code = status_code
-
-        if error_common_so is None:
-            self.error_code = error_code
-            self.error_specification_code = error_specification_code
-            self.error_description = error_description
-            if error_description_data is None:
-                error_description_data = {}
-            self.error_description_data = error_description_data
-            if error_data is None:
-                error_data = {}
-            self.error_data = error_data
-            self.error_common_so = ErrorCommonSO(
-                has_error=True,
-                error_code=self.error_code,
-                error_specification_code=self.error_specification_code,
-                error_description=self.error_description,
-                error_description_data=self.error_description_data,
-                error_data=self.error_data
-            )
-        else:
-            self.error_common_so = error_common_so
-            self.error_code = error_common_so.error_code
-            self.error_specification_code = error_common_so.error_specification_code
-            self.error_description = error_common_so.error_description
-            self.error_description_data = error_common_so.error_description_data
-            self.error_data = error_common_so.error_data
-
-        if kwargs_ is None:
-            kwargs_ = {}
-        if "create_story_log" not in kwargs_:
-            kwargs_["create_story_log"] = kwargs_create_story_log
-        if "logging" not in kwargs_:
-            kwargs_["logging_full_error"] = kwargs_logging_full_error
-        self.kwargs_ = kwargs_
-
-        super().__init__(
-            status_code=self.status_code,
-            detail=self.error_common_so.model_dump(mode="json")
-        )