arpakitlib 1.8.25__tar.gz → 1.8.28__tar.gz

{arpakitlib-1.8.25 → arpakitlib-1.8.28}/PKG-INFO

@@ -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.28/arpakitlib/_arpakit_project_template_v_5_1/arpakitlib_project_template_info.json

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

{arpakitlib-1.8.25 → arpakitlib-1.8.28}/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-1.8.25 → arpakitlib-1.8.28}/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-1.8.25 → arpakitlib-1.8.28}/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-1.8.25 → arpakitlib-1.8.28}/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-1.8.28/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-1.8.25 → arpakitlib-1.8.28}/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-1.8.25 → arpakitlib-1.8.28}/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-1.8.25 → arpakitlib-1.8.28}/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 → arpakitlib-1.8.28}/pyproject.toml

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

arpakitlib-1.8.25/arpakitlib/_arpakit_project_template_v_5_1/arpakitlib_project_template_info.json

@@ -1,3 +0,0 @@
-{
-  "arpakitlib_project_template_version": "5_1"
-}