arpakitlib 1.8.96__tar.gz → 1.8.97__tar.gz

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/PKG-INFO

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

arpakitlib-1.8.97/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

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

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/authorize.py

@@ -5,18 +5,17 @@ import fastapi.exceptions
 import fastapi.responses
 import fastapi.security
 import sqlalchemy
-from fastapi import Security
-from fastapi.security import APIKeyHeader
-from pydantic import BaseModel, ConfigDict
-from sqlalchemy.orm import joinedload
-
 from arpakitlib.ar_func_util import is_async_func, is_sync_func
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
+from fastapi import Security
+from fastapi.security import APIKeyHeader
 from project.api.const import APIErrorCodes
 from project.api.exception import APIException
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import ApiKeyDBM, UserTokenDBM
+from pydantic import BaseModel, ConfigDict
+from sqlalchemy.orm import joinedload
 
 
 class APIAuthorizeData(BaseModel):

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py

@@ -5,7 +5,6 @@ import starlette.types
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
-
 from project.api.event import get_startup_api_events, get_shutdown_api_events
 from project.api.exception_handler import add_exception_handler_to_api_app
 from project.api.openapi_ui import add_local_openapi_ui_to_api_app

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/exception.py

@@ -1,7 +1,6 @@
 from typing import Any
 
 import fastapi.security
-
 from project.api.const import APIErrorCodes
 from project.api.schema.out.common.error import ErrorCommonSO
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py

@@ -6,7 +6,6 @@ from typing import Any, Callable
 
 import fastapi
 import starlette.exceptions
-
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_exception_util import exception_to_traceback_str

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/response.py

@@ -1,7 +1,6 @@
 from typing import Any
 
 import fastapi
-
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
 from project.api.schema.common import BaseSO
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/clear_log_file.py

@@ -1,7 +1,6 @@
 import fastapi
-from fastapi import APIRouter
-
 from arpakitlib.ar_logging_util import init_log_file
+from fastapi import APIRouter
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
     require_user_token_dbm_api_authorize_middleware, api_authorize
 from project.api.schema.out.common.error import ErrorCommonSO

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/create_operation.py

@@ -2,7 +2,6 @@ from typing import Any
 
 import fastapi
 from fastapi import APIRouter
-
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, \
     require_user_token_dbm_api_authorize_middleware, APIAuthorizeData, api_authorize
 from project.api.schema.common import BaseSI

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py

@@ -2,7 +2,6 @@ from typing import Any
 
 import fastapi
 from fastapi import APIRouter
-
 from project.api.authorize import require_user_token_dbm_api_authorize_middleware, APIAuthorizeData, \
     api_authorize, require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py

@@ -1,9 +1,8 @@
 from typing import Any
 
 import fastapi.requests
-from fastapi import APIRouter
-
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
+from fastapi import APIRouter
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_log_file.py

@@ -1,7 +1,6 @@
 import fastapi
-from fastapi import APIRouter
-
 from arpakitlib.ar_logging_util import init_log_file
+from fastapi import APIRouter
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, \
     require_user_token_dbm_api_authorize_middleware, api_authorize
 from project.core.settings import get_cached_settings

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_operation.py

@@ -1,8 +1,7 @@
 import fastapi.requests
 import sqlalchemy
-from fastapi import APIRouter
-
 from arpakitlib.ar_str_util import strip_if_not_none, make_none_if_blank
+from fastapi import APIRouter
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.admin.operation import Operation1AdminSO

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_settings.py

@@ -2,7 +2,6 @@ from typing import Any
 
 import fastapi.requests
 from fastapi import APIRouter
-
 from project.api.authorize import APIAuthorizeData, api_authorize, require_api_key_dbm_api_authorize_middleware, \
     require_user_token_dbm_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_sqlalchemy_db_table_name_to_amount.py

@@ -2,7 +2,6 @@ from typing import Any
 
 import fastapi
 from fastapi import APIRouter
-
 from project.api.authorize import require_user_token_dbm_api_authorize_middleware, APIAuthorizeData, \
     api_authorize, require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.common.error import ErrorCommonSO

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_story_log.py

@@ -1,8 +1,7 @@
 import fastapi.requests
 import sqlalchemy
-from fastapi import APIRouter
-
 from arpakitlib.ar_str_util import make_none_if_blank, strip_if_not_none
+from fastapi import APIRouter
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.admin.story_log import StoryLog1AdminSO

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_user.py

@@ -1,8 +1,7 @@
 import fastapi.requests
 import sqlalchemy
-from fastapi import APIRouter
-
 from arpakitlib.ar_str_util import strip_if_not_none, make_none_if_blank
+from fastapi import APIRouter
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.admin.user import User1AdminSO

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py

@@ -3,14 +3,13 @@ from __future__ import annotations
 import fastapi.requests
 import sqlalchemy
 from fastapi import APIRouter
-from sqlalchemy.orm import joinedload
-
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.client.complicated_user_1 import ComplicatedUser1ClientSO
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+from sqlalchemy.orm import joinedload
 
 api_router = APIRouter()
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import fastapi.requests
 from fastapi import APIRouter
-
 from project.api.authorize import APIAuthorizeData, api_authorize, require_user_token_dbm_api_authorize_middleware, \
     require_api_key_dbm_api_authorize_middleware
 from project.api.schema.out.client.complicated_user_token_1 import ComplicatedUserToken1ClientSO

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/general/healthcheck.py

@@ -1,9 +1,8 @@
 import datetime as dt
 
 import fastapi
-from fastapi import APIRouter
-
 from arpakitlib.ar_datetime_util import now_utc_dt
+from fastapi import APIRouter
 from project.api.schema.common import BaseSO
 from project.api.schema.out.common.error import ErrorCommonSO
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/router/general/now_utc_datetime.py

@@ -1,7 +1,6 @@
 import fastapi
-from fastapi import APIRouter
-
 from arpakitlib.ar_datetime_util import now_utc_dt
+from fastapi import APIRouter
 from project.api.authorize import require_api_key_dbm_api_authorize_middleware, APIAuthorizeData, api_authorize
 from project.api.schema.out.common.datetime_ import DatetimeCommonSO
 from project.api.schema.out.common.error import ErrorCommonSO

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user.py

@@ -27,6 +27,7 @@ class User1AdminSO(SimpleDBMAdminSO):
     tg_data_at_username: str | None
     tg_data_fullname: str | None
     tg_data_link_by_username: str | None
+    email_prefix: str | None
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: UserDBM, **kwargs) -> User1AdminSO:

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py

@@ -26,6 +26,7 @@ class User1ClientSO(SimpleDBMClientSO):
     tg_data_at_username: str | None
     tg_data_fullname: str | None
     tg_data_link_by_username: str | None
+    email_prefix: str | None
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: UserDBM, **kwargs) -> User1ClientSO:

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/general/user.py

@@ -26,6 +26,7 @@ class User1GeneralSO(SimpleDBMGeneralSO):
     tg_data_at_username: str | None
     tg_data_fullname: str | None
     tg_data_link_by_username: str | None
+    email_prefix: str | None
 
     @classmethod
     def from_dbm(cls, *, simple_dbm: UserDBM, **kwargs) -> User1GeneralSO:

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/core/jinja2_templates.py

@@ -1,7 +1,6 @@
 from functools import lru_cache
 
 from fastapi.templating import Jinja2Templates
-
 from project.core.const import ProjectPaths
 
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/core/settings.py

@@ -3,14 +3,13 @@ from functools import lru_cache
 from typing import Any
 
 import pytz
-from pydantic import field_validator
-from pydantic_core.core_schema import ValidationInfo
-
 from arpakitlib.ar_json_util import transfer_data_to_json_str
 from arpakitlib.ar_settings_util import SimpleSettings
 from arpakitlib.ar_sqlalchemy_util import generate_sqlalchemy_url
 from arpakitlib.ar_type_util import raise_for_type
 from project.core.const import ProjectPaths
+from pydantic import field_validator
+from pydantic_core.core_schema import ValidationInfo
 
 
 class Settings(SimpleSettings):

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/operation_execution/operation_executor_worker.py

@@ -5,8 +5,6 @@ from datetime import timedelta
 from typing import Any
 
 import sqlalchemy
-from sqlalchemy import asc
-
 from arpakitlib.ar_base_worker_util import BaseWorker
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
@@ -15,6 +13,7 @@ from arpakitlib.ar_sqlalchemy_util import SQLAlchemyDb
 from arpakitlib.ar_type_util import raise_for_type
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM, StoryLogDBM
+from sqlalchemy import asc
 
 
 class OperationExecutorWorker(BaseWorker):
@@ -27,7 +26,7 @@ class OperationExecutorWorker(BaseWorker):
             startup_funcs: list[Any] | None = None
     ):
         super().__init__(
-            timeout_after_run=timedelta(seconds=0.1),
+            timeout_after_run=timedelta(seconds=0.01),
             timeout_after_error_in_run=timedelta(seconds=0.1),
             startup_funcs=startup_funcs,
         )

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/operation_execution/scheduled_operations.py

@@ -1,11 +1,10 @@
 from datetime import timedelta
 from typing import Any, Callable
 
-from pydantic import ConfigDict
-from pydantic.v1 import BaseModel
-
 from project.operation_execution.util import every_timedelta_is_time_func
 from project.sqlalchemy_db_.sqlalchemy_model import OperationDBM
+from pydantic import ConfigDict
+from pydantic.v1 import BaseModel
 
 
 class ScheduledOperation(BaseModel):

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/add_admin_in_app.py

@@ -1,10 +1,9 @@
 from fastapi import FastAPI
-from sqladmin import Admin
-
 from project.core.settings import get_cached_settings
 from project.sqladmin_.admin_authorize import SQLAdminAuth
 from project.sqladmin_.model_view import SimpleMV
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from sqladmin import Admin
 
 
 def add_sqladmin_in_app(

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/admin_authorize.py

@@ -2,12 +2,11 @@ import logging
 
 import fastapi
 import sqlalchemy
-from sqladmin.authentication import AuthenticationBackend
-
 from arpakitlib.ar_str_util import make_none_if_blank, strip_if_not_none
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
 from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM, UserDBM
+from sqladmin.authentication import AuthenticationBackend
 
 SQLADMIN_AUTHORIZE_KEY = "sqladmin_authorize_key"
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/create_sqladmin_app.py

@@ -2,7 +2,6 @@ import logging
 
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-
 from project.core.settings import get_cached_settings
 from project.core.util import setup_logging
 from project.sqladmin_.add_admin_in_app import add_sqladmin_in_app

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user.py

@@ -7,6 +7,7 @@ from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 class UserMV(SimpleMV, model=UserDBM):
     name = "User"
     name_plural = "Users"
+    icon = "fa-solid fa-user"
     column_list = [
         UserDBM.id,
         UserDBM.long_id,
@@ -41,7 +42,6 @@ class UserMV(SimpleMV, model=UserDBM):
     column_searchable_list = [
         UserDBM.id,
         UserDBM.long_id,
-        UserDBM.slug,
         UserDBM.email,
         UserDBM.username,
         UserDBM.password,

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqladmin_/model_view/user_token.py

@@ -7,6 +7,7 @@ from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
 class UserTokenMV(SimpleMV, model=UserTokenDBM):
     name = "UserToken"
     name_plural = "UserTokens"
+    icon = "fa-solid fa-fingerprint"
     column_list = [
         UserTokenDBM.id,
         UserTokenDBM.long_id,

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/api_key.py

@@ -4,11 +4,10 @@ from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import sqlalchemy
-from sqlalchemy.orm import Mapped, mapped_column, validates
-
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_str_util import make_none_if_blank
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
+from sqlalchemy.orm import Mapped, mapped_column, validates
 
 if TYPE_CHECKING:
     pass

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py

@@ -3,11 +3,10 @@ from typing import Any
 from uuid import uuid4
 
 import sqlalchemy
-from sqlalchemy import func
-from sqlalchemy.orm import mapped_column, Mapped, validates
-
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_sqlalchemy_util import get_string_info_from_declarative_base, BaseDBM
+from sqlalchemy import func
+from sqlalchemy.orm import mapped_column, Mapped, validates
 
 
 def generate_default_long_id() -> str:
@@ -91,6 +90,14 @@ class SimpleDBM(BaseDBM):
             raise ValueError(f"{key=}, {value=}, value is not dict")
         return value
 
+    @property
+    def id_and_long_id(self) -> str:
+        return f"{self.id}--{self.long_id}"
+
+    @property
+    def sdp_id_and_long_id(self) -> str:
+        return self.id_and_long_id
+
     @property
     def entity_name(self) -> str:
         return self.__class__.__name__.removesuffix("DBM")

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py

@@ -4,12 +4,11 @@ from datetime import datetime, timedelta
 from typing import Any, TYPE_CHECKING
 
 import sqlalchemy
-from sqlalchemy.dialects import postgresql
-from sqlalchemy.orm import mapped_column, Mapped, validates
-
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_str_util import make_none_if_blank
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
+from sqlalchemy.dialects import postgresql
+from sqlalchemy.orm import mapped_column, Mapped, validates
 
 if TYPE_CHECKING:
     pass

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py

@@ -3,11 +3,10 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import sqlalchemy
-from sqlalchemy.orm import mapped_column, Mapped, validates
-
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_str_util import make_none_if_blank
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
+from sqlalchemy.orm import mapped_column, Mapped, validates
 
 if TYPE_CHECKING:
     pass

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py

@@ -5,14 +5,13 @@ from typing import TYPE_CHECKING, Any
 from uuid import uuid4
 
 import sqlalchemy
-from email_validator import validate_email
-from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
-
 from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_enumeration_util import Enumeration
 from arpakitlib.ar_str_util import make_none_if_blank
 from arpakitlib.ar_type_util import raise_for_type
+from email_validator import validate_email
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
+from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
 
 if TYPE_CHECKING:
     from project.sqlalchemy_db_.sqlalchemy_model.user_token import UserTokenDBM
@@ -226,3 +225,15 @@ class UserDBM(SimpleDBM):
     @property
     def sdp_tg_data_link_by_username(self) -> str | None:
         return self.tg_data_link_by_username
+
+    @property
+    def email_prefix(self) -> str | None:
+        if self.email is None:
+            return None
+        if self.email.count("@") != 1:
+            return None
+        return self.email.split("@")[0]
+
+    @property
+    def sdp_email_prefix(self) -> str | None:
+        return self.email_prefix

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py

@@ -4,10 +4,9 @@ from typing import TYPE_CHECKING
 from uuid import uuid4
 
 import sqlalchemy
-from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
-
 from arpakitlib.ar_datetime_util import now_utc_dt
 from project.sqlalchemy_db_.sqlalchemy_model.common import SimpleDBM
+from sqlalchemy.orm import Mapped, mapped_column, relationship, validates
 
 if TYPE_CHECKING:
     from project.sqlalchemy_db_.sqlalchemy_model.user import UserDBM

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/admin.py

@@ -1,8 +1,7 @@
 from functools import lru_cache
 
-from emoji import emojize
-
 from arpakitlib.ar_json_util import transfer_data_to_json_str
+from emoji import emojize
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 from project.tg_bot.blank.common import SimpleBlankTgBot
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/client.py

@@ -1,7 +1,6 @@
 from functools import lru_cache
 
 from emoji import emojize
-
 from project.tg_bot.blank.common import SimpleBlankTgBot
 from project.tg_bot.const import ClientTgBotCommands
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/event.py

@@ -3,7 +3,6 @@ import logging
 from typing import Callable
 
 from aiogram import Dispatcher
-
 from arpakitlib.ar_base_worker_util import safe_run_worker_in_background, SafeRunInBackgroundModes
 from arpakitlib.ar_datetime_util import now_utc_dt
 from project.core.cache_file_storage_in_dir import get_cached_cache_file_storage_in_dir

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/message_text.py

@@ -2,7 +2,6 @@ from typing import Iterable
 
 import aiogram.types
 from aiogram.filters import Filter
-
 from arpakitlib.ar_type_util import raise_for_type
 
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/middleware/common.py

@@ -1,8 +1,7 @@
 from typing import Any
 
-from pydantic import BaseModel, ConfigDict
-
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+from pydantic import BaseModel, ConfigDict
 
 
 class MiddlewareDataTgBot(BaseModel):

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/middleware/init_user.py

@@ -5,7 +5,6 @@ import aiogram
 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.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/log_file.py

@@ -5,7 +5,6 @@ from aiogram import Router, types
 from aiogram.filters import Command
 from aiogram.fsm.context import FSMContext
 from aiogram.types import FSInputFile
-
 from arpakitlib.ar_aiogram_util import as_tg_command
 from project.core.settings import get_cached_settings
 from project.tg_bot.const import AdminTgBotCommands

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/about.py

@@ -4,7 +4,6 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 from aiogram.fsm.context import FSMContext
-
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.const import ClientTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/author.py

@@ -4,7 +4,6 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 from aiogram.fsm.context import FSMContext
-
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.const import ClientTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/cancel.py

@@ -4,7 +4,6 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 from aiogram.fsm.context import FSMContext
-
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.const import ClientTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/error_handler.py

@@ -4,7 +4,6 @@ import aiogram
 from aiogram import Router
 from aiogram.exceptions import TelegramBadRequest
 from aiogram.fsm.context import FSMContext
-
 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

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/raw_callback_query.py

@@ -3,7 +3,6 @@ import logging
 import aiogram.filters
 from aiogram.exceptions import AiogramError
 from aiogram.fsm.context import FSMContext
-
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/remove_message.py

@@ -3,7 +3,6 @@ import logging
 from aiogram import Router, types
 from aiogram.exceptions import AiogramError
 from aiogram.fsm.context import FSMContext
-
 from project.tg_bot.callback.client import RemoveMessageClientCD
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 

{arpakitlib-1.8.96 → arpakitlib-1.8.97}/arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/start.py

@@ -4,7 +4,6 @@ import aiogram
 from aiogram import Router
 from aiogram.filters import Command, or_f
 from aiogram.fsm.context import FSMContext
-
 from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.const import ClientTgBotCommands
 from project.tg_bot.filter_.message_text import MessageTextTgBotFilter