arpakitlib 1.8.20__py3-none-any.whl → 1.8.21__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/example.env

@@ -11,12 +11,10 @@
 # api_port=
 # api_init_sqlalchemy_db=
 # api_init_json_db=
-# api_api_keys=
-# api_user_tokens=
+# api_correct_api_keys=
 # api_enable_sqladmin=
 # api_start_operation_executor_worker=
 # api_start_scheduled_operation_creator_worker=
-# api_create_story_log_func_before_in_exception_handler=
 # sqladmin_secret_key=
 # sqladmin_auth_keys=
 # sqladmin_port=

arpakitlib/_arpakit_project_template_v_5/project/additional_model/common.py

@@ -1,8 +1,5 @@
-from typing import Any
-
 from pydantic import ConfigDict, BaseModel
 
 
 class BaseAM(BaseModel):
     model_config = ConfigDict(extra="forbid", arbitrary_types_allowed=True, from_attributes=True)
-    additional_data: dict[str, Any] = {}

arpakitlib/_arpakit_project_template_v_5/project/api/auth.py

@@ -1,4 +1,3 @@
-import functools
 from typing import Callable, Any
 
 import fastapi
@@ -120,7 +119,9 @@ def api_auth(
             if get_cached_settings().api_correct_api_keys is None:
                 api_auth_data.is_api_key_correct = None
             else:
-                api_auth_data.is_api_key_correct = api_auth_data.api_key_string in get_cached_settings().api_correct_api_keys
+                api_auth_data.is_api_key_correct = (
+                        api_auth_data.api_key_string in get_cached_settings().api_correct_api_keys
+                )
 
         # api_key_dbm
 
@@ -133,7 +134,7 @@ def api_auth(
 
         # user_token_dbm
 
-        if api_auth_data.api_key_string is not None:
+        if api_auth_data.user_token_string is not None:
             if get_cached_sqlalchemy_db() is not None:
                 async with get_cached_sqlalchemy_db().new_async_session() as async_session:
                     api_auth_data.user_token_dbm = await async_session.scalar(
@@ -167,35 +168,36 @@ def api_auth(
 
 
 def require_prod_mode_api_middleware():
-    @functools.wraps(require_prod_mode_api_middleware)
     def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
         if not get_cached_settings().prod_mode:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
                 error_code=APIErrorCodes.cannot_authorize,
-                error_description=f"prod_mode={get_cached_settings().prod_mode}",
+                error_description=f"prod_mode is required, {get_cached_settings().prod_mode=}",
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
+    func.__name__ = require_prod_mode_api_middleware.__name__
+
     return func
 
 
 def require_not_prod_mode_api_middleware():
-    @functools.wraps(require_not_prod_mode_api_middleware)
     def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
         if get_cached_settings().prod_mode:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
                 error_code=APIErrorCodes.cannot_authorize,
-                error_description=f"prod_mode={get_cached_settings().prod_mode}",
+                error_description=f"not prod_mode is required, {get_cached_settings().prod_mode=}",
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
+    func.__name__ = require_not_prod_mode_api_middleware.__name__
+
     return func
 
 
 def require_api_key_string_api_middleware():
-    @functools.wraps(require_api_key_string_api_middleware)
     def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
         if api_auth_data.api_key_string is None:
             raise APIException(
@@ -205,11 +207,12 @@ def require_api_key_string_api_middleware():
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
+    func.__name__ = require_api_key_string_api_middleware.__name__
+
     return func
 
 
 def require_user_token_string_api_middleware():
-    @functools.wraps(require_user_token_string_api_middleware)
     def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
         if api_auth_data.user_token_string is None:
             raise APIException(
@@ -219,60 +222,96 @@ def require_user_token_string_api_middleware():
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
+    func.__name__ = require_user_token_string_api_middleware.__name__
+
     return func
 
 
-def require_correct_api_key_dbm_api_middleware():
-    @functools.wraps(require_correct_api_key_dbm_api_middleware)
+def require_correct_api_key_api_middleware():
     def func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
         if not api_auth_data.is_api_key_correct:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
                 error_code=APIErrorCodes.cannot_authorize,
-                error_description="api_key_string is not correct",
+                error_description="correct api_key_string is required",
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
+    func.__name__ = require_correct_api_key_api_middleware.__name__
+
     return func
 
 
 def require_api_key_dbm_api_middleware(*, require_active: bool = True):
-    @functools.wraps(require_api_key_dbm_api_middleware)
     async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
         if api_auth_data.api_key_dbm is None:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
                 error_code=APIErrorCodes.cannot_authorize,
-                error_description="api_key_dbm is required",
+                error_description=f"api_key_dbm is required, {require_active=}",
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
         if require_active and not api_auth_data.api_key_dbm.is_active:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
                 error_code=APIErrorCodes.cannot_authorize,
-                error_description="api_key_dbm is not active",
+                error_description=f"api_key_dbm is required, {require_active=}",
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
 
+    async_func.__name__ = require_api_key_dbm_api_middleware.__name__
+
     return async_func
 
 
-def require_user_token_dbm_api_middleware(*, require_active: bool = True):
-    @functools.wraps(require_user_token_dbm_api_middleware)
+def require_correct_api_key_or_api_key_dbm_api_middleware(*, require_active_api_key_dbm: bool = True):
+    async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
+        if not api_auth_data.is_api_key_correct and (
+                api_auth_data.api_key_dbm is None
+                or (require_active_api_key_dbm and not api_auth_data.api_key_dbm.is_active)
+        ):
+            raise APIException(
+                status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
+                error_code=APIErrorCodes.cannot_authorize,
+                error_description=(
+                    f"correct api_key is required or api_key_dbm is required, {require_active_api_key_dbm=}"
+                ),
+                error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
+            )
+
+    async_func.__name__ = require_correct_api_key_or_api_key_dbm_api_middleware.__name__
+
+    return async_func
+
+
+def require_user_token_dbm_api_middleware(
+        *, require_active_user_token: bool = True,
+        require_user_roles: list[str] | None = None
+):
     async def async_func(*, api_auth_data: APIAuthData, request: fastapi.requests.Request):
         if api_auth_data.user_token_dbm is None:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
                 error_code=APIErrorCodes.cannot_authorize,
-                error_description="user_key_dbm is required",
+                error_description=f"user_key_dbm is required, {require_active_user_token=}, {require_user_roles=}",
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
-        if require_active and not api_auth_data.user_token_dbm.is_active:
+        if require_active_user_token and not api_auth_data.user_token_dbm.is_active:
             raise APIException(
                 status_code=fastapi.status.HTTP_401_UNAUTHORIZED,
                 error_code=APIErrorCodes.cannot_authorize,
-                error_description="user_key_dbm is not active",
+                error_description=f"user_key_dbm is required, {require_active_user_token=}, {require_user_roles=}",
                 error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
             )
+        if require_user_roles is not None:
+            if not api_auth_data.user_token_dbm.user.compare_roles(require_user_roles):
+                raise APIException(
+                    status_code=fastapi.status.HTTP_403_FORBIDDEN,
+                    error_code=APIErrorCodes.cannot_authorize,
+                    error_description=f"user_key_dbm is required, {require_active_user_token=}, {require_user_roles=}",
+                    error_data=transfer_data_to_json_str_to_data(api_auth_data.model_dump())
+                )
+
+    async_func.__name__ = require_user_token_dbm_api_middleware.__name__
 
     return async_func

arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py

@@ -15,7 +15,6 @@ from project.api.const import APIErrorCodes
 from project.api.exception import APIException
 from project.api.response import APIJSONResponse
 from project.api.schema.out.common.error import ErrorCommonSO
-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 StoryLogDBM
 
@@ -236,10 +235,7 @@ def get_exception_handler() -> Callable:
     funcs_before = []
     async_funcs_after = []
 
-    if (
-            get_cached_settings().api_create_story_log_func_before_in_api_exception_handler
-            and get_cached_sqlalchemy_db() is not None
-    ):
+    if get_cached_sqlalchemy_db() is not None:
         funcs_before.append(
             create_story_log_func_before_in_api_exception_handler(
                 ignore_api_error_codes=[

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py

@@ -1,10 +1,11 @@
 import fastapi
 from fastapi import APIRouter
 
-from project.api.auth import require_user_token_dbm_api_middleware, require_api_key_dbm_api_middleware, APIAuthData, \
-    api_auth
+from project.api.auth import require_user_token_dbm_api_middleware, APIAuthData, \
+    api_auth, require_correct_api_key_or_api_key_dbm_api_middleware
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.api.schema.out.common.raw_data import RawDataCommonSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 from project.util.arpakitlib_project_template import get_arpakitlib_project_template_info
 
 api_router = APIRouter()
@@ -21,8 +22,11 @@ async def _(
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
         api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_api_key_dbm_api_middleware(require_active=True),
-            require_user_token_dbm_api_middleware(require_active=True)
+            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
+            require_user_token_dbm_api_middleware(
+                require_active_user_token=True,
+                require_user_roles=[UserDBM.Roles.admin]
+            )
         ]))
 ):
     arpakitlib_project_template_data = get_arpakitlib_project_template_info()

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py

@@ -3,9 +3,10 @@ from fastapi import APIRouter
 
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
 from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
-    require_api_key_dbm_api_middleware
+    require_correct_api_key_or_api_key_dbm_api_middleware
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.api.schema.out.common.raw_data import RawDataCommonSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 api_router = APIRouter()
 
@@ -21,8 +22,11 @@ async def _(
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
         api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_api_key_dbm_api_middleware(require_active=True),
-            require_user_token_dbm_api_middleware(require_active=True)
+            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
+            require_user_token_dbm_api_middleware(
+                require_active_user_token=True,
+                require_user_roles=[UserDBM.Roles.admin]
+            )
         ]))
 ):
     return RawDataCommonSO(data=transfer_data_to_json_str_to_data(api_auth_data.model_dump()))

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_story_log.py

@@ -0,0 +1,46 @@
+import fastapi.requests
+import sqlalchemy
+from fastapi import APIRouter
+
+from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
+    require_correct_api_key_or_api_key_dbm_api_middleware
+from project.api.schema.out.admin.story_log import StoryLogAdminSO
+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, StoryLogDBM
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    "",
+    name="Get story log",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=StoryLogAdminSO | None | ErrorCommonSO,
+)
+async def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
+            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
+            require_user_token_dbm_api_middleware(
+                require_active_user_token=True,
+                require_user_roles=[UserDBM.Roles.admin]
+            )
+        ])),
+        filter_id: int | None = fastapi.Query(default=None),
+        filter_long_id: str | None = fastapi.Query(default=None),
+):
+    if filter_id is None and filter_long_id is None:
+        return None
+
+    query = sqlalchemy.select(StoryLogDBM)
+    if filter_id is not None:
+        query = query.filter(StoryLogDBM.id == filter_id)
+    if filter_long_id is not None:
+        query = query.filter(StoryLogDBM.long_id == filter_long_id)
+
+    async with get_cached_sqlalchemy_db().new_async_session() as async_session:
+        result = await async_session.scalar(query)
+        return StoryLogAdminSO.from_dbm(simple_dbm=result)

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/main_router.py

@@ -1,6 +1,7 @@
 from fastapi import APIRouter
 
-from project.api.router.admin import get_auth_data, get_arpakitlib_project_template_info, raise_fake_error
+from project.api.router.admin import get_auth_data, get_arpakitlib_project_template_info, raise_fake_error, \
+    reinit_sqlalchemy_db, get_story_log
 
 main_admin_api_router = APIRouter()
 
@@ -18,3 +19,13 @@ main_admin_api_router.include_router(
     router=raise_fake_error.api_router,
     prefix="/raise_fake_error"
 )
+
+main_admin_api_router.include_router(
+    router=reinit_sqlalchemy_db.api_router,
+    prefix="/reinit_sqlalchemy_db"
+)
+
+main_admin_api_router.include_router(
+    router=get_story_log.api_router,
+    prefix="/get_story_log"
+)

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_fake_error.py

@@ -2,9 +2,10 @@ import fastapi.requests
 from fastapi import APIRouter
 
 from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
-    require_api_key_dbm_api_middleware
+    require_correct_api_key_or_api_key_dbm_api_middleware
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.api.schema.out.common.raw_data import RawDataCommonSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 api_router = APIRouter()
 
@@ -20,8 +21,11 @@ async def _(
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
         api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_api_key_dbm_api_middleware(require_active=True),
-            require_user_token_dbm_api_middleware(require_active=True)
+            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
+            require_user_token_dbm_api_middleware(
+                require_active_user_token=True,
+                require_user_roles=[UserDBM.Roles.admin]
+            )
         ]))
 ):
     raise Exception("fake error")

arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/reinit_sqlalchemy_db.py

@@ -0,0 +1,35 @@
+import fastapi.requests
+from fastapi import APIRouter
+
+from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
+    require_not_prod_mode_api_middleware, \
+    require_correct_api_key_or_api_key_dbm_api_middleware
+from project.api.schema.out.common.error import ErrorCommonSO
+from project.api.schema.out.common.raw_data import RawDataCommonSO
+from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    path="",
+    name="Reinit sqlalchemy db",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=RawDataCommonSO | ErrorCommonSO,
+)
+async def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
+            require_not_prod_mode_api_middleware(),
+            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
+            require_user_token_dbm_api_middleware(
+                require_active_user_token=True,
+                require_user_roles=[UserDBM.Roles.admin],
+            ),
+        ]))
+):
+    get_cached_sqlalchemy_db().reinit()
+    return RawDataCommonSO()

arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py

@@ -0,0 +1,33 @@
+import fastapi.requests
+from fastapi import APIRouter
+
+from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
+    require_correct_api_key_or_api_key_dbm_api_middleware
+from project.api.schema.out.client.user import UserClientSO
+from project.api.schema.out.common.error import ErrorCommonSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    "",
+    name="Get current user",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=UserClientSO | ErrorCommonSO,
+)
+async def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
+            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
+            require_user_token_dbm_api_middleware(
+                require_active_user_token=True,
+                require_user_roles=[UserDBM.Roles.client]
+            )
+        ]))
+):
+    return UserClientSO.from_dbm(
+        simple_dbm=api_auth_data.user_token_dbm.user
+    )

arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py

@@ -0,0 +1,33 @@
+import fastapi.requests
+from fastapi import APIRouter
+
+from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
+    require_correct_api_key_or_api_key_dbm_api_middleware
+from project.api.schema.out.client.user_token import UserTokenClientSO
+from project.api.schema.out.common.error import ErrorCommonSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
+
+api_router = APIRouter()
+
+
+@api_router.get(
+    "",
+    name="Get current user token",
+    status_code=fastapi.status.HTTP_200_OK,
+    response_model=UserTokenClientSO | ErrorCommonSO,
+)
+async def _(
+        *,
+        request: fastapi.requests.Request,
+        response: fastapi.responses.Response,
+        api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
+            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
+            require_user_token_dbm_api_middleware(
+                require_active_user_token=True,
+                require_user_roles=[UserDBM.Roles.client]
+            )
+        ]))
+):
+    return UserTokenClientSO.from_dbm(
+        simple_dbm=api_auth_data.user_token_dbm
+    )

arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_errors_info.py

@@ -1,8 +1,8 @@
 import fastapi.requests
 from fastapi import APIRouter
 
-from project.api.auth import APIAuthData, api_auth, require_api_key_dbm_api_middleware, \
-    require_user_token_dbm_api_middleware
+from project.api.auth import APIAuthData, api_auth, require_user_token_dbm_api_middleware, \
+    require_correct_api_key_or_api_key_dbm_api_middleware
 from project.api.const import APIErrorCodes, APIErrorSpecificationCodes
 from project.api.schema.out.common.error import ErrorCommonSO
 from project.api.schema.out.general.errors_info_general import ErrorsInfoGeneralSO
@@ -21,8 +21,10 @@ async def _(
         request: fastapi.requests.Request,
         response: fastapi.responses.Response,
         api_auth_data: APIAuthData = fastapi.Depends(api_auth(middlewares=[
-            require_api_key_dbm_api_middleware(require_active=True),
-            require_user_token_dbm_api_middleware(require_active=True)
+            require_correct_api_key_or_api_key_dbm_api_middleware(require_active_api_key_dbm=True),
+            require_user_token_dbm_api_middleware(
+                require_active_user_token=True
+            )
         ]))
 ):
     return ErrorsInfoGeneralSO(

arpakitlib/_arpakit_project_template_v_5/project/api/router/client/main_router.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from project.api.router.client import get_errors_info
+from project.api.router.client import get_errors_info, get_current_user, get_current_user_token
 
 main_client_api_router = APIRouter()
 
@@ -8,3 +8,13 @@ main_client_api_router.include_router(
     router=get_errors_info.api_router,
     prefix="/get_errors_info"
 )
+
+main_client_api_router.include_router(
+    router=get_current_user.api_router,
+    prefix="/get_current_user"
+)
+
+main_client_api_router.include_router(
+    router=get_current_user_token.api_router,
+    prefix="/get_current_user_token"
+)

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

@@ -1,6 +1,9 @@
+from __future__ import annotations
+
 import datetime as dt
 
 from project.api.schema.common import BaseSO
+from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
 
 
 class SimpleDBMAdminSO(BaseSO):
@@ -8,3 +11,7 @@ class SimpleDBMAdminSO(BaseSO):
     long_id: str
     slug: str | None
     creation_dt: dt.datetime
+
+    @classmethod
+    def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMAdminSO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())

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

@@ -19,5 +19,5 @@ class OperationAdminSO(SimpleDBMAdminSO):
     duration_total_seconds: float | None
 
     @classmethod
-    def from_operation_dbm(cls, *, operation_dbm: OperationDBM) -> OperationAdminSO:
-        return cls.model_validate(operation_dbm.simple_dict_with_sd_properties())
+    def from_dbm(cls, *, simple_dbm: OperationDBM) -> OperationAdminSO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py

@@ -13,5 +13,5 @@ class StoryLogAdminSO(SimpleDBMAdminSO):
     data: dict[str, Any]
 
     @classmethod
-    def from_story_log_dbm(cls, *, story_log_dbm: StoryLogDBM) -> StoryLogAdminSO:
-        return cls.model_validate(story_log_dbm.simple_dict_with_sd_properties())
+    def from_dbm(cls, *, simple_dbm: StoryLogDBM) -> StoryLogAdminSO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())

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

@@ -1,6 +1,9 @@
+from __future__ import annotations
+
 import datetime as dt
 
 from project.api.schema.common import BaseSO
+from project.sqlalchemy_db_.sqlalchemy_model import SimpleDBM
 
 
 class SimpleDBMClientSO(BaseSO):
@@ -8,3 +11,7 @@ class SimpleDBMClientSO(BaseSO):
     long_id: str
     slug: str | None
     creation_dt: dt.datetime
