refactor: move more constants to core.constants

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

kiauh/components/webui_client/client_utils.py

@@ -21,16 +21,21 @@ 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.constants import (
+    COLOR_CYAN,
+    COLOR_YELLOW,
+    NGINX_CONFD,
+    NGINX_SITES_AVAILABLE,
+    RESET_FORMAT,
+)
 from core.logger import Logger
 from core.settings.kiauh_settings import KiauhSettings
-from utils import NGINX_CONFD, NGINX_SITES_AVAILABLE
+from core.types import ComponentStatus
 from utils.common import get_install_status
 from utils.git_utils import (
     get_latest_tag,
     get_latest_unstable_tag,
 )
-from core.types import ComponentStatus
 
 
 def get_client_status(

kiauh/core/constants.py

@@ -11,6 +11,8 @@ import os
 import pwd
 from pathlib import Path
 
+from core.backup_manager import BACKUP_ROOT_DIR
+
 # text colors and formats
 COLOR_WHITE = "\033[37m"  # white
 COLOR_MAGENTA = "\033[35m"  # magenta
@@ -19,6 +21,19 @@ COLOR_YELLOW = "\033[93m"  # bright yellow
 COLOR_RED = "\033[91m"  # bright red
 COLOR_CYAN = "\033[96m"  # bright cyan
 RESET_FORMAT = "\033[0m"  # reset format
+
+# global dependencies
+GLOBAL_DEPS = ["git", "wget", "curl", "unzip", "dfu-util", "python3-virtualenv"]
+
+# strings
+INVALID_CHOICE = "Invalid choice. Please select a valid value."
+
 # current user
 CURRENT_USER = pwd.getpwuid(os.getuid())[0]
+
+# dirs
 SYSTEMD = Path("/etc/systemd/system")
+PRINTER_CFG_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("printer-cfg-backups")
+NGINX_SITES_AVAILABLE = Path("/etc/nginx/sites-available")
+NGINX_SITES_ENABLED = Path("/etc/nginx/sites-enabled")
+NGINX_CONFD = Path("/etc/nginx/conf.d")

kiauh/extensions/pretty_gcode/pretty_gcode_extension.py

@@ -9,9 +9,9 @@
 import shutil
 from pathlib import Path
 
+from core.constants import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
 from core.logger import DialogType, Logger
 from extensions.base_extension import BaseExtension
-from utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED
 from utils.common import check_install_dependencies
 from utils.fs_utils import (
     create_nginx_cfg,

kiauh/utils/__init__.py

@@ -9,15 +9,4 @@
 
 from pathlib import Path
 
-from core.backup_manager import BACKUP_ROOT_DIR
-
 MODULE_PATH = Path(__file__).resolve().parent
-INVALID_CHOICE = "Invalid choice. Please select a valid value."
-PRINTER_CFG_BACKUP_DIR = BACKUP_ROOT_DIR.joinpath("printer-cfg-backups")
-
-GLOBAL_DEPS = ["git", "wget", "curl", "unzip", "dfu-util", "python3-virtualenv"]
-
-# ================== NGINX =====================#
-NGINX_SITES_AVAILABLE = Path("/etc/nginx/sites-available")
-NGINX_SITES_ENABLED = Path("/etc/nginx/sites-enabled")
-NGINX_CONFD = Path("/etc/nginx/conf.d")

kiauh/utils/common.py

@@ -16,13 +16,14 @@ from typing import Dict, List, Literal, Optional, Set, Type
 from components.klipper.klipper import Klipper
 from core.constants import (
     COLOR_CYAN,
+    GLOBAL_DEPS,
+    PRINTER_CFG_BACKUP_DIR,
     RESET_FORMAT,
 )
 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 (
     check_package_install,

kiauh/utils/fs_utils.py

@@ -17,14 +17,14 @@ from typing import List
 from zipfile import ZipFile
 
 from components.klipper.klipper import Klipper
-from core.decorators import deprecated
-from core.logger import Logger
-from utils import (
-    MODULE_PATH,
+from core.constants import (
     NGINX_CONFD,
     NGINX_SITES_AVAILABLE,
     NGINX_SITES_ENABLED,
 )
+from core.decorators import deprecated
+from core.logger import Logger
+from utils import MODULE_PATH
 
 
 def check_file_exist(file_path: Path, sudo=False) -> bool:

kiauh/utils/input_utils.py

@@ -11,9 +11,8 @@ from __future__ import annotations
 import re
 from typing import Dict, List
 
-from core.constants import COLOR_CYAN, RESET_FORMAT
+from core.constants import COLOR_CYAN, INVALID_CHOICE, RESET_FORMAT
 from core.logger import Logger
-from utils import INVALID_CHOICE
 
 
 def get_confirm(question: str, default_choice=True, allow_go_back=False) -> bool | None: