chore: ruff organize imports

Signed-off-by: Dominik Willner <th33xitus@gmail.com>

kiauh/components/klipper/klipper_dialogs.py

@@ -13,7 +13,7 @@ from typing import List
 
 from core.instance_manager.base_instance import BaseInstance
 from core.menus.base_menu import print_back_footer
-from utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
+from utils.constants import COLOR_CYAN, COLOR_GREEN, COLOR_YELLOW, RESET_FORMAT
 
 
 @unique

kiauh/components/klipper/klipper_setup.py

@@ -9,10 +9,6 @@
 
 from pathlib import Path
 
-from components.webui_client.client_utils import (
-    get_existing_clients,
-)
-from core.settings.kiauh_settings import KiauhSettings
 from components.klipper import (
     EXIT_KLIPPER_SETUP,
     KLIPPER_DIR,
@@ -22,28 +18,32 @@ from components.klipper import (
 from components.klipper.klipper import Klipper
 from components.klipper.klipper_dialogs import print_update_warn_dialog
 from components.klipper.klipper_utils import (
-    handle_disruptive_system_packages,
-    check_user_groups,
-    handle_to_multi_instance_conversion,
-    create_example_printer_cfg,
     add_to_existing,
-    get_install_count,
-    init_name_scheme,
-    check_is_single_to_multi_conversion,
-    update_name_scheme,
-    handle_instance_naming,
     backup_klipper_dir,
+    check_is_single_to_multi_conversion,
+    check_user_groups,
+    create_example_printer_cfg,
+    get_install_count,
+    handle_disruptive_system_packages,
+    handle_instance_naming,
+    handle_to_multi_instance_conversion,
+    init_name_scheme,
+    update_name_scheme,
 )
 from components.moonraker.moonraker import Moonraker
+from components.webui_client.client_utils import (
+    get_existing_clients,
+)
 from core.instance_manager.instance_manager import InstanceManager
+from core.settings.kiauh_settings import KiauhSettings
 from utils.common import check_install_dependencies
 from utils.git_utils import git_clone_wrapper, git_pull_wrapper
 from utils.input_utils import get_confirm
 from utils.logger import Logger
 from utils.sys_utils import (
-    parse_packages_from_file,
     create_python_venv,
     install_python_requirements,
+    parse_packages_from_file,
 )
 
 

kiauh/components/klipper/menus/klipper_remove_menu.py

@@ -8,12 +8,12 @@
 # ======================================================================= #
 
 import textwrap
-from typing import Type, Optional
+from typing import Optional, Type
 
 from components.klipper import klipper_remove
 from core.menus import FooterType, Option
 from core.menus.base_menu import BaseMenu
-from utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
+from utils.constants import COLOR_CYAN, COLOR_RED, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal

kiauh/components/klipper_firmware/firmware_utils.py

@@ -7,15 +7,15 @@
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
 
-from subprocess import CalledProcessError, check_output, Popen, PIPE, STDOUT, run
+from subprocess import PIPE, STDOUT, CalledProcessError, Popen, check_output, run
 from typing import List
 
 from components.klipper import KLIPPER_DIR
 from components.klipper.klipper import Klipper
 from components.klipper_firmware import SD_FLASH_SCRIPT
 from components.klipper_firmware.flash_options import (
-    FlashOptions,
     FlashMethod,
+    FlashOptions,
 )
 from core.instance_manager.instance_manager import InstanceManager
 from utils.logger import Logger

kiauh/components/klipper_firmware/flash_options.py

@@ -9,7 +9,7 @@
 
 from dataclasses import field
 from enum import Enum
-from typing import Union, List
+from typing import List, Union
 
 
 class FlashMethod(Enum):

kiauh/components/klipper_firmware/menus/klipper_build_menu.py

@@ -8,22 +8,22 @@
 # ======================================================================= #
 
 import textwrap
-from typing import Type, Optional
+from typing import Optional, Type
 
 from components.klipper import KLIPPER_DIR
 from components.klipper_firmware.firmware_utils import (
+    run_make,
     run_make_clean,
     run_make_menuconfig,
-    run_make,
 )
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from utils.constants import COLOR_CYAN, RESET_FORMAT, COLOR_GREEN, COLOR_RED
+from utils.constants import COLOR_CYAN, COLOR_GREEN, COLOR_RED, RESET_FORMAT
 from utils.logger import Logger
 from utils.sys_utils import (
     check_package_install,
-    update_system_package_lists,
     install_system_packages,
+    update_system_package_lists,
 )
 
 

kiauh/components/klipper_firmware/menus/klipper_flash_error_menu.py

@@ -9,7 +9,7 @@
 import textwrap
 from typing import Optional, Type
 
-from components.klipper_firmware.flash_options import FlashOptions, FlashMethod
+from components.klipper_firmware.flash_options import FlashMethod, FlashOptions
 from core.menus import FooterType, Option
 from core.menus.base_menu import BaseMenu
 from utils.constants import COLOR_RED, RESET_FORMAT

kiauh/components/klipper_firmware/menus/klipper_flash_help_menu.py

@@ -7,10 +7,10 @@
 #  This file may be distributed under the terms of the GNU GPLv3 license  #
 # ======================================================================= #
 import textwrap
-from typing import Type, Optional
+from typing import Optional, Type
 
 from core.menus.base_menu import BaseMenu
-from utils.constants import COLOR_CYAN, RESET_FORMAT, COLOR_YELLOW
+from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 
 
 # noinspection DuplicatedCode

kiauh/components/klipper_firmware/menus/klipper_flash_menu.py

@@ -9,35 +9,34 @@
 
 import textwrap
 import time
-from typing import Type, Optional
+from typing import Optional, Type
 
-from components.klipper_firmware.flash_options import (
-    FlashOptions,
-    FlashMethod,
-    FlashCommand,
-    ConnectionType,
-)
 from components.klipper_firmware.firmware_utils import (
-    find_usb_device_by_id,
+    find_firmware_file,
     find_uart_device,
+    find_usb_device_by_id,
     find_usb_dfu_device,
     get_sd_flash_board_list,
     start_flash_process,
-    find_firmware_file,
+)
+from components.klipper_firmware.flash_options import (
+    ConnectionType,
+    FlashCommand,
+    FlashMethod,
+    FlashOptions,
 )
 from components.klipper_firmware.menus.klipper_flash_error_menu import (
     KlipperNoBoardTypesErrorMenu,
     KlipperNoFirmwareErrorMenu,
 )
 from components.klipper_firmware.menus.klipper_flash_help_menu import (
-    KlipperMcuConnectionHelpMenu,
     KlipperFlashCommandHelpMenu,
     KlipperFlashMethodHelpMenu,
+    KlipperMcuConnectionHelpMenu,
 )
 from core.menus import FooterType, Option
-
 from core.menus.base_menu import BaseMenu
-from utils.constants import COLOR_CYAN, RESET_FORMAT, COLOR_YELLOW, COLOR_RED
+from utils.constants import COLOR_CYAN, COLOR_RED, COLOR_YELLOW, RESET_FORMAT
 from utils.input_utils import get_number_input
 from utils.logger import Logger
 

kiauh/components/log_uploads/__init__.py

@@ -8,7 +8,7 @@
 # ======================================================================= #
 
 from pathlib import Path
-from typing import Dict, Union, Literal
+from typing import Dict, Literal, Union
 
 FileKey = Literal["filepath", "display_name"]
 LogFile = Dict[FileKey, Union[str, Path]]

kiauh/components/log_uploads/menus/log_upload_menu.py

@@ -8,13 +8,12 @@
 # ======================================================================= #
 
 import textwrap
-from typing import Type, Optional
+from typing import Optional, Type
 
-from components.log_uploads.log_upload_utils import get_logfile_list
-from components.log_uploads.log_upload_utils import upload_logfile
+from components.log_uploads.log_upload_utils import get_logfile_list, upload_logfile
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from utils.constants import RESET_FORMAT, COLOR_YELLOW
+from utils.constants import COLOR_YELLOW, RESET_FORMAT
 
 
 # noinspection PyMethodMayBeStatic

kiauh/components/moonraker/menus/moonraker_remove_menu.py

@@ -8,12 +8,12 @@
 # ======================================================================= #
 
 import textwrap
-from typing import Type, Optional
+from typing import Optional, Type
 
 from components.moonraker import moonraker_remove
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
+from utils.constants import COLOR_CYAN, COLOR_RED, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal

kiauh/components/moonraker/moonraker.py

@@ -11,7 +11,7 @@ import subprocess
 from pathlib import Path
 from typing import List, Union
 
-from components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR, MODULE_PATH
+from components.moonraker import MODULE_PATH, MOONRAKER_DIR, MOONRAKER_ENV_DIR
 from core.config_manager.config_manager import ConfigManager
 from core.instance_manager.base_instance import BaseInstance
 from utils.constants import SYSTEMD

kiauh/components/moonraker/moonraker_dialogs.py

@@ -13,7 +13,7 @@ from typing import List
 from components.klipper.klipper import Klipper
 from components.moonraker.moonraker import Moonraker
 from core.menus.base_menu import print_back_footer
-from utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
+from utils.constants import COLOR_CYAN, COLOR_GREEN, COLOR_YELLOW, RESET_FORMAT
 
 
 def print_moonraker_overview(

kiauh/components/moonraker/moonraker_setup.py

@@ -10,30 +10,30 @@ import json
 import subprocess
 from pathlib import Path
 
-from components.webui_client.client_utils import (
-    enable_mainsail_remotemode,
-    get_existing_clients,
-)
-from components.webui_client.mainsail_data import MainsailData
-from core.settings.kiauh_settings import KiauhSettings
 from components.klipper.klipper import Klipper
 from components.moonraker import (
     EXIT_MOONRAKER_SETUP,
     MOONRAKER_DIR,
     MOONRAKER_ENV_DIR,
     MOONRAKER_REQUIREMENTS_TXT,
-    POLKIT_LEGACY_FILE,
     POLKIT_FILE,
-    POLKIT_USR_FILE,
+    POLKIT_LEGACY_FILE,
     POLKIT_SCRIPT,
+    POLKIT_USR_FILE,
 )
 from components.moonraker.moonraker import Moonraker
 from components.moonraker.moonraker_dialogs import print_moonraker_overview
 from components.moonraker.moonraker_utils import (
-    create_example_moonraker_conf,
     backup_moonraker_dir,
+    create_example_moonraker_conf,
 )
+from components.webui_client.client_utils import (
+    enable_mainsail_remotemode,
+    get_existing_clients,
+)
+from components.webui_client.mainsail_data import MainsailData
 from core.instance_manager.instance_manager import InstanceManager
+from core.settings.kiauh_settings import KiauhSettings
 from utils.common import check_install_dependencies
 from utils.fs_utils import check_file_exist
 from utils.git_utils import git_clone_wrapper, git_pull_wrapper
@@ -43,10 +43,10 @@ from utils.input_utils import (
 )
 from utils.logger import Logger
 from utils.sys_utils import (
-    parse_packages_from_file,
+    check_python_version,
     create_python_venv,
     install_python_requirements,
-    check_python_version,
+    parse_packages_from_file,
 )
 
 

kiauh/components/webui_client/client_config/client_config_setup.py

@@ -12,10 +12,9 @@ import subprocess
 from pathlib import Path
 from typing import List
 
-from components.webui_client.base_data import BaseWebClient, BaseWebClientConfig
-from core.settings.kiauh_settings import KiauhSettings
 from components.klipper.klipper import Klipper
 from components.moonraker.moonraker import Moonraker
+from components.webui_client.base_data import BaseWebClient, BaseWebClientConfig
 from components.webui_client.client_dialogs import (
     print_client_already_installed_dialog,
 )
@@ -23,8 +22,8 @@ from components.webui_client.client_utils import (
     backup_client_config_data,
     config_for_other_client_exist,
 )
-
 from core.instance_manager.instance_manager import InstanceManager
+from core.settings.kiauh_settings import KiauhSettings
 from utils.common import backup_printer_config_dir
 from utils.config_utils import add_config_section, add_config_section_at_top
 from utils.fs_utils import create_symlink

kiauh/components/webui_client/client_dialogs.py

@@ -12,7 +12,7 @@ from typing import List
 
 from components.webui_client.base_data import BaseWebClient
 from core.menus.base_menu import print_back_footer
-from utils.constants import RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN
+from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 
 
 def print_moonraker_not_found_dialog():

kiauh/components/webui_client/client_remove.py

@@ -21,7 +21,6 @@ from components.webui_client.client_config.client_config_remove import (
     run_client_config_removal,
 )
 from components.webui_client.client_utils import backup_mainsail_config_json
-
 from core.instance_manager.instance_manager import InstanceManager
 from utils.config_utils import remove_config_section
 from utils.fs_utils import (

kiauh/components/webui_client/client_setup.py

@@ -11,27 +11,26 @@ from pathlib import Path
 from typing import List
 
 from components.klipper.klipper import Klipper
-
 from components.moonraker.moonraker import Moonraker
 from components.webui_client.base_data import (
-    WebClientType,
     BaseWebClient,
     BaseWebClientConfig,
+    WebClientType,
 )
 from components.webui_client.client_config.client_config_setup import (
     install_client_config,
 )
 from components.webui_client.client_dialogs import (
-    print_moonraker_not_found_dialog,
     print_client_port_select_dialog,
     print_install_client_config_dialog,
+    print_moonraker_not_found_dialog,
 )
 from components.webui_client.client_utils import (
     backup_mainsail_config_json,
-    restore_mainsail_config_json,
-    enable_mainsail_remotemode,
-    symlink_webui_nginx_log,
     config_for_other_client_exist,
+    enable_mainsail_remotemode,
+    restore_mainsail_config_json,
+    symlink_webui_nginx_log,
 )
 from core.instance_manager.instance_manager import InstanceManager
 from core.settings.kiauh_settings import KiauhSettings
@@ -39,23 +38,23 @@ from utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
 from utils.common import check_install_dependencies
 from utils.config_utils import add_config_section
 from utils.fs_utils import (
-    unzip,
-    copy_upstream_nginx_cfg,
     copy_common_vars_nginx_cfg,
+    copy_upstream_nginx_cfg,
     create_nginx_cfg,
     create_symlink,
-    remove_file,
-    read_ports_from_nginx_configs,
-    is_valid_port,
     get_next_free_port,
+    is_valid_port,
+    read_ports_from_nginx_configs,
+    remove_file,
+    unzip,
 )
 from utils.input_utils import get_confirm, get_number_input
 from utils.logger import Logger
 from utils.sys_utils import (
-    download_file,
-    set_nginx_permissions,
-    get_ipv4_addr,
     cmd_sysctl_service,
+    download_file,
+    get_ipv4_addr,
+    set_nginx_permissions,
 )
 
 

kiauh/components/webui_client/fluidd_data.py

@@ -13,10 +13,10 @@ from dataclasses import dataclass
 from pathlib import Path
 
 from components.webui_client.base_data import (
+    BaseWebClient,
     BaseWebClientConfig,
     WebClientConfigType,
     WebClientType,
-    BaseWebClient,
 )
 from components.webui_client.client_utils import get_download_url
 from core.backup_manager import BACKUP_ROOT_DIR

kiauh/components/webui_client/mainsail_data.py

@@ -13,10 +13,10 @@ from dataclasses import dataclass
 from pathlib import Path
 
 from components.webui_client.base_data import (
+    BaseWebClient,
     BaseWebClientConfig,
     WebClientConfigType,
     WebClientType,
-    BaseWebClient,
 )
 from core.backup_manager import BACKUP_ROOT_DIR
 

kiauh/components/webui_client/menus/client_remove_menu.py

@@ -8,13 +8,13 @@
 # ======================================================================= #
 
 import textwrap
-from typing import Type, Optional
+from typing import Optional, Type
 
 from components.webui_client import client_remove
 from components.webui_client.base_data import BaseWebClient, WebClientType
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN
+from utils.constants import COLOR_CYAN, COLOR_RED, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal