machineconfig 3.2__py3-none-any.whl → 3.3__py3-none-any.whl

machineconfig/cluster/sessions_managers/zellij_local.py

@@ -204,7 +204,7 @@ class ZellijLayoutGenerator:
                     elif cmd in proc_cmdline[0] and cmd not in shells:
                         # Non-shell command in first argument
                         is_match = True
-                    
+
                     # Additional shell wrapper filter - be more restrictive for shells
                     if is_match and proc_name in shells and args:
                         # For shell processes, ensure the match is actually meaningful
@@ -216,7 +216,7 @@ class ZellijLayoutGenerator:
                                 meaningful_match = True
                                 break
                             # Or if it's an exact script name match
-                            elif arg.endswith('.py') or arg.endswith('.sh') or arg.endswith('.rb'):
+                            elif arg.endswith(".py") or arg.endswith(".sh") or arg.endswith(".rb"):
                                 if any(arg in cmdline_arg for cmdline_arg in proc_cmdline[1:]):
                                     meaningful_match = True
                                     break

machineconfig/cluster/sessions_managers/zellij_utils/monitoring_types.py

@@ -1,4 +1,3 @@
-
 from typing import NotRequired, TypedDict, Optional
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
 
@@ -16,11 +15,11 @@ class ProcessInfo(TypedDict):
 
 
 class CommandStatus(TypedDict):
-    status: str                   # e.g. running | not_running | unknown | error
-    running: bool                 # Convenience boolean
+    status: str  # e.g. running | not_running | unknown | error
+    running: bool  # Convenience boolean
     processes: list[ProcessInfo]  # Matching processes (can be empty)
-    command: str                  # Original command string ('' if unknown)
-    tab_name: str                 # Tab identifier
+    command: str  # Original command string ('' if unknown)
+    tab_name: str  # Tab identifier
     # Optional / contextual fields
     cwd: NotRequired[str]
     error: NotRequired[str]
@@ -30,12 +29,15 @@ class CommandStatus(TypedDict):
     method: NotRequired[str]
     raw_output: NotRequired[str]
     verification_method: NotRequired[str]
+
+
 class CommandSummary(TypedDict):
     total_commands: int
     running_commands: int
     stopped_commands: int
     session_healthy: bool
 
+
 class ZellijSessionStatus(TypedDict):
     zellij_running: bool
     session_exists: bool
@@ -48,20 +50,28 @@ class SessionReport(TypedDict):
     session_status: ZellijSessionStatus  # ZellijSessionStatus from zellij_local
     commands_status: dict[str, CommandStatus]  # dict[str, CommandStatus from zellij_local]
     summary: CommandSummary
+
+
 class ComprehensiveStatus(TypedDict):
     zellij_session: ZellijSessionStatus
     commands: dict[str, CommandStatus]
     summary: CommandSummary
+
+
 class SessionMetadata(TypedDict):
     session_name_prefix: str
     created_at: str
     num_managers: int
     sessions: list[str]
     manager_type: str
+
+
 class ManagerData(TypedDict):
     session_name: Optional[str]
     layout_config: Optional[LayoutConfig]  # Will be LayoutConfig from layout_types
     layout_path: Optional[str]
+
+
 class ActiveSessionInfo(TypedDict):
     session_name: str
     is_active: bool
@@ -84,11 +94,11 @@ class StartResult(TypedDict):
     success: bool
     message: NotRequired[str]
     error: NotRequired[str]
+
+
 class StatusRow(TypedDict):
     session: str
     tab: str
     running: bool
     command: str
     processes: int
-
-

machineconfig/jobs/python_custom_installers/archive/ngrok.py

