arpakitlib 1.8.35__py3-none-any.whl → 1.8.37__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py

@@ -1,3 +1,5 @@
+import sqlalchemy
+
 from project.sqladmin_.model_view.common import SimpleMV
 from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
 
@@ -5,22 +7,16 @@ from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
 class UserTokenMV(SimpleMV, model=UserTokenDBM):
     name = "UserToken"
     name_plural = "UserTokens"
-    column_list = [
-        UserTokenDBM.id,
-        UserTokenDBM.long_id,
-        UserTokenDBM.slug,
-        UserTokenDBM.creation_dt,
-        UserTokenDBM.value,
-        UserTokenDBM.user,
-        UserTokenDBM.is_active,
-    ]
+    column_list = sqlalchemy.inspect(UserTokenDBM).columns
     form_columns = [
         UserTokenDBM.slug,
         UserTokenDBM.creation_dt,
         UserTokenDBM.value,
         UserTokenDBM.user,
         UserTokenDBM.is_active,
+        UserTokenDBM.extra_data
     ]
+    column_sortable_list = sqlalchemy.inspect(UserTokenDBM).columns
     column_default_sort = [
         (UserTokenDBM.creation_dt, True)
     ]
@@ -29,6 +25,4 @@ class UserTokenMV(SimpleMV, model=UserTokenDBM):
         UserTokenDBM.long_id,
         UserTokenDBM.slug,
         UserTokenDBM.value,
-        UserTokenDBM.user_id,
-        UserTokenDBM.is_active,
     ]

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

@@ -5,7 +5,7 @@ from typing import Any, TYPE_CHECKING
 
 import sqlalchemy
 from sqlalchemy.dialects import postgresql
-from sqlalchemy.orm import mapped_column, Mapped
+from sqlalchemy.orm import mapped_column, Mapped, validates
 
 from arpakitlib.ar_enumeration_util import Enumeration
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
@@ -66,6 +66,11 @@ class OperationDBM(SimpleDBM):
         nullable=False
     )
 
+    @validates("status")
+    def _validate_status(self, key, value, *args, **kwargs):
+        self.Statuses.parse_and_validate_values(value)
+        return value
+
     def raise_if_executed_with_error(self):
         if self.status == self.Statuses.executed_with_error:
             raise Exception(

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
-from typing import Any, TYPE_CHECKING
+from typing import TYPE_CHECKING
 
 import sqlalchemy
-from sqlalchemy.dialects import postgresql
-from sqlalchemy.orm import mapped_column, Mapped
+from sqlalchemy.orm import mapped_column, Mapped, validates
 
 from arpakitlib.ar_enumeration_util import Enumeration
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
@@ -43,12 +42,10 @@ class StoryLogDBM(SimpleDBM):
         insert_default=None,
         nullable=True
     )
-    data: Mapped[dict[str, Any]] = mapped_column(
-        postgresql.JSON,
-        insert_default={},
-        server_default="{}",
-        nullable=False
-    )
+
+    @validates("level")
+    def _validate_level(self, key, value, *args, **kwargs):
+        self.Levels.parse_and_validate_values(value)
 
     @property
     def sdp_allowed_levels(self) -> list[str]:

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py

@@ -99,76 +99,76 @@ class UserDBM(SimpleDBM):
         return bool(set(roles) & set(self.roles))
 
     @property
-    def tg_first_name(self) -> str | None:
+    def tg_data_first_name(self) -> str | None:
         if self.tg_data and "first_name" in self.tg_data:
             return self.tg_data["first_name"]
         return None
 
     @property
-    def sdp_tg_first_name(self) -> str | None:
-        return self.tg_first_name
+    def sdp_tg_data_first_name(self) -> str | None:
+        return self.tg_data_first_name
 
     @property
-    def tg_last_name(self) -> str | None:
+    def tg_data_last_name(self) -> str | None:
         if self.tg_data and "last_name" in self.tg_data:
             return self.tg_data["last_name"]
         return None
 
     @property
-    def sdp_tg_last_name(self) -> str | None:
-        return self.tg_last_name
+    def sdp_tg_data_last_name(self) -> str | None:
+        return self.tg_data_last_name
 
     @property
-    def tg_language_code(self) -> str | None:
+    def tg_data_language_code(self) -> str | None:
         if self.tg_data and "language_code" in self.tg_data:
             return self.tg_data["language_code"]
         return None
 
     @property
-    def sdp_tg_language_code(self) -> str | None:
-        return self.tg_language_code
+    def sdp_tg_data_language_code(self) -> str | None:
+        return self.tg_data_language_code
 
     @property
