add command params

bot/handlers/menu/entities.py

@@ -9,7 +9,7 @@ from ....model.settings import Settings
 from ..context import ContextData, CallbackCommand
 from ....utils.main import get_send_message
 from ....model.descriptors import EntityCaptionCallable
-from ..navigation import save_navigation_context, pop_navigation_context
+from ....utils.navigation import save_navigation_context, pop_navigation_context
 
 if TYPE_CHECKING:
     from ....main import QBotApp
@@ -45,9 +45,7 @@ async def entities_menu(
     entity_metadata = app.entity_metadata
 
     for entity in entity_metadata.entity_descriptors.values():
-
         if entity.show_in_entities_menu:
-
             if entity.full_name_plural.__class__ == EntityCaptionCallable:
                 caption = entity.full_name_plural(entity) or entity.name
             elif entity.full_name_plural.__class__ == LazyProxy:

bot/handlers/menu/language.py

@@ -10,7 +10,7 @@ from aiogram.utils.i18n import I18n
 from logging import getLogger
 from sqlmodel.ext.asyncio.session import AsyncSession
 
-from ..navigation import pop_navigation_context, save_navigation_context
+from ....utils.navigation import pop_navigation_context, save_navigation_context
 from ....model.language import LanguageBase
 from ....model.settings import Settings
 from ....model.user import UserBase

bot/handlers/menu/main.py

@@ -5,7 +5,7 @@ from logging import getLogger
 from ....model.settings import Settings
 from ..context import ContextData, CallbackCommand
 from ....utils.main import get_send_message
-from ..navigation import save_navigation_context, pop_navigation_context
+from ....utils.navigation import save_navigation_context, pop_navigation_context
 
 import qbot.bot.handlers.menu.entities as entities
 import qbot.bot.handlers.menu.settings as settings
@@ -17,7 +17,7 @@ import qbot.bot.handlers.forms.entity_list as entity_list
 import qbot.bot.handlers.forms.entity_form as entity_form
 import qbot.bot.handlers.forms.entity_form_callbacks as entity_form_callbacks
 import qbot.bot.handlers.common.filtering_callbacks as filtering_callbacks
-import qbot.bot.handlers.user_handlers as user_handlers
+import qbot.bot.handlers.user_handlers.main as user_handlers_main
 
 
 logger = getLogger(__name__)
@@ -26,7 +26,7 @@ router = Router()
 
 @router.callback_query(ContextData.filter(F.command == CallbackCommand.MENU_ENTRY_MAIN))
 async def menu_entry_main(message: CallbackQuery, **kwargs):
-    stack = await save_navigation_context(
+    stack = save_navigation_context(
         callback_data=kwargs["callback_data"], state=kwargs["state"]
     )
 
@@ -84,5 +84,5 @@ router.include_routers(
     entity_form.router,
     entity_form_callbacks.router,
     filtering_callbacks.router,
-    user_handlers.router,
+    user_handlers_main.router,
 )

bot/handlers/menu/parameters.py

@@ -13,7 +13,7 @@ from ....utils.main import (
     get_value_repr,
     get_callable_str,
 )
-from ..navigation import save_navigation_context, pop_navigation_context
+from ....utils.navigation import save_navigation_context, pop_navigation_context
 from ....auth import authorize_command
 
 

bot/handlers/menu/settings.py

@@ -9,7 +9,7 @@ from ....model.user import UserBase
 from ....utils.main import get_send_message
 from ..context import ContextData, CallbackCommand
 from ....auth import authorize_command
-from ..navigation import save_navigation_context, pop_navigation_context
+from ....utils.navigation import save_navigation_context, pop_navigation_context
 
 logger = getLogger(__name__)
 router = Router()