arpakitlib 1.8.232__py3-none-any.whl → 1.8.234__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

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

arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py

@@ -74,7 +74,9 @@ def create_api_app(*, prefix: str = "/api") -> FastAPI:
 
     if get_cached_settings().api_enable_sqladmin:
         from project.sqladmin_.add_admin_in_app import add_sqladmin_in_app
-        add_sqladmin_in_app(app=api_app, favicon_url="/static/openapi-favicon.png")
+        add_sqladmin_in_app(
+            base_url=get_cached_settings().sqladmin_prefix, app=api_app, favicon_url="/static/openapi-favicon.png"
+        )
 
     _logger.info("finish")
 

arpakitlib/_arpakit_project_template_v_5/project/api/exception.py

@@ -11,31 +11,52 @@ class APIException(fastapi.exceptions.HTTPException):
             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_: dict[str, Any] | None = None,
+            kwargs_create_story_log: bool = True,
+            kwargs_logging_full_error: bool = True,
     ):
         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 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_
 
-        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")

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/_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/_arpakit_project_template_v_5/project/core/settings.py

@@ -153,6 +153,12 @@ class Settings(SimpleSettings):
 
     sqladmin_port: int | None = 8081
 
+    sqladmin_prefix: str | None = "/sqladmin"
+
+    sqladmin_full_url: str = f"http://{api_host}:{api_port}"
+
+    sqladmin_full_url_with_prefix: str = sqladmin_full_url + sqladmin_prefix
+
     tg_bot_token: str | None = None
 
     tg_bot_proxy_url: str | None = None

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/asgi.py

@@ -1,3 +1,4 @@
+from project.core.settings import get_cached_settings
 from project.sqladmin_.create_sqladmin_app import create_sqladmin_app
 
-app = create_sqladmin_app()
+app = create_sqladmin_app(base_url=get_cached_settings().sqladmin_prefix)

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.py

@@ -11,7 +11,7 @@ from project.sqladmin_.event import get_sqladmin_startup_events, get_sqladmin_sh
 _logger = logging.getLogger(__name__)
 
 
-def create_sqladmin_app(*, prefix: str = "/sqladmin") -> FastAPI:
+def create_sqladmin_app(*, base_url: str = "/sqladmin") -> FastAPI:
     setup_logging()
 
     _logger.info("start")
@@ -41,7 +41,7 @@ def create_sqladmin_app(*, prefix: str = "/sqladmin") -> FastAPI:
 
     add_sqladmin_in_app(
         app=sqladmin_app,
-        base_url=prefix
+        base_url=base_url
     )
 
     _logger.info("finish")

{arpakitlib-1.8.232.dist-info → arpakitlib-1.8.234.dist-info}/METADATA

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

{arpakitlib-1.8.232.dist-info → arpakitlib-1.8.234.dist-info}/RECORD

@@ -8,7 +8,7 @@ arpakitlib/_arpakit_project_template_v_5/alembic/env.py,sha256=Qesmnj5A2kB-Doeuf
 arpakitlib/_arpakit_project_template_v_5/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 arpakitlib/_arpakit_project_template_v_5/alembic/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/alembic.ini,sha256=8fuyeEvGBiPGbxEFy8ISBV3xX_fgVmuhEGpB10_B5Uo,3733
-arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=dN2oKmHuIXZOFL1sBNYTX1n2YqT7tqoPZWGtuxXs1zg,98
+arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json,sha256=zvYnveSfv5GgCQr3J2tmByBGeJ9LQ7qucpvueiUjYL8,98
 arpakitlib/_arpakit_project_template_v_5/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/command/alembic_history.sh,sha256=OMnDNtHIksGh9iavWnzbtxcudZW4vjdcISsBXvzZSPw,22
 arpakitlib/_arpakit_project_template_v_5/command/alembic_revision_autogenerate.sh,sha256=yW2i-SBOtBx15Ya0poVQqKkJM5t2JZp06r9AEW-DmGE,46
@@ -89,15 +89,16 @@ arpakitlib/_arpakit_project_template_v_5/project/api/blank/__init__.py,sha256=47
 arpakitlib/_arpakit_project_template_v_5/project/api/blank/admin.py,sha256=ii1zLHjvB7OVLQKFOhp4lpodXcwAmtwDdrM1iaafQfg,100
 arpakitlib/_arpakit_project_template_v_5/project/api/blank/client.py,sha256=rvJKtAB26Qy2pKVSHSMUM_70oI4v8Yr6Vmpr6r4EzNk,101
 arpakitlib/_arpakit_project_template_v_5/project/api/blank/common.py,sha256=ug1FylE_CVC5eij-u4nh-IHNO-gwkbBGo5KgyWDujC8,91
-arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py,sha256=rY9rI-_mbx8mu1-Q-MRVbw5Cmrv5qtHCJznFs1gBiNQ,3006
+arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py,sha256=-xJLrNuiUC8K-L2Q_1YbQzi_2bquW3HgVx7Ye2haHNk,3076
 arpakitlib/_arpakit_project_template_v_5/project/api/create_first_data.py,sha256=BgqmD-7gXQ_zoz3ATqVacQzkg9lbvKnCSvQxm0M0Vxw,1824
 arpakitlib/_arpakit_project_template_v_5/project/api/event.py,sha256=P8gV2Bq6LeLH0JDN9Z3O401PMbyNr2n-tme2gPvT-m4,996
-arpakitlib/_arpakit_project_template_v_5/project/api/exception.py,sha256=BSCYbdHYBldXmbdRxW14tIA47vttRXVlBGw7wMur8us,1425
+arpakitlib/_arpakit_project_template_v_5/project/api/exception.py,sha256=_lQ-qX0SxU8_XBDUYz924ZjxJ-FnOvXFaVbyptGuRyw,2600
 arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py,sha256=Se4Bj1Sdp6KXW7-G5xm0obJAFu3MfPA5NTm6yEEjgqU,11556
 arpakitlib/_arpakit_project_template_v_5/project/api/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/middleware/add_api_middlewares.py,sha256=TrWn0yPDCn0yTlHqLf19ypGtRumNjDxm0sM60yVsqXE,468
 arpakitlib/_arpakit_project_template_v_5/project/api/middleware/limit_content_length.py,sha256=cEtGcJSh3e2EyuQCFqKzRcrl3qS6oIvpSv5UEbYsvR4,1622
 arpakitlib/_arpakit_project_template_v_5/project/api/openapi_ui.py,sha256=7yg9ZNu6BjTAregnfbRFpwvqa-gTIY6o6NCz5pmsbeo,976
+arpakitlib/_arpakit_project_template_v_5/project/api/raise_own_exception_if_exception_in_api_router.py,sha256=6wBvzf0et1Jw7GSYKzZ6typmIubPn2SMJJMAZUBPsz0,1304
 arpakitlib/_arpakit_project_template_v_5/project/api/response.py,sha256=xZMymP2BuQaRNVWLeIp3UgUUo-MFN8MJnsn9Al4vOb8,1028
 arpakitlib/_arpakit_project_template_v_5/project/api/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -162,7 +163,7 @@ arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py,s
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py,sha256=Emhpawd_jGWu9xzyYyXk9h0YDSnHGDkyfP-hIgenzpA,508
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/datetime_.py,sha256=YFo29Qc7JMVq-OR398kPy4ypjh9kYAxPuZZUsobhDdc,942
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/error.py,sha256=C8oaHotxmxBnN7Lr1qT7T5Mk0SIU2Ha7_tPDpgiR6M8,286
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/error.py,sha256=QAJPTEVf4257fdWmmJes081TWqGb5eglDamQOO1ZHkE,412
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/ok.py,sha256=t0uT5WIO7hiHG6rQBkb10l37GCAUbki14v-E8-mWzNs,96
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/raw_data.py,sha256=T7DWPHlno37-2qfQLLGXY2_4Ajs_l9_UxDDF1VGdpqk,136
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -186,7 +187,7 @@ arpakitlib/_arpakit_project_template_v_5/project/core/dump_file_storage_in_dir.p
 arpakitlib/_arpakit_project_template_v_5/project/core/easy_openai_api_client.py,sha256=ssQ8Ju6CBQeXSOa_lfLaqycSf0a-NIj6ucOhEsPseVc,1141
 arpakitlib/_arpakit_project_template_v_5/project/core/jinja2_templates.py,sha256=jCNLaBauGC7YNvZdTLNHuPp7hmRGt94O23Skg6ewo7o,352
 arpakitlib/_arpakit_project_template_v_5/project/core/media_file_storage_in_dir.py,sha256=fMofTsfJtA8pp5lEUhucEUu3PBsmj-elaRZzExDsdLI,623
-arpakitlib/_arpakit_project_template_v_5/project/core/settings.py,sha256=-pxFzibJiQiOq9wId4UCfFa8T84J3PwioZBcYANKyf0,6915
+arpakitlib/_arpakit_project_template_v_5/project/core/settings.py,sha256=-1iKNOUQrHohahxoPl_V7e7Q53T_Sl1LTdu_EsBx9MU,7102
 arpakitlib/_arpakit_project_template_v_5/project/core/setup_logging.py,sha256=7VRejVMUNeR-MywrVw7B1RxVkIBHwVNQJFC4wlpBJco,1497
 arpakitlib/_arpakit_project_template_v_5/project/core/util.py,sha256=iCwpuRqr6TfW0sKVH-3asQjhueJuad3ffq6sPI6ZUrs,347
 arpakitlib/_arpakit_project_template_v_5/project/emailer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -249,8 +250,8 @@ arpakitlib/_arpakit_project_template_v_5/project/site/router/main_router.py,sha2
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/add_admin_in_app.py,sha256=JTXLf18DQVsZtoe6yFpZIVJI95rgJofnTe9YKyVwwhQ,851
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py,sha256=eIJ-oG8-piqSsnEPN3aJT_U5XOnxL7ZW3BCbLfVKS-E,5349
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/asgi.py,sha256=DRlRPkcOGXOccfP73oKEXolZTsc5VWdQgEG-qoW03ms,99
-arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.py,sha256=JGCHgqJJvAjpc8xnbXPqCeUiLeKO7eo6OA6uPYzzqlk,1308
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/asgi.py,sha256=kkzOo8xQ5NZCKVQYeaVXzYIhAXRLUrQVFToqEJWvQEc,199
+arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.py,sha256=GdNfgOEKSyBSQqyym0f7OuWqcTvI1MGcpUXPrQbt2bc,1312
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/event.py,sha256=LjAUYNlsX9Sj_QLMzYuTQbbYYbIMHhbsSjTXt-G7lOE,849
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/__init__.py,sha256=upngi5hsrv6f5M-_R0r_DfERl8jzTnZ6VOum71xiGcY,595
 arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/api_key.py,sha256=AfWtDIf0Z7GVEsnGw921u3VbkxhFIffR8u8MfspldSs,750
@@ -422,8 +423,8 @@ arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrI
 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=WCgrT0rwNMEAE__44TQaY4UXzRBKt-aJbMoOvTMGJVc,5541
-arpakitlib-1.8.232.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.232.dist-info/METADATA,sha256=CaPTaSh0P_kdxE1DSMscXf9ZlxSKEkmn_1OC9hr55DI,3741
-arpakitlib-1.8.232.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.232.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.232.dist-info/RECORD,,
+arpakitlib-1.8.234.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.234.dist-info/METADATA,sha256=LXaP2vSyl6XV2z0eEKi4uupUTu9mQzBwOBNVGJ7Ca-4,3741
+arpakitlib-1.8.234.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.234.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.234.dist-info/RECORD,,