arpakitlib 1.8.84__py3-none-any.whl → 1.8.87__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/kb_with_old_cd.py

@@ -1,4 +1,5 @@
 import aiogram.filters
+from aiogram.fsm.context import FSMContext
 from aiogram.types import InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
@@ -24,16 +25,16 @@ class _CD(BaseCD, prefix=AdminTgBotCommands.kb_with_old_cd):
 @as_tg_command()
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
+    await state.clear()
     kb_builder = InlineKeyboardBuilder()
-
     kb_builder.row(InlineKeyboardButton(
         text="Button with old data",
         callback_data=_CD().pack()
     ))
-
     await m.answer(
         text="Old data",
         reply_markup=kb_builder.as_markup()

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/kb_with_raise_error.py

@@ -1,9 +1,10 @@
 import aiogram.filters
+from aiogram.fsm.context import FSMContext
 from aiogram.types import InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from arpakitlib.ar_aiogram_util import as_tg_command
-from project.tg_bot.blank.admin import get_cached_admin_tg_bot_blank
+from project.tg_bot.blank.admin import get_cached_eng_admin_tg_bot_blank
 from project.tg_bot.callback.common import BaseCD
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
@@ -25,16 +26,18 @@ class _CD(BaseCD, prefix=AdminTgBotCommands.kb_with_raise_error):
 @as_tg_command()
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
+    await state.clear()
     kb_builder = InlineKeyboardBuilder()
     kb_builder.row(InlineKeyboardButton(
         text="Raise fake error",
         callback_data=_CD().pack()
     ))
     await m.answer(
-        text=get_cached_admin_tg_bot_blank().good(),
+        text=get_cached_eng_admin_tg_bot_blank().good(),
         reply_markup=kb_builder.as_markup()
     )
 
@@ -42,6 +45,7 @@ async def _(
 @tg_bot_router.callback_query(_CD.filter())
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/kb_with_remove_message.py

@@ -1,10 +1,11 @@
 import aiogram.filters
+from aiogram.fsm.context import FSMContext
 from aiogram.types import InlineKeyboardButton
 from aiogram.utils.keyboard import InlineKeyboardBuilder
 
 from arpakitlib.ar_aiogram_util import as_tg_command
-from project.tg_bot.blank.admin import get_cached_admin_tg_bot_blank
-from project.tg_bot.callback.client import RemoveMessageCD
+from project.tg_bot.blank.admin import get_cached_eng_admin_tg_bot_blank
+from project.tg_bot.callback.client import RemoveMessageClientCD
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.user_roles_has_admin import UserRolesHasAdminTgBotFilter
@@ -21,15 +22,17 @@ tg_bot_router = aiogram.Router()
 @as_tg_command()
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
+    await state.clear()
     kb_builder = InlineKeyboardBuilder()
     kb_builder.row(InlineKeyboardButton(
         text="Remove",
-        callback_data=RemoveMessageCD().pack()
+        callback_data=RemoveMessageClientCD().pack()
     ))
     await m.answer(
-        text=get_cached_admin_tg_bot_blank().good(),
+        text=get_cached_eng_admin_tg_bot_blank().good(),
         reply_markup=kb_builder.as_markup()
     )

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/log_file.py

@@ -3,6 +3,7 @@ import os
 import aiogram
 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
@@ -10,6 +11,7 @@ from project.core.settings import get_cached_settings
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.user_roles_has_admin import UserRolesHasAdminTgBotFilter
+from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 tg_bot_router = Router()
 
@@ -22,11 +24,14 @@ tg_bot_router = Router()
 @as_tg_command(passwd_validator=get_cached_settings().tg_bot_command_passwd)
 async def _(
         m: types.Message,
+        state: FSMContext,
+        middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
+    await state.clear()
     with open(get_cached_settings().log_filepath, mode="r") as f:
         if not f.read():
-            await m.answer("log файл пустой")
+            await m.answer("Log file is empty")
             return
 
     await m.answer_document(

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/me.py

@@ -1,7 +1,8 @@
 import aiogram.filters
+from aiogram.fsm.context import FSMContext
 
 from arpakitlib.ar_aiogram_util import as_tg_command
-from project.tg_bot.blank.admin import get_cached_admin_tg_bot_blank
+from project.tg_bot.blank.admin import get_cached_eng_admin_tg_bot_blank
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.user_roles_has_admin import UserRolesHasAdminTgBotFilter
@@ -18,7 +19,11 @@ tg_bot_router = aiogram.Router()
 @as_tg_command()
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
-    await m.answer(text=get_cached_admin_tg_bot_blank().user_dbm(user_dbm=middleware_data_tg_bot.user_dbm))
+    await state.clear()
+    await m.answer(
+        text=get_cached_eng_admin_tg_bot_blank().user_dbm(user_dbm=middleware_data_tg_bot.current_user_dbm)
+    )

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

@@ -1,7 +1,7 @@
 import aiogram.filters
+from aiogram.fsm.context import FSMContext
 
 from arpakitlib.ar_aiogram_util import as_tg_command
-from project.core.settings import get_cached_settings
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.user_roles_has_admin import UserRolesHasAdminTgBotFilter
@@ -15,10 +15,12 @@ tg_bot_router = aiogram.Router()
     UserRolesHasAdminTgBotFilter(),
     aiogram.filters.Command(AdminTgBotCommands.raise_fake_error)
 )
-@as_tg_command(passwd_validator=get_cached_settings().tg_bot_command_passwd)
+@as_tg_command()
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
+    await state.clear()
     raise Exception("fake error")

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

@@ -1,11 +1,12 @@
 import aiogram
 from aiogram import Router
 from aiogram.filters import Command
+from aiogram.fsm.context import FSMContext
 
 from arpakitlib.ar_aiogram_util import as_tg_command
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db
-from project.tg_bot.blank.admin import get_cached_admin_tg_bot_blank
+from project.tg_bot.blank.admin import get_cached_eng_admin_tg_bot_blank
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.not_prod_mode_filter import NotProdModeTgBotFilter
@@ -24,8 +25,10 @@ tg_bot_router = Router()
 @as_tg_command(passwd_validator=get_cached_settings().tg_bot_command_passwd)
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
+    await state.clear()
     get_cached_sqlalchemy_db().reinit()
-    await m.answer(text=get_cached_admin_tg_bot_blank().good())
+    await m.answer(text=get_cached_eng_admin_tg_bot_blank().good())

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/router/admin/set_tg_bot_commands.py

@@ -1,9 +1,10 @@
 import aiogram
 from aiogram import Router
 from aiogram.filters import Command
+from aiogram.fsm.context import FSMContext
 
 from arpakitlib.ar_aiogram_util import as_tg_command
-from project.tg_bot.blank.admin import get_cached_admin_tg_bot_blank
+from project.tg_bot.blank.admin import get_cached_eng_admin_tg_bot_blank
 from project.tg_bot.const import AdminTgBotCommands
 from project.tg_bot.filter_.is_private_chat import IsPrivateChatTgBotFilter
 from project.tg_bot.filter_.user_roles_has_admin import UserRolesHasAdminTgBotFilter
@@ -21,8 +22,10 @@ tg_bot_router = Router()
 @as_tg_command()
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
+    await state.clear()
     await set_all_tg_bot_commands()
-    await m.answer(get_cached_admin_tg_bot_blank().good())
+    await m.answer(get_cached_eng_admin_tg_bot_blank().good())

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

@@ -3,9 +3,10 @@ import logging
 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_client_tg_bot_blank
-from project.tg_bot.const import GeneralTgBotCommands
+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
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
@@ -15,16 +16,18 @@ _logger = logging.getLogger(__name__)
 
 @tg_bot_router.message(
     or_f(
-        Command(GeneralTgBotCommands.about),
+        Command(ClientTgBotCommands.about),
         MessageTextTgBotFilter([
-            GeneralTgBotCommands.about,
+            ClientTgBotCommands.about,
             "о проекте"
         ], ignore_case=True)
     ),
 )
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
-    await m.answer(text=get_cached_client_tg_bot_blank().about())
+    await state.clear()
+    await m.answer(text=get_cached_rus_client_tg_bot_blank().about())

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

@@ -3,9 +3,10 @@ import logging
 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_client_tg_bot_blank
-from project.tg_bot.const import GeneralTgBotCommands
+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
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
@@ -15,9 +16,9 @@ _logger = logging.getLogger(__name__)
 
 @tg_bot_router.message(
     or_f(
-        Command(GeneralTgBotCommands.author),
+        Command(ClientTgBotCommands.author),
         MessageTextTgBotFilter([
-            GeneralTgBotCommands.about,
+            ClientTgBotCommands.about,
             "автор",
             "авторы"
         ], ignore_case=True)
@@ -25,7 +26,9 @@ _logger = logging.getLogger(__name__)
 )
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
-    await m.answer(text=get_cached_client_tg_bot_blank().author())
+    await state.clear()
+    await m.answer(text=get_cached_rus_client_tg_bot_blank().author())

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

@@ -3,9 +3,10 @@ import logging
 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_client_tg_bot_blank
-from project.tg_bot.const import GeneralTgBotCommands
+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
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
@@ -15,16 +16,18 @@ _logger = logging.getLogger(__name__)
 
 @tg_bot_router.message(
     or_f(
-        Command(GeneralTgBotCommands.support),
+        Command(ClientTgBotCommands.cancel),
         MessageTextTgBotFilter([
-            GeneralTgBotCommands.support,
-            "поддержка"
+            ClientTgBotCommands.cancel,
+            "отменить",
         ], ignore_case=True)
     )
 )
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
-    await m.answer(text=get_cached_client_tg_bot_blank().support())
+    await state.clear()
+    await m.answer(text=get_cached_rus_client_tg_bot_blank().cancel())

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

@@ -3,11 +3,12 @@ import logging
 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
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 _logger = logging.getLogger(__name__)
@@ -18,9 +19,12 @@ tg_bot_router = Router()
 @tg_bot_router.error()
 async def _(
         error_event: aiogram.types.ErrorEvent,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
+    await state.clear()
+
     need_logging = True
     need_create_story_log = True
 
@@ -30,7 +34,7 @@ async def _(
     ):
         try:
             await error_event.update.event.answer(
-                text=get_cached_client_tg_bot_blank().error()
+                text=get_cached_rus_client_tg_bot_blank().error()
             )
         except Exception as exception:
             _logger.error(exception)
@@ -66,7 +70,7 @@ async def _(
 
             try:
                 await error_event.update.event.message.answer(
-                    text=get_cached_client_tg_bot_blank().error()
+                    text=get_cached_rus_client_tg_bot_blank().error()
                 )
             except Exception as exception:
                 _logger.error(exception)

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

@@ -0,0 +1,21 @@
+import aiogram.filters
+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.middleware.common import MiddlewareDataTgBot
+
+tg_bot_router = aiogram.Router()
+
+
+@tg_bot_router.message(
+    aiogram.filters.Command(ClientTgBotCommands.healthcheck),
+)
+async def _(
+        m: aiogram.types.Message,
+        state: FSMContext,
+        middleware_data_tg_bot: MiddlewareDataTgBot,
+        **kwargs
+):
+    await state.clear()
+    await m.answer(text=get_cached_rus_client_tg_bot_blank().healthcheck())

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

@@ -2,8 +2,9 @@ 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_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 _logger = logging.getLogger(__name__)
@@ -13,12 +14,13 @@ tg_bot_router = aiogram.Router()
 @tg_bot_router.callback_query()
 async def _(
         cq: aiogram.types.CallbackQuery,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
     try:
         await cq.answer(
-            text=get_cached_client_tg_bot_blank().keyboard_is_old(),
+            text=get_cached_rus_client_tg_bot_blank().keyboard_is_old(),
             show_alert=True
         )
     except AiogramError as exception:

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

@@ -1,4 +1,5 @@
 import aiogram.filters
+from aiogram.fsm.context import FSMContext
 
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
@@ -8,6 +9,7 @@ tg_bot_router = aiogram.Router()
 @tg_bot_router.inline_query()
 async def _(
         iq: aiogram.types.InlineQuery,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):

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

@@ -1,6 +1,7 @@
 import aiogram.filters
+from aiogram.fsm.context import FSMContext
 
-from project.tg_bot.blank.client import get_cached_client_tg_bot_blank
+from project.tg_bot.blank.client import get_cached_rus_client_tg_bot_blank
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 tg_bot_router = aiogram.Router()
@@ -9,7 +10,9 @@ tg_bot_router = aiogram.Router()
 @tg_bot_router.message()
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
-    await m.answer(text=get_cached_client_tg_bot_blank().raw_message())
+    await state.clear()
+    await m.answer(text=get_cached_rus_client_tg_bot_blank().raw_message())

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

@@ -2,8 +2,9 @@ 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 RemoveMessageCD
+from project.tg_bot.callback.client import RemoveMessageClientCD
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
 _logger = logging.getLogger(__name__)
@@ -11,10 +12,11 @@ tg_bot_router = Router()
 
 
 @tg_bot_router.callback_query(
-    RemoveMessageCD.filter(),
+    RemoveMessageClientCD.filter(),
 )
 async def _(
         cq: types.CallbackQuery,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):

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

@@ -3,9 +3,10 @@ import logging
 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_client_tg_bot_blank
-from project.tg_bot.const import GeneralTgBotCommands
+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
 from project.tg_bot.middleware.common import MiddlewareDataTgBot
 
@@ -15,9 +16,9 @@ _logger = logging.getLogger(__name__)
 
 @tg_bot_router.message(
     or_f(
-        Command(GeneralTgBotCommands.start),
+        Command(ClientTgBotCommands.start),
         MessageTextTgBotFilter([
-            GeneralTgBotCommands.start,
+            ClientTgBotCommands.start,
             "начать",
             "старт",
             "привет",
@@ -28,7 +29,9 @@ _logger = logging.getLogger(__name__)
 )
 async def _(
         m: aiogram.types.Message,
+        state: FSMContext,
         middleware_data_tg_bot: MiddlewareDataTgBot,
         **kwargs
 ):
-    await m.answer(text=get_cached_client_tg_bot_blank().welcome())
+    await state.clear()
+    await m.answer(text=get_cached_rus_client_tg_bot_blank().welcome())

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

@@ -0,0 +1,37 @@
+import logging
+
+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
+from project.tg_bot.kb.inline_.client.support import support_client_inline_kb_tg_bot
+from project.tg_bot.middleware.common import MiddlewareDataTgBot
+
+tg_bot_router = Router()
+_logger = logging.getLogger(__name__)
+
+
+@tg_bot_router.message(
+    or_f(
+        Command(ClientTgBotCommands.support),
+        MessageTextTgBotFilter([
+            ClientTgBotCommands.support,
+            "поддержка"
+        ], ignore_case=True)
+    )
+)
+async def _(
+        m: aiogram.types.Message,
+        state: FSMContext,
+        middleware_data_tg_bot: MiddlewareDataTgBot,
+        **kwargs
+):
+    await state.clear()
+    await m.answer(
+        text=get_cached_rus_client_tg_bot_blank().support(),
+        reply_markup=support_client_inline_kb_tg_bot()
+    )

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

@@ -2,12 +2,22 @@ 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.general import remove_message, start, about, healthcheck, hello_world, \
-    support, error_handler, raw_callback_query, raw_message, raw_inline_query, author
+    kb_with_old_cd, kb_with_raise_error, kb_with_not_modified, current_state, hello_world
+from project.tg_bot.router.client import remove_message, start, about, healthcheck, \
+    support, error_handler, raw_callback_query, raw_message, raw_inline_query, author, cancel
 
 main_tg_bot_router = Router()
 
+# client
+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)
+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=support.tg_bot_router)
+main_tg_bot_router.include_router(router=author.tg_bot_router)
+main_tg_bot_router.include_router(router=cancel.tg_bot_router)
+
 # admin
 main_tg_bot_router.include_router(router=reinit_sqlalchemy_db.tg_bot_router)
 main_tg_bot_router.include_router(router=arpakitlib_project_template_info.tg_bot_router)
@@ -22,16 +32,10 @@ main_tg_bot_router.include_router(router=kb_with_remove_message.tg_bot_router)
 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)
-
-# 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)
-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=current_state.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)
+
+# client
 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/state/client.py

@@ -0,0 +1,5 @@
+from aiogram.fsm.state import StatesGroup, State
+
+
+class HelloWorldClientStates(StatesGroup):
+    input_text = State()

arpakitlib/_arpakit_project_template_v_5/project/tg_bot/tg_bot_dispatcher.py

@@ -2,7 +2,7 @@ import aiogram
 from aiogram.fsm.storage.memory import MemoryStorage
 
 from project.tg_bot.event import add_events_to_tg_bot_dispatcher
-from project.tg_bot.middleware.middleware import register_middlewares_to_tg_bot
+from project.tg_bot.middleware.uil import register_middlewares_to_tg_bot
 from project.tg_bot.router.main_router import main_tg_bot_router