machineconfig 7.49__py3-none-any.whl → 7.64__py3-none-any.whl

machineconfig/cluster/sessions_managers/utils/maker.py

@@ -4,26 +4,30 @@ from typing import Optional, Literal
 from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
 from pathlib import Path
 
-def get_fire_tab_using_uv(func: FunctionType, import_module: bool, uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> tuple[TabConfig, Path]:
+def get_fire_tab_using_uv(func: FunctionType, tab_weight: int, import_module: bool, uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> tuple[TabConfig, Path]:
     from machineconfig.utils.meta import lambda_to_python_script
-    py_script =  lambda_to_python_script(lmb=lambda: func, in_global=True, import_module=import_module)
+    if func.__name__ == "<lambda>":
+        py_script =  lambda_to_python_script(lmb=func, in_global=True, import_module=import_module)
+    else:
+        py_script =  lambda_to_python_script(lmb=lambda: func(), in_global=True, import_module=import_module)
     from machineconfig.utils.code import get_uv_command_executing_python_script
     command_to_run, py_script_path = get_uv_command_executing_python_script(python_script=py_script, uv_with=uv_with, uv_project_dir=uv_project_dir)
     tab_config: TabConfig = {
         "command": command_to_run,
         "startDir": "$HOME",
-        "tabName": func.__name__
+        "tabName": func.__name__,
+        "tabWeight": tab_weight
     }
     return tab_config, py_script_path
-def get_fire_tab_using_fire(func: FunctionType):
+def get_fire_tab_using_fire(func: FunctionType, tab_weight: int) -> TabConfig:
     import inspect
     from machineconfig.utils.source_of_truth import CONFIG_ROOT
     import platform
     if platform.system().lower() == "windows":
-        wrap_mcfg = CONFIG_ROOT / "scripts/windows/wrap_mcfg.ps1"
+        wrap_mcfg = CONFIG_ROOT / "scripts/wrap_mcfg.ps1"
         wrap_mcfg = f'& "{wrap_mcfg}"'
     elif platform.system().lower() == "linux" or platform.system().lower() == "darwin":
-        wrap_mcfg = CONFIG_ROOT / "scripts/linux/wrap_mcfg"
+        wrap_mcfg = CONFIG_ROOT / "scripts/wrap_mcfg"
     else:
         raise ValueError(f"Unsupported platform: {platform.system()}")
     path = Path(inspect.getfile(func))
@@ -32,21 +36,27 @@ def get_fire_tab_using_fire(func: FunctionType):
     tab_config: TabConfig = {
         "command": command_to_run,
         "startDir": "$HOME",
-        "tabName": func.__name__
+        "tabName": func.__name__,
+        "tabWeight": tab_weight
     }
     return tab_config
 
 
 
-def make_layout_from_functions(functions: list[FunctionType], import_module: bool, tab_configs: list[TabConfig], layout_name: str, method: Literal["script", "fire"]="fire") -> LayoutConfig:
+def make_layout_from_functions(functions: list[FunctionType], functions_weights: Optional[list[int]], import_module: bool, tab_configs: list[TabConfig],
+                               layout_name: str, method: Literal["script", "fire"],
+                               uv_with: Optional[list[str]] = None, uv_project_dir: Optional[str] = None
+                               ) -> LayoutConfig:
     tabs2artifacts: list[tuple[TabConfig, list[Path]]] = []
-    for a_func in functions:
+    for a_func, tab_weight in zip(functions, functions_weights or [1]*len(functions)):
         match method:
             case "script":
-                tab_config, artifact_files_1 = get_fire_tab_using_uv(a_func, import_module=import_module, uv_with=None, uv_project_dir=None)
+                tab_config, artifact_files_1 = get_fire_tab_using_uv(a_func, tab_weight=tab_weight, import_module=import_module,
+                                                                     uv_with=uv_with, uv_project_dir=uv_project_dir
+                                                                     )
                 artifact_files = [artifact_files_1]
             case "fire":
-                tab_config = get_fire_tab_using_fire(a_func)
+                tab_config = get_fire_tab_using_fire(a_func, tab_weight=tab_weight)
                 artifact_files = []
         tabs2artifacts.append((tab_config, artifact_files))
     list_of_tabs = [tab for tab, _ in tabs2artifacts] + tab_configs

machineconfig/jobs/installer/custom/boxes.py

@@ -5,7 +5,7 @@ from typing import Optional
 
 from rich.console import Console
 from rich.panel import Panel
-from machineconfig.utils.installer_utils.installer_abc import WINDOWS_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import WINDOWS_INSTALL_PATH
 
 from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
@@ -40,7 +40,7 @@ def main(installer_data: InstallerData, version: Optional[str] = None) -> None:
     )
 
     installer = Installer(installer_data=installer_data_modified)
-    downloaded, _version_to_be_installed = installer.download(version=version)
+    downloaded, _version_to_be_installed = installer.binary_download(version=version)
     decomp_path = downloaded.decompress()
     from pathlib import Path
     for item in decomp_path.rglob("*"):

machineconfig/jobs/installer/custom/hx.py

@@ -3,17 +3,18 @@ Installers do not add runtime files to the machine, hence this script.
 """
 
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.installer_utils.installer_abc import WINDOWS_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils import WINDOWS_INSTALL_PATH
 from typing import Optional
 import platform
 
-from machineconfig.utils.installer_utils.installer_abc import LINUX_INSTALL_PATH
+from machineconfig.utils.installer_utils.installer_locator_utils 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
 
 
+LANGUAGES_SUPPORTED_GRAMMER = ["python.so", "nu.so", "bash.so", "lua.so", "powershell.so"]
 config_dict: InstallerData = {
     "appName": "hx",
     "repoURL": "CMD",
@@ -44,7 +45,7 @@ def main(installer_data: InstallerData, version: Optional[str], install_lib: boo
     inst = Installer(installer_data=config_dict_copy)
 
     print("\n📥 [Step 1/5] Downloading Helix editor...")
-    downloaded, _version_to_be_installed = inst.download(version=version)
+    downloaded, _version_to_be_installed = inst.binary_download(version=version)
     print("   ✨ Download complete.")
 
     print("\n🔍 [Step 2/5] Locating executable and components...")
@@ -58,6 +59,7 @@ def main(installer_data: InstallerData, version: Optional[str], install_lib: boo
         raise FileNotFoundError(f"Could not find 'hx' executable in {downloaded.name}")
 
     assert len(hx_file_search) == 1, f"Expected 1 'hx' executable, found {len(hx_file_search)}"
+
     hx_file = hx_file_search[0]
     contrib = hx_file.parent / "contrib"
     runtime = contrib.parent / "runtime"
@@ -101,11 +103,12 @@ def main(installer_data: InstallerData, version: Optional[str], install_lib: boo
                 if not child.exists():
                     continue
                 if child.name == "grammars":
-                    # copy only the python.so file from runtime/grammars if it exists
-                    python_so = child.joinpath("python.so")
-                    if python_so.exists() and python_so.is_file():
-                        dest = target_runtime.joinpath("grammars")
-                        python_so.copy(folder=dest, overwrite=True)
+                    # copy only the specific language files from runtime/grammars if they exist
+                    for a_language in LANGUAGES_SUPPORTED_GRAMMER:
+                        lang_file = child.joinpath(a_language)
+                        if lang_file.exists() and lang_file.is_file():
+                            dest = target_runtime.joinpath("grammars")
+                            lang_file.copy(folder=dest, overwrite=True)
                 else:
                     # copy the whole child (file or directory) into target_runtime
                     # for directories, copy will create target_runtime/<child.name>
@@ -147,10 +150,11 @@ def main(installer_data: InstallerData, version: Optional[str], install_lib: boo
                 if not child.exists():
                     continue
                 if child.name == "grammars":
-                    python_so = child.joinpath("python.so")
-                    if python_so.exists() and python_so.is_file():
-                        dest = target_runtime.joinpath("grammars")
-                        python_so.copy(folder=dest, overwrite=True)
+                    for a_language in LANGUAGES_SUPPORTED_GRAMMER:
+                        lang_file = child.joinpath(a_language)
+                        if lang_file.exists() and lang_file.is_file():
+                            dest = target_runtime.joinpath("grammars")
+                            lang_file.copy(folder=dest, overwrite=True)
                 else:
                     try:
                         child.copy(folder=target_runtime, overwrite=True)

machineconfig/jobs/installer/custom_dev/brave.py

@@ -27,7 +27,7 @@ def main(installer_data: InstallerData, version: Optional[str]) -> None:
         console.print("🪟 Installing Brave Browser on Windows using winget...", style="bold")
         program = """
 
-winget install --Name "Brave Browser" --Id Brave.Brave --source winget --accept-package-agreements --accept-source-agreements
+winget install --no-upgrade --name "Brave"                        --Id "Brave.Brave"                --source winget --scope user --accept-package-agreements --accept-source-agreements
 
 """
     elif platform.system() in ["Linux", "Darwin"]:

machineconfig/jobs/installer/custom_dev/cloudflare_warp_cli.py

@@ -0,0 +1,23 @@
+
+from typing import Optional
+import platform
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+
+def main(installer_data: InstallerData, version: Optional[str]):
+    _ = installer_data, version
+    system = platform.system()
+    if system == "Windows":
+        raise NotImplementedError("Installer is not yet implemented for Windows.")
+    elif system == "Linux":
+        from pathlib import Path
+        import machineconfig.jobs.installer as module
+        program = Path(module.__file__).parent.joinpath("linux_scripts/cloudflare_warp_cli.sh").read_text(encoding="utf-8")
+    elif system == "Darwin":
+        program = "brew install --cask cloudflare-warp"
+    else:
+        raise NotImplementedError(f"Unsupported platform: {system}")
+    import subprocess
+    subprocess.run(program, shell=True, check=True)
+    return f"Cloudflare WARP CLI installed successfully on {system}."
+

machineconfig/jobs/installer/custom_dev/code.py

@@ -32,7 +32,10 @@ def main(installer_data: InstallerData, version: Optional[str] = None) -> None:
         install_script = """brew install --cask visual-studio-code"""
     elif platform.system() == "Windows":
         console.print("🪟 Installing VS Code on Windows using winget...", style="bold")
-        install_script = """winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements"""
+        install_script = """
+winget install --no-upgrade --name "Microsoft Visual Studio Code" --Id "Microsoft.VisualStudioCode" --source winget --scope user --accept-package-agreements --accept-source-agreements
+
+"""
     else:
         error_msg = f"Unsupported platform: {platform.system()}"
         console.print(

machineconfig/jobs/installer/custom_dev/dubdb_adbc.py

@@ -25,6 +25,6 @@ installer_data: InstallerData = {
 
 def main(installer_data: InstallerData, version: Optional[str]) -> None:
     _ = version
-    from machineconfig.utils.installer import Installer
+    from machineconfig.utils.installer_utils.installer_runner import Installer
     installer = Installer(installer_data)
     installer.install(version=None)

machineconfig/jobs/installer/custom_dev/nerfont_windows_helper.py

@@ -18,7 +18,6 @@ from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
 
-# Nerd Fonts installer configuration data
 nerd_fonts: InstallerData = {
     "appName": "Cascadia Code Nerd Font",
     "repoURL": "https://github.com/ryanoasis/nerd-fonts",
@@ -38,14 +37,6 @@ nerd_fonts: InstallerData = {
 }
 
 
-# Patterns to match any installed variant (NF, Nerd Font, Mono, Propo, style weights) of Cascadia/Caskaydia
-# We'll compile them at runtime for flexibility. Keep them simple to avoid false positives.
-# REQUIRED_FONT_PATTERNS: tuple[str, ...] = (
-#     r"caskaydiacove.*(nf|nerd ?font)",
-#     r"cascadiacode.*(nf|nerd ?font)"
-# )
-
-
 console = Console()
 
 
@@ -125,7 +116,7 @@ def install_nerd_fonts() -> None:
     console.print(f"🔍 Missing fonts detected: {', '.join(missing)}. Proceeding with installation...")
     console.print("🔍 Downloading Nerd Fonts package...")
     
-    folder, _version_to_be_installed = Installer(installer_data=nerd_fonts).download(version=None)
+    folder, _version_to_be_installed = Installer(installer_data=nerd_fonts).binary_download(version=None)
 
     console.print("🧹 Cleaning up unnecessary files...")
     [p.delete(sure=True) for p in folder.search("*Windows*")]

machineconfig/jobs/installer/custom_dev/sysabc.py

@@ -0,0 +1,119 @@
+
+
+import platform
+from typing import Optional
+from rich import box
+from rich.console import Console
+from rich.panel import Panel
+from machineconfig.utils.schemas.installer.installer_types import InstallerData
+
+
+ps1 = r"""
+winget install --no-upgrade --name "Powershell"                   --Id "Microsoft.PowerShell"       --source winget --scope user --accept-package-agreements --accept-source-agreements  # powershell require admin
+winget install --no-upgrade --name "Windows Terminal"             --Id "Microsoft.WindowsTerminal"  --source winget --scope user --accept-package-agreements --accept-source-agreements  # Terminal is is installed by default on W 11
+winget install --no-upgrade --name "GNU Nano"                     --Id "GNU.Nano"                   --source winget --scope user --accept-package-agreements --accept-source-agreements
+# --GROUP:gui:Brave+VSCode+Git+WezTerm
+# --GROUP:dev2:VSRedistrib+VSBuildTools+Codeblocks+GnuWin32: Make+GnuPG+graphviz+WinFsp+SSHFS-win+xming+Node.js+Rustup+Cloudflare+Cloudflare WARP+Microsoft Garage Mouse without Borders
+# --GROUP:user:nu+Chrome+ChromeRemoteDesktop+Zoom+7zip+Firefox+Thunderbird+StreamlabsOBS+OBSStudio+MiKTeX+TexMaker+notepad+++Lapce+TesseractOCR+perl+DB Browser for SQLite+sql server management studio+Adobe Acrobat Reader DC+julia+Chafa+bottom+onefetch+Just+hyperfine+AWS CLI
+# Install-Module -Name Terminal-Icons -Repository PSGallery -Force -AcceptLicense -PassThru -Confirm  # -RequiredVersion 2.5.10
+# Install-Module -Name PSFzf  -SkipPublisherCheck  # -AcceptLicense -PassThru -Confirm  #  -RequiredVersion 2.5.10
+
+"""
+
+zsh = r"""
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+echo "🔄 Updating Homebrew..."
+brew update || true
+echo "📥 Installing essential tools..."
+echo "📥 Installing Git version control..."
+echo "📥 Installing Nano text editor..."
+echo "📥 Installing Node Version Manager (NVM)..."
+# Note: git and nano are pre-installed on macOS, but we install via Homebrew to ensure latest versions
+# brew install git || true
+# brew install nano || true
+# brew install curl || true
+# Install NVM
+if [ ! -s "$HOME/.nvm/nvm.sh" ]; then
+    echo "📥 Installing NVM (Node Version Manager)..."
+    curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+fi
+echo "🔧 Configuring NVM environment..."
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+echo "📥 Installing latest Node.js..."
+nvm install node || true
+# brew install make
+# brew install ffmpeg
+# brew install openssl
+echo "✅ Essential tools installation complete."
+"""
+
+bash = r"""
+sudo apt update -y || true
+sudo apt install nala -y || true
+sudo nala install curl wget gpg lsb-release apt-transport-https -y || true
+sudo nala install git net-tools htop nano -y || true
+sudo nala install build-essential python3-dev -y || true  # C build toolchain: Where build-essential brings gcc, make, etc., and python3-dev ensures headers for your Python version.
+# sudo nala install libssl-dev -y
+# sudo nala install libaa-bin -y
+
+curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+echo "🔧 Configuring NVM environment..."
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+echo "📥 Installing latest Node.js..."
+nvm install node || true
+
+sudo nala install samba
+sudo nala install fuse3 -y || true
+sudo nala install nfs-common -y || true
+
+# echo 'keyboard-configuration keyboard-configuration/layout select US English' | sudo debconf-set-selections
+# echo 'keyboard-configuration keyboard-configuration/layoutcode string us' | sudo debconf-set-selections
+# sudo DEBIAN_FRONTEND=noninteractive nala install -y cmatrix
+# sudo nala install hollywood -y || true
+
+# sudo nala install ffmpeg -y || true  # Required by some dev tools
+# sudo nala install make -y || true  # Required by LunarVim and SpaceVim
+# (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh) || true
+
+"""
+
+
+def main(installer_data: InstallerData, version: Optional[str]) -> None:
+    console = Console()
+    _ = installer_data
+    console.print(
+        Panel.fit(
+            "\n".join([f"💻 Platform: {platform.system()}", f"🔄 Version: {'latest' if version is None else version}"]),
+            title="🔧 ABC Installer",
+            border_style="blue",
+            box=box.ROUNDED,
+        )
+    )
+
+    _ = version
+    if platform.system() == "Windows":
+        console.print("🪟 Installing ABC on Windows using winget...", style="bold")
+        program = ps1
+    elif platform.system() == "Linux":
+        console.print("🐧 Installing ABC on Linux...", style="bold")
+        program = bash
+    elif platform.system() == "Darwin":
+        console.print("🍎 Installing ABC on macOS...", style="bold")
+        program = zsh
+    else:
+        error_msg = f"Unsupported platform: {platform.system()}"
+        console.print(
+            Panel.fit(
+                "\n".join([error_msg]),
+                title="❌ Error",
+                subtitle="⚠️ Unsupported platform",
+                border_style="red",
+                box=box.ROUNDED,
+            )
+        )
+        raise NotImplementedError(error_msg)
+    from machineconfig.utils.code import print_code, run_shell_script
+    print_code(code=program, lexer="shell", desc="Installation Script Preview")
+    run_shell_script(program)

machineconfig/jobs/installer/custom_dev/wezterm.py

@@ -9,10 +9,6 @@ from rich.panel import Panel
 
 from machineconfig.utils.schemas.installer.installer_types import InstallerData
 
-
-# config_dict: InstallerData = {"appName": "Wezterm", "repoURL": "CMD", "doc": "Modern, GPU-accelerated terminal emulator"}
-
-
 console = Console()
 
 
@@ -35,21 +31,8 @@ def main(installer_data: InstallerData, version: Optional[str]):
 
     _ = version
     if platform.system() == "Windows":
-        error_msg = "WezTerm installation not supported on Windows through this installer"
-        console.print(
-            Panel.fit(
-                "\n".join(
-                    [
-                        f"❌ ERROR | {error_msg}",
-                        "💡 TIP: Please download and install manually from the WezTerm website",
-                    ]
-                ),
-                title="Unsupported Platform",
-                border_style="red",
-                padding=(1, 2),
-            )
-        )
-        raise NotImplementedError(error_msg)
+        program = """winget install --no-upgrade --name "WezTerm"                      --Id "wez.wezterm"                --source winget --accept-package-agreements --accept-source-agreements
+"""
     elif platform.system() in ["Linux", "Darwin"]:
         system_name = "LINUX" if platform.system() == "Linux" else "MACOS"
         console.print(