Merge c47d6e221b into 985b66d41f

.gitignore

@@ -10,4 +10,3 @@ __pycache__
 *.code-workspace
 *.iml
 kiauh.cfg
-klipper_repos.txt

kiauh/components/moonraker/utils/utils.py

@@ -126,7 +126,7 @@ def create_example_moonraker_conf(
     scp.read_file(target)
     trusted_clients: List[str] = [
         f"    {'.'.join(ip)}\n",
-        *scp.getvals("authorization", "trusted_clients"),
+        *scp.getval("authorization", "trusted_clients"),
     ]
 
     scp.set_option("server", "port", str(port))

kiauh/core/instance_manager/base_instance.py

@@ -16,9 +16,8 @@ from typing import List
 
 from utils.fs_utils import get_data_dir
 
-# suffixes that are not allowed to be used for instances
-# because they would cause conflicts with other components or are reserved
-SUFFIX_BLACKLIST: List[str] = ["None", "mcu", "obico", "bambu", "companion", "hmi"]
+SUFFIX_BLACKLIST: List[str] = ["None", "mcu", "obico", "bambu", "companion"]
+
 
 @dataclass(repr=True)
 class BaseInstance:

kiauh/core/menus/repo_select_menu.py

@@ -10,17 +10,14 @@ from __future__ import annotations
 
 from typing import List, Literal, Type
 
-from core.logger import Logger, DialogType
+from core.logger import Logger
 from core.menus import Option
 from core.menus.base_menu import BaseMenu
 from core.settings.kiauh_settings import KiauhSettings, Repository
 from core.types.color import Color
 from procedures.switch_repo import run_switch_repo_routine
-from utils.input_utils import get_string_input, get_number_input, get_confirm
 
 
-# noinspection PyUnusedLocal
-# noinspection PyMethodMayBeStatic
 class RepoSelectMenu(BaseMenu):
     def __init__(
         self,
@@ -51,27 +48,26 @@ class RepoSelectMenu(BaseMenu):
 
     def set_options(self) -> None:
         self.options = {}
-        if self.repos:
-            for idx, repo in enumerate(self.repos, start=1):
-                self.options[str(idx)] = Option(
-                    method=self.select_repository, opt_data=repo
-                )
-        self.options["a"] = Option(method=self.add_repository)
-        self.options["r"] = Option(method=self.remove_repository)
-        self.options["b"] = Option(method=self.go_back)
+
+        if not self.repos:
+            return
+
+        for idx, repo in enumerate(self.repos, start=1):
+            self.options[str(idx)] = Option(
+                method=self.select_repository, opt_data=repo
+            )
 
     def print_menu(self) -> None:
         menu = "╟───────────────────────────────────────────────────────╢\n"
         menu += "║ Available Repositories:                               ║\n"
         menu += "╟───────────────────────────────────────────────────────╢\n"
+
         for idx, repo in enumerate(self.repos, start=1):
             url = f"● Repo: {repo.url.replace('.git', '')}"
             branch = f"└► Branch: {repo.branch}"
             menu += f"║ {idx}) {Color.apply(url, Color.CYAN):<59} ║\n"
             menu += f"║    {Color.apply(branch, Color.CYAN):<59} ║\n"
-        menu += "╟───────────────────────────────────────────────────────╢\n"
-        menu += "║ A) Add repository                                     ║\n"
-        menu += "║ R) Remove repository                                  ║\n"
+
         menu += "╟───────────────────────────────────────────────────────╢\n"
         print(menu, end="")
 
@@ -81,82 +77,3 @@ class RepoSelectMenu(BaseMenu):
             f"Switching to {self.name.capitalize()}'s new source repository ..."
         )
         run_switch_repo_routine(self.name, repo.url, repo.branch)
-
-    def add_repository(self, **kwargs) -> None:
-        while True:
-            Logger.print_dialog(
-                DialogType.CUSTOM,
-                custom_title="Enter the repository URL",
-                content=[
-                    "NOTE: There is no input validation in place, "
-                    "please check your input for correctness",
-                ],
-            )
-            url = get_string_input("Repository URL", allow_special_chars=True).strip()
-
-            Logger.print_dialog(
-                DialogType.CUSTOM,
-                custom_title="Enter the branch name",
-                content=[ "Press Enter to use the default branch (master)." ],
-                center_content=False,
-            )
-            branch = get_string_input("Branch", allow_special_chars=True, default="master").strip()
-            Logger.print_dialog(
-                DialogType.CUSTOM,
-                custom_title="Summary",
-                content=[
-                    f"● URL:    {url}",
-                    f"● Branch: {branch}",
-                ],
-            )
-            confirm = get_confirm("Save repository")
-            if confirm:
-                repo = Repository(url, branch)
-                if self.name == "klipper":
-                    self.settings.klipper.repositories.append(repo)
-                    self.settings.save()
-                    self.repos = self.settings.klipper.repositories
-                else:
-                    self.settings.moonraker.repositories.append(repo)
-                    self.settings.save()
-                    self.repos = self.settings.moonraker.repositories
-                Logger.print_ok("Repository added and saved.")
-
-                # Refresh menu to show new repo immediately and update options
-                self.set_options()
-                self.run()
-                break
-            else:
-                Logger.print_info("Operation cancelled by user.")
-                break
-
-    def remove_repository(self, **kwargs) -> None:
-        repos = self.repos
-        if not repos:
-            Logger.print_info("No repositories configured.")
-            return
-        repo_lines = [f"{idx}) {repo.url} [{repo.branch}]" for idx, repo in enumerate(repos, start=1)]
-        Logger.print_dialog(
-            DialogType.CUSTOM,
-            custom_title="Available Repositories",
-            content=[*repo_lines],
-        )
-        idx = get_number_input("Select the repository to remove", 1, len(repos))
-        removed = repos.pop(idx - 1)
-        if self.name == "klipper":
-            self.settings.klipper.repositories = repos
-            self.settings.save()
-            self.repos = self.settings.klipper.repositories
-        else:
-            self.settings.moonraker.repositories = repos
-            self.settings.save()
-            self.repos = self.settings.moonraker.repositories
-        Logger.print_ok(f"Removed repository: {removed.url} [{removed.branch}]")
-
-        # Refresh menu to show updated repo list and options
-        self.set_options()
-        self.run()
-
-    def go_back(self, **kwargs) -> None:
-        from core.menus.settings_menu import SettingsMenu
-        SettingsMenu().run()

kiauh/core/menus/settings_menu.py

@@ -117,12 +117,20 @@ class SettingsMenu(BaseMenu):
         )
 
     def switch_klipper_repo(self, **kwargs) -> None:
+        name = "Klipper"
         repos = self.settings.klipper.repositories
-        RepoSelectMenu("klipper", repos=repos, previous_menu=self.__class__).run()
+        if not repos:
+            self._warn_no_repos(name)
+            return
+        RepoSelectMenu(name.lower(), repos=repos, previous_menu=self.__class__).run()
 
     def switch_moonraker_repo(self, **kwargs) -> None:
+        name = "Moonraker"
         repos = self.settings.moonraker.repositories
-        RepoSelectMenu("moonraker", repos=repos, previous_menu=self.__class__).run()
+        if not repos:
+            self._warn_no_repos(name)
+            return
+        RepoSelectMenu(name.lower(), repos=repos, previous_menu=self.__class__).run()
 
     def toggle_mainsail_release(self, **kwargs) -> None:
         self.mainsail_unstable = not self.mainsail_unstable

kiauh/core/submodules/simple_config_parser/README.md

@@ -12,7 +12,6 @@ Specialized for handling Klipper style config files.
 - Option Block: A line starting with a word, followed by a `:` or `=` and a newline
 - Comment: A line starting with a `#` or `;`
 - Blank: A line containing only whitespace characters
-- SaveConfig: Klippers auto-generated SAVE_CONFIG section that can be found at the very end of the config file
 
 ---
 

kiauh/core/submodules/simple_config_parser/src/simple_config_parser/constants.py

@@ -49,9 +49,6 @@ LINE_COMMENT_RE = re.compile(r"^\s*[#;].*")
 #  - the line MUST contain only whitespace characters
 EMPTY_LINE_RE = re.compile(r"^\s*$")
 
-SAVE_CONFIG_START_RE = re.compile(r"^#\*# <-+ SAVE_CONFIG -+>$")
-SAVE_CONFIG_CONTENT_RE = re.compile(r"^#\*#.*$")
-
 BOOLEAN_STATES = {
     "1": True,
     "yes": True,

kiauh/core/submodules/simple_config_parser/src/simple_config_parser/simple_config_parser.py

@@ -18,7 +18,7 @@ from ..simple_config_parser.constants import (
     LINE_COMMENT_RE,
     OPTION_RE,
     OPTIONS_BLOCK_START_RE,
-    SECTION_RE, LineType, INDENT, SAVE_CONFIG_START_RE, SAVE_CONFIG_CONTENT_RE,
+    SECTION_RE, LineType, INDENT,
 )
 
 _UNSET = object()
@@ -61,34 +61,25 @@ class SimpleConfigParser:
 
     def __init__(self) -> None:
         self.header: List[str] = []
-        self.save_config_block: List[str] = []
         self.config: Dict = {}
         self.current_section: str | None = None
         self.current_opt_block: str | None = None
         self.in_option_block: bool = False
 
     def _match_section(self, line: str) -> bool:
-        """Whether the given line matches the definition of a section"""
+        """Wheter or not the given line matches the definition of a section"""
         return SECTION_RE.match(line) is not None
 
     def _match_option(self, line: str) -> bool:
-        """Whether the given line matches the definition of an option"""
+        """Wheter or not the given line matches the definition of an option"""
         return OPTION_RE.match(line) is not None
 
     def _match_options_block_start(self, line: str) -> bool:
-        """Whether the given line matches the definition of a multiline option"""
+        """Wheter or not the given line matches the definition of a multiline option"""
         return OPTIONS_BLOCK_START_RE.match(line) is not None
 
-    def _match_save_config_start(self, line: str) -> bool:
-        """Whether the given line matches the definition of a save config start"""
-        return SAVE_CONFIG_START_RE.match(line) is not None
-
-    def _match_save_config_content(self, line: str) -> bool:
-        """Whether the given line matches the definition of a save config content"""
-        return SAVE_CONFIG_CONTENT_RE.match(line) is not None
-
     def _match_line_comment(self, line: str) -> bool:
-        """Whether the given line matches the definition of a comment"""
+        """Wheter or not the given line matches the definition of a comment"""
         return LINE_COMMENT_RE.match(line) is not None
 
     def _match_empty_line(self, line: str) -> bool:
@@ -133,14 +124,6 @@ class SimpleConfigParser:
                     element["value"].append(line.strip()) # indentation is removed
                     break
 
-        elif self._match_save_config_start(line):
-            self.current_opt_block = None
-            self.save_config_block.append(line)
-
-        elif self._match_save_config_content(line):
-            self.current_opt_block = None
-            self.save_config_block.append(line)
-
         elif self._match_empty_line(line) or self._match_line_comment(line):
             self.current_opt_block = None
 
@@ -202,11 +185,6 @@ class SimpleConfigParser:
                     if not last_line.endswith("\n"):
                         f.write("\n")
 
-            if self.save_config_block:
-                for line in self.save_config_block:
-                    f.write(line)
-                f.write("\n")
-
     def get_sections(self) -> List[str]:
         """Return a list of all section names, but exclude any section starting with '#_'"""
         return list(

kiauh/core/submodules/simple_config_parser/tests/assets/test_config_4.cfg

@@ -1,116 +0,0 @@
-# a comment at the very top
-# should be treated as the file header
-
-# up to the first section, including all blank lines
-
-[section_1]
-option_1: value_1
-option_1_1: True # this is a boolean
-option_1_2: 5 ; this is an integer
-option_1_3: 1.123 #;this is a float
-
-[section_2] ; comment
-option_2: value_2
-
-; comment
-
-[section_3]
-option_3: value_3 # comment
-
-[section_4]
-# comment
-option_4: value_4
-
-[section number 5]
-#option_5: value_5
-option_5 = this.is.value-5
-multi_option:
-    # these are multi-line values
-    value_5_1
-    value_5_2 ; here is a comment
-    value_5_3
-option_5_1: value_5_1
-
-[gcode_macro M117]
-rename_existing: M117.1
-gcode:
-    {% if rawparams %}
-       {% set escaped_msg = rawparams.split(';', 1)[0].split('\x23', 1)[0]|replace('"', '\\"') %}
-       SET_DISPLAY_TEXT MSG="{escaped_msg}"
-       RESPOND TYPE=command MSG="{escaped_msg}"
-    {% else %}
-        SET_DISPLAY_TEXT
-    {% endif %}
-
-# SDCard 'looping' (aka Marlin M808 commands) support
-#
-# Support SDCard looping
-[sdcard_loop]
-[gcode_macro M486]
-gcode:
-    # Parameters known to M486 are as follows:
-    #   [C<flag>] Cancel the current object
-    #   [P<index>] Cancel the object with the given index
-    #   [S<index>] Set the index of the current object.
-    #       If the object with the given index has been canceled, this will cause
-    #       the firmware to skip to the next object. The value -1 is used to
-    #       indicate something that isn’t an object and shouldn’t be skipped.
-    #   [T<count>] Reset the state and set the number of objects
-    #   [U<index>] Un-cancel the object with the given index. This command will be
-    #       ignored if the object has already been skipped
-
-    {% if 'exclude_object' not in printer %}
-        {action_raise_error("[exclude_object] is not enabled")}
-    {% endif %}
-
-    {% if 'T' in params %}
-        EXCLUDE_OBJECT RESET=1
-
-      {% for i in range(params.T | int) %}
-        EXCLUDE_OBJECT_DEFINE NAME={i}
-      {% endfor %}
-    {% endif %}
-
-    {% if 'C' in params %}
-      EXCLUDE_OBJECT CURRENT=1
-    {% endif %}
-
-    {% if 'P' in params %}
-      EXCLUDE_OBJECT NAME={params.P}
-    {% endif %}
-
-    {% if 'S' in params %}
-        {% if params.S == '-1' %}
-            {% if printer.exclude_object.current_object %}
-                EXCLUDE_OBJECT_END NAME={printer.exclude_object.current_object}
-            {% endif %}
-        {% else %}
-            EXCLUDE_OBJECT_START NAME={params.S}
-        {% endif %}
-    {% endif %}
-
-    {% if 'U' in params %}
-        EXCLUDE_OBJECT RESET=1 NAME={params.U}
-    {% endif %}
-
-#*# <---------------------- SAVE_CONFIG ---------------------->
-#*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
-#*#
-#*# [bed_mesh default]
-#*# version = 1
-#*# points =
-#*# 	  -0.152500, -0.133125, -0.113125, -0.159375, -0.232500
-#*# 	  -0.095000, -0.078750, -0.068125, -0.133125, -0.235000
-#*# 	  -0.092500, -0.040625, 0.004375, -0.077500, -0.193125
-#*# 	  -0.073750, 0.023750, 0.085625, 0.026875, -0.085000
-#*# 	  -0.140625, 0.038125, 0.126250, 0.097500, 0.003750
-#*# tension = 0.2
-#*# min_x = 26.0
-#*# algo = bicubic
-#*# y_count = 5
-#*# mesh_y_pps = 2
-#*# min_y = 5.0
-#*# x_count = 5
-#*# max_y = 174.0
-#*# mesh_x_pps = 2
-#*# max_x = 194.0

kiauh/core/submodules/simple_config_parser/tests/line_matching/match_save_config_content/test_data/matching_data.txt

@@ -1,22 +0,0 @@
-#*# any content
-#*#
-#*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
-#*#
-#*# [bed_mesh default]
-#*# version = 1
-#*# points =
-#*# 	  -0.152500, -0.133125, -0.113125, -0.159375, -0.232500
-#*# 	  -0.095000, -0.078750, -0.068125, -0.133125, -0.235000
-#*# 	  -0.092500, -0.040625, 0.004375, -0.077500, -0.193125
-#*# 	  -0.073750, 0.023750, 0.085625, 0.026875, -0.085000
-#*# 	  -0.140625, 0.038125, 0.126250, 0.097500, 0.003750
-#*# tension = 0.2
-#*# min_x = 26.0
-#*# algo = bicubic
-#*# y_count = 5
-#*# mesh_y_pps = 2
-#*# min_y = 5.0
-#*# x_count = 5
-#*# max_y = 174.0
-#*# mesh_x_pps = 2
-#*# max_x = 194.0

kiauh/core/submodules/simple_config_parser/tests/line_matching/match_save_config_content/test_data/non_matching_data.txt

@@ -1,6 +0,0 @@
- #*# leading space prevents match
-random
-*# not starting with hash-star-hash
-#   *# spaced out
-<- SAVE_CONFIG ->
-;#*# semicolon first

kiauh/core/submodules/simple_config_parser/tests/line_matching/match_save_config_content/test_match_save_config_content.py

@@ -1,37 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2024 Dominik Willner <th33xitus@gmail.com>               #
-#                                                                         #
-#  https://github.com/dw-0/simple-config-parser                           #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-
-from pathlib import Path
-
-import pytest
-
-from src.simple_config_parser.simple_config_parser import SimpleConfigParser
-from tests.utils import load_testdata_from_file
-
-BASE_DIR = Path(__file__).parent.joinpath("test_data")
-MATCHING_TEST_DATA_PATH = BASE_DIR.joinpath("matching_data.txt")
-NON_MATCHING_TEST_DATA_PATH = BASE_DIR.joinpath("non_matching_data.txt")
-
-
-@pytest.fixture
-def parser():
-    return SimpleConfigParser()
-
-
-def test_matching_lines(parser):
-    """Alle Zeilen in matching_data.txt sollen als Save-Config-Content erkannt werden."""
-    matching_lines = load_testdata_from_file(MATCHING_TEST_DATA_PATH)
-    for line in matching_lines:
-        assert parser._match_save_config_content(line) is True, f"Line should be a save config content: {line!r}"
-
-
-def test_non_matching_lines(parser):
-    """Alle Zeilen in non_matching_data.txt sollen NICHT als Save-Config-Content erkannt werden."""
-    non_matching_lines = load_testdata_from_file(NON_MATCHING_TEST_DATA_PATH)
-    for line in non_matching_lines:
-        assert parser._match_save_config_content(line) is False, f"Line should not be a save config content: {line!r}"

kiauh/core/submodules/simple_config_parser/tests/line_matching/match_save_config_start/test_data/matching_data.txt

@@ -1,6 +0,0 @@
-#*# <- SAVE_CONFIG ->
-#*# <---- SAVE_CONFIG ---->
-#*# <------------------- SAVE_CONFIG ------------------->
-#*# <---------------------- SAVE_CONFIG ---------------------->
-#*# <----- SAVE_CONFIG ->
-#*# <- SAVE_CONFIG ----------------->

kiauh/core/submodules/simple_config_parser/tests/line_matching/match_save_config_start/test_data/non_matching_data.txt

@@ -1,13 +0,0 @@
-#*#<- SAVE_CONFIG ->
-#*# <-SAVE_CONFIG ->
-#*# <- SAVE_CONFIG->
-#*# <- SAVE_CONFIG -> extra
-#*# SAVE_CONFIG ---->
-#*# < SAVE_CONFIG >
-# *# <- SAVE_CONFIG ->
-<- SAVE_CONFIG ->
-random text
- #*# <---------------------- SAVE_CONFIG ---------------------->
-#*# <---------------------- SAVE_CONFIG ----------------------> #*#
-#*# <-------------------------------------------->
-#*# SAVE_CONFIG

kiauh/core/submodules/simple_config_parser/tests/line_matching/match_save_config_start/test_match_save_config_start.py

@@ -1,37 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2024 Dominik Willner <th33xitus@gmail.com>               #
-#                                                                         #
-#  https://github.com/dw-0/simple-config-parser                           #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-
-from pathlib import Path
-
-import pytest
-
-from src.simple_config_parser.simple_config_parser import SimpleConfigParser
-from tests.utils import load_testdata_from_file
-
-BASE_DIR = Path(__file__).parent.joinpath("test_data")
-MATCHING_TEST_DATA_PATH = BASE_DIR.joinpath("matching_data.txt")
-NON_MATCHING_TEST_DATA_PATH = BASE_DIR.joinpath("non_matching_data.txt")
-
-
-@pytest.fixture
-def parser():
-    return SimpleConfigParser()
-
-
-def test_matching_lines(parser):
-    """Test that all lines in the matching data file are correctly identified as save config start lines."""
-    matching_lines = load_testdata_from_file(MATCHING_TEST_DATA_PATH)
-    for line in matching_lines:
-        assert parser._match_save_config_start(line) is True, f"Line should be a save config start: {line!r}"
-
-
-def test_non_matching_lines(parser):
-    """Test that all lines in the non-matching data file are correctly identified as not save config start lines."""
-    non_matching_lines = load_testdata_from_file(NON_MATCHING_TEST_DATA_PATH)
-    for line in non_matching_lines:
-        assert parser._match_save_config_start(line) is False, f"Line should not be a save config start: {line!r}"

kiauh/core/submodules/simple_config_parser/tests/public_api/conftest.py

@@ -13,7 +13,7 @@ from src.simple_config_parser.simple_config_parser import SimpleConfigParser
 from tests.utils import load_testdata_from_file
 
 BASE_DIR = Path(__file__).parent.parent.joinpath("assets")
-CONFIG_FILES = ["test_config_1.cfg", "test_config_2.cfg", "test_config_3.cfg", "test_config_4.cfg"]
+CONFIG_FILES = ["test_config_1.cfg", "test_config_2.cfg", "test_config_3.cfg"]
 
 
 @pytest.fixture(params=CONFIG_FILES)

kiauh/extensions/extensions_menu.py

@@ -143,31 +143,6 @@ class ExtensionSubmenu(BaseMenu):
             """
         )[1:]
         menu += f"{description_text}\n"
-
-        # add links if available
-        website: str = (self.extension.metadata.get("website") or "").strip()
-        repo: str = (self.extension.metadata.get("repo") or "").strip()
-        if website or repo:
-            links_lines: List[str] = ["Links:"]
-            if website:
-                links_lines.append(f"● {website}")
-            if repo:
-                links_lines.append(f"● {repo}")
-
-            links_text = Logger.format_content(
-                links_lines,
-                line_width,
-                border_left="║",
-                border_right="║",
-            )
-
-            menu += textwrap.dedent(
-                """
-                ╟───────────────────────────────────────────────────────╢
-                """
-            )[1:]
-            menu += f"{links_text}\n"
-
         menu += textwrap.dedent(
             """
             ╟───────────────────────────────────────────────────────╢

kiauh/extensions/gcode_shell_cmd/metadata.json

@@ -4,7 +4,6 @@
     "module": "gcode_shell_cmd_extension",
     "maintained_by": "dw-0",
     "display_name": "G-Code Shell Command",
-    "description": ["Run a shell commands from gcode."],
-    "updates": false
+    "description": ["Run a shell commands from gcode."]
   }
 }

kiauh/extensions/klipper_backup/metadata.json

@@ -5,8 +5,6 @@
     "maintained_by": "Staubgeborener",
     "display_name": "Klipper-Backup",
     "description": ["Backup all your Klipper files to GitHub"],
-    "website": "https://klipperbackup.xyz",
-    "repo": "https://github.com/Staubgeborener/klipper-backup",
     "updates": true
   }
 }

kiauh/extensions/mainsail_theme_installer/metadata.json

@@ -4,8 +4,6 @@
     "module": "mainsail_theme_installer_extension",
     "maintained_by": "dw-0",
     "display_name": "Mainsail Theme Installer",
-    "description": ["Install Mainsail Themes maintained by the Mainsail community."],
-    "website": "https://docs.mainsail.xyz/theming/themes",
-    "updates": false
+    "description": ["Install Mainsail Themes maintained by the Mainsail community."]
   }
 }

kiauh/extensions/mobileraker/metadata.json

@@ -7,7 +7,6 @@
         "description": [
             "Companion for Mobileraker, enabling push notification for Klipper using Moonraker."
         ],
-        "repo": "https://github.com/Clon1998/mobileraker_companion",
         "updates": true
     }
 }

kiauh/extensions/obico/metadata.json

@@ -11,8 +11,6 @@
         "- 25FPS High-Def Webcam Streaming",
         "- Free 4.9-Star Mobile App"
     ],
-    "website": "https://obico.io",
-    "repo": "github.com/TheSpaghettiDetective/moonraker-obico",
     "updates": true
   }
 }

kiauh/extensions/octoapp/metadata.json

@@ -12,7 +12,6 @@
             "- Live Gcode preview",
             "- And much much more!"
         ],
-        "repo": "https://github.com/crysxd/OctoApp-Plugin",
         "updates": true
     }
 }

kiauh/extensions/octoeverywhere/metadata.json

@@ -11,8 +11,6 @@
             "- Real-time Notifications",
             "- Live Streaming, and More!"
         ],
-        "website": "https://octoeverywhere.com",
-        "repo": "github.com/QuinnDamerell/OctoPrint-OctoEverywhere",
         "updates": true
     }
 }

kiauh/extensions/octoprint/__init__.py

@@ -1,22 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2025 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-from pathlib import Path
-
-# Constants
-OP_DEFAULT_PORT = 5000
-
-# OctoPrint instance naming/prefixes
-OP_ENV_PREFIX = "OctoPrint"
-OP_BASEDIR_PREFIX = ".octoprint"
-
-# Service/log filenames
-OP_LOG_NAME = "octoprint.log"
-
-# Files/paths (computed per-instance where applicable)
-OP_SUDOERS_FILE = Path("/etc/sudoers.d/octoprint-shutdown")

kiauh/extensions/octoprint/metadata.json

@@ -1,18 +0,0 @@
-{
-  "metadata": {
-    "index": 12,
-    "module": "octoprint_extension",
-    "maintained_by": "dw-0",
-    "display_name": "OctoPrint",
-    "description": [
-      "Open-source web interface to control and monitor your 3D printer",
-      "- Upload and manage G-code, start/pause/cancel prints",
-      "- Live webcam view and timelapse support",
-      "- Real-time temperature graphs and printer status",
-      "- Powerful plugin ecosystem"
-    ],
-    "website": "https://octoprint.org",
-    "repo": "https://github.com/OctoPrint/OctoPrint",
-    "updates": false
-  }
-}

kiauh/extensions/octoprint/octoprint.py

