Fix isort import formatting issues identified by CI

Co-authored-by: MarkShidran <15670678+MarkShidran@users.noreply.github.com>

Author: Copilot

handlers/admin/ban_handlers.py

@@ -6,17 +6,12 @@
 from controllerBD.db_loader import Session
 from controllerBD.models import BanList, Holidays, UserStatus
 from handlers.admin.handlers import admin_menu
-from handlers.admin.validators import ban_validator, comment_validator, unban_validator
+from handlers.admin.validators import (ban_validator, comment_validator,
+                                       unban_validator)
 from handlers.decorators import admin_handlers
-from keyboards.admin import (
-    add_to_ban_list,
-    admin_ban_markup,
-    admin_cancel_markup,
-    back_to_main_markup,
-    ban_list,
-    cancel,
-    remove_from_ban_list,
-)
+from keyboards.admin import (add_to_ban_list, admin_ban_markup,
+                             admin_cancel_markup, back_to_main_markup,
+                             ban_list, cancel, remove_from_ban_list)
 from keyboards.user import back_to_main
 from loader import bot, logger
 from states import AdminData

handlers/admin/handlers.py

@@ -6,33 +6,23 @@
 
 from controllerBD.db_loader import Session
 from controllerBD.models import UserStatus
-from controllerBD.services import get_active_user_names_from_db, get_user_count_from_db
-from handlers.admin.admin_report import prepare_report_message, prepare_user_info
+from controllerBD.services import (get_active_user_names_from_db,
+                                   get_user_count_from_db)
+from handlers.admin.admin_report import (prepare_report_message,
+                                         prepare_user_info)
 from handlers.decorators import admin_handlers
 from handlers.user.check_message import prepare_user_list, send_message
 from handlers.user.get_info_from_table import get_id_from_user_info_table
-from keyboards.admin import (
-    admin_cancel_markup,
-    admin_change_status_markup,
-    admin_inform_markup,
-    admin_menu_button,
-    admin_menu_markup,
-    admin_pair_generation_markup,
-    cancel,
-    change_pair_generation_date,
-    change_status,
-    do_not_take_part_button,
-    force_pair_generation,
-    go_back,
-    inform,
-    inform_active_users,
-    inform_bad_users,
-    pair_generation,
-    renew_pair_generation,
-    send_message_to_all_button,
-    stop_pair_generation,
-    take_part_button,
-)
+from keyboards.admin import (admin_cancel_markup, admin_change_status_markup,
+                             admin_inform_markup, admin_menu_button,
+                             admin_menu_markup, admin_pair_generation_markup,
+                             cancel, change_pair_generation_date,
+                             change_status, do_not_take_part_button,
+                             force_pair_generation, go_back, inform,
+                             inform_active_users, inform_bad_users,
+                             pair_generation, renew_pair_generation,
+                             send_message_to_all_button, stop_pair_generation,
+                             take_part_button)
 from loader import bot, logger
 from match_algoritm.MatchingHelper import start_algoritm
 from states import AdminData

handlers/user/handlers.py

@@ -5,13 +5,11 @@
 from controllerBD.models import MetInfo
 from handlers.decorators import user_handlers
 from handlers.user.add_username import check_username
-from handlers.user.get_info_from_table import (
-    get_full_user_info_by_id,
-    get_holidays_status_from_db,
-    get_id_from_user_info_table,
-    get_user_data_from_db,
-    get_user_status_from_db,
-)
+from handlers.user.get_info_from_table import (get_full_user_info_by_id,
+                                               get_holidays_status_from_db,
+                                               get_id_from_user_info_table,
+                                               get_user_data_from_db,
+                                               get_user_status_from_db)
 from handlers.user.new_member import get_gender_from_db, start_registration
 from handlers.user.reviews import get_met_id_with_user_last_week
 from handlers.user.work_with_date import date_from_db_to_message

handlers/user/holidays.py

@@ -9,18 +9,11 @@
 from handlers.decorators import user_handlers
 from handlers.user.check_message import send_message
 from handlers.user.get_info_from_table import (
-    get_id_from_user_info_table,
-    get_teleg_id_from_user_info_table,
-)
+    get_id_from_user_info_table, get_teleg_id_from_user_info_table)
 from handlers.user.work_with_date import date_from_db_to_message
-from keyboards.user import (
-    holidays_length,
-    one_week_holidays_message,
-    set_holiday_message,
-    three_week_holidays_message,
-    turn_off_holidays,
-    two_week_holidays_message,
-)
+from keyboards.user import (holidays_length, one_week_holidays_message,
+                            set_holiday_message, three_week_holidays_message,
+                            turn_off_holidays, two_week_holidays_message)
 from loader import bot, logger
 
 

handlers/user/new_member.py

@@ -7,30 +7,17 @@
 from handlers.admin.ban_handlers import back_to_main_markup
 from handlers.user.add_username import check_username
 from handlers.user.first_check import check_and_add_registration_button
-from handlers.user.get_info_from_table import (
-    check_user_in_base,
-    get_id_from_user_info_table,
-)
-from handlers.user.validators import (
-    validate_about,
-    validate_birthday,
-    validate_check_info,
-    validate_gender,
-    validate_name,
-)
+from handlers.user.get_info_from_table import (check_user_in_base,
+                                               get_id_from_user_info_table)
+from handlers.user.validators import (validate_about, validate_birthday,
+                                      validate_check_info, validate_gender,
+                                      validate_name)
 from handlers.user.work_with_date import date_from_message_to_db
-from keyboards.user import (
-    back_message,
-    confirm_markup,
-    man_message,
-    register_can_skip_reply_markup,
-    register_man_or_woman_markup,
-    registr_message,
-    return_to_begin_button,
-    return_to_begin_markup,
-    skip_message,
-    woman_message,
-)
+from keyboards.user import (back_message, confirm_markup, man_message,
+                            register_can_skip_reply_markup,
+                            register_man_or_woman_markup, registr_message,
+                            return_to_begin_button, return_to_begin_markup,
+                            skip_message, woman_message)
 from loader import bot, logger
 from states.states import UserData
 

handlers/user/review_history.py

@@ -10,10 +10,8 @@
 from controllerBD.services import get_tg_username_from_db_by_base_id
 from handlers.decorators import user_handlers
 from handlers.user.add_username import check_username
-from handlers.user.get_info_from_table import (
-    get_id_from_user_info_table,
-    get_user_info_by_id,
-)
+from handlers.user.get_info_from_table import (get_id_from_user_info_table,
+                                               get_user_info_by_id)
 from handlers.user.work_with_date import date_from_db_to_message
 from keyboards.user import my_reviews, review_yes_or_no
 from loader import bot, logger

handlers/user/reviews.py

@@ -8,23 +8,12 @@
 from controllerBD.models import MetInfo, MetsReview
 from handlers.decorators import admin_handlers
 from handlers.user.get_info_from_table import (
-    get_id_from_user_info_table,
-    get_teleg_id_from_user_info_table,
-)
-from handlers.user.validators import (
-    validate_about,
-    validate_review_grade,
-    validate_review_yes_or_no,
-)
+    get_id_from_user_info_table, get_teleg_id_from_user_info_table)
+from handlers.user.validators import (validate_about, validate_review_grade,
+                                      validate_review_yes_or_no)
 from keyboards.admin import review_messages
-from keyboards.user import (
-    menu_markup,
-    no_button,
-    review_skip,
-    review_yes_or_no,
-    skip_message,
-    yes_button,
-)
+from keyboards.user import (menu_markup, no_button, review_skip,
+                            review_yes_or_no, skip_message, yes_button)
 from loader import bot, logger
 from states import ReviewState
 

handlers/user/validators/validators.py

@@ -3,15 +3,8 @@
 
 from aiogram import types
 
-from keyboards.user import (
-    all_right_message,
-    back_message,
-    man_message,
-    no_button,
-    skip_message,
-    woman_message,
-    yes_button,
-)
+from keyboards.user import (all_right_message, back_message, man_message,
+                            no_button, skip_message, woman_message, yes_button)
 from loader import bot
 
 

keyboards/admin/admin_markups.py

@@ -2,7 +2,8 @@
 from aiogram.types import ReplyKeyboardMarkup
 
 from data import ADMIN_TG_ID
-from keyboards.user.defalt_markups import back_to_main, menu_markup, menu_message
+from keyboards.user.defalt_markups import (back_to_main, menu_markup,
+                                           menu_message)
 
 admin_menu_button = "Меню администратора"
 inform = "Отчет"

main.py

@@ -9,7 +9,8 @@
 from handlers.admin.handlers import register_admin_handlers
 from handlers.user.handlers import register_user_handlers
 from handlers.user.help_texts import register_help_texts_handlers
-from handlers.user.holidays import register_holidays_handlers, sheduled_check_holidays
+from handlers.user.holidays import (register_holidays_handlers,
+                                    sheduled_check_holidays)
 from handlers.user.new_member import register_new_member_handler
 from handlers.user.review_history import register_review_history_handler
 from handlers.user.reviews import register_review_handlers