-    def tg_username(self) -> str | None:
+    def tg_data_username(self) -> str | None:
         if self.tg_data and "username" in self.tg_data:
             return self.tg_data["username"]
         return None
 
     @property
-    def sdp_tg_username(self) -> str | None:
-        return self.tg_username
+    def sdp_tg_data_username(self) -> str | None:
+        return self.tg_data_username
 
     @property
-    def tg_at_username(self) -> str | None:
-        if self.tg_username:
-            return f"@{self.tg_username}"
+    def tg_data_at_username(self) -> str | None:
+        if self.tg_data_username:
+            return f"@{self.tg_data_username}"
         return None
 
     @property
-    def sdp_tg_at_username(self) -> str | None:
-        return self.tg_at_username
+    def sdp_tg_data_at_username(self) -> str | None:
+        return self.tg_data_at_username
 
     @property
-    def tg_fullname(self) -> str | None:
-        if not self.tg_first_name and not self.tg_last_name:
+    def tg_data_fullname(self) -> str | None:
+        if not self.tg_data_first_name and not self.tg_data_last_name:
             return None
         res = ""
-        if self.tg_first_name:
-            res += self.tg_first_name
-        if self.tg_last_name:
-            res += " " + self.tg_last_name
+        if self.tg_data_first_name:
+            res += self.tg_data_first_name
+        if self.tg_data_last_name:
+            res += " " + self.tg_data_last_name
         return res
 
     @property
-    def sdp_tg_fullname(self) -> str | None:
-        return self.tg_fullname
+    def sdp_tg_data_fullname(self) -> str | None:
+        return self.tg_data_fullname
 
     @property
-    def tg_link_by_username(self) -> str | None:
-        if not self.tg_username:
+    def tg_data_link_by_username(self) -> str | None:
+        if not self.tg_data_username:
             return None
-        return f"https://t.me/{self.tg_username}"
+        return f"https://t.me/{self.tg_data_username}"
 
     @property
-    def sdp_tg_link_by_username(self) -> str | None:
-        return self.tg_link_by_username
+    def sdp_tg_data_link_by_username(self) -> str | None:
+        return self.tg_data_link_by_username

arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py

@@ -56,3 +56,7 @@ class UserTokenDBM(SimpleDBM):
     def __repr__(self) -> str:
         res = f"{self.entity_name} (id={self.id}, user_id={self.user_id})"
         return res
+
+    @property
+    def sdp_user(self) -> UserDBM:
+        return self.user

arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_api_keys.py

@@ -13,8 +13,8 @@ def make_test_data_1():
     with get_cached_sqlalchemy_db().new_session() as session:
         session.query(ApiKeyDBM).delete()
         session.commit()
-        for i in range(10):
-            api_key = ApiKeyDBM(value=str(i))
+        for i in range(1000):
+            api_key = ApiKeyDBM(value=str(i + 1))
             session.add(api_key)
             _logger.info(api_key)
         session.commit()

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/{client.py → general.py}

@@ -3,15 +3,16 @@ from functools import lru_cache
 from emoji import emojize
 
 from project.tg_bot.blank.common import SimpleBlankTgBot
-from project.tg_bot.const import ClientTgBotCommands
+from project.tg_bot.const import GeneralTgBotCommands
 
 
 class ClientTgBotBlank(SimpleBlankTgBot):
     def command_to_desc(self) -> dict[str, str]:
         return {
-            ClientTgBotCommands.start: emojize(":waving_hand: Начать"),
-            ClientTgBotCommands.about: emojize(":information: О проекте"),
-            ClientTgBotCommands.author: emojize(":bust_in_silhouette: Авторы"),
+            GeneralTgBotCommands.start: emojize(":waving_hand: Начать"),
+            GeneralTgBotCommands.about: emojize(":information: О проекте"),
+            GeneralTgBotCommands.author: emojize(":bust_in_silhouette: Авторы"),
+            GeneralTgBotCommands.support: emojize(":red_heart: Поддержка"),
         }
 
     def but_hello_world(self) -> str:
@@ -34,7 +35,7 @@ class ClientTgBotBlank(SimpleBlankTgBot):
 
     def author(self) -> str:
         res = "<b>ARPAKIT Company</b>"
-        res += "\n\n<i>Мы создаём качественные IT продукты<i>"
+        res += "\n\n<i>Мы создаём качественные IT продукты</i>"
         res += "\n\n:link: https://arpakit.com/"
         res += "\n\n:e-mail: support@arpakit.com"
         return emojize(res.strip())
@@ -52,7 +53,7 @@ class ClientTgBotBlank(SimpleBlankTgBot):
         return emojize(res.strip())
 
     def support(self) -> str:
-        res = ":red_heart: <b>Поддержка</b>"
+        res = ":red_heart: <b>Поддержка</b> :red_heart:"
         return emojize(res.strip())
 
     def keyboard_is_old(self) -> str:

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/const.py

@@ -1,7 +1,7 @@
 from arpakitlib.ar_enumeration_util import Enumeration
 
 
-class ClientTgBotCommands(Enumeration):
+class GeneralTgBotCommands(Enumeration):
     start = "start"
     about = "about"
     author = "author"
@@ -28,7 +28,7 @@ class AdminTgBotCommands(Enumeration):
 
 def __example():
     print("ClientCommandsTgBot:")
-    for v in ClientTgBotCommands.values_list():
+    for v in GeneralTgBotCommands.values_list():
         print(f"- {v}")
     print()
     print("AdminCommandsTgBot:")

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/kb/inline_/client/hello_world.py

@@ -1,7 +1,7 @@
 from aiogram.types import InlineKeyboardMarkup, InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
 from project.tg_bot.callback.client import HelloWorldClientCD
 
 

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/kb/static_/client/hello_world.py

@@ -1,7 +1,7 @@
 from aiogram.types import ReplyKeyboardMarkup, KeyboardButton
 from aiogram.utils.keyboard import ReplyKeyboardBuilder
 
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
 
 
 def hello_world_client_static_kb_tg_bot() -> ReplyKeyboardMarkup:

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/about.py

