arpakitlib 1.8.27__tar.gz → 1.8.29__tar.gz

{arpakitlib-1.8.27 → arpakitlib-1.8.29}/PKG-INFO

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

arpakitlib-1.8.29/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.27 → arpakitlib-1.8.29}/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.27 → arpakitlib-1.8.29}/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.27 → arpakitlib-1.8.29}/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.27 → arpakitlib-1.8.29}/arpakitlib/ar_sqlalchemy_util.py

@@ -6,6 +6,7 @@ from typing import Any
 from urllib.parse import quote_plus
 from uuid import uuid4
 
+import sqlalchemy
 from sqlalchemy import create_engine, QueuePool, text, func, inspect, AsyncAdaptedQueuePool
 from sqlalchemy.ext.asyncio import create_async_engine, async_sessionmaker, AsyncSession
 from sqlalchemy.orm import sessionmaker, DeclarativeBase
@@ -243,6 +244,19 @@ class SQLAlchemyDb:
     def generate_creation_dt(self) -> datetime:
         return now_utc_dt()
 
+    async def async_get_table_name_to_amount(self) -> dict[str, int]:
+        res = {}
+
+        async with self.new_async_session() as async_session:
+            for table_name, table in BaseDBM.metadata.tables.items():
+                res[table_name] = await async_session.scalar(
+                    sqlalchemy.select(
+                        sqlalchemy.func.count(1)
+                    ).select_from(table)
+                )
+
+        return res
+
 
 def get_string_info_from_declarative_base(class_: type[DeclarativeBase]):
     res = f"Db Models: {len(class_.__subclasses__())}"

{arpakitlib-1.8.27 → arpakitlib-1.8.29}/pyproject.toml

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

arpakitlib-1.8.27/arpakitlib/_arpakit_project_template_v_5_1/arpakitlib_project_template_info.json

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