diff --git a/kiauh/components/crowsnest/crowsnest.py b/kiauh/components/crowsnest/crowsnest.py index ba20db6..b3a347b 100644 --- a/kiauh/components/crowsnest/crowsnest.py +++ b/kiauh/components/crowsnest/crowsnest.py @@ -44,7 +44,7 @@ from utils.sys_utils import ( cmd_sysctl_service, parse_packages_from_file, ) -from utils.types import ComponentStatus +from core.types import ComponentStatus def install_crowsnest() -> None: diff --git a/kiauh/components/klipper/klipper_utils.py b/kiauh/components/klipper/klipper_utils.py index 177a9f5..fd2edf1 100644 --- a/kiauh/components/klipper/klipper_utils.py +++ b/kiauh/components/klipper/klipper_utils.py @@ -39,7 +39,7 @@ from core.submodules.simple_config_parser.src.simple_config_parser.simple_config from utils.common import get_install_status from utils.input_utils import get_confirm, get_number_input, get_string_input from utils.sys_utils import cmd_sysctl_service -from utils.types import ComponentStatus +from core.types import ComponentStatus def get_klipper_status() -> ComponentStatus: diff --git a/kiauh/components/klipperscreen/klipperscreen.py b/kiauh/components/klipperscreen/klipperscreen.py index 2828287..7a6e338 100644 --- a/kiauh/components/klipperscreen/klipperscreen.py +++ b/kiauh/components/klipperscreen/klipperscreen.py @@ -47,7 +47,7 @@ from utils.sys_utils import ( install_python_requirements, remove_service_file, ) -from utils.types import ComponentStatus +from core.types import ComponentStatus def install_klipperscreen() -> None: diff --git a/kiauh/components/mobileraker/mobileraker.py b/kiauh/components/mobileraker/mobileraker.py index 2780521..799532f 100644 --- a/kiauh/components/mobileraker/mobileraker.py +++ b/kiauh/components/mobileraker/mobileraker.py @@ -42,7 +42,7 @@ from utils.sys_utils import ( install_python_requirements, remove_service_file, ) -from utils.types import ComponentStatus +from core.types import ComponentStatus def install_mobileraker() -> None: diff --git a/kiauh/components/moonraker/moonraker_utils.py b/kiauh/components/moonraker/moonraker_utils.py index c555633..b316893 100644 --- a/kiauh/components/moonraker/moonraker_utils.py +++ b/kiauh/components/moonraker/moonraker_utils.py @@ -30,7 +30,7 @@ from utils.common import get_install_status from utils.sys_utils import ( get_ipv4_addr, ) -from utils.types import ComponentStatus +from core.types import ComponentStatus def get_moonraker_status() -> ComponentStatus: diff --git a/kiauh/components/octoeverywhere/octoeverywhere_setup.py b/kiauh/components/octoeverywhere/octoeverywhere_setup.py index 3db6679..fe2bcf3 100644 --- a/kiauh/components/octoeverywhere/octoeverywhere_setup.py +++ b/kiauh/components/octoeverywhere/octoeverywhere_setup.py @@ -39,7 +39,7 @@ from utils.sys_utils import ( install_python_requirements, parse_packages_from_file, ) -from utils.types import ComponentStatus +from core.types import ComponentStatus def get_octoeverywhere_status() -> ComponentStatus: diff --git a/kiauh/components/webui_client/client_utils.py b/kiauh/components/webui_client/client_utils.py index f89cf75..2ce38d7 100644 --- a/kiauh/components/webui_client/client_utils.py +++ b/kiauh/components/webui_client/client_utils.py @@ -30,7 +30,7 @@ from utils.git_utils import ( get_latest_tag, get_latest_unstable_tag, ) -from utils.types import ComponentStatus +from core.types import ComponentStatus def get_client_status( diff --git a/kiauh/core/menus/main_menu.py b/kiauh/core/menus/main_menu.py index f648ad8..fa0b40c 100644 --- a/kiauh/core/menus/main_menu.py +++ b/kiauh/core/menus/main_menu.py @@ -43,7 +43,7 @@ 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.types import ComponentStatus, StatusMap, StatusText +from core.types import ComponentStatus, StatusMap, StatusText # noinspection PyUnusedLocal diff --git a/kiauh/core/menus/update_menu.py b/kiauh/core/menus/update_menu.py index 3831870..4715887 100644 --- a/kiauh/core/menus/update_menu.py +++ b/kiauh/core/menus/update_menu.py @@ -56,7 +56,7 @@ from utils.sys_utils import ( update_system_package_lists, upgrade_system_packages, ) -from utils.types import ComponentStatus +from core.types import ComponentStatus # noinspection PyUnusedLocal diff --git a/kiauh/utils/types.py b/kiauh/core/types.py similarity index 100% rename from kiauh/utils/types.py rename to kiauh/core/types.py diff --git a/kiauh/utils/common.py b/kiauh/utils/common.py index ec39260..efe430a 100644 --- a/kiauh/utils/common.py +++ b/kiauh/utils/common.py @@ -21,6 +21,7 @@ from core.constants import ( from core.instance_manager.base_instance import BaseInstance from core.instance_manager.instance_manager import InstanceManager from core.logger import DialogType, Logger +from core.types import ComponentStatus, StatusCode 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.sys_utils import ( @@ -28,7 +29,6 @@ from utils.sys_utils import ( install_system_packages, update_system_package_lists, ) -from utils.types import ComponentStatus, StatusCode def convert_camelcase_to_kebabcase(name: str) -> str: