Merge 0d971c70a0 into c91816d13f

default.kiauh.cfg

@@ -13,10 +13,6 @@ repositories:
     https://github.com/Klipper3d/klipper
 
 [moonraker]
-# Moonraker supports two optional Python packages that can be used to reduce its CPU load
-# If set to true, those packages will be installed during the Moonraker installation
-optional_speedups: True
-
 # add custom repositories here, if at least one is given, the first in the list will be used by default
 # otherwise the official repository is used
 #

kiauh/core/settings/kiauh_settings.py

@@ -53,20 +53,17 @@ class Repository:
     url: str
     branch: str
 
-
 @dataclass
 class KlipperSettings:
     repositories: List[Repository] | None = field(default=None)
     use_python_binary: str | None = field(default=None)
 
-
 @dataclass
 class MoonrakerSettings:
     optional_speedups: bool | None = field(default=None)
     repositories: List[Repository] | None = field(default=None)
     use_python_binary: str | None = field(default=None)
 
-
 @dataclass
 class WebUiSettings:
     port: int | None = field(default=None)
@@ -161,6 +158,8 @@ class KiauhSettings:
 
             self._validate_int("fluidd", "port")
             self._validate_bool("fluidd", "unstable_releases")
+            
+            self._validate_bool("moonraker", "optional_speedups")
 
         except ValueError:
             err = f"Invalid value for option '{self._v_option}' in section '{self._v_section}'"
@@ -216,9 +215,7 @@ class KiauhSettings:
             "kiauh", "backup_before_update"
         )
 
-        self.moonraker.optional_speedups = self.config.getboolean(
+        self.moonraker.optional_speedups = self.config.getboolean("moonraker", "optional_speedups", True)
-            "moonraker", "optional_speedups", True
-        )
 
         kl_repos = self.config.getval("klipper", "repositories")
         self.klipper.repositories = self.__set_repo_state(kl_repos)
@@ -226,12 +223,8 @@ class KiauhSettings:
         mr_repos = self.config.getval("moonraker", "repositories")
         self.moonraker.repositories = self.__set_repo_state(mr_repos)
 
-        self.klipper.use_python_binary = self.config.getval(
+        self.klipper.use_python_binary = self.config.getval("klipper", "use_python_binary", None)
-            "klipper", "use_python_binary", None
+        self.moonraker.use_python_binary = self.config.getval("moonraker", "use_python_binary", None)
-        )
-        self.moonraker.use_python_binary = self.config.getval(
-            "moonraker", "use_python_binary", None
-        )
 
         self.mainsail.port = self.config.getint("mainsail", "port")
         self.mainsail.unstable_releases = self.config.getboolean(