+
+    @classmethod
+    def from_dbm(cls, *, simple_dbm: SimpleDBM) -> SimpleDBMClientSO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/{admin → client}/user.py

@@ -3,12 +3,12 @@ from __future__ import annotations
 import datetime as dt
 from typing import Any
 
-from project.api.schema.out.admin.common import SimpleDBMAdminSO
+from project.api.schema.out.client.common import SimpleDBMClientSO
 from project.sqlalchemy_db_.sqlalchemy_model import UserDBM
 
 
-class UserDBMSAdminSO(SimpleDBMAdminSO):
-    mail: str | None
+class UserClientSO(SimpleDBMClientSO):
+    email: str | None
     roles: list[str]
     is_active: bool
     tg_id: int | None
@@ -18,5 +18,5 @@ class UserDBMSAdminSO(SimpleDBMAdminSO):
     roles_has_client: bool
 
     @classmethod
-    def from_user_dbm(cls, *, user_dbm: UserDBM) -> UserDBMSAdminSO:
-        return cls.model_validate(user_dbm.simple_dict_with_sd_properties())
+    def from_dbm(cls, *, simple_dbm: UserDBM) -> UserClientSO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py

@@ -0,0 +1,14 @@
+from __future__ import annotations
+
+from project.api.schema.out.client.common import SimpleDBMClientSO
+from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
+
+
+class UserTokenClientSO(SimpleDBMClientSO):
+    value: str
+    user_id: int
+    is_active: bool
+
+    @classmethod
+    def from_dbm(cls, *, simple_dbm: UserTokenDBM) -> UserTokenClientSO:
+        return cls.model_validate(simple_dbm.simple_dict_with_sd_properties())

arpakitlib/_arpakit_project_template_v_5/project/core/settings.py

@@ -104,8 +104,6 @@ class Settings(SimpleSettings):
 
     api_start_scheduled_operation_creator_worker: bool = False
 
-    api_create_story_log_func_before_in_api_exception_handler: bool = False
-
     sqladmin_secret_key: str | None = "85a9583cb91c4de7a78d7eb1e5306a04418c9c43014c447ea8ec8dd5deb4cf71"
 
     sqladmin_auth_keys: list[str] | None = ["1"]

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

@@ -34,9 +34,19 @@ class OperationDBM(SimpleDBM):
     type: Mapped[str] = mapped_column(
         sqlalchemy.TEXT, index=True, insert_default=Types.healthcheck_, nullable=False
     )
-    title: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, insert_default=None, nullable=True)
-    execution_start_dt: Mapped[datetime | None] = mapped_column(sqlalchemy.TIMESTAMP(timezone=True), nullable=True)
-    execution_finish_dt: Mapped[datetime | None] = mapped_column(sqlalchemy.TIMESTAMP(timezone=True), nullable=True)
+    title: Mapped[str | None] = mapped_column(
+        sqlalchemy.TEXT,
+        insert_default=None,
+        nullable=True
+    )
+    execution_start_dt: Mapped[datetime | None] = mapped_column(
+        sqlalchemy.TIMESTAMP(timezone=True),
+        nullable=True
+    )
+    execution_finish_dt: Mapped[datetime | None] = mapped_column(
+        sqlalchemy.TIMESTAMP(timezone=True),
+        nullable=True
+    )
     input_data: Mapped[dict[str, Any]] = mapped_column(
         postgresql.JSON,
         insert_default={},

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

@@ -27,12 +27,27 @@ class StoryLogDBM(SimpleDBM):
         error_in_tg_bot = "error_in_tg_bot"
 
     level: Mapped[str] = mapped_column(
-        sqlalchemy.TEXT, insert_default=Levels.info, server_default=Levels.info, index=True, nullable=False
+        sqlalchemy.TEXT,
+        insert_default=Levels.info,
+        server_default=Levels.info,
+        index=True,
+        nullable=False
+    )
+    type: Mapped[str | None] = mapped_column(
+        sqlalchemy.TEXT,
+        index=True,
+        insert_default=None,
+        nullable=True)
+    title: Mapped[str | None] = mapped_column(
+        sqlalchemy.TEXT,
+        insert_default=None,
+        nullable=True
     )
-    type: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, index=True, insert_default=None, nullable=True)
-    title: Mapped[str | None] = mapped_column(sqlalchemy.TEXT, insert_default=None, nullable=True)
     data: Mapped[dict[str, Any]] = mapped_column(
-        postgresql.JSON, insert_default={}, server_default="{}", nullable=False
+        postgresql.JSON,
+        insert_default={},
+        server_default="{}",
+        nullable=False
     )
 
 

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

@@ -21,7 +21,7 @@ class UserDBM(SimpleDBM):
         admin = "admin"
         client = "client"
 
-    mail: Mapped[str | None] = mapped_column(
+    email: Mapped[str | None] = mapped_column(
         sqlalchemy.TEXT,
         index=True,
         insert_default=None,

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/client.py

@@ -10,7 +10,8 @@ class ClientTgBotBlank(SimpleBlankTgBot):
     def command_to_desc(self) -> dict[str, str]:
         return {
             ClientTgBotCommands.start: emojize(":waving_hand: Начать"),
-            ClientTgBotCommands.about: emojize(":information: О проекте")
+            ClientTgBotCommands.about: emojize(":information: О проекте"),
+            ClientTgBotCommands.author: emojize(":bust_in_silhouette: Авторы"),
         }
 
     def but_hello_world(self) -> str:
@@ -31,24 +32,31 @@ class ClientTgBotBlank(SimpleBlankTgBot):
         res = "healthcheck"
         return emojize(res.strip())
 
+    def author(self) -> str:
+        res = "<b>ARPAKIT Company</b>"
+        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())
+
     def welcome(self) -> str:
         res = ":waving_hand: <b>Welcome</b> :waving_hand:"
         return emojize(res.strip())
 
     def raw_message(self) -> str:
-        res = ":warning: <b>Сообщние не обработано</b> :warning:"
+        res = ":warning: <b>Сообщение не обработано</b> :warning:"
         return emojize(res.strip())
 
-    def about_project(self) -> str:
+    def about(self) -> str:
         res = ":information: <b>О проекте</b>"
         return emojize(res.strip())
 
-    def support_info(self) -> str:
+    def support(self) -> str:
         res = ":red_heart: <b>Поддержка</b>"
         return emojize(res.strip())
 
     def keyboard_is_old(self) -> str:
-        res = ":information: Данная клавиатура устарела :information:"
+        res = ":information: Эта клавиатура устарела :information:"
         return emojize(res.strip())
 
 
@@ -62,7 +70,7 @@ def get_cached_client_tg_bot_blank() -> ClientTgBotBlank:
 
 
 def __example():
-    print(get_cached_client_tg_bot_blank().welcome())
+    print(get_cached_client_tg_bot_blank().author())
 
 
 if __name__ == '__main__':

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/const.py

@@ -4,6 +4,7 @@ from arpakitlib.ar_enumeration_util import Enumeration
 class ClientTgBotCommands(Enumeration):
     start = "start"
     about = "about"
+    author = "author"
     support = "support"
     healthcheck = "healthcheck"
     hello_world = "hello_world"

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

@@ -27,4 +27,4 @@ async def _(
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
-    await m.answer(text=get_cached_client_tg_bot_blank().about_project())
+    await m.answer(text=get_cached_client_tg_bot_blank().about())

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

@@ -0,0 +1,31 @@
+import logging
+
+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.filter_.message_text import MessageTextTgBotFilter
+from project.tg_bot.middleware.common import MiddlewareDataTgBot
+
+tg_bot_router = Router()
+_logger = logging.getLogger(__name__)
+
+
+@tg_bot_router.message(
+    or_f(
+        Command(ClientTgBotCommands.author),
+        MessageTextTgBotFilter([
+            ClientTgBotCommands.about,
+            "автор",
+            "авторы"
+        ], ignore_case=True)
+    )
+)
+async def _(
+        m: aiogram.types.Message,
+        middleware_data_tg_bot: MiddlewareDataTgBot,
+        **kwargs
+):
+    await m.answer(text=get_cached_client_tg_bot_blank().author())

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

@@ -27,4 +27,4 @@ async def _(
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
-    await m.answer(text=get_cached_client_tg_bot_blank().support_info())
+    await m.answer(text=get_cached_client_tg_bot_blank().support())

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/main_router.py

@@ -3,8 +3,8 @@ from aiogram import Router
 from project.tg_bot.router.admin import reinit_sqlalchemy_db, arpakitlib_project_template_info, raise_fake_error, me, \
     log_file, clear_log_file, set_tg_bot_commands, init_sqlalchemy_db, drop_sqlalchemy_db, kb_with_remove_message, \
     kb_with_old_cd, kb_with_raise_error, kb_with_not_modified
-from project.tg_bot.router.client import remove_message, start, about, healthcheck, hello_world, \
-    support, error_handler, raw_callback_query, raw_message, raw_inline_query
+from project.tg_bot.router.general import remove_message, start, about, healthcheck, hello_world, \
+    support, error_handler, raw_callback_query, raw_message, raw_inline_query, author
 
 main_tg_bot_router = Router()
 
@@ -23,7 +23,7 @@ main_tg_bot_router.include_router(router=kb_with_old_cd.tg_bot_router)
 main_tg_bot_router.include_router(router=kb_with_raise_error.tg_bot_router)
 main_tg_bot_router.include_router(router=kb_with_not_modified.tg_bot_router)
 
-# client
+# general
 main_tg_bot_router.include_router(router=error_handler.tg_bot_router)
 main_tg_bot_router.include_router(router=remove_message.tg_bot_router)
 main_tg_bot_router.include_router(router=start.tg_bot_router)
@@ -31,6 +31,7 @@ main_tg_bot_router.include_router(router=about.tg_bot_router)
 main_tg_bot_router.include_router(router=healthcheck.tg_bot_router)
 main_tg_bot_router.include_router(router=hello_world.tg_bot_router)
 main_tg_bot_router.include_router(router=support.tg_bot_router)
+main_tg_bot_router.include_router(router=author.tg_bot_router)
 main_tg_bot_router.include_router(router=raw_message.tg_bot_router)
 main_tg_bot_router.include_router(router=raw_inline_query.tg_bot_router)
 main_tg_bot_router.include_router(router=raw_callback_query.tg_bot_router)

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

@@ -37,7 +37,15 @@ def get_client_tg_bot_commands_to_set() -> list[BotCommand]:
                 get_cached_client_tg_bot_blank().command_to_desc().get(ClientTgBotCommands.support),
                 ClientTgBotCommands.support
             )
+        ),
+        BotCommand(
+            command=ClientTgBotCommands.author,
+            description=return_str_if_none(
+                get_cached_client_tg_bot_blank().command_to_desc().get(ClientTgBotCommands.author),
+                ClientTgBotCommands.author
+            )
         )
+
     ]
     return res
 

{arpakitlib-1.8.20.dist-info → arpakitlib-1.8.21.dist-info}/METADATA

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

{arpakitlib-1.8.20.dist-info → arpakitlib-1.8.21.dist-info}/RECORD

@@ -67,7 +67,7 @@ arpakitlib/_arpakit_project_template_v_5/command/start_sqladmin_for_prod.py,sha2
 arpakitlib/_arpakit_project_template_v_5/command/start_sqladmin_with_reload.py,sha256=KmbadM6bmsQfP23xTn8aBzlvCQ1J2rLAuFk0_RCChjs,374
 arpakitlib/_arpakit_project_template_v_5/command/start_tg_bot.py,sha256=AJ1AxfdpbayBhScy6yAPVkSWnHJjzOTHxEewwGKaJMQ,200
 arpakitlib/_arpakit_project_template_v_5/command/start_tg_bot_for_prod.py,sha256=AJ1AxfdpbayBhScy6yAPVkSWnHJjzOTHxEewwGKaJMQ,200
-arpakitlib/_arpakit_project_template_v_5/example.env,sha256=HFoVmA3rvPv7rl1W7kRfxHGGiM2lA6h9zFz4fhXm6Kc,1082
+arpakitlib/_arpakit_project_template_v_5/example.env,sha256=8fsl0G7qVRmjRGXbafXwuQOlxTX1pU0-He77KC6pGeE,1014
 arpakitlib/_arpakit_project_template_v_5/note/note_1.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/note/note_2.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/note/note_3.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -75,26 +75,30 @@ arpakitlib/_arpakit_project_template_v_5/note/note_4.txt,sha256=47DEQpj8HBSa-_TI
 arpakitlib/_arpakit_project_template_v_5/note/note_5.txt,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/additional_model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/additional_model/common.py,sha256=XuVbWeesA5fxD0dFPDW8D7NAk0w4RyD5jXPwGOSFchg,233
+arpakitlib/_arpakit_project_template_v_5/project/additional_model/common.py,sha256=BRz-B699ZY52DfUD6kmhpuThBWpPzpZpD0QXIjlkwC8,168
 arpakitlib/_arpakit_project_template_v_5/project/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/asgi.py,sha256=ES3YGwNxWUHVyD6e2ii6QkvTyB-vlVmr8_PhfVIXQ4Y,78
-arpakitlib/_arpakit_project_template_v_5/project/api/auth.py,sha256=wuiwenDuQ6NFmYbBcui8RJ3Wzgqz85S5Rpnc5ObrZuM,12096
+arpakitlib/_arpakit_project_template_v_5/project/api/auth.py,sha256=2UwEB5dcSERsVIjRYaK4dUtFcl7SLzszBVTz0awIIqo,13921
 arpakitlib/_arpakit_project_template_v_5/project/api/const.py,sha256=J9bqaRRiIc3RLn6SJTvdfDvFrSsM_Ixii9t2M8dA5Jc,433
 arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py,sha256=-taA-OJ69donUlCUIl4tNxjHjRGnjwXl796lThef-uA,2284
 arpakitlib/_arpakit_project_template_v_5/project/api/event.py,sha256=xKfJ3UnOx_g1s7KNZjWRp0eZbVRTsSlyJhT3wkfwT6k,2414
 arpakitlib/_arpakit_project_template_v_5/project/api/exception.py,sha256=cNZaI2DacGLl8Hyn1qIfFpVjvQzOQjwXWsVW4auBrCo,1280
-arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py,sha256=BZ5myTNgruU7q92cM7832PaB4qHa8ooGcZS6CmSaqnQ,11295
+arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py,sha256=Uyt0gB_8QnMFcZuNoUaEiAAJEjziWQpsXY1OM36e3YU,11125
 arpakitlib/_arpakit_project_template_v_5/project/api/openapi_ui.py,sha256=PLhH-W6zDViO-75AGCs8Vq3IoyHChdqwBYAqLvdQN0U,904
 arpakitlib/_arpakit_project_template_v_5/project/api/response.py,sha256=xZMymP2BuQaRNVWLeIp3UgUUo-MFN8MJnsn9Al4vOb8,1028
 arpakitlib/_arpakit_project_template_v_5/project/api/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py,sha256=uN2yJN8NpncyvIOc-D6s9nxftDpA5XwP9ZC6wqI9FZw,1084
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py,sha256=SWh7P4-D1LSTS0anBEbIxnQI6OV9nymBlqFV5P8h8j4,1007
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/main_router.py,sha256=wzlJlKxj-hontW8ckuyqpQvzRKs0clpSAuwpXpFiaAQ,545
-arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_fake_error.py,sha256=DNRWLRCmGoqqdjnm_zjJmFkClwyEzxpZJTT74vH_TrQ,879
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_arpakitlib_project_template_info.py,sha256=VSnyxswDMrD4MEhLK77hrm4UYNHerzBV-92ASgEOqis,1293
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_auth_data.py,sha256=F_nqzPr2q6ssDv3RNqyn8CyRQBJ89rzpOHrgjkNYS8I,1216
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/get_story_log.py,sha256=DUSPKlXhITe5Ah5gq4d7dAls5H_K42AHj6pLSMZJ6RM,1785
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/main_router.py,sha256=dYjl8mrxCmQjTinqvimowzgYbLm_zAtYLYNWyvI3y10,814
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_fake_error.py,sha256=I8g9PeguugvBZYrC4gzLtPBBoJw7U8joxYFmwqFW0mE,1088
+arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/reinit_sqlalchemy_db.py,sha256=IfjKMlDwkEt_fRcYxjCDZT1rYdpUXUhSoL4VyYTZzSA,1299
 arpakitlib/_arpakit_project_template_v_5/project/api/router/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_errors_info.py,sha256=uG5skKLpYbrXAlHu8MO8pjIHI9dIvYaL8kfTPW4iEIU,1101
-arpakitlib/_arpakit_project_template_v_5/project/api/router/client/main_router.py,sha256=MFYUoxo0lal7__1B7wf1NT5RhJfVtK5rqp7SYix6AaY,234
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user.py,sha256=q-ViMaj6dv09qYegh9ApbT1_tKFqqL-HlpvxCbeZWVw,1133
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_current_user_token.py,sha256=9EsbkMg1nmTPyVbkb847DOo-HkFTZUpySeTOnVmqMbA,1155
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/get_errors_info.py,sha256=55khAkCurF5DLhkFXDpb85ex5PULOLag9Z5EezMpUEs,1192
+arpakitlib/_arpakit_project_template_v_5/project/api/router/client/main_router.py,sha256=S20kGyWjfPS0Ue1s8tpAqQsQlJ63m3uSSiOgKkHOuNk,514
 arpakitlib/_arpakit_project_template_v_5/project/api/router/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/router/general/healthcheck.py,sha256=xQNMi81IaroNE2H3LvYNUYV6X1dcGSeS2kAUSvGEcWA,523
 arpakitlib/_arpakit_project_template_v_5/project/api/router/general/main_router.py,sha256=OPKujYKPInDozmfZrffQnMGtdwyxMBQv1k2f-LttMDY,356
@@ -112,13 +116,13 @@ arpakitlib/_arpakit_project_template_v_5/project/api/schema/in_/general/__init__
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/in_/general/common.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/common.py,sha256=i_qLlACMT7XKB4liOEG1PTYkGIL0IDNHoP2Ioh_Xugw,181
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/operation.py,sha256=SrRo1HqugMGDYnc0NUTzHzoMfNdtRzd1EleejURsx_M,715
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py,sha256=GQ5EDbYCDByKVwSJpdfLLULWvjUUhE3vo5c2FdK0HBY,498
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user.py,sha256=W0g6qHEKqPa4CJvmhzyfUiLzqXLjtTR3OC07UhfdkZc,632
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user_token.py,sha256=w7LL2q58aG7zgVDW1D_lUhg4zCJLqJcfXQX4geHSPXw,446
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/common.py,sha256=b0s5VdLcH-sBvD9WFaVg-cek299ItBH8W0xn7JWaV78,445
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/operation.py,sha256=8oPqCofV5KJMB6JB-Cozi_5l-2t8EPSvfossT0wIZBM,699
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/story_log.py,sha256=EenBUvs9qENEGuCpZrBRSd4TNVjR-ER55g44QGPLAzY,482
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/common.py,sha256=hi0ybvowgARVEQaD0V8JYxUM5f4gqaJ6U7FlLQCxABE,182
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/common.py,sha256=cm7FAsZf5GlGAcR_w0tr2fR9gUMNcY--ifqE-BuFGpU,447
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user.py,sha256=S93SizBPg5evgycr3Y_AF0Ds0M5gvO2o_W2VsDZXFeY,629
+arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/client/user_token.py,sha256=XRUs3ieMDZGGnMMst-QXptBWXqBL-qPQa25NJVbSI9I,436
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/datetime_.py,sha256=YFo29Qc7JMVq-OR398kPy4ypjh9kYAxPuZZUsobhDdc,942
 arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/common/error.py,sha256=C8oaHotxmxBnN7Lr1qT7T5Mk0SIU2Ha7_tPDpgiR6M8,286
@@ -138,7 +142,7 @@ arpakitlib/_arpakit_project_template_v_5/project/core/const.py,sha256=hgiiPIYL95
 arpakitlib/_arpakit_project_template_v_5/project/core/dump_file_storage_in_dir.py,sha256=u3-vStMGaseMsRLuJmQK04UDhaez9vw6o5jyHb1fwNg,617
 arpakitlib/_arpakit_project_template_v_5/project/core/jinja2_templates.py,sha256=jCNLaBauGC7YNvZdTLNHuPp7hmRGt94O23Skg6ewo7o,352
 arpakitlib/_arpakit_project_template_v_5/project/core/media_file_storage_in_dir.py,sha256=fMofTsfJtA8pp5lEUhucEUu3PBsmj-elaRZzExDsdLI,623
-arpakitlib/_arpakit_project_template_v_5/project/core/settings.py,sha256=jGZSy5VNfYaoq3tiUywHV8Nlx1_Vsw2Fml22bc3UUiQ,5905
+arpakitlib/_arpakit_project_template_v_5/project/core/settings.py,sha256=UR9EM_Fw2WfVRACwrZTkJMMA5IV2YYiWa87qi_IcMvg,5828
 arpakitlib/_arpakit_project_template_v_5/project/core/util.py,sha256=1ha9UrguVPsTSjoMHhVZVCD0_mNBfhIDGEvcG1nA4Zw,667
 arpakitlib/_arpakit_project_template_v_5/project/json_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/json_db/json_db.py,sha256=tBML-z4Y7uY8f_0ggcxvlDNt15Sf93Jr_OUeHwWxqOA,724
