black & isort reformatted

keyboards/kb_client.py

@@ -15,6 +15,7 @@
 
 
 import os
+
 from render_template import load_keyboards
 
 json_file_path = os.path.join("template", "keyboards", "client.json")

render_template/__init__.py

@@ -1,2 +1 @@
-from render_template.render import load_keyboards
-from render_template.render import load_valid_commands
+from render_template.render import load_keyboards, load_valid_commands

render_template/render.py

@@ -16,6 +16,7 @@
 
 from aiogram.types import KeyboardButton, ReplyKeyboardMarkup
 
+
 def load_keyboards(file_path: str) -> Dict[str, ReplyKeyboardMarkup]:
     """
     Загружает клавиатуры из JSON-файла и создает словарь объектов ReplyKeyboardMarkup.
@@ -34,12 +35,12 @@ def load_keyboards(file_path: str) -> Dict[str, ReplyKeyboardMarkup]:
                 for row in params["keyboard"]
             ]
             keyboards_dict[name] = ReplyKeyboardMarkup(
-                resize_keyboard=params.get("resize_keyboard", True), keyboard=keyboard_buttons
+                resize_keyboard=params.get("resize_keyboard", True),
+                keyboard=keyboard_buttons,
             )
     return keyboards_dict
 
 
-
 def load_valid_commands(json_file_path: str) -> Dict[str, List[str]]:
     """
     Загружает допустимые команды из указанного JSON файла.
@@ -49,6 +50,6 @@ def load_valid_commands(json_file_path: str) -> Dict[str, List[str]]:
     :return:
         Словарь с допустимыми командами, где ключи - это состояния, а значения - списки команд.
     """
-    with open(json_file_path, 'r', encoding='utf-8') as file:
+    with open(json_file_path, "r", encoding="utf-8") as file:
         data = json.load(file)
         return data["valid_commands"]

routers/admin.py

@@ -65,7 +65,7 @@ async def cancel_settings(message: types.Message, state: FSMContext) -> None:
 
 
 async def back_to_state(
-        message: types.Message, state: FSMContext, state_to_set: State
+    message: types.Message, state: FSMContext, state_to_set: State
 ) -> None:
     await message.answer(
         "Возвращаемся назад!", reply_markup=kb_admin.roles_switch_panel
@@ -87,11 +87,11 @@ async def back_to_state_settings(message: types.Message, state: FSMContext) -> N
 
 
 async def back_to_state_on_markup(
-        message: types.Message,
-        state: FSMContext,
-        reply_text: str,
-        markup,
-        state_to_set: State,
+    message: types.Message,
+    state: FSMContext,
+    reply_text: str,
+    markup,
+    state_to_set: State,
 ) -> None:
     await message.answer(reply_text, reply_markup=markup)
     await state.set_state(state_to_set)
@@ -108,7 +108,7 @@ async def back_state_commands_switch(message: types.Message, state: FSMContext)
 
 
 async def back_state_remove_roles_switcher(
-        message: types.Message, state: FSMContext
+    message: types.Message, state: FSMContext
 ) -> None:
     await back_to_state_on_markup(
         message,
@@ -296,21 +296,29 @@ async def command_remove(message: types.Message) -> None:
 
 
 async def register_routers() -> None:
-    admin_router.message.register(settings_panel, TextInFilter(valid_commands["settings"]))
     admin_router.message.register(
-        cancel_settings, TextInFilter(valid_commands["cancel"]), StateFilter(AdminState.settings)
+        settings_panel, TextInFilter(valid_commands["settings"])
+    )
+    admin_router.message.register(
+        cancel_settings,
+        TextInFilter(valid_commands["cancel"]),
+        StateFilter(AdminState.settings),
     )
 
 
 admin_router.message.register(
     roles_switch, TextInFilter(valid_commands["role"]), StateFilter(AdminState.settings)
 )
 admin_router.message.register(
-    commands_settings, TextInFilter(valid_commands["commands"]), StateFilter(AdminState.settings)
+    commands_settings,
+    TextInFilter(valid_commands["commands"]),
+    StateFilter(AdminState.settings),
 )
 
 admin_router.message.register(
-    back_to_state_settings, TextInFilter(valid_commands["back"]), StateFilter(AdminState.commands)
+    back_to_state_settings,
+    TextInFilter(valid_commands["back"]),
+    StateFilter(AdminState.commands),
 )
 admin_router.message.register(
     back_state_add,
@@ -339,29 +347,43 @@ async def register_routers() -> None:
 )
 
 admin_router.message.register(
-    give_roles, TextInFilter(valid_commands["give_role"]), StateFilter(AdminState.roles_switch)
+    give_roles,
+    TextInFilter(valid_commands["give_role"]),
+    StateFilter(AdminState.roles_switch),
 )
 admin_router.message.register(
-    remove_role, TextInFilter(valid_commands["remove_role"]), StateFilter(AdminState.roles_switch)
+    remove_role,
+    TextInFilter(valid_commands["remove_role"]),
+    StateFilter(AdminState.roles_switch),
 )
 admin_router.message.register(
-    roles_add_user, TextInFilter(valid_commands["role_normal"]), StateFilter(AdminState.give)
+    roles_add_user,
+    TextInFilter(valid_commands["role_normal"]),
+    StateFilter(AdminState.give),
 )
 admin_router.message.register(
-    roles_add_admin, TextInFilter(valid_commands["role_admin"]), StateFilter(AdminState.give)
+    roles_add_admin,
+    TextInFilter(valid_commands["role_admin"]),
+    StateFilter(AdminState.give),
 )
 admin_router.message.register(
-    remove_role_user, TextInFilter(valid_commands["role_normal"]), StateFilter(AdminState.remove)
+    remove_role_user,
+    TextInFilter(valid_commands["role_normal"]),
+    StateFilter(AdminState.remove),
 )
 admin_router.message.register(
-    remove_role_admin, TextInFilter(valid_commands["role_admin"]), StateFilter(AdminState.remove)
+    remove_role_admin,
+    TextInFilter(valid_commands["role_admin"]),
+    StateFilter(AdminState.remove),
 )
 
 admin_router.message.register(get_remove_user_id, StateFilter(AdminState.remove_user))
 admin_router.message.register(get_remove_admin_id, StateFilter(AdminState.remove_admin))
 
 admin_router.message.register(
-    button_commands_add, TextInFilter(valid_commands["add_command"]), StateFilter(AdminState.commands)
+    button_commands_add,
+    TextInFilter(valid_commands["add_command"]),
+    StateFilter(AdminState.commands),
 )
 admin_router.message.register(
     button_commands_remove,

routers/client.py

@@ -19,13 +19,14 @@
 from aiogram.filters import StateFilter
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.state import State, StatesGroup
-from render_template import load_valid_commands
+
 from custom_filters import TextInFilter
 from keyboards import get_main_menu, kb_client
 from logger.group_logger import groups_logger
 from logger.log import logger
 from minecraft import rcon
 from provider import db
+from render_template import load_valid_commands
 
 json_file_path = os.path.join("template", "commands", "client.json")
 valid_commands = load_valid_commands(json_file_path)

routers/other.py

@@ -44,6 +44,4 @@ async def support_cmd(message: types.Message) -> None:
 async def register_routers() -> None:
     other_router.message.register(id_cmd, TextInFilter(valid_commands["id"]))
     other_router.message.register(info_cmd, TextInFilter(valid_commands["info"]))
-    other_router.message.register(
-        support_cmd, TextInFilter(valid_commands["support"])
-    )
+    other_router.message.register(support_cmd, TextInFilter(valid_commands["support"]))