arpakitlib 1.8.238__py3-none-any.whl → 1.8.239__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/api/api_exception.py

@@ -32,7 +32,7 @@ class APIException(fastapi.exceptions.HTTPException):
         self.status_code = status_code
 
         if error_common_so is None:
-            self.error_common_so = ErrorCommonSO(
+            error_common_so = ErrorCommonSO(
                 has_error=True,
                 error_code=error_code,
                 error_specification_code=error_specification_code,
@@ -40,27 +40,27 @@ class APIException(fastapi.exceptions.HTTPException):
                 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
-            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_in_own_exception.get("raise_own_exception_if_exception_in_api_router") is True:
-            self.error_data["raise_own_exception_if_exception_in_api_router"] = True
-            if kwargs_in_own_exception.get("caught_exception_str"):
-                self.error_data["caught_exception_str"] = kwargs_in_own_exception.get("caught_exception_str")
+            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_data["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_data["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__(
@@ -69,7 +69,7 @@ class APIException(fastapi.exceptions.HTTPException):
         )
 
     def __str__(self) -> str:
-        return f"{self.status_code=}, {self.error_code=}, {self.error_specification_code=}"
+        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_code=}, {self.error_specification_code=}"
+        return f"{self.status_code=}, {self.error_common_so.error_code=}, {self.error_common_so.error_specification_code=}"

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.238.dist-info → arpakitlib-1.8.239.dist-info}/METADATA

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

{arpakitlib-1.8.238.dist-info → arpakitlib-1.8.239.dist-info}/RECORD

@@ -82,7 +82,7 @@ arpakitlib/_arpakit_project_template_v_5/project/additional_model/__init__.py,sh
 arpakitlib/_arpakit_project_template_v_5/project/additional_model/common.py,sha256=BRz-B699ZY52DfUD6kmhpuThBWpPzpZpD0QXIjlkwC8,168
 arpakitlib/_arpakit_project_template_v_5/project/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/api_error_codes.py,sha256=LRTrqg-xulcEI9_-m1rcUZkaEpwA6zpLFYhQA8ZdXv4,1330
-arpakitlib/_arpakit_project_template_v_5/project/api/api_exception.py,sha256=jeYZxoyx-rWaUXpcMT52w_ZLV4pcya5mvQdRuxw5ozg,3291
+arpakitlib/_arpakit_project_template_v_5/project/api/api_exception.py,sha256=xAUFdGfLkH4OWT6kIsvHqPN42J4MKaGbi-mFd2dqoKg,3226
 arpakitlib/_arpakit_project_template_v_5/project/api/asgi.py,sha256=ES3YGwNxWUHVyD6e2ii6QkvTyB-vlVmr8_PhfVIXQ4Y,78
 arpakitlib/_arpakit_project_template_v_5/project/api/authorize.py,sha256=IGQuAZF-NvQRcVv5qbEKXszVMTJJE3iJdtQHzMFqpSA,15438
 arpakitlib/_arpakit_project_template_v_5/project/api/before_start_api.py,sha256=a7eiV8oaWk9qYzlNNnY8BYY8VlnQAZ0w8TwuC2u6v_c,1902
@@ -422,9 +422,9 @@ arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,40
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/clone_pydantic_model_fields.py,sha256=xxLwtvJzDf8EWMvBE4psWIj8c-cyeCxLRX76oCY_4zk,1214
 arpakitlib/pydantic_schema_from_sqlalchemy_model.py,sha256=_5Y79kQ4lLIOL6_afIFVwxY1EXzTMpi-veRR-WkPFOs,2879
-arpakitlib/raise_own_exception_if_exception.py,sha256=81OHXgjrvdNdRaf6NuhPAXucBzj7wwf9deUdVWE7Hlg,5762
-arpakitlib-1.8.238.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.238.dist-info/METADATA,sha256=n_MhTZc7EcWf_Mr-q9pZoynKgqYAiOGfWD9G2LjDD3U,3741
-arpakitlib-1.8.238.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.238.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.238.dist-info/RECORD,,
+arpakitlib/raise_own_exception_if_exception.py,sha256=NMZsURUtb07s0zxPySayk4bXymqhF7ng74dxgGnLBbw,5968
+arpakitlib-1.8.239.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.239.dist-info/METADATA,sha256=sDFT7bGpyWjEvMavq3bsvdGsGXGT9SUc1AvumYPvnE0,3741
+arpakitlib-1.8.239.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.239.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.239.dist-info/RECORD,,