@@ -5,15 +5,16 @@ flagged as virus by 35% of antivirus engines
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {
-    "repo_url": "CUSTOM",
+config_dict: InstallerData = {
+    "appName": "ngrok",
+    "repoURL": "CUSTOM",
     "doc": "ngrok secure introspectable tunnels to localhost",
-    "filename_template_windows_amd_64": "ngrok-stable-windows-amd64.zip",
-    "filename_template_linux_amd_64": "ngrok-stable-linux-amd64.zip",
-    "strip_v": False,
-    "exe_name": "ngrok",
+    "filenameTemplate": {"amd64": {"windows": "ngrok-stable-windows-amd64.zip", "linux": "ngrok-stable-linux-amd64.zip", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "ngrok",
 }
 
 

machineconfig/jobs/python_custom_installers/dev/aider.py

@@ -1,7 +1,15 @@
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 import platform
 
-config_dict = {"repo_url": "CUSTOM", "doc": "Aider Chat", "filename_template_windows_amd_64": "aider-chat-{}.exe", "filename_template_linux_amd_64": "aider-chat-{}.deb", "strip_v": True, "exe_name": "aider-chat"}
+config_dict: InstallerData = {
+    "appName": "aider-chat",
+    "repoURL": "https://github.com/paul-gauthier/aider",
+    "doc": "Aider Chat",
+    "filenameTemplate": {"amd64": {"windows": "aider-chat-{}.exe", "linux": "aider-chat-{}.deb", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": True,
+    "exeName": "aider-chat",
+}
 
 
 def main(version: Optional[str] = None):

machineconfig/jobs/python_custom_installers/dev/alacritty.py

@@ -2,9 +2,10 @@
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "Terminal Console", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "alacritty"}
+config_dict: InstallerData = {"appName": "Alacritty", "repoURL": "CUSTOM", "doc": "Terminal Console", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "alacritty"}
 
 
 def main(version: Optional[str]):

machineconfig/jobs/python_custom_installers/dev/brave.py

@@ -3,8 +3,17 @@
 import platform
 from typing import Optional
 
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-config_dict = {"repo_url": "CUSTOM", "doc": "Chrome with no ads", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "brave"}
+
+config_dict: InstallerData = {
+    "appName": "Brave",
+    "repoURL": "CUSTOM",
+    "doc": "Privacy-focused web browser with built-in ad blocking",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "brave",
+}
 
 
 def main(version: Optional[str]):

machineconfig/jobs/python_custom_installers/dev/bypass_paywall.py

@@ -2,10 +2,18 @@
 
 # from platform import system
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 from machineconfig.utils.path_reduced import PathExtended as PathExtended
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": """Plugin for chrome to bypass paywalls""", "filename_template_windows_amd_64": "VSCodeSetup-{}.exe", "filename_template_linux_amd_64": "code_{}.deb", "strip_v": True, "exe_name": "pluginName"}
+config_dict: InstallerData = {
+    "appName": "bypass-paywalls-chrome",
+    "repoURL": "https://github.com/iamadamdev/bypass-paywalls-chrome",
+    "doc": """Plugin for chrome to bypass paywalls""",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": True,
+    "exeName": "",
+}
 
 
 def main(version: Optional[str] = None):

machineconfig/jobs/python_custom_installers/dev/code.py

@@ -2,9 +2,16 @@
 
 from typing import Optional
 import platform
-
-
-config_dict = {"repo_url": "CUSTOM", "doc": "Visual Studio Code", "filename_template_windows_amd_64": "VSCodeSetup-{}.exe", "filename_template_linux_amd_64": "code_{}.deb", "strip_v": True, "exe_name": "code"}
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+config_dict: InstallerData = {
+    "appName": "Visual Studio Code",
+    "repoURL": "CUSTOM",
+    "doc": "Visual Studio Code",
+    "filenameTemplate": {"amd64": {"windows": "VSCodeSetup-{}.exe", "linux": "code_{}.deb", "macos": ""}},
+    "stripVersion": True,
+    "exeName": "code",
+}
 
 
 def main(version: Optional[str] = None):

machineconfig/jobs/python_custom_installers/dev/cursor.py

@@ -4,9 +4,10 @@ from pathlib import Path
 import platform
 import subprocess
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "Cursor", "filename_template_windows_amd_64": "VSCodeSetup-{}.exe", "filename_template_linux_amd_64": "code_{}.deb", "strip_v": True, "exe_name": "cursor"}
+config_dict: InstallerData = {"appName": "Cursor", "repoURL": "CUSTOM", "doc": "Cursor", "filenameTemplate": {"amd64": {"windows": "VSCodeSetup-{}.exe", "linux": "code_{}.deb", "macos": ""}}, "stripVersion": True, "exeName": "cursor"}
 
 
 def install_linux(version: Optional[str] = None):

machineconfig/jobs/python_custom_installers/dev/docker_desktop.py

@@ -4,6 +4,7 @@ Installer
 
 # from machineconfig.utils.installer import get_latest_release
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 # https://docs.docker.com/desktop/install/ubuntu/
 # https://docs.docker.com/engine/install/ubuntu/#install-using-the-repository
@@ -14,13 +15,13 @@ from typing import Optional
 # fname = r"bytehound-x86_64-unknown-linux-gnu.tgz"
 
 
-config_dict = {
-    "repo_url": "CUSTOM",
+config_dict: InstallerData = {
+    "appName": "docker_desktop",
+    "repoURL": "CUSTOM",
     "doc": """Docker Desktop for Ubuntu as per https://docs.docker.com/desktop/install/ubuntu/""",
-    "filename_template_windows_amd_64": "gh_{}_windows_amd64.zip",
-    "filename_template_linux_amd_64": "gh_{}_linux_amd64.tar.gz",
-    "strip_v": True,
-    "exe_name": "docker",
+    "filenameTemplate": {"amd64": {"windows": "gh_{}_windows_amd64.zip", "linux": "gh_{}_linux_amd64.tar.gz", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": True,
+    "exeName": "docker",
 }
 
 

machineconfig/jobs/python_custom_installers/dev/espanso.py

@@ -5,8 +5,16 @@ https://github.com/espanso/espanso
 """
 
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-config_dict = {"repo_url": "CUSTOM", "doc": "A text expander.", "filename_template_windows_amd_64": "Espanso-Win-Installer-x86_64.exe", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "espanso"}
+config_dict: InstallerData = {
+    "appName": "espanso",
+    "repoURL": "CUSTOM",
+    "doc": "A text expander.",
+    "filenameTemplate": {"amd64": {"windows": "Espanso-Win-Installer-x86_64.exe", "linux": "", "macos": "Espanso.dmg"}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "espanso",
+}
 
 
 def main(version: Optional[str]):
@@ -21,7 +29,7 @@ def main(version: Optional[str]):
     _ = version
     import platform
 
-    config_dict["repo_url"] = "https://github.com/espanso/espanso"
+    config_dict["repoURL"] = "https://github.com/espanso/espanso"
     if platform.system() == "Windows":
         print("🪟 Installing Espanso on Windows...")
     elif platform.system() in ["Linux", "Darwin"]:
@@ -36,7 +44,7 @@ def main(version: Optional[str]):
 📦 Using Wayland-specific package
 {"=" * 150}
 """)
-                config_dict["filename_template_linux_amd_64"] = "espanso-debian-wayland-amd64.deb"
+                config_dict["filenameTemplate"]["amd64"]["linux"] = "espanso-debian-wayland-amd64.deb"
             else:
                 print(f"""
 {"=" * 150}
@@ -44,10 +52,10 @@ def main(version: Optional[str]):
 📦 Using X11-specific package
 {"=" * 150}
 """)
-                config_dict["filename_template_linux_amd_64"] = "espanso-debian-x11-amd64.deb"
+                config_dict["filenameTemplate"]["amd64"]["linux"] = "espanso-debian-x11-amd64.deb"
         else:  # Darwin/macOS
             print("🍎 Installing Espanso on macOS...")
-            config_dict["filename_template_linux_amd_64"] = "Espanso.dmg"
+            config_dict["filenameTemplate"]["amd64"]["macos"] = "Espanso.dmg"
     else:
         error_msg = f"Unsupported platform: {platform.system()}"
         print(f"""

machineconfig/jobs/python_custom_installers/dev/goes.py

@@ -5,7 +5,16 @@ https://github.com/ShishirPatil/gorilla
 
 # import subprocess
 
-config_dict = {"repo_url": "CUSTOM", "doc": "natural language to API", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "goex"}
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+config_dict: InstallerData = {
+    "appName": "Gorilla",
+    "repoURL": "https://github.com/ShishirPatil/gorilla",
+    "doc": "natural language to API",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "goex",
+}
 
 ve_name = "goex"
 

machineconfig/jobs/python_custom_installers/dev/lvim.py

@@ -4,13 +4,21 @@ from machineconfig.utils.terminal import Terminal
 import subprocess
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
 _ = Terminal, subprocess
 # as per https://www.lunarvim.org/docs/installation
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "Terminal text editor based on neovim.", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "lvim"}
+config_dict: InstallerData = {
+    "appName": "lvim",
+    "repoURL": "CUSTOM",
+    "doc": "Terminal text editor based on neovim.",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "lvim",
+}
 
 
 def main(version: Optional[str]):

machineconfig/jobs/python_custom_installers/dev/nerdfont.py

@@ -2,9 +2,17 @@
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "lightweight containerization", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "nerdfont"}
+config_dict: InstallerData = {
+    "appName": "nerdfont",
+    "repoURL": "CUSTOM",
+    "doc": "lightweight containerization",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "nerdfont",
+}
 
 
 def main(version: Optional[str]):

machineconfig/jobs/python_custom_installers/dev/redis.py

@@ -2,9 +2,9 @@
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-
-config_dict = {"repo_url": "CUSTOM", "doc": "submillisecond fast key-value db", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "redis"}
+config_dict: InstallerData = {"appName": "Redis", "repoURL": "CUSTOM", "doc": "submillisecond fast key-value db", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "redis"}
 
 
 def main(version: Optional[str]):

machineconfig/jobs/python_custom_installers/dev/wezterm.py

@@ -3,8 +3,10 @@
 import platform
 from typing import Optional
 
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-config_dict = {"repo_url": "CUSTOM", "doc": "cli for wezterm", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "wezterm"}
+
+config_dict: InstallerData = {"appName": "Wezterm", "repoURL": "CUSTOM", "doc": "Modern, GPU-accelerated terminal emulator", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "wezterm"}
 
 
 def main(version: Optional[str]):

machineconfig/jobs/python_custom_installers/dev/winget.py

@@ -3,9 +3,10 @@ import requests
 import tempfile
 from pathlib import Path
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "winget installer", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "winget"}
+config_dict: InstallerData = {"appName": "winget", "repoURL": "CUSTOM", "doc": "winget installer", "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}}, "stripVersion": False, "exeName": "winget"}
 
 
 def is_winget_available() -> bool:

machineconfig/jobs/python_custom_installers/docker.py

@@ -2,9 +2,17 @@
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "lightweight containerization", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "docker"}
+config_dict: InstallerData = {
+    "appName": "docker",
+    "repoURL": "CUSTOM",
+    "doc": "lightweight containerization",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "docker",
+}
 
 
 def main(version: Optional[str]):

machineconfig/jobs/python_custom_installers/gh.py

@@ -3,11 +3,13 @@
 import platform
 from typing import Optional
 from machineconfig.utils.installer_utils.installer_class import Installer
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 from machineconfig.utils.terminal import Terminal
 
 r"""
 https://github.com/cli/cli
 
+
 # as per https://docs.github.com/en/copilot/github-copilot-in-the-cli/using-github-copilot-in-the-cli
 # gh auth login
 # gh extension install github/gh-copilot
@@ -17,7 +19,14 @@ https://github.com/cli/cli
 
 """
 
-config_dict = {"repo_url": "https://github.com/cli/cli", "doc": "GitHub CLI", "filename_template_windows_amd_64": "gh_{}_windows_amd64.zip", "filename_template_linux_amd_64": "gh_{}_linux_amd64.tar.gz", "strip_v": True, "exe_name": "gh"}
+config_dict: InstallerData = {
+    "appName": "gh",
+    "repoURL": "https://github.com/cli/cli",
+    "doc": "GitHub CLI",
+    "filenameTemplate": {"amd64": {"windows": "gh_{}_windows_amd64.zip", "linux": "gh_{}_linux_amd64.tar.gz", "macos": "gh_{}_macOS_amd64.tar.gz"}},
+    "stripVersion": True,
+    "exeName": "gh",
+}
 
 
 def main(version: Optional[str]):
@@ -30,7 +39,7 @@ def main(version: Optional[str]):
 """)
 
     _ = version
-    inst = Installer.from_dict(d=config_dict, name="gh")
+    inst = Installer(installer_data=config_dict)
     print("""
 📦 INSTALLATION | Installing GitHub CLI base package...
 """)

machineconfig/jobs/python_custom_installers/hx.py

@@ -11,15 +11,16 @@ from machineconfig.utils.installer_utils.installer_abc import LINUX_INSTALL_PATH
 from machineconfig.utils.installer_utils.installer_class import Installer
 from rich.console import Console
 from rich.panel import Panel
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {
-    "repo_url": "CUSTOM",
+config_dict: InstallerData = {
+    "appName": "hx",
+    "repoURL": "CUSTOM",
     "doc": "Helix is a post-modern modal text editor.",
-    "filename_template_windows_amd_64": "helix-{}-x86_64-windows.zip",
-    "filename_template_linux_amd_64": "helix-{}-x86_64-linux.tar.xz",
-    "strip_v": False,
-    "exe_name": "hx",
+    "filenameTemplate": {"amd64": {"windows": "helix-{}-x86_64-windows.zip", "linux": "helix-{}-x86_64-linux.tar.xz", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "hx",
 }
 
 
@@ -29,8 +30,8 @@ def main(version: Optional[str], install_lib: bool = False):
     console.print(Panel(f"HELIX EDITOR INSTALLER 🧬\nPlatform: {platform.system()}\nVersion:  {'latest' if version is None else version}", title="Installer", expand=False))
 
     config_dict_copy = config_dict.copy()
-    config_dict_copy["repo_url"] = "https://github.com/helix-editor/helix"
-    inst = Installer.from_dict(d=config_dict_copy, name="hx")
+    config_dict_copy["repoURL"] = "https://github.com/helix-editor/helix"
+    inst = Installer(installer_data=config_dict_copy)
 
     print("\n📥 [Step 1/5] Downloading Helix editor...")
     downloaded, _version_to_be_installed = inst.download(version=version)

machineconfig/jobs/python_custom_installers/warp-cli.py

@@ -2,9 +2,17 @@
 
 import platform
 from typing import Optional
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-config_dict = {"repo_url": "CUSTOM", "doc": "cli for warp from cloudflare", "filename_template_windows_amd_64": "", "filename_template_linux_amd_64": "", "strip_v": False, "exe_name": "warp-cli"}
+config_dict: InstallerData = {
+    "appName": "warp-cli",
+    "repoURL": "CUSTOM",
+    "doc": "cli for warp from cloudflare",
+    "filenameTemplate": {"amd64": {"windows": "", "linux": "", "macos": ""}, "arm64": {"windows": "", "linux": "", "macos": ""}},
+    "stripVersion": False,
+    "exeName": "warp-cli",
+}
 
 
 def main(version: Optional[str]):