@@ -205,9 +209,9 @@ arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_db.py
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/__init__.py,sha256=btSjCQ7RJqomeXzYs9HePCu1dZHs0z6-RuboYKG89_8,598
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/api_key.py,sha256=a-xSHsnE8EkiH9g1ZoxaQQ7Y7q0urIm3SynlGYiSE8E,1038
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/common.py,sha256=yK0fFdRYZUpjWl8Vq9S9DKMLBkj9ZT9TXhGyPuR6asU,1876
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=ZyK6jRVYM7K_ze2LDaYBwqTP6MkTFjtQMTD-HroX0jg,3293
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=MyXra-PNFrqe9FOjXnDXNYkzX8_A9pbj2uhk1GTPFJ8,1264
-arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=HwFXmlQD9IIFYwGh5wvp0W1RaKqg2nWtjgLFTIsw5ww,2353
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/operation.py,sha256=4jahuEqTD7OgIDB1TDVDb7occhgid_TLpEBtbi8vu2E,3367
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/story_log.py,sha256=Hm6DTPAvK9f1WgIvBXBO00DAeienEXr3CZIVG_Odrfg,1383
+arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user.py,sha256=lCgNR-SLUL6JN-Q1pstxGKF0PiSTKTWGzWANF5u9u7o,2354
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/sqlalchemy_model/user_token.py,sha256=9yGVRC4Ns1TgM7IOaZvbQWuiLYpxDTQKzitokpCGRoQ,1013
 arpakitlib/_arpakit_project_template_v_5/project/sqlalchemy_db_/util.py,sha256=QSA_nT6aWdtE412-Uj3VTd7yh3dzS4HugDK9FivjTPo,570
 arpakitlib/_arpakit_project_template_v_5/project/test_data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -220,13 +224,13 @@ arpakitlib/_arpakit_project_template_v_5/project/test_data/make_test_data_5.py,s
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/admin.py,sha256=RG9YRcOJAkS3Z4VNEnwyTnKj8Xb65gCZWta7NdGdxvU,1008
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/client.py,sha256=5icJT6y1kblwtZod29GslLqSSfkxhArQrrrVzAX9fZ4,2112
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/client.py,sha256=vWd7GgXBMcBlLtkJByVSfX_NVSUUM6KUAeynUBySTV0,2477
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/blank/common.py,sha256=HjJnKLQAdHtLLM73wURiFR2zzJEvkypVg0pMsKu5mKs,93
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/callback/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/callback/admin.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/callback/client.py,sha256=8eJAc0mq8bX6BbP0eWY4NYToFOFSUXB-nujBmTlQF-k,157
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/callback/common.py,sha256=FhSQLjdR-XArdorqG9RxsCjgQv_RyWbFZFHM52Sar-4,1023
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/const.py,sha256=faClxsyUT2c02IN74ymLcxvjPo8sFE46X4GPSEqnSy4,1134
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/const.py,sha256=tdPNjFQFv5_zcZs_dSVvRs7oXR-xPCaE-165tWzSY9A,1156
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/event.py,sha256=9BkUt4qsNUT3_AnTKBUTen0G2-L1872XKriQKS_hIxk,3628
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/filter_/is_private_chat.py,sha256=2anQo68KqkNYQnfIZDXSOX0P9hU59oSSSIJ36bWQdo8,500
@@ -269,25 +273,26 @@ arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/me.py,sha25
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/raise_fake_error.py,sha256=UBSrDdf0E6Gss9xWmChVnfCGf7M-hZ2Pq7usSzMz9mU,835
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/reinit_sqlalchemy_db.py,sha256=x2Er6OZd0ymLvyMxqMfPVoSf62QpNh0mPcrYxB2wyGE,1193
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/set_tg_bot_commands.py,sha256=Agdjw1qjcT6l0K-k_AVrgGvLGEY5Jh9fQX66wLwJRVM,981
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/about.py,sha256=IChQLcuMI5hE-tmeN8PbPqZtYErX7WIddJl86hsc30I,841
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/error_handler.py,sha256=DRPh_kiqXvDkKKWqxpyFDEAnYt6UE9san7ku99GJgzA,3221
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/healthcheck.py,sha256=l-M6Oc15o9EQ0M3dTsPcVQIrnVLj5j0adMRUBdnb5r4,529
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/hello_world.py,sha256=NjQpD2Q4hUZvqogZOWDWkNo9C9bNWUO6mGEZLJKUW7U,1584
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/raw_callback_query.py,sha256=s4jVTZ6k_syYbXdixKnwgj5wHeARP4QD96_sLmBy1vc,792
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/raw_inline_query.py,sha256=77LZnmvTtBgIqhJmLV1k_1IUKcm66uW_lLzFV8oi930,289
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/raw_message.py,sha256=rdLdF9ML7ezM9V6sy9j67JX-ffpny2nFViBB5thKTa8,413
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/remove_message.py,sha256=nYS-Q7ZqVCcHw4oClOzG9w86exbCWcInZc9vF_KfMcw,703
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/start.py,sha256=EFAZMbd3CVri_E4gt-B544CSrBBBAsKYVaCslxAfwCs,914
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/client/support.py,sha256=d_KsuAzZz04oq8K3k4SO0pabcSLBYYKHF-6VbI3mgiI,844
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/main_router.py,sha256=jjJBU8-e2BIQSjWSOapN0GqQ6u_t1-erz9f7kKDDqlc,2198
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/about.py,sha256=R4nAcXU37mwW0WS9Je-Z4NHuYwOUGQWNDQNZOepT5Bg,833
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/author.py,sha256=e-K1y5CGJRoPMPgMJEuMi-irQ8Ka_uuNtBFLPibgywU,855
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/error_handler.py,sha256=DRPh_kiqXvDkKKWqxpyFDEAnYt6UE9san7ku99GJgzA,3221
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/healthcheck.py,sha256=l-M6Oc15o9EQ0M3dTsPcVQIrnVLj5j0adMRUBdnb5r4,529
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/hello_world.py,sha256=NjQpD2Q4hUZvqogZOWDWkNo9C9bNWUO6mGEZLJKUW7U,1584
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/raw_callback_query.py,sha256=s4jVTZ6k_syYbXdixKnwgj5wHeARP4QD96_sLmBy1vc,792
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/raw_inline_query.py,sha256=77LZnmvTtBgIqhJmLV1k_1IUKcm66uW_lLzFV8oi930,289
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/raw_message.py,sha256=rdLdF9ML7ezM9V6sy9j67JX-ffpny2nFViBB5thKTa8,413
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/remove_message.py,sha256=nYS-Q7ZqVCcHw4oClOzG9w86exbCWcInZc9vF_KfMcw,703
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/start.py,sha256=EFAZMbd3CVri_E4gt-B544CSrBBBAsKYVaCslxAfwCs,914
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/general/support.py,sha256=DuJ1QcPuK-rRz8BFErYOaT_Z74NclsvrdmryQL9bmCA,839
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/main_router.py,sha256=nz94jcuZ0rmjGt6NuUXY7bD_cL2SMD0vdjuompd2KK4,2271
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/start_tg_bot.py,sha256=vHARWETCD4hlK624aFxnkjsytgEbZY20bt973Oc_Peo,1253
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/tg_bot.py,sha256=jMX_awQl3GvyKZ8pmR0dQOzg_2LyrYTmn31DAVmOxxs,849
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/tg_bot_dispatcher.py,sha256=CUTYSiVEQrOcOe1pTl8BAHZIDIqurwVQEy0zCmab8Z8,660
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/etc.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/notify_admins.py,sha256=Qoqa45bbTYCpBhhgSVzN8AH5WBXM0oFnahrCd3XGmTU,1835
-arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/set_tg_bot_commands.py,sha256=tPdWE85cgYh7qmkHg6JeXrAM06oYD3RK8fwctC2OL6w,3189
+arpakitlib/_arpakit_project_template_v_5/project/tg_bot/util/set_tg_bot_commands.py,sha256=moTtG-8uSyUx_zxiQi55xQ7Cl2cHiyqtGUAuQ8_g-BI,3470
 arpakitlib/_arpakit_project_template_v_5/project/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/util/arpakitlib_project_template.py,sha256=syA_IuszHVub0zm0sVdB4_7rPJXwXRW4JmQ4qHbjXPk,396
 arpakitlib/ar_additional_model_util.py,sha256=GFg-glLCxH9X95R2bhTJsscVwv37FgE1qbaAAyXrnIE,917
@@ -341,8 +346,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.20.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.20.dist-info/METADATA,sha256=1-ryZ5_8onpKsykVGz1CtFYHmC6CcpHL5Uvx-xLQdLc,3432
-arpakitlib-1.8.20.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
-arpakitlib-1.8.20.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.20.dist-info/RECORD,,
+arpakitlib-1.8.21.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.21.dist-info/METADATA,sha256=qKkcrxSptiTet5lmpfdIMRsYHhI9ZXC5OEEYSESBnX4,3432
+arpakitlib-1.8.21.dist-info/WHEEL,sha256=XbeZDeTWKc1w7CSIyre5aMDU_-PohRwTQceYnisIYYY,88
+arpakitlib-1.8.21.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.21.dist-info/RECORD,,

arpakitlib/_arpakit_project_template_v_5/project/api/schema/out/admin/user_token.py

@@ -1,14 +0,0 @@
-from __future__ import annotations
-
-from project.api.schema.out.admin.common import SimpleDBMAdminSO
-from project.sqlalchemy_db_.sqlalchemy_model import UserTokenDBM
-
-
-class UserTokenDBMSAdminSO(SimpleDBMAdminSO):
-    value: str
-    user_id: int
-    is_active: bool
-
-    @classmethod
-    def from_user_token_dbm(cls, *, user_dbm: UserTokenDBM) -> UserTokenDBMSAdminSO:
-        return cls.model_validate(user_dbm.simple_dict_with_sd_properties())