From 01afe1fe773c6d380fc15996a15df77514f143a9 Mon Sep 17 00:00:00 2001 From: dw-0 Date: Mon, 20 May 2024 10:52:18 +0200 Subject: [PATCH] chore: ruff organize imports Signed-off-by: Dominik Willner --- kiauh/components/klipper/klipper_dialogs.py | 2 +- kiauh/components/klipper/klipper_setup.py | 28 +++++++++---------- .../klipper/menus/klipper_remove_menu.py | 4 +-- .../klipper_firmware/firmware_utils.py | 4 +-- .../klipper_firmware/flash_options.py | 2 +- .../menus/klipper_build_menu.py | 8 +++--- .../menus/klipper_flash_error_menu.py | 2 +- .../menus/klipper_flash_help_menu.py | 4 +-- .../menus/klipper_flash_menu.py | 23 ++++++++------- kiauh/components/log_uploads/__init__.py | 2 +- .../log_uploads/menus/log_upload_menu.py | 7 ++--- .../moonraker/menus/moonraker_remove_menu.py | 4 +-- kiauh/components/moonraker/moonraker.py | 2 +- .../components/moonraker/moonraker_dialogs.py | 2 +- kiauh/components/moonraker/moonraker_setup.py | 22 +++++++-------- .../client_config/client_config_setup.py | 5 ++-- .../components/webui_client/client_dialogs.py | 2 +- .../components/webui_client/client_remove.py | 1 - kiauh/components/webui_client/client_setup.py | 27 +++++++++--------- kiauh/components/webui_client/fluidd_data.py | 2 +- .../components/webui_client/mainsail_data.py | 2 +- .../webui_client/menus/client_remove_menu.py | 4 +-- kiauh/core/instance_manager/base_instance.py | 5 ++-- .../core/instance_manager/instance_manager.py | 2 +- kiauh/core/instance_manager/name_scheme.py | 2 +- kiauh/core/menus/__init__.py | 2 +- kiauh/core/menus/advanced_menu.py | 2 +- kiauh/core/menus/backup_menu.py | 8 +++--- kiauh/core/menus/base_menu.py | 8 +++--- kiauh/core/menus/install_menu.py | 3 +- kiauh/core/menus/remove_menu.py | 2 +- kiauh/core/settings/kiauh_settings.py | 7 +++-- kiauh/extensions/base_extension.py | 2 +- kiauh/extensions/extensions_menu.py | 6 ++-- .../gcode_shell_cmd_extension.py | 8 +++--- .../klipper_backup_extension.py | 5 ++-- .../mainsail_theme_installer_extension.py | 13 ++++----- kiauh/utils/config_utils.py | 2 +- kiauh/utils/fs_utils.py | 7 ++--- kiauh/utils/logger.py | 12 ++++---- kiauh/utils/sys_utils.py | 6 ++-- 41 files changed, 126 insertions(+), 135 deletions(-) diff --git a/kiauh/components/klipper/klipper_dialogs.py b/kiauh/components/klipper/klipper_dialogs.py index 9964f66..7218c43 100644 --- a/kiauh/components/klipper/klipper_dialogs.py +++ b/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 diff --git a/kiauh/components/klipper/klipper_setup.py b/kiauh/components/klipper/klipper_setup.py index 1745d25..21e013a 100644 --- a/kiauh/components/klipper/klipper_setup.py +++ b/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, ) diff --git a/kiauh/components/klipper/menus/klipper_remove_menu.py b/kiauh/components/klipper/menus/klipper_remove_menu.py index 1190e98..07e24a3 100644 --- a/kiauh/components/klipper/menus/klipper_remove_menu.py +++ b/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 diff --git a/kiauh/components/klipper_firmware/firmware_utils.py b/kiauh/components/klipper_firmware/firmware_utils.py index b2d33d1..b2ac682 100644 --- a/kiauh/components/klipper_firmware/firmware_utils.py +++ b/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 diff --git a/kiauh/components/klipper_firmware/flash_options.py b/kiauh/components/klipper_firmware/flash_options.py index 47e51f9..775fa9c 100644 --- a/kiauh/components/klipper_firmware/flash_options.py +++ b/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): diff --git a/kiauh/components/klipper_firmware/menus/klipper_build_menu.py b/kiauh/components/klipper_firmware/menus/klipper_build_menu.py index b4e643e..a9768b9 100644 --- a/kiauh/components/klipper_firmware/menus/klipper_build_menu.py +++ b/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, ) diff --git a/kiauh/components/klipper_firmware/menus/klipper_flash_error_menu.py b/kiauh/components/klipper_firmware/menus/klipper_flash_error_menu.py index 7df7e82..0077d39 100644 --- a/kiauh/components/klipper_firmware/menus/klipper_flash_error_menu.py +++ b/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 diff --git a/kiauh/components/klipper_firmware/menus/klipper_flash_help_menu.py b/kiauh/components/klipper_firmware/menus/klipper_flash_help_menu.py index 736d9e9..4cebafd 100644 --- a/kiauh/components/klipper_firmware/menus/klipper_flash_help_menu.py +++ b/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 diff --git a/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py b/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py index 455732e..07c1ca5 100644 --- a/kiauh/components/klipper_firmware/menus/klipper_flash_menu.py +++ b/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 diff --git a/kiauh/components/log_uploads/__init__.py b/kiauh/components/log_uploads/__init__.py index 1d87ba8..0303dee 100644 --- a/kiauh/components/log_uploads/__init__.py +++ b/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]] diff --git a/kiauh/components/log_uploads/menus/log_upload_menu.py b/kiauh/components/log_uploads/menus/log_upload_menu.py index 34f9834..01f1675 100644 --- a/kiauh/components/log_uploads/menus/log_upload_menu.py +++ b/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 diff --git a/kiauh/components/moonraker/menus/moonraker_remove_menu.py b/kiauh/components/moonraker/menus/moonraker_remove_menu.py index 102c369..0ae48bc 100644 --- a/kiauh/components/moonraker/menus/moonraker_remove_menu.py +++ b/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 diff --git a/kiauh/components/moonraker/moonraker.py b/kiauh/components/moonraker/moonraker.py index 8cffeb3..9f92b46 100644 --- a/kiauh/components/moonraker/moonraker.py +++ b/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 diff --git a/kiauh/components/moonraker/moonraker_dialogs.py b/kiauh/components/moonraker/moonraker_dialogs.py index c047e4a..f49d0a7 100644 --- a/kiauh/components/moonraker/moonraker_dialogs.py +++ b/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( diff --git a/kiauh/components/moonraker/moonraker_setup.py b/kiauh/components/moonraker/moonraker_setup.py index 8885b34..b14e658 100644 --- a/kiauh/components/moonraker/moonraker_setup.py +++ b/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, ) diff --git a/kiauh/components/webui_client/client_config/client_config_setup.py b/kiauh/components/webui_client/client_config/client_config_setup.py index bd37184..c5abf7f 100644 --- a/kiauh/components/webui_client/client_config/client_config_setup.py +++ b/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 diff --git a/kiauh/components/webui_client/client_dialogs.py b/kiauh/components/webui_client/client_dialogs.py index 1932ad6..525aece 100644 --- a/kiauh/components/webui_client/client_dialogs.py +++ b/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(): diff --git a/kiauh/components/webui_client/client_remove.py b/kiauh/components/webui_client/client_remove.py index a803ffd..a4a0b82 100644 --- a/kiauh/components/webui_client/client_remove.py +++ b/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 ( diff --git a/kiauh/components/webui_client/client_setup.py b/kiauh/components/webui_client/client_setup.py index f4e1066..cb27075 100644 --- a/kiauh/components/webui_client/client_setup.py +++ b/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, ) diff --git a/kiauh/components/webui_client/fluidd_data.py b/kiauh/components/webui_client/fluidd_data.py index 6d34279..59e75d6 100644 --- a/kiauh/components/webui_client/fluidd_data.py +++ b/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 diff --git a/kiauh/components/webui_client/mainsail_data.py b/kiauh/components/webui_client/mainsail_data.py index 91299c2..efab649 100644 --- a/kiauh/components/webui_client/mainsail_data.py +++ b/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 diff --git a/kiauh/components/webui_client/menus/client_remove_menu.py b/kiauh/components/webui_client/menus/client_remove_menu.py index f38da19..f8f64ff 100644 --- a/kiauh/components/webui_client/menus/client_remove_menu.py +++ b/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 diff --git a/kiauh/core/instance_manager/base_instance.py b/kiauh/core/instance_manager/base_instance.py index a2ab9a5..f99db2a 100644 --- a/kiauh/core/instance_manager/base_instance.py +++ b/kiauh/core/instance_manager/base_instance.py @@ -8,11 +8,12 @@ # ======================================================================= # from __future__ import annotations -from abc import abstractmethod, ABC + +from abc import ABC, abstractmethod from pathlib import Path from typing import List, Optional -from utils.constants import SYSTEMD, CURRENT_USER +from utils.constants import CURRENT_USER, SYSTEMD class BaseInstance(ABC): diff --git a/kiauh/core/instance_manager/instance_manager.py b/kiauh/core/instance_manager/instance_manager.py index 05d8197..ed3d306 100644 --- a/kiauh/core/instance_manager/instance_manager.py +++ b/kiauh/core/instance_manager/instance_manager.py @@ -10,7 +10,7 @@ import re import subprocess from pathlib import Path -from typing import List, Optional, Union, TypeVar +from typing import List, Optional, TypeVar, Union from core.instance_manager.base_instance import BaseInstance from utils.constants import SYSTEMD diff --git a/kiauh/core/instance_manager/name_scheme.py b/kiauh/core/instance_manager/name_scheme.py index bfd9e2c..492cd6b 100644 --- a/kiauh/core/instance_manager/name_scheme.py +++ b/kiauh/core/instance_manager/name_scheme.py @@ -1,4 +1,4 @@ -from enum import unique, Enum +from enum import Enum, unique @unique diff --git a/kiauh/core/menus/__init__.py b/kiauh/core/menus/__init__.py index 8102e76..f5a6731 100644 --- a/kiauh/core/menus/__init__.py +++ b/kiauh/core/menus/__init__.py @@ -9,7 +9,7 @@ from dataclasses import dataclass from enum import Enum -from typing import Callable, Any, Union +from typing import Any, Callable, Union @dataclass diff --git a/kiauh/core/menus/advanced_menu.py b/kiauh/core/menus/advanced_menu.py index fb4a3ea..30b8ef3 100644 --- a/kiauh/core/menus/advanced_menu.py +++ b/kiauh/core/menus/advanced_menu.py @@ -8,7 +8,7 @@ # ======================================================================= # import textwrap -from typing import Type, Optional +from typing import Optional, Type from components.klipper import KLIPPER_DIR from components.klipper.klipper import Klipper diff --git a/kiauh/core/menus/backup_menu.py b/kiauh/core/menus/backup_menu.py index a7b28d6..2f9f39f 100644 --- a/kiauh/core/menus/backup_menu.py +++ b/kiauh/core/menus/backup_menu.py @@ -8,24 +8,24 @@ # ======================================================================= # import textwrap -from typing import Type, Optional +from typing import Optional, Type from components.klipper.klipper_utils import backup_klipper_dir from components.klipperscreen.klipperscreen import backup_klipperscreen_dir from components.moonraker.moonraker_utils import ( - backup_moonraker_dir, backup_moonraker_db_dir, + backup_moonraker_dir, ) from components.webui_client.client_utils import ( - backup_client_data, backup_client_config_data, + backup_client_data, ) from components.webui_client.fluidd_data import FluiddData from components.webui_client.mainsail_data import MainsailData from core.menus import Option from core.menus.base_menu import BaseMenu from utils.common import backup_printer_config_dir -from utils.constants import COLOR_CYAN, RESET_FORMAT, COLOR_YELLOW +from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT # noinspection PyUnusedLocal diff --git a/kiauh/core/menus/base_menu.py b/kiauh/core/menus/base_menu.py index ef169b4..6c0b9e3 100644 --- a/kiauh/core/menus/base_menu.py +++ b/kiauh/core/menus/base_menu.py @@ -14,14 +14,14 @@ import sys import textwrap import traceback from abc import abstractmethod -from typing import Type, Dict, Optional +from typing import Dict, Optional, Type from core.menus import FooterType, Option from utils.constants import ( - COLOR_GREEN, - COLOR_YELLOW, - COLOR_RED, COLOR_CYAN, + COLOR_GREEN, + COLOR_RED, + COLOR_YELLOW, RESET_FORMAT, ) from utils.logger import Logger diff --git a/kiauh/core/menus/install_menu.py b/kiauh/core/menus/install_menu.py index d1c9d27..c739da7 100644 --- a/kiauh/core/menus/install_menu.py +++ b/kiauh/core/menus/install_menu.py @@ -8,7 +8,7 @@ # ======================================================================= # import textwrap -from typing import Type, Optional +from typing import Optional, Type from components.crowsnest.crowsnest import install_crowsnest from components.klipper import klipper_setup @@ -20,7 +20,6 @@ from components.webui_client.client_config import client_config_setup from components.webui_client.fluidd_data import FluiddData from components.webui_client.mainsail_data import MainsailData from core.menus import Option - from core.menus.base_menu import BaseMenu from utils.constants import COLOR_GREEN, RESET_FORMAT diff --git a/kiauh/core/menus/remove_menu.py b/kiauh/core/menus/remove_menu.py index 55714fd..82d4f30 100644 --- a/kiauh/core/menus/remove_menu.py +++ b/kiauh/core/menus/remove_menu.py @@ -8,7 +8,7 @@ # ======================================================================= # import textwrap -from typing import Type, Optional +from typing import Optional, Type from components.crowsnest.crowsnest import remove_crowsnest from components.klipper.menus.klipper_remove_menu import KlipperRemoveMenu diff --git a/kiauh/core/settings/kiauh_settings.py b/kiauh/core/settings/kiauh_settings.py index 6547855..aacf3db 100644 --- a/kiauh/core/settings/kiauh_settings.py +++ b/kiauh/core/settings/kiauh_settings.py @@ -7,16 +7,17 @@ # This file may be distributed under the terms of the GNU GPLv3 license # # ======================================================================= # -import textwrap import configparser +import textwrap from typing import Dict, Union from core.config_manager.config_manager import CustomConfigParser -from kiauh import PROJECT_ROOT -from utils.constants import RESET_FORMAT, COLOR_RED +from utils.constants import COLOR_RED, RESET_FORMAT from utils.logger import Logger from utils.sys_utils import kill +from kiauh import PROJECT_ROOT + # noinspection PyUnusedLocal # noinspection PyMethodMayBeStatic diff --git a/kiauh/extensions/base_extension.py b/kiauh/extensions/base_extension.py index a14cbaa..008c520 100644 --- a/kiauh/extensions/base_extension.py +++ b/kiauh/extensions/base_extension.py @@ -7,7 +7,7 @@ # This file may be distributed under the terms of the GNU GPLv3 license # # ======================================================================= # -from abc import abstractmethod, ABC +from abc import ABC, abstractmethod from typing import Dict diff --git a/kiauh/extensions/extensions_menu.py b/kiauh/extensions/extensions_menu.py index 80c6a85..781589b 100644 --- a/kiauh/extensions/extensions_menu.py +++ b/kiauh/extensions/extensions_menu.py @@ -12,13 +12,13 @@ import inspect import json import textwrap from pathlib import Path -from typing import Type, Dict, Optional +from typing import Dict, Optional, Type from core.menus import Option +from core.menus.base_menu import BaseMenu from extensions import EXTENSION_ROOT from extensions.base_extension import BaseExtension -from core.menus.base_menu import BaseMenu -from utils.constants import RESET_FORMAT, COLOR_CYAN, COLOR_YELLOW +from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT # noinspection PyUnusedLocal diff --git a/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py b/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py index 8e90550..54106b8 100644 --- a/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py +++ b/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py @@ -13,14 +13,14 @@ from typing import List from components.klipper.klipper import Klipper from core.backup_manager.backup_manager import BackupManager -from extensions.base_extension import BaseExtension from core.config_manager.config_manager import ConfigManager from core.instance_manager.instance_manager import InstanceManager +from extensions.base_extension import BaseExtension from extensions.gcode_shell_cmd import ( - EXTENSION_TARGET_PATH, - EXTENSION_SRC, - KLIPPER_DIR, EXAMPLE_CFG_SRC, + EXTENSION_SRC, + EXTENSION_TARGET_PATH, + KLIPPER_DIR, KLIPPER_EXTRAS, ) from utils.fs_utils import check_file_exist diff --git a/kiauh/extensions/klipper_backup/klipper_backup_extension.py b/kiauh/extensions/klipper_backup/klipper_backup_extension.py index 94d1570..0d545ba 100644 --- a/kiauh/extensions/klipper_backup/klipper_backup_extension.py +++ b/kiauh/extensions/klipper_backup/klipper_backup_extension.py @@ -15,12 +15,11 @@ import subprocess from extensions.base_extension import BaseExtension from extensions.klipper_backup import ( - KLIPPERBACKUP_REPO_URL, - KLIPPERBACKUP_DIR, KLIPPERBACKUP_CONFIG_DIR, + KLIPPERBACKUP_DIR, + KLIPPERBACKUP_REPO_URL, MOONRAKER_CONF, ) - from utils.fs_utils import check_file_exist from utils.input_utils import get_confirm from utils.logger import Logger diff --git a/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py b/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py index fec24d7..1807af1 100644 --- a/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py +++ b/kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py @@ -11,20 +11,19 @@ import csv import shutil import textwrap import urllib.request -from typing import List, Union, Optional, Type -from typing import TypedDict +from typing import List, Optional, Type, TypedDict, Union from components.klipper.klipper import Klipper from components.klipper.klipper_dialogs import ( - print_instance_overview, DisplayType, + print_instance_overview, ) -from core.menus import Option -from extensions.base_extension import BaseExtension from core.instance_manager.base_instance import BaseInstance from core.instance_manager.instance_manager import InstanceManager +from core.menus import Option from core.menus.base_menu import BaseMenu -from utils.constants import COLOR_YELLOW, COLOR_CYAN, RESET_FORMAT +from extensions.base_extension import BaseExtension +from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT from utils.git_utils import git_clone_wrapper from utils.input_utils import get_selection_input from utils.logger import Logger @@ -106,7 +105,7 @@ class MainsailThemeInstallMenu(BaseMenu): | {color}{header:~^{count}}{RESET_FORMAT} | |-------------------------------------------------------| | {line1:<62} | - | https://docs.mainsail.xyz/theming/themes | + | https://docs.mainsail.xyz/theming/themes | |-------------------------------------------------------| """ )[1:] diff --git a/kiauh/utils/config_utils.py b/kiauh/utils/config_utils.py index 42a2992..52e1c7e 100644 --- a/kiauh/utils/config_utils.py +++ b/kiauh/utils/config_utils.py @@ -8,7 +8,7 @@ # ======================================================================= # import tempfile from pathlib import Path -from typing import List, TypeVar, Tuple, Optional +from typing import List, Optional, Tuple, TypeVar from components.klipper.klipper import Klipper from components.moonraker.moonraker import Moonraker diff --git a/kiauh/utils/fs_utils.py b/kiauh/utils/fs_utils.py index 57efbaf..92f461e 100644 --- a/kiauh/utils/fs_utils.py +++ b/kiauh/utils/fs_utils.py @@ -12,16 +12,15 @@ import re import shutil from pathlib import Path -from zipfile import ZipFile -from subprocess import run, check_output, CalledProcessError, PIPE, DEVNULL - +from subprocess import DEVNULL, PIPE, CalledProcessError, check_output, run from typing import List +from zipfile import ZipFile from components.klipper.klipper import Klipper from utils import ( - NGINX_SITES_AVAILABLE, MODULE_PATH, NGINX_CONFD, + NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED, ) from utils.decorators import deprecated diff --git a/kiauh/utils/logger.py b/kiauh/utils/logger.py index 3a357ba..1b6c0fa 100644 --- a/kiauh/utils/logger.py +++ b/kiauh/utils/logger.py @@ -11,13 +11,13 @@ from enum import Enum from typing import List from utils.constants import ( - COLOR_WHITE, - COLOR_GREEN, - COLOR_YELLOW, - COLOR_RED, - COLOR_MAGENTA, - RESET_FORMAT, COLOR_CYAN, + COLOR_GREEN, + COLOR_MAGENTA, + COLOR_RED, + COLOR_WHITE, + COLOR_YELLOW, + RESET_FORMAT, ) diff --git a/kiauh/utils/sys_utils.py b/kiauh/utils/sys_utils.py index f6b12fa..e93531d 100644 --- a/kiauh/utils/sys_utils.py +++ b/kiauh/utils/sys_utils.py @@ -8,24 +8,22 @@ # ======================================================================= # import os +import select import shutil import socket -from subprocess import Popen, PIPE, CalledProcessError, run, DEVNULL import sys import time import urllib.error import urllib.request import venv from pathlib import Path +from subprocess import DEVNULL, PIPE, CalledProcessError, Popen, run from typing import List, Literal -import select - from utils.fs_utils import check_file_exist from utils.input_utils import get_confirm from utils.logger import Logger - SysCtlServiceAction = Literal[ "start", "stop",