arpakitlib 1.8.233__tar.gz → 1.8.235__tar.gz

{arpakitlib-1.8.233 → arpakitlib-1.8.235}/PKG-INFO

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

arpakitlib-1.8.235/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

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

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

@@ -0,0 +1,63 @@
+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")
+        )

arpakitlib-1.8.235/arpakitlib/_arpakit_project_template_v_5/project/api/raise_own_exception_if_exception_in_api_router.py

@@ -0,0 +1,34 @@
+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.schema.out.common.error import ErrorCommonSO
+
+
+def raise_own_exception_if_exception_in_api_router(
+        *,
+        status_code: int = fastapi.status.HTTP_400_BAD_REQUEST,
+        error_common_so: ErrorCommonSO | None = None,
+        kwargs_: dict[str, Any] | None = None,
+        kwargs_create_story_log: bool = True,
+        kwargs_logging_full_error: bool = True,
+):
+    """Обертка над декоратором raise_own_exception_if_exception"""
+
+    def decorator(func):
+        # просто возвращаем результат применения исходного декоратора
+        return raise_own_exception_if_exception(
+            catching_exceptions=Exception,
+            own_exception=APIException,
+            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
+            }
+        )(func)
+
+    return decorator

{arpakitlib-1.8.233 → arpakitlib-1.8.235}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/error.py

@@ -1,5 +1,7 @@
 from typing import Any
 
+from pydantic import Field
+
 from project.api.schema.common import BaseSO
 
 
@@ -8,4 +10,5 @@ class ErrorCommonSO(BaseSO):
     error_code: str | None = None
     error_specification_code: str | None = None
     error_description: str | None = None
-    error_data: dict[str, Any] = {}
+    error_description_data: dict[str, Any] = Field(default_factory=dict)
+    error_data: dict[str, Any] = Field(default_factory=dict)

{arpakitlib-1.8.233 → arpakitlib-1.8.235}/arpakitlib/raise_own_exception_if_exception.py

@@ -74,7 +74,7 @@ def raise_own_exception_if_exception(
                     try:
                         _kwargs = {}
                         if kwargs_in_own_exception is not None:
-                            _kwargs = {"kwargs_": copied_kwargs_in_own_exception}
+                            _kwargs = {"kwargs_in_own_exception": copied_kwargs_in_own_exception}
                         if forward_kwargs_in_own_exception is not None:
                             _kwargs.update(forward_kwargs_in_own_exception)
                         raise own_exception(**_kwargs) from caught_exception
@@ -97,7 +97,7 @@ def raise_own_exception_if_exception(
                 try:
                     _kwargs = {}
                     if kwargs_in_own_exception is not None:
-                        _kwargs = {"kwargs_": copied_kwargs_in_own_exception}
+                        _kwargs = {"kwargs_in_own_exception": copied_kwargs_in_own_exception}
                     if forward_kwargs_in_own_exception is not None:
                         _kwargs.update(forward_kwargs_in_own_exception)
                     raise own_exception(**_kwargs) from caught_exception

{arpakitlib-1.8.233 → arpakitlib-1.8.235}/pyproject.toml

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

arpakitlib-1.8.233/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

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

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

@@ -1,42 +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_code: str | None = APIErrorCodes.unknown_error,
-            error_specification_code: str | None = None,
-            error_description: str | None = None,
-            error_data: dict[str, Any] | None = None,
-            kwargs_: dict[str, Any] | None = None
-    ):
-        self.status_code = status_code
-        self.error_code = error_code
-        self.error_specification_code = error_specification_code
-        self.error_description = error_description
-        if error_data is None:
-            error_data = {}
-        self.error_data = error_data
-        if kwargs_ is None:
-            kwargs_ = {}
-        self.kwargs_ = kwargs_
-
-        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_data=self.error_data
-        )
-
-        super().__init__(
-            status_code=self.status_code,
-            detail=self.error_common_so.model_dump(mode="json")
-        )