@@ -1,116 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2025 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-from __future__ import annotations
-
-from dataclasses import dataclass, field
-from pathlib import Path
-from textwrap import dedent
-
-from components.klipper.klipper import Klipper
-from core.constants import CURRENT_USER
-from core.instance_manager.base_instance import BaseInstance
-from core.logger import Logger
-from extensions.octoprint import (
-    OP_BASEDIR_PREFIX,
-    OP_ENV_PREFIX,
-    OP_LOG_NAME,
-)
-from utils.fs_utils import create_folders
-from utils.sys_utils import create_service_file, get_service_file_path
-
-
-@dataclass
-class Octoprint:
-    suffix: str
-    base: BaseInstance = field(init=False, repr=False)
-    service_file_path: Path = field(init=False)
-    log_file_name = OP_LOG_NAME
-    env_dir: Path = field(init=False)
-    basedir: Path = field(init=False)
-    cfg_file: Path = field(init=False)
-
-    def __post_init__(self):
-        self.base = BaseInstance(Klipper, self.suffix)
-        self.base.log_file_name = self.log_file_name
-
-        self.service_file_path = get_service_file_path(Octoprint, self.suffix)
-
-        # OctoPrint stores its data under ~/.octoprint[_SUFFIX]
-        self.basedir = (
-            Path.home().joinpath(OP_BASEDIR_PREFIX)
-            if self.suffix == ""
-            else Path.home().joinpath(f"{OP_BASEDIR_PREFIX}_{self.suffix}")
-        )
-        self.cfg_file = self.basedir.joinpath("config.yaml")
-
-        # OctoPrint virtualenv lives under ~/OctoPrint[_SUFFIX]
-        self.env_dir = (
-            Path.home().joinpath(OP_ENV_PREFIX)
-            if self.suffix == ""
-            else Path.home().joinpath(f"{OP_ENV_PREFIX}_{self.suffix}")
-        )
-
-    def create(self, port: int) -> None:
-        Logger.print_status(
-            f"Creating OctoPrint instance '{self.service_file_path.stem}' ..."
-        )
-
-        # Ensure basedir exists and config.yaml is present
-        create_folders([self.basedir])
-        if not self.cfg_file.exists():
-            Logger.print_status("Creating config.yaml ...")
-            self.cfg_file.write_text(self._prep_config_yaml())
-            Logger.print_ok("config.yaml created!")
-        else:
-            Logger.print_info("config.yaml already exists. Skipped ...")
-
-        create_service_file(self.service_file_path.name, self._prep_service_content(port))
-
-    def _prep_service_content(self, port: int) -> str:
-        basedir = self.basedir.as_posix()
-        cfg = self.cfg_file.as_posix()
-        octo_exec = self.env_dir.joinpath("bin/octoprint").as_posix()
-
-        return dedent(
-            f"""\
-            [Unit]
-            Description=Starts OctoPrint on startup
-            After=network-online.target
-            Wants=network-online.target
-
-            [Service]
-            Environment="LC_ALL=C.UTF-8"
-            Environment="LANG=C.UTF-8"
-            Type=simple
-            User={CURRENT_USER}
-            ExecStart={octo_exec} --basedir {basedir} --config {cfg} --port={port} serve
-
-            [Install]
-            WantedBy=multi-user.target
-            """
-        )
-
-    def _prep_config_yaml(self) -> str:
-        printer = self.base.comms_dir.joinpath("klippy.serial").as_posix()
-        restart_service = self.service_file_path.stem
-
-        return dedent(
-            f"""\
-            serial:
-                additionalPorts:
-                - {printer}
-                disconnectOnErrors: false
-                port: {printer}
-            server:
-                commands:
-                    serverRestartCommand: sudo service {restart_service} restart
-                    systemRestartCommand: sudo shutdown -r now
-                    systemShutdownCommand: sudo shutdown -h now
-            """
-        )

kiauh/extensions/octoprint/octoprint_extension.py

@@ -1,286 +0,0 @@
-# ======================================================================= #
-#  Copyright (C) 2020 - 2025 Dominik Willner <th33xitus@gmail.com>        #
-#                                                                         #
-#  This file is part of KIAUH - Klipper Installation And Update Helper    #
-#  https://github.com/dw-0/kiauh                                          #
-#                                                                         #
-#  This file may be distributed under the terms of the GNU GPLv3 license  #
-# ======================================================================= #
-from __future__ import annotations
-
-import re
-from typing import Dict, List, Optional, Set
-
-from components.klipper.klipper import Klipper
-from core.instance_manager.instance_manager import InstanceManager
-from core.logger import DialogType, Logger
-from core.types.color import Color
-from core.menus.base_menu import print_back_footer
-from extensions.base_extension import BaseExtension
-from extensions.octoprint import (
-    OP_SUDOERS_FILE, OP_DEFAULT_PORT,
-)
-from extensions.octoprint.octoprint import Octoprint
-from utils.common import check_install_dependencies
-from utils.fs_utils import run_remove_routines, remove_with_sudo
-from utils.input_utils import get_selection_input, get_confirm
-from utils.instance_utils import get_instances
-from utils.sys_utils import (
-    create_python_venv,
-    get_ipv4_addr,
-    install_python_packages,
-)
-
-
-# noinspection PyMethodMayBeStatic
-class OctoprintExtension(BaseExtension):
-    def install_extension(self, **kwargs) -> None:
-        Logger.print_status("Installing OctoPrint ...")
-
-        klipper_instances: List[Klipper] = get_instances(Klipper)
-        if not klipper_instances:
-            Logger.print_dialog(
-                DialogType.WARNING,
-                [
-                    "Klipper not found! Please install Klipper first.",
-                ],
-            )
-            return
-
-        existing_ops: List[Octoprint] = get_instances(Octoprint)
-        existing_by_suffix: Dict[str, Octoprint] = {op.suffix: op for op in existing_ops}
-        candidates: List[Klipper] = [k for k in klipper_instances if k.suffix not in existing_by_suffix]
-
-        chosen: List[Klipper] = []
-
-        if len(klipper_instances) == 1:
-            k = klipper_instances[0]
-            if k.suffix in existing_by_suffix:
-                if not get_confirm(
-                    f"OctoPrint already exists for '{k.service_file_path.stem}'. Reinstall?",
-                    default_choice=True,
-                    allow_go_back=True,
-                ):
-                    Logger.print_info("Aborted OctoPrint installation.")
-                    return
-            chosen = [k]
-        else:
-            while True:
-                dialog = "╔═══════════════════════════════════════════════════════╗\n"
-                headline = Color.apply(
-                    "The following Klipper instances were found:", Color.GREEN
-                )
-                dialog += f"║{headline:^64}║\n"
-                dialog += "╟───────────────────────────────────────────────────────╢\n"
-
-                if candidates:
-                    line_all = Color.apply("a) Select all (install for all missing)", Color.YELLOW)
-                    dialog += f"║ {line_all:<63}║\n"
-                    dialog += "║                                                       ║\n"
-
-                index_map: Dict[str, Klipper] = {}
-                for i, k in enumerate(klipper_instances, start=1):
-                    mapping = existing_by_suffix.get(k.suffix)
-                    suffix = f" <-> {mapping.service_file_path.stem}" if mapping else ""
-                    line = Color.apply(f"{i}) {k.service_file_path.stem}{suffix}", Color.CYAN)
-                    dialog += f"║ {line:<63}║\n"
-                    index_map[str(i)] = k
-
-                dialog += "╟───────────────────────────────────────────────────────╢\n"
-                print(dialog, end="")
-                print_back_footer()
-
-                allowed = list(index_map.keys()) + ["b"] + (["a"] if candidates else [])
-                choice = get_selection_input("Choose instance to install OctoPrint for", allowed)
-
-                if choice == "b":
-                    Logger.print_info("Aborted OctoPrint installation.")
-                    return
-                if choice == "a":
-                    chosen = candidates
-                    break
-
-                selected = index_map[choice]
-                if selected.suffix in existing_by_suffix:
-                    confirm = get_confirm(
-                        f"OctoPrint already exists for '{selected.service_file_path.stem}'. Reinstall?",
-                        default_choice=True,
-                        allow_go_back=True,
-                    )
-                    if not confirm:
-                        # back to menu
-                        continue
-                chosen = [selected]
-                break
-
-        deps = {
-            "git",
-            "wget",
-            "python3-pip",
-            "python3-dev",
-            "libyaml-dev",
-            "build-essential",
-            "python3-setuptools",
-            "python3-virtualenv",
-        }
-        check_install_dependencies(deps)
-
-        # Determine used ports from existing OctoPrint services and prepare regex
-        used_ports: Set[int] = set()
-        port_re = re.compile(r"--port=(\d+)")
-        for op in existing_ops:
-            try:
-                content = op.service_file_path.read_text()
-                m = port_re.search(content)
-                if m:
-                    used_ports.add(int(m.group(1)))
-            except OSError:
-                pass
-
-        # noinspection PyShadowingNames
-        def read_existing_port(suffix: str) -> Optional[int]:
-            op = existing_by_suffix.get(suffix)
-            if not op:
-                return None
-            try:
-                content = op.service_file_path.read_text()
-                m = port_re.search(content)
-                return int(m.group(1)) if m else None
-            except OSError:
-                return None
-
-        def next_free_port(start: int, used: Set[int]) -> int:
-            p = start
-            while p in used:
-                p += 1
-            used.add(p)
-            return p
-
-        created_ops: List[Octoprint] = []
-        for k in chosen:
-            # Keep existing port on reinstall, otherwise assign next free one
-            existing_port = read_existing_port(k.suffix)
-            port = existing_port if existing_port is not None else next_free_port(OP_DEFAULT_PORT, used_ports)
-
-            instance = Octoprint(suffix=k.suffix)
-
-            if create_python_venv(instance.env_dir, force=False):
-                Logger.print_ok(
-                    f"Virtualenv created: {instance.env_dir}", prefix=False
-                )
-            else:
-                Logger.print_info(
-                    f"Virtualenv exists: {instance.env_dir}. Skipping creation ..."
-                )
-
-            install_python_packages(instance.env_dir, ["octoprint"])
-
-            instance.create(port=port)
-            created_ops.append(instance)
-
-        for inst in created_ops:
-            try:
-                InstanceManager.enable(inst)
-                InstanceManager.start(inst)
-            except Exception as e:
-                Logger.print_error(
-                    f"Failed to enable/start {inst.service_file_path.name}: {e}"
-                )
-
-        ip = get_ipv4_addr()
-        lines = ["Access your new OctoPrint instance(s) at:"]
-        for inst in created_ops:
-            try:
-                content = inst.service_file_path.read_text()
-                m = port_re.search(content)
-                if m:
-                    # noinspection HttpUrlsUsage
-                    lines.append(f"● {inst.service_file_path.stem}: http://{ip}:{m.group(1)}")
-            except OSError:
-                pass
-
-        Logger.print_dialog(DialogType.SUCCESS, lines, center_content=False)
-
-    def remove_extension(self, **kwargs) -> None:
-        Logger.print_status("Removing OctoPrint ...")
-
-        try:
-            op_instances: List[Octoprint] = get_instances(Octoprint)
-            if not op_instances:
-                Logger.print_info("No OctoPrint instances found. Skipped ...")
-                return
-
-            remove_all = False
-            if len(op_instances) == 1:
-                to_remove = op_instances
-            else:
-                dialog = "╔═══════════════════════════════════════════════════════╗\n"
-                headline = Color.apply(
-                    "The following OctoPrint instances were found:", Color.GREEN
-                )
-                dialog += f"║{headline:^64}║\n"
-                dialog += "╟───────────────────────────────────────────────────────╢\n"
-                select_all = Color.apply("a) Select all", Color.YELLOW)
-                dialog += f"║ {select_all:<63}║\n"
-                dialog += "║                                                       ║\n"
-
-                for i, inst in enumerate(op_instances, start=1):
-                    line = Color.apply(
-                        f"{i}) {inst.service_file_path.stem}", Color.CYAN
-                    )
-                    dialog += f"║ {line:<63}║\n"
-                dialog += "╟───────────────────────────────────────────────────────╢\n"
-                print(dialog, end="")
-                print_back_footer()
-
-                allowed = [str(i) for i in range(1, len(op_instances) + 1)]
-                allowed.extend(["a", "b"])
-                choice = get_selection_input("Choose instance to remove", allowed)
-
-                if choice == "a":
-                    remove_all = True
-                    to_remove = op_instances
-                elif choice == "b":
-                    Logger.print_info("Aborted OctoPrint removal.")
-                    return
-                else:
-                    idx = int(choice) - 1
-                    to_remove = [op_instances[idx]]
-
-            for inst in to_remove:
-                Logger.print_status(
-                    f"Removing instance {inst.service_file_path.stem} ..."
-                )
-                try:
-                    InstanceManager.remove(inst)
-                except Exception as e:
-                    Logger.print_error(
-                        f"Failed to remove service {inst.service_file_path.name}: {e}"
-                    )
-
-                # Remove only this instance's env and basedir
-                if inst.env_dir.exists():
-                    Logger.print_status(f"Removing {inst.env_dir} ...")
-                    run_remove_routines(inst.env_dir)
-                if inst.basedir.exists():
-                    Logger.print_status(f"Removing {inst.basedir} ...")
-                    run_remove_routines(inst.basedir)
-
-            # Remove sudoers file only if no instances remain
-            remaining = get_instances(Octoprint)
-            if not remaining and OP_SUDOERS_FILE.exists():
-                Logger.print_status(f"Removing {OP_SUDOERS_FILE} ...")
-                remove_with_sudo(OP_SUDOERS_FILE)
-
-            Logger.print_dialog(
-                DialogType.SUCCESS,
-                [
-                    "Selected OctoPrint instance(s) successfully removed!"
-                    if not remove_all
-                    else "All OctoPrint instances successfully removed!",
-                ],
-                center_content=True,
-            )
-
-        except Exception as e:
-            Logger.print_error(f"Error during OctoPrint removal: {e}")