@@ -4,8 +4,8 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
-from project.tg_bot.const import ClientTgBotCommands
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
@@ -15,9 +15,9 @@ _logger = logging.getLogger(__name__)
 
 @tg_bot_router.message(
     or_f(
-        Command(ClientTgBotCommands.about),
+        Command(GeneralTgBotCommands.about),
         MessageTextTgBotFilter([
-            ClientTgBotCommands.about,
+            GeneralTgBotCommands.about,
             "о проекте"
         ], ignore_case=True)
     ),

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/author.py

@@ -4,8 +4,8 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
-from project.tg_bot.const import ClientTgBotCommands
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
@@ -15,9 +15,9 @@ _logger = logging.getLogger(__name__)
 
 @tg_bot_router.message(
     or_f(
-        Command(ClientTgBotCommands.author),
+        Command(GeneralTgBotCommands.author),
         MessageTextTgBotFilter([
-            ClientTgBotCommands.about,
+            GeneralTgBotCommands.about,
             "автор",
             "авторы"
         ], ignore_case=True)

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/error_handler.py

@@ -7,7 +7,7 @@ from aiogram.exceptions import TelegramBadRequest
 from arpakitlib.ar_exception_util import exception_to_traceback_str
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import StoryLogDBM
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 _logger = logging.getLogger(__name__)
@@ -81,7 +81,7 @@ async def _(
                     level=StoryLogDBM.Levels.error,
                     type=StoryLogDBM.Types.error_in_tg_bot,
                     title=f"{type(error_event.exception)}",
-                    data={
+                    extra_data={
                         "exception": str(error_event.exception),
                         "exception_traceback": exception_to_traceback_str(exception=error_event.exception)
                     }

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/healthcheck.py

@@ -1,14 +1,14 @@
 import aiogram.filters
 
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
-from project.tg_bot.const import ClientTgBotCommands
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 tg_bot_router = aiogram.Router()
 
 
 @tg_bot_router.message(
-    aiogram.filters.Command(ClientTgBotCommands.healthcheck),
+    aiogram.filters.Command(GeneralTgBotCommands.healthcheck),
 )
 async def _(
         m: aiogram.types.Message,

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/hello_world.py

@@ -2,9 +2,9 @@ import aiogram.filters
 from aiogram.filters import or_f
 
 from arpakitlib.ar_str_util import remove_html
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
 from project.tg_bot.callback.client import HelloWorldClientCD
-from project.tg_bot.const import ClientTgBotCommands
+from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter
 from project.tg_bot.kb.inline_.client.hello_world import hello_world_client_inline_kb_tg_bot
 from project.tg_bot.kb.static_.client.hello_world import hello_world_client_static_kb_tg_bot
@@ -15,7 +15,7 @@ tg_bot_router = aiogram.Router()
 
 @tg_bot_router.message(
     or_f(
-        aiogram.filters.Command(ClientTgBotCommands.hello_world),
+        aiogram.filters.Command(GeneralTgBotCommands.hello_world),
         MessageTextTgBotFilter(get_cached_client_tg_bot_blank().but_hello_world())
     ),
 

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/raw_callback_query.py

@@ -3,7 +3,7 @@ import logging
 import aiogram.filters
 from aiogram.exceptions import AiogramError
 
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 _logger = logging.getLogger(__name__)

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/raw_message.py

@@ -1,6 +1,6 @@
 import aiogram.filters
 
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 tg_bot_router = aiogram.Router()

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/start.py

@@ -4,8 +4,8 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
-from project.tg_bot.const import ClientTgBotCommands
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
@@ -15,9 +15,9 @@ _logger = logging.getLogger(__name__)
 
 @tg_bot_router.message(
     or_f(
-        Command(ClientTgBotCommands.start),
+        Command(GeneralTgBotCommands.start),
         MessageTextTgBotFilter([
-            ClientTgBotCommands.start,
+            GeneralTgBotCommands.start,
             "начать",
             "старт",
             "привет",

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/support.py

@@ -4,8 +4,8 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
-from project.tg_bot.const import ClientTgBotCommands
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.const import GeneralTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
@@ -15,9 +15,9 @@ _logger = logging.getLogger(__name__)
 
 @tg_bot_router.message(
     or_f(
-        Command(ClientTgBotCommands.support),
+        Command(GeneralTgBotCommands.support),
         MessageTextTgBotFilter([
-            ClientTgBotCommands.support,
+            GeneralTgBotCommands.support,
             "поддержка"
         ], ignore_case=True)
     )

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/set_tg_bot_commands.py

@@ -8,8 +8,8 @@ from project.core.settings import get_cached_settings
 from project.core.util import setup_logging
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
-from project.tg_bot.const import ClientTgBotCommands, AdminTgBotCommands
+from project.tg_bot.blank.general import get_cached_client_tg_bot_blank
+from project.tg_bot.const import GeneralTgBotCommands, AdminTgBotCommands
 from project.tg_bot.tg_bot import get_cached_tg_bot
 
 _logger = logging.getLogger(__name__)
@@ -18,31 +18,31 @@ _logger = logging.getLogger(__name__)
 def get_client_tg_bot_commands_to_set() -> list[BotCommand]:
     res = [
         BotCommand(
-            command=ClientTgBotCommands.start,
+            command=GeneralTgBotCommands.start,
             description=return_str_if_none(
-                get_cached_client_tg_bot_blank().command_to_desc().get(ClientTgBotCommands.start),
-                ClientTgBotCommands.start
+                get_cached_client_tg_bot_blank().command_to_desc().get(GeneralTgBotCommands.start),
+                GeneralTgBotCommands.start
             )
         ),
         BotCommand(
-            command=ClientTgBotCommands.about,
+            command=GeneralTgBotCommands.about,
             description=return_str_if_none(
-                get_cached_client_tg_bot_blank().command_to_desc().get(ClientTgBotCommands.about),
-                ClientTgBotCommands.about
+                get_cached_client_tg_bot_blank().command_to_desc().get(GeneralTgBotCommands.about),
+                GeneralTgBotCommands.about
             )
         ),
         BotCommand(
-            command=ClientTgBotCommands.support,
+            command=GeneralTgBotCommands.support,
             description=return_str_if_none(
-                get_cached_client_tg_bot_blank().command_to_desc().get(ClientTgBotCommands.support),
-                ClientTgBotCommands.support
+                get_cached_client_tg_bot_blank().command_to_desc().get(GeneralTgBotCommands.support),
+                GeneralTgBotCommands.support
             )
         ),
         BotCommand(
-            command=ClientTgBotCommands.author,
+            command=GeneralTgBotCommands.author,
             description=return_str_if_none(
-                get_cached_client_tg_bot_blank().command_to_desc().get(ClientTgBotCommands.author),
-                ClientTgBotCommands.author
+                get_cached_client_tg_bot_blank().command_to_desc().get(GeneralTgBotCommands.author),
+                GeneralTgBotCommands.author
             )
         )
 

arpakitlib/ar_enumeration_util.py

@@ -48,14 +48,14 @@ class Enumeration:
 
             if isinstance(value, str) or isinstance(value, int):
                 if validate is True and value not in cls.values_set():
-                    raise ValueError(f"validate is True and {value} not in {cls.values_set()}")
+                    raise ValueError(f"{value} not in {cls.values_set()}")
                 res.append(value)
 
             elif isinstance(value, Iterable):
                 for value_ in value:
                     if isinstance(value_, str) or isinstance(value_, int):
                         if validate is True and value_ not in cls.values_set():
-                            raise ValueError(f"validate is True and {value_} not in {cls.values_set()}")
+                            raise ValueError(f"{value_} not in {cls.values_set()}")
                         res.append(value_)
                     else:
                         raise TypeError(f"bad type, value={value}, type={type(value)}")