arpakitlib 1.8.25__py3-none-any.whl → 1.8.28__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5_1/arpakitlib_project_template_info.json

@@ -1,3 +1,4 @@
 {
-  "arpakitlib_project_template_version": "5_1"
+  "arpakitlib_project_template_version": "5_2",
+  "arpakitlib_project_template_subversion": "3"
 }

arpakitlib/_arpakit_project_template_v_5_1/project/api/exception_handler.py

@@ -52,6 +52,7 @@ def create_api_exception_handler(
         )
 
         if isinstance(exception, APIException):
+            status_code = exception.status_code
             old_error_data = error_common_so.error_data
             error_common_so = exception.error_common_so
             error_common_so.error_data = combine_dicts(old_error_data, error_common_so.error_data)

arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/admin/common.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import datetime as dt
+from typing import Any
 
 from project.api.schema.common import BaseSO
 from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
@@ -11,6 +12,8 @@ class SimpleDBMAdminSO(BaseSO):
     long_id: str
     slug: str | None
     creation_dt: dt.datetime
+    extra_data: dict[str, Any]
+    entity_name: str
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMAdminSO:

arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/admin/operation.py

@@ -17,6 +17,8 @@ class OperationAdminSO(SimpleDBMAdminSO):
     output_data: dict[str, Any]
     error_data: dict[str, Any]
     duration_total_seconds: float | None
+    allowed_statuses: list[str]
+    allowed_types: list[str]
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: OperationDBM) -> OperationAdminSO:

arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/client/common.py

@@ -11,6 +11,7 @@ class SimpleDBMClientSO(BaseSO):
     long_id: str
     slug: str | None
     creation_dt: dt.datetime
+    entity_name: str
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMClientSO:

arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/general/common.py

@@ -0,0 +1,18 @@
+from __future__ import annotations
+
+import datetime as dt
+
+from project.api.schema.common import BaseSO
+from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
+
+
+class SimpleDBMGeneralSO(BaseSO):
+    id: int
+    long_id: str
+    slug: str | None
+    creation_dt: dt.datetime
+    entity_name: str
+
+    @classmethod
+    def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMGeneralSO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())

arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/common.py

@@ -42,11 +42,11 @@ class SimpleDBM(BaseDBM):
         sort_order=-100,
         nullable=False
     )
-    extra_data: Mapped[dict[str, Any] | None] = mapped_column(
+    extra_data: Mapped[dict[str, Any]] = mapped_column(
         sqlalchemy.JSON,
         index=False,
-        nullable=True,
-        insert_default=None,
+        nullable=False,
+        insert_default={},
         server_default="{}",
         sort_order=1000,
     )
@@ -56,6 +56,14 @@ class SimpleDBM(BaseDBM):
             return f"{self.__class__.__name__.removesuffix('DBM')} (id={self.id})"
         return f"{self.__class__.__name__.removesuffix('DBM')} (id={self.id}, slug={self.slug})"
 
+    @property
+    def entity_name(self) -> str:
+        return self.__class__.__name__.removesuffix("DBM")
+
+    @property
+    def sdp_entity_name(self) -> str:
+        return self.entity_name
+
 
 def get_simple_dbm_class() -> type[SimpleDBM]:
     from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM

arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/operation.py

@@ -97,3 +97,11 @@ class OperationDBM(SimpleDBM):
         То есть префикс sdp_ и даёт этот бонус.
         """
         return self.duration_total_seconds
+
+    @property
+    def sdp_allowed_statuses(self) -> list[str]:
+        return self.Statuses.values_list()
+
+    @property
+    def sdp_allowed_types(self) -> list[str]:
+        return self.Types.values_list()

arpakitlib/_arpakit_project_template_v_5_1/project/tg_bot/middleware/init_user.py

@@ -6,8 +6,8 @@ import sqlalchemy
 from aiogram import BaseMiddleware
 from aiogram.types import TelegramObject
 
+from arpakitlib.ar_datetime_util import now_utc_dt
 from project.core.settings import get_cached_settings
-from project.core.util import now_local_dt
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
@@ -43,7 +43,7 @@ class InitUserTgBotMiddleware(BaseMiddleware):
             middleware_data_tg_bot.additional_data["tg_user_was_found"] = tg_user
             middleware_data_tg_bot.additional_data["found_tg_user_id"] = tg_user.id
 
-        now_local_dt_ = now_local_dt()
+        now_utc_dt_ = now_utc_dt()
 
         if tg_user is not None and get_cached_sqlalchemy_db() is not None:
             async with get_cached_sqlalchemy_db().new_async_session() as async_session:
@@ -55,11 +55,11 @@ class InitUserTgBotMiddleware(BaseMiddleware):
                     if tg_user.id in get_cached_settings().tg_bot_admin_tg_ids:
                         roles.append(UserDBM.Roles.admin)
                     middleware_data_tg_bot.user_dbm = UserDBM(
-                        creation_dt=now_local_dt_,
+                        creation_dt=now_utc_dt_,
                         roles=roles,
                         tg_id=tg_user.id,
                         tg_data=tg_user.model_dump(mode="json"),
-                        tg_bot_last_action_dt=now_local_dt_
+                        tg_bot_last_action_dt=now_utc_dt_
                     )
                     async_session.add(middleware_data_tg_bot.user_dbm)
                     await async_session.commit()
@@ -68,7 +68,7 @@ class InitUserTgBotMiddleware(BaseMiddleware):
                     _logger.info(f"user_dbm was added, {middleware_data_tg_bot.user_dbm}")
                 else:
                     middleware_data_tg_bot.user_dbm.tg_data = tg_user.model_dump(mode="json")
-                    middleware_data_tg_bot.user_dbm.tg_bot_last_action_dt = now_local_dt_
+                    middleware_data_tg_bot.user_dbm.tg_bot_last_action_dt = now_utc_dt_
                     if (
                             tg_user.id in get_cached_settings().tg_bot_admin_tg_ids
                             and UserDBM.Roles.admin not in middleware_data_tg_bot.user_dbm.roles

{arpakitlib-1.8.25.dist-info → arpakitlib-1.8.28.dist-info}/METADATA

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

{arpakitlib-1.8.25.dist-info → arpakitlib-1.8.28.dist-info}/RECORD

@@ -8,7 +8,7 @@ arpakitlib/_arpakit_project_template_v_5_1/alembic/env.py,sha256=Qesmnj5A2kB-Doe
 arpakitlib/_arpakit_project_template_v_5_1/alembic/script.py.mako,sha256=MEqL-2qATlST9TAOeYgscMn1uy6HUS9NFvDgl93dMj8,635
 arpakitlib/_arpakit_project_template_v_5_1/alembic/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5_1/alembic.ini,sha256=8fuyeEvGBiPGbxEFy8ISBV3xX_fgVmuhEGpB10_B5Uo,3733
-arpakitlib/_arpakit_project_template_v_5_1/arpakitlib_project_template_info.json,sha256=mpl217vxjKE2HUKTtW8EIgYqW7oLU6hg_HLavmvLPfA,50
+arpakitlib/_arpakit_project_template_v_5_1/arpakitlib_project_template_info.json,sha256=WtF1ajvE3KZWYKpcV9BePD-2v3bo3jaro_sA9pHfA40,99
 arpakitlib/_arpakit_project_template_v_5_1/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5_1/command/alembic_history.sh,sha256=OMnDNtHIksGh9iavWnzbtxcudZW4vjdcISsBXvzZSPw,22
 arpakitlib/_arpakit_project_template_v_5_1/command/alembic_revision_autogenerate.sh,sha256=yW2i-SBOtBx15Ya0poVQqKkJM5t2JZp06r9AEW-DmGE,46
@@ -87,7 +87,7 @@ arpakitlib/_arpakit_project_template_v_5_1/project/api/const.py,sha256=J9bqaRRiI
 arpakitlib/_arpakit_project_template_v_5_1/project/api/create_api_app.py,sha256=C7VhAh7cTYLUBg8HyEgNTCdzvRlAC6hGYKdDrweWq6I,2327
 arpakitlib/_arpakit_project_template_v_5_1/project/api/event.py,sha256=xKfJ3UnOx_g1s7KNZjWRp0eZbVRTsSlyJhT3wkfwT6k,2414
 arpakitlib/_arpakit_project_template_v_5_1/project/api/exception.py,sha256=cNZaI2DacGLl8Hyn1qIfFpVjvQzOQjwXWsVW4auBrCo,1280
-arpakitlib/_arpakit_project_template_v_5_1/project/api/exception_handler.py,sha256=Uyt0gB_8QnMFcZuNoUaEiAAJEjziWQpsXY1OM36e3YU,11125
+arpakitlib/_arpakit_project_template_v_5_1/project/api/exception_handler.py,sha256=X5vC3kIAN1wXR0Q_iCsQWapKqaNK29q37M2WeFcIt8s,11173
 arpakitlib/_arpakit_project_template_v_5_1/project/api/openapi_ui.py,sha256=PLhH-W6zDViO-75AGCs8Vq3IoyHChdqwBYAqLvdQN0U,904
 arpakitlib/_arpakit_project_template_v_5_1/project/api/response.py,sha256=xZMymP2BuQaRNVWLeIp3UgUUo-MFN8MJnsn9Al4vOb8,1028
 arpakitlib/_arpakit_project_template_v_5_1/project/api/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -122,12 +122,12 @@ arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/in_/general/__init
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/in_/general/common.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/admin/common.py,sha256=b0s5VdLcH-sBvD9WFaVg-cek299ItBH8W0xn7JWaV78,445
-arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/admin/operation.py,sha256=8oPqCofV5KJMB6JB-Cozi_5l-2t8EPSvfossT0wIZBM,699
+arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/admin/common.py,sha256=sKZ5cFZ-Orpw0jD7Whs6OLwz2LXCC6q_og4_ABaqJ1w,520
+arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/admin/operation.py,sha256=xDZe7xgkGp2rv2LBZv5iGuNIgoqjv9OALe7FIK-1gUQ,760
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/admin/story_log.py,sha256=EenBUvs9qENEGuCpZrBRSd4TNVjR-ER55g44QGPLAzY,482
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/client/api_key.py,sha256=opXOQvpC3turivtLkf-BOJ9Octq5HW8HaM-oRTLhrX0,429
-arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/client/common.py,sha256=cm7FAsZf5GlGAcR_w0tr2fR9gUMNcY--ifqE-BuFGpU,447
+arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/client/common.py,sha256=xh5FaklPcc1HX5XL5FRWC8l1ev_IlvF_MK0ULpWjjOk,468
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/client/user.py,sha256=S93SizBPg5evgycr3Y_AF0Ds0M5gvO2o_W2VsDZXFeY,629
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/client/user_token.py,sha256=XRUs3ieMDZGGnMMst-QXptBWXqBL-qPQa25NJVbSI9I,436
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -135,7 +135,7 @@ arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/common/datetim
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/common/error.py,sha256=C8oaHotxmxBnN7Lr1qT7T5Mk0SIU2Ha7_tPDpgiR6M8,286
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/common/raw_data.py,sha256=F0CGmdqDAqnpoJW1q_yaRa4OsaSI4UbsCXavCxxDZVQ,132
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/general/common.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/general/common.py,sha256=0I4hOs9ihpd4BS0M8P_BLXH7TxDLQtV4HQb-h9pz1uA,470
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/general/errors_info_general.py,sha256=meZ3lxkbgEZegN4bV_DlnR7sK-lw6ef0lAs0smPADC4,168
 arpakitlib/_arpakit_project_template_v_5_1/project/api/schema/out/general/healthcheck.py,sha256=H8YkH3BYj7J1qTX1Ur2c4EGTSmLZygV86dlqvMx7QFM,106
 arpakitlib/_arpakit_project_template_v_5_1/project/api/util.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -219,8 +219,8 @@ arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/const.py,sha25
 arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_db.py,sha256=1y3FaMFzm_5UM2poqtBve_UP_mh1vjs--krq6yO8PsA,742
 arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/__init__.py,sha256=btSjCQ7RJqomeXzYs9HePCu1dZHs0z6-RuboYKG89_8,598
 arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/api_key.py,sha256=RVkfa6kuhdv1D_3Qindh4bucapqz5MZa5gNkiYuwC14,1096
-arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=St2jp3kvVbz4iE9ZEiJNGUGsVSzW1LaVokpBo0X2VB0,1905
-arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=xm_0X5DNoLtw_2HkDVd386cleOFBeA-Ll7Cr2hw-fgk,3288
+arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=xhMxNea8ndjmdsNwp_a9L_VUkkRb8jjVLhczxDasNss,2090
+arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=0uhlkE95_lX8Nmgl2n5oJ7lty558Y6ZOoQc6lfuSyCY,3496
 arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=uB7nKEqvUKJyE_xybJUjXIJtVXh0IKyoPDnDUogq8lE,1306
 arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=GaOJkxsQ6B3B4pO43_MOOrJSUE8d7VzXyYLQcoEvCCw,2355
 arpakitlib/_arpakit_project_template_v_5_1/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=AtFEPQZlYl_fr0WgYkS8ToiHluNomXV02HDuD0nVjZw,1398
@@ -267,7 +267,7 @@ arpakitlib/_arpakit_project_template_v_5_1/project/tg_bot/kb/static_/client/hell
 arpakitlib/_arpakit_project_template_v_5_1/project/tg_bot/kb/static_/common.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5_1/project/tg_bot/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5_1/project/tg_bot/middleware/common.py,sha256=DbUyWtk3zmWJx28QmJLX9keTNBUhI9ZJJjEnjrgxhgs,390
-arpakitlib/_arpakit_project_template_v_5_1/project/tg_bot/middleware/init_user.py,sha256=dtr7ZuGiU0rYNtYKqp3nkGm-WYgqeocPARxJVblOaxE,3829
+arpakitlib/_arpakit_project_template_v_5_1/project/tg_bot/middleware/init_user.py,sha256=0hsU0PBXhYdsTpTVq8dds7SPw96oGykTh14SEAyesAc,3827
 arpakitlib/_arpakit_project_template_v_5_1/project/tg_bot/middleware/middleware.py,sha256=66v3pHu8nhJ8pJayXaHNKjmPVK4fKUCNWilOM0yzNKg,319
 arpakitlib/_arpakit_project_template_v_5_1/project/tg_bot/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5_1/project/tg_bot/router/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -357,8 +357,8 @@ arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,40
 arpakitlib/ar_wata_api_client.py,sha256=gdHOqDbuqxhTjVDtRW1DvkRJLdDofCrOq51GTctzLns,242
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
 arpakitlib/ar_zabbix_api_client_util.py,sha256=Q-VR4MvoZ9aHwZeYZr9G3LwN-ANx1T5KFmF6pvPM-9M,6402
-arpakitlib-1.8.25.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.25.dist-info/METADATA,sha256=QLOmp4KFpk-_QVtGg324rH_E39mO86R_dRAK_s7V0vA,3434
-arpakitlib-1.8.25.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.25.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.25.dist-info/RECORD,,
+arpakitlib-1.8.28.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.28.dist-info/METADATA,sha256=t9RUXfOVchKgDsRMh5ssroG0uk7RYb2cBwsDF2oT4qQ,3434
+arpakitlib-1.8.28.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.28.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.28.dist-info/RECORD,,