kiauh/extensions/pretty_gcode/metadata.json

@@ -5,7 +5,6 @@
     "maintained_by": "Kragrathea",
     "display_name": "PrettyGCode for Klipper",
     "description": ["3D G-Code viewer for Klipper"],
-    "repo": "https://github.com/Kragrathea/pgcode",
     "updates": true
   }
 }

kiauh/extensions/simply_print/metadata.json

@@ -1,16 +1,13 @@
 {
-  "metadata": {
-    "index": 10,
-    "module": "simply_print_extension",
-    "maintained_by": "dw-0",
-    "display_name": "SimplyPrint",
-    "description": [
-      "3D Printer Cloud Management Software.",
-      "\n\n",
-      "3D printing doesn't have to be a complicated, analog, SD card-filled experience; step into the future of modern 3D printing"
-    ],
-    "website": "https://simplyprint.io",
-    "repo": "https://github.com/SimplyPrint",
-    "updates": false
-  }
+    "metadata": {
+        "index": 10,
+        "module": "simply_print_extension",
+        "maintained_by": "dw-0",
+        "display_name": "SimplyPrint",
+        "description": [
+            "3D Printer Cloud Management Software.",
+            "\n\n",
+            "3D printing doesn't have to be a complicated, analog, SD card-filled experience; step into the future of modern 3D printing"
+        ]
+    }
 }

kiauh/extensions/spoolman/metadata.json

@@ -13,7 +13,6 @@
       "\n\n",
       "Note: This extension installs Spoolman using Docker. Docker must be installed on your system before installing Spoolman."
     ],
-    "repo": "https://github.com/Donkie/Spoolman",
     "updates": true
   }
 }

kiauh/extensions/telegram_bot/metadata.json

@@ -5,7 +5,7 @@
     "maintained_by": "nlef",
     "display_name": "Moonraker Telegram Bot",
     "description": ["Control your printer with the Telegram messenger app."],
-    "repo": "https://github.com/nlef/moonraker-telegram-bot",
+    "project_url": "https://github.com/nlef/moonraker-telegram-bot",
     "updates": true
   }
 }

kiauh/utils/common.py

@@ -42,13 +42,10 @@ from utils.sys_utils import (
 def get_kiauh_version() -> str:
     """
     Helper method to get the current KIAUH version by reading the latest tag
-    :return: string of the latest tag or a default value if no tags exist
+    :return: string of the latest tag
     """
-    tags = get_local_tags(Path(__file__).parent.parent)
-    if tags:
-        return tags[-1]
-    else:
-        return "v?.?.?"
+    lastest_tag: str = get_local_tags(Path(__file__).parent.parent)[-1]
+    return lastest_tag
 
 
 def convert_camelcase_to_kebabcase(name: str) -> str:

kiauh/utils/instance_type.py

@@ -15,7 +15,6 @@ from extensions.obico.moonraker_obico import MoonrakerObico
 from extensions.octoeverywhere.octoeverywhere import Octoeverywhere
 from extensions.octoapp.octoapp import Octoapp
 from extensions.telegram_bot.moonraker_telegram_bot import MoonrakerTelegramBot
-from extensions.octoprint.octoprint import Octoprint
 
 InstanceType = TypeVar(
     "InstanceType",
@@ -25,5 +24,4 @@ InstanceType = TypeVar(
     MoonrakerObico,
     Octoeverywhere,
     Octoapp,
-    Octoprint,
 )

klipper_repos.txt.example

@@ -1,18 +0,0 @@
-# This file acts as an example file.
-#
-# 1) Make a copy of this file and rename it to 'klipper_repos.txt'
-# 2) Add your custom Klipper repository to the bottom of that copy
-# 3) Save the file
-#
-# Back in KIAUH you can now go into -> [Settings] and use action '2' to set a different Klipper repository
-#
-# Make sure to always separate the repository and the branch with a ','.
-# <repository>,<branch> -> https://github.com/Klipper3d/klipper,master
-# If you omit a branch, it will always default to 'master'
-#
-# You are allowed to omit the 'https://github.com/' part of the repository URL
-# Down below are now a few examples of what is considered as valid:
-https://github.com/Klipper3d/klipper,master
-https://github.com/Klipper3d/klipper
-Klipper3d/klipper,master
-Klipper3d/klipper

scripts/moonraker.sh

@@ -27,7 +27,7 @@ function moonraker_systemd() {
   ###
   # any moonraker client that uses "moonraker" in its own name must be blacklisted using
   # this variable, otherwise they will be falsely recognized as moonraker instances
-  blacklist="obico|hmi|telegram-bot"
+  blacklist="obico"
 
   ignore="${SYSTEMD}/moonraker-(${blacklist}).service"
   match="${SYSTEMD}/moonraker(-[0-9a-zA-Z]+)?.service"