refactor: move constants and decorators to core package

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

kiauh/components/crowsnest/__init__.py

@@ -10,7 +10,7 @@
 from pathlib import Path
 
 from core.backup_manager import BACKUP_ROOT_DIR
-from utils.constants import SYSTEMD
+from core.constants import SYSTEMD
 
 # repo
 CROWSNEST_REPO = "https://github.com/mainsail-crew/crowsnest.git"

kiauh/components/crowsnest/crowsnest.py

@@ -27,13 +27,13 @@ from components.crowsnest import (
 )
 from components.klipper.klipper import Klipper
 from core.backup_manager.backup_manager import BackupManager
+from core.constants import CURRENT_USER
 from core.instance_manager.instance_manager import InstanceManager
 from core.settings.kiauh_settings import KiauhSettings
 from utils.common import (
     check_install_dependencies,
     get_install_status,
 )
-from utils.constants import CURRENT_USER
 from utils.git_utils import (
     git_clone_wrapper,
     git_pull_wrapper,

kiauh/components/klipper/klipper_dialogs.py

@@ -11,14 +11,14 @@ import textwrap
 from enum import Enum, unique
 from typing import List
 
-from core.instance_manager.base_instance import BaseInstance
+from core.constants import (
-from core.menus.base_menu import print_back_footer
-from utils.constants import (
     COLOR_CYAN,
     COLOR_GREEN,
     COLOR_YELLOW,
     RESET_FORMAT,
 )
+from core.instance_manager.base_instance import BaseInstance
+from core.menus.base_menu import print_back_footer
 
 
 @unique

kiauh/components/klipper/klipper_utils.py

@@ -30,12 +30,12 @@ from components.webui_client.client_config.client_config_setup import (
     create_client_config_symlink,
 )
 from core.backup_manager.backup_manager import BackupManager
+from core.constants import CURRENT_USER
 from core.instance_manager.instance_manager import InstanceManager
 from core.submodules.simple_config_parser.src.simple_config_parser.simple_config_parser import (
     SimpleConfigParser,
 )
 from utils.common import get_install_status
-from utils.constants import CURRENT_USER
 from utils.input_utils import get_confirm, get_number_input, get_string_input
 from utils.logger import DialogType, Logger
 from utils.sys_utils import cmd_sysctl_service

kiauh/components/klipper/menus/klipper_remove_menu.py

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

kiauh/components/klipper_firmware/menus/klipper_build_menu.py

@@ -17,9 +17,9 @@ from components.klipper_firmware.firmware_utils import (
     run_make_clean,
     run_make_menuconfig,
 )
+from core.constants import COLOR_CYAN, COLOR_GREEN, COLOR_RED, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-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,

kiauh/components/klipper_firmware/menus/klipper_flash_error_menu.py

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

kiauh/components/klipper_firmware/menus/klipper_flash_help_menu.py

@@ -11,8 +11,8 @@ from __future__ import annotations
 import textwrap
 from typing import Type
 
+from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 from core.menus.base_menu import BaseMenu
-from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 
 
 # noinspection DuplicatedCode

kiauh/components/klipper_firmware/menus/klipper_flash_menu.py

@@ -35,9 +35,9 @@ from components.klipper_firmware.menus.klipper_flash_help_menu import (
     KlipperFlashMethodHelpMenu,
     KlipperMcuConnectionHelpMenu,
 )
+from core.constants import COLOR_CYAN, COLOR_RED, COLOR_YELLOW, RESET_FORMAT
 from core.menus import FooterType, Option
 from core.menus.base_menu import BaseMenu
-from utils.constants import COLOR_CYAN, COLOR_RED, COLOR_YELLOW, RESET_FORMAT
 from utils.input_utils import get_number_input
 from utils.logger import DialogType, Logger
 

kiauh/components/klipperscreen/__init__.py

@@ -9,7 +9,7 @@
 from pathlib import Path
 
 from core.backup_manager import BACKUP_ROOT_DIR
-from utils.constants import SYSTEMD
+from core.constants import SYSTEMD
 
 # repo
 KLIPPERSCREEN_REPO = "https://github.com/KlipperScreen/KlipperScreen.git"

kiauh/components/klipperscreen/klipperscreen.py

@@ -26,6 +26,7 @@ from components.klipperscreen import (
 )
 from components.moonraker.moonraker import Moonraker
 from core.backup_manager.backup_manager import BackupManager
+from core.constants import SYSTEMD
 from core.instance_manager.instance_manager import InstanceManager
 from core.settings.kiauh_settings import KiauhSettings
 from utils.common import (
@@ -33,7 +34,6 @@ from utils.common import (
     get_install_status,
 )
 from utils.config_utils import add_config_section, remove_config_section
-from utils.constants import SYSTEMD
 from utils.fs_utils import remove_with_sudo
 from utils.git_utils import (
     git_clone_wrapper,

kiauh/components/log_uploads/menus/log_upload_menu.py

@@ -12,9 +12,9 @@ import textwrap
 from typing import Type
 
 from components.log_uploads.log_upload_utils import get_logfile_list, upload_logfile
+from core.constants import COLOR_YELLOW, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from utils.constants import COLOR_YELLOW, RESET_FORMAT
 from utils.logger import Logger
 
 

kiauh/components/mobileraker/__init__.py

@@ -9,7 +9,7 @@
 from pathlib import Path
 
 from core.backup_manager import BACKUP_ROOT_DIR
-from utils.constants import SYSTEMD
+from core.constants import SYSTEMD
 
 # repo
 MOBILERAKER_REPO = "https://github.com/Clon1998/mobileraker_companion.git"

kiauh/components/moonraker/menus/moonraker_remove_menu.py

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

kiauh/components/moonraker/moonraker_dialogs.py

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

kiauh/components/webui_client/client_utils.py

@@ -21,10 +21,10 @@ from components.webui_client.base_data import (
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
 from core.backup_manager.backup_manager import BackupManager
+from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 from core.settings.kiauh_settings import KiauhSettings
 from utils import NGINX_CONFD, NGINX_SITES_AVAILABLE
 from utils.common import get_install_status
-from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 from utils.git_utils import (
     get_latest_tag,
     get_latest_unstable_tag,

kiauh/components/webui_client/menus/client_remove_menu.py

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

kiauh/core/instance_manager/base_instance.py

@@ -15,7 +15,7 @@ from dataclasses import dataclass, field
 from pathlib import Path
 from typing import List
 
-from utils.constants import CURRENT_USER, SYSTEMD
+from core.constants import CURRENT_USER, SYSTEMD
 from utils.logger import Logger
 
 

kiauh/core/instance_manager/instance_manager.py

@@ -13,8 +13,8 @@ import subprocess
 from pathlib import Path
 from typing import List, Type, TypeVar
 
+from core.constants import SYSTEMD
 from core.instance_manager.base_instance import BaseInstance
-from utils.constants import SYSTEMD
 from utils.logger import Logger
 from utils.sys_utils import cmd_sysctl_service
 

kiauh/core/menus/advanced_menu.py

@@ -22,9 +22,9 @@ from components.klipper_firmware.menus.klipper_flash_menu import (
 )
 from components.moonraker import MOONRAKER_DIR
 from components.moonraker.moonraker import Moonraker
+from core.constants import COLOR_YELLOW, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from utils.constants import COLOR_YELLOW, RESET_FORMAT
 from utils.git_utils import rollback_repository
 
 

kiauh/core/menus/backup_menu.py

@@ -23,10 +23,10 @@ from components.webui_client.client_utils import (
 )
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
+from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 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, COLOR_YELLOW, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal

kiauh/core/menus/base_menu.py

@@ -16,14 +16,14 @@ import traceback
 from abc import abstractmethod
 from typing import Dict, Type
 
-from core.menus import FooterType, Option
+from core.constants import (
-from utils.constants import (
     COLOR_CYAN,
     COLOR_GREEN,
     COLOR_RED,
     COLOR_YELLOW,
     RESET_FORMAT,
 )
+from core.menus import FooterType, Option
 from utils.logger import Logger
 
 

kiauh/core/menus/install_menu.py

@@ -21,9 +21,9 @@ from components.webui_client import client_setup
 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.constants import COLOR_GREEN, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from utils.constants import COLOR_GREEN, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal

kiauh/core/menus/main_menu.py

@@ -25,6 +25,14 @@ from components.webui_client.client_utils import (
 )
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
+from core.constants import (
+    COLOR_CYAN,
+    COLOR_GREEN,
+    COLOR_MAGENTA,
+    COLOR_RED,
+    COLOR_YELLOW,
+    RESET_FORMAT,
+)
 from core.menus import FooterType
 from core.menus.advanced_menu import AdvancedMenu
 from core.menus.backup_menu import BackupMenu
@@ -34,14 +42,6 @@ from core.menus.remove_menu import RemoveMenu
 from core.menus.settings_menu import SettingsMenu
 from core.menus.update_menu import UpdateMenu
 from extensions.extensions_menu import ExtensionsMenu
-from utils.constants import (
-    COLOR_CYAN,
-    COLOR_GREEN,
-    COLOR_MAGENTA,
-    COLOR_RED,
-    COLOR_YELLOW,
-    RESET_FORMAT,
-)
 from utils.logger import Logger
 from utils.types import ComponentStatus, StatusMap, StatusText
 

kiauh/core/menus/remove_menu.py

@@ -22,9 +22,9 @@ from components.octoeverywhere.octoeverywhere_setup import remove_octoeverywhere
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
 from components.webui_client.menus.client_remove_menu import ClientRemoveMenu
+from core.constants import COLOR_RED, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
-from utils.constants import COLOR_RED, RESET_FORMAT
 
 
 # noinspection PyUnusedLocal

kiauh/core/menus/settings_menu.py

@@ -17,11 +17,11 @@ from components.klipper import KLIPPER_DIR
 from components.klipper.klipper import Klipper
 from components.moonraker import MOONRAKER_DIR
 from components.moonraker.moonraker import Moonraker
+from core.constants import COLOR_CYAN, COLOR_GREEN, RESET_FORMAT
 from core.instance_manager.instance_manager import InstanceManager
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
 from core.settings.kiauh_settings import KiauhSettings
-from utils.constants import COLOR_CYAN, COLOR_GREEN, RESET_FORMAT
 from utils.git_utils import git_clone_wrapper
 from utils.input_utils import get_confirm, get_string_input
 from utils.logger import DialogType, Logger

kiauh/core/menus/update_menu.py

@@ -40,14 +40,14 @@ from components.webui_client.client_utils import (
 )
 from components.webui_client.fluidd_data import FluiddData
 from components.webui_client.mainsail_data import MainsailData
-from core.menus import Option
+from core.constants import (
-from core.menus.base_menu import BaseMenu
-from utils.constants import (
     COLOR_GREEN,
     COLOR_RED,
     COLOR_YELLOW,
     RESET_FORMAT,
 )
+from core.menus import Option
+from core.menus.base_menu import BaseMenu
 from utils.input_utils import get_confirm
 from utils.logger import DialogType, Logger
 from utils.spinner import Spinner

kiauh/extensions/extensions_menu.py

@@ -15,11 +15,11 @@ import textwrap
 from pathlib import Path
 from typing import Dict, List, Type
 
+from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
 from extensions import EXTENSION_ROOT
 from extensions.base_extension import BaseExtension
-from utils.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 from utils.logger import Logger
 
 

kiauh/extensions/mainsail_theme_installer/mainsail_theme_installer_extension.py

@@ -19,12 +19,12 @@ from components.klipper.klipper_dialogs import (
     DisplayType,
     print_instance_overview,
 )
+from core.constants import COLOR_CYAN, COLOR_YELLOW, RESET_FORMAT
 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 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

kiauh/utils/common.py

@@ -14,13 +14,13 @@ from pathlib import Path
 from typing import Dict, List, Literal, Optional, Type
 
 from components.klipper.klipper import Klipper
-from core.instance_manager.base_instance import BaseInstance
+from core.constants import (
-from core.instance_manager.instance_manager import InstanceManager
-from utils import GLOBAL_DEPS, PRINTER_CFG_BACKUP_DIR
-from utils.constants import (
     COLOR_CYAN,
     RESET_FORMAT,
 )
+from core.instance_manager.base_instance import BaseInstance
+from core.instance_manager.instance_manager import InstanceManager
+from utils import GLOBAL_DEPS, PRINTER_CFG_BACKUP_DIR
 from utils.git_utils import get_local_commit, get_remote_commit, get_repo_name
 from utils.logger import DialogType, Logger
 from utils.sys_utils import (

kiauh/utils/fs_utils.py

@@ -17,13 +17,13 @@ from typing import List
 from zipfile import ZipFile
 
 from components.klipper.klipper import Klipper
+from core.decorators import deprecated
 from utils import (
     MODULE_PATH,
     NGINX_CONFD,
     NGINX_SITES_AVAILABLE,
     NGINX_SITES_ENABLED,
 )
-from utils.decorators import deprecated
 from utils.logger import Logger
 
 

kiauh/utils/input_utils.py

@@ -11,8 +11,8 @@ from __future__ import annotations
 import re
 from typing import Dict, List
 
+from core.constants import COLOR_CYAN, RESET_FORMAT
 from utils import INVALID_CHOICE
-from utils.constants import COLOR_CYAN, RESET_FORMAT
 from utils.logger import Logger
 
 

kiauh/utils/logger.py

@@ -12,7 +12,7 @@ import textwrap
 from enum import Enum
 from typing import List
 
-from utils.constants import (
+from core.constants import (
     COLOR_CYAN,
     COLOR_GREEN,
     COLOR_MAGENTA,

kiauh/utils/sys_utils.py

@@ -21,7 +21,7 @@ from pathlib import Path
 from subprocess import DEVNULL, PIPE, CalledProcessError, Popen, check_output, run
 from typing import List, Literal, Set
 
-from utils.constants import SYSTEMD
+from core.constants import SYSTEMD
 from utils.fs_utils import check_file_exist, remove_with_sudo
 from utils.input_utils import get_confirm
 from utils.logger import Logger