machineconfig 7.51__py3-none-any.whl → 7.53__py3-none-any.whl

machineconfig/utils/installer.py

@@ -1,9 +1,9 @@
 """package manager"""
 
-from machineconfig.utils.installer_utils.installer_abc import check_if_installed_already, parse_apps_installer_linux, parse_apps_installer_windows
+from machineconfig.utils.installer_utils.installer_abc import check_if_installed_already
 from machineconfig.utils.installer_utils.installer_class import Installer
 from machineconfig.utils.schemas.installer.installer_types import InstallerData, InstallerDataFiles, get_normalized_arch, get_os_name, OPERATING_SYSTEMS, CPU_ARCHITECTURES
-from machineconfig.jobs.installer.package_groups import PACKAGE_GROUPS, PACKAGE_GROUP2NAMES
+from machineconfig.jobs.installer.package_groups import PACKAGE_GROUP2NAMES
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.source_of_truth import INSTALL_VERSION_ROOT, LINUX_INSTALL_PATH
 from machineconfig.utils.io import read_json
@@ -18,7 +18,7 @@ from joblib import Parallel, delayed
 def check_latest():
     console = Console()  # Added console initialization
     console.print(Panel("🔍  CHECKING FOR LATEST VERSIONS", title="Status", expand=False))  # Replaced print with Panel
-    installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["ESSENTIAL"])
+    installers = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=["termabc"])
     installers_github = []
     for inst__ in installers:
         app_name = inst__["appName"]
@@ -91,7 +91,7 @@ def get_installed_cli_apps():
     return apps
 
 
-def get_installers(os: OPERATING_SYSTEMS, arch: CPU_ARCHITECTURES, which_cats: Optional[list[PACKAGE_GROUPS]]) -> list[InstallerData]:
+def get_installers(os: OPERATING_SYSTEMS, arch: CPU_ARCHITECTURES, which_cats: Optional[list[str]]) -> list[InstallerData]:
     res_all = get_all_installer_data_files()
     acceptable_apps_names: list[str] | None = None
     if which_cats is not None:
@@ -105,8 +105,13 @@ def get_installers(os: OPERATING_SYSTEMS, arch: CPU_ARCHITECTURES, which_cats: O
         if acceptable_apps_names is not None:
             if installer_data["appName"] not in acceptable_apps_names:
                 continue
-        if installer_data["fileNamePattern"][arch][os] is None:
-            continue
+        try:
+            if installer_data["fileNamePattern"][arch][os] is None:
+                continue
+        except KeyError as ke:
+            print(f"❌ ERROR: Missing key in installer data: {ke}")
+            print(f"Installer data: {installer_data}")
+            raise KeyError(f"Missing key in installer data: {ke}")
         all_installers.append(installer_data)
     return all_installers
 
@@ -119,27 +124,6 @@ def get_all_installer_data_files() -> list[InstallerData]:
     return res_final
 
 
-def dynamically_extract_installers_system_groups_from_scripts():
-    res_final: list[InstallerData] = []
-    from platform import system
-    if system() == "Windows":
-        from machineconfig.setup_windows import APPS
-        options_system = parse_apps_installer_windows(APPS.read_text(encoding="utf-8"))
-    elif system() == "Linux":
-        from machineconfig.setup_linux import APPS
-        options_system = parse_apps_installer_linux(APPS.read_text(encoding="utf-8"))
-    elif system() == "Darwin":
-        from machineconfig.setup_mac import APPS
-        options_system = parse_apps_installer_linux(APPS.read_text(encoding="utf-8"))
-    else:
-        raise NotImplementedError(f"❌ System {system()} not supported")
-    os_name = get_os_name()
-    for group_name, (docs, script) in options_system.items():
-        item: InstallerData = {"appName": group_name, "doc": docs, "repoURL": "CMD", "fileNamePattern": {"amd64": {os_name: script}, "arm64": {os_name: script}}}
-        res_final.append(item)
-    return res_final
-
-
 def install_bulk(installers_data: list[InstallerData], safe: bool = False, jobs: int = 10, fresh: bool = False):
     print("🚀 BULK INSTALLATION PROCESS 🚀")
     if fresh:

machineconfig/utils/installer_utils/installer.py

@@ -1,12 +1,11 @@
 """Devops Devapps Install"""
 
-from machineconfig.utils.installer import dynamically_extract_installers_system_groups_from_scripts
 import typer
 from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
-from typing import Optional, cast, get_args, Annotated
-from machineconfig.jobs.installer.package_groups import PACKAGE_GROUPS, PACKAGE_GROUP2NAMES
+from typing import Optional, Annotated
+from machineconfig.jobs.installer.package_groups import PACKAGE_GROUP2NAMES
 
 console = Console()
 
@@ -36,7 +35,7 @@ def _handle_installer_not_found(search_term: str, all_names: list[str]) -> None:
         if len(all_names) > 10:
             console.print(f"   [dim]... and {len(all_names) - 10} more[/dim]")
 
-    panel = Panel(f"[bold blue]💡 Use 'ia' to interactively browse all available installers.[/bold blue]\n[bold blue]💡 Use one of the categories: {list(get_args(PACKAGE_GROUPS))}[/bold blue]", title="[yellow]Helpful Tips[/yellow]", border_style="yellow")
+    panel = Panel(f"[bold blue]💡 Use 'ia' to interactively browse all available installers.[/bold blue]\n[bold blue]💡 Use one of the categories: {list(PACKAGE_GROUP2NAMES.keys())}[/bold blue]", title="[yellow]Helpful Tips[/yellow]", border_style="yellow")
     console.print(panel)
 
 
@@ -63,7 +62,7 @@ def main(
     else:
         if group:
             typer.echo("❌ You must provide a group name when using the --group/-g option.")
-            res = get_static_groups_combined_with_dynamic_groups_extracted()
+            res = get_group_name_to_repr()
             console.print("[bold blue]Here are the available groups:[/bold blue]")
             table = Table(show_header=True, header_style="bold magenta")
             table.add_column("Group", style="cyan", no_wrap=True)
@@ -87,16 +86,12 @@ def main(
     raise typer.Exit(1)
 
 
-def get_static_groups_combined_with_dynamic_groups_extracted():
+def get_group_name_to_repr() -> dict[str, str]:
     # Build category options and maintain a mapping from display text to actual category name
     category_display_to_name: dict[str, str] = {}
     for group_name, group_values in PACKAGE_GROUP2NAMES.items():
         display = f"📦 {group_name:<20}" + "   --   " + f"{'|'.join(group_values):<60}"
         category_display_to_name[display] = group_name
-    options_system = dynamically_extract_installers_system_groups_from_scripts()
-    for item in options_system:
-        display = f"📦 {item['appName']:<20}   --   {item['doc']:<60}"
-        category_display_to_name[display] = item['appName']
     return category_display_to_name
 
 
@@ -110,9 +105,9 @@ def install_interactively():
     for x in installers:
         installer_options.append(Installer(installer_data=x).get_description())
 
-    category_display_to_name = get_static_groups_combined_with_dynamic_groups_extracted()
+    category_display_to_name = get_group_name_to_repr()
     options = list(category_display_to_name.keys()) + ["─" * 50] + installer_options
-    program_names = choose_from_options(multi=True, msg="Categories are prefixed with 📦", options=options, header="🚀 CHOOSE DEV APP OR CATEGORY", default="📦 essentials", fzf=True)
+    program_names = choose_from_options(multi=True, msg="Categories are prefixed with 📦", options=options, header="🚀 CHOOSE DEV APP OR CATEGORY", default="📦 termabc", fzf=True)
     installation_messages: list[str] = []
     for _an_idx, a_program_name in enumerate(program_names):
         if a_program_name.startswith("─"):  # 50 dashes separator
@@ -120,7 +115,7 @@ def install_interactively():
         if a_program_name.startswith("📦 "):
             category_name = category_display_to_name.get(a_program_name)
             if category_name:
-                install_group(package_group=cast(PACKAGE_GROUPS, category_name))
+                install_group(package_group=category_name)
         else:
             installer_idx = installer_options.index(a_program_name)
             an_installer_data = installers[installer_idx]
@@ -140,43 +135,7 @@ def install_group(package_group: str):
         installers_ = get_installers(os=get_os_name(), arch=get_normalized_arch(), which_cats=[package_group])
         install_bulk(installers_data=installers_)
         return
-    options_system = dynamically_extract_installers_system_groups_from_scripts()
-    from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
-    from machineconfig.utils.code import run_shell_script
-    for an_item in options_system:
-        if an_item["appName"] == package_group:
-            panel = Panel(f"[bold yellow]Installing programs from category: [green]{package_group}[/green][/bold yellow]", title="[bold blue]📦 Category Installation[/bold blue]", border_style="blue", padding=(1, 2))
-            console.print(panel)
-            program = an_item["fileNamePattern"][get_normalized_arch()][get_os_name()]
-            if program is not None:
-                run_shell_script(program)
-                break
-    else:
-        console.print(f"❌ [red]Group '{package_group}' not found.[/red]", style="bold")
-        _handle_installer_not_found(package_group, all_names=list(PACKAGE_GROUP2NAMES.keys()) + [item['appName'] for item in options_system])
-
-
-def choose_from_system_package_groups(options_system: dict[str, tuple[str, str]]) -> str:
-    from machineconfig.utils.options import choose_from_options
-    display_options = []
-    for group_name, (description, _) in options_system.items():
-        if description:
-            display_options.append(f"{group_name:<20} - {description}")
-        else:
-            display_options.append(group_name)
-    program_names = choose_from_options(multi=True, msg="", options=sorted(display_options), header="🚀 CHOOSE DEV APP", fzf=True)
-    program = ""
-    for display_name in program_names:
-        # Extract the actual group name (everything before " - " if present)
-        group_name = display_name.split(" - ")[0].strip() if " - " in display_name else display_name.strip()
-        console.print(f"\n[bold cyan]⚙️  Installing: [yellow]{group_name}[/yellow][/bold cyan]", style="bold")
-        _, sub_program = options_system[group_name]  # Extract content from tuple
-        if sub_program.startswith("#winget"):
-            sub_program = sub_program[1:]
-        program += "\n" + sub_program
-    return program
-
-
+    print(f"❌ ERROR: Unknown package group: {package_group}. Available groups are: {list(PACKAGE_GROUP2NAMES.keys())}")
 def install_clis(clis_names: list[str]):
     from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
     from machineconfig.utils.installer import get_installers

machineconfig/utils/installer_utils/installer_abc.py

@@ -191,71 +191,3 @@ def check_if_installed_already(exe_name: str, version: Optional[str], use_cache:
     return ("⚠️ NotInstalled", "None", version or "unknown")
 
 
-def parse_apps_installer_linux(txt: str) -> dict[str, tuple[str, str]]:
-    """Parse Linux shell installation scripts into logical chunks.
-    
-    Splits scripts by # --GROUP:<name>:<description> comment signatures into a dictionary
-    mapping block names to (description, shell script content) tuples.
-    
-    Returns:
-        dict[str, tuple[str, str]]: Dictionary mapping block/section names to (description, installation_script) tuples
-    """
-    chunks = txt.split('# --GROUP:')
-    res: dict[str, tuple[str, str]] = {}
-    
-    for chunk in chunks[1:]:  # Skip first empty chunk before first group
-        lines = chunk.split('\n')
-        # First line contains the group name and description in format "NAME:DESCRIPTION"
-        group_line = lines[0].strip()
-        
-        # Extract group name and description
-        if ':' in group_line:
-            parts = group_line.split(':', 1)  # Split only on first colon
-            group_name = parts[0].strip()
-            group_description = parts[1].strip() if len(parts) > 1 else ""
-        else:
-            group_name = group_line
-            group_description = ""
-        
-        # Rest is the content
-        content = '\n'.join(lines[1:]).strip()
-        
-        if group_name and content:
-            res[group_name] = (group_description, content)
-    
-    return res
-
-
-def parse_apps_installer_windows(txt: str) -> dict[str, tuple[str, str]]:
-    """Parse Windows PowerShell installation scripts into logical chunks.
-    
-    Splits scripts by # --GROUP:<name>:<description> comment signatures into a dictionary
-    mapping block names to (description, PowerShell script content) tuples.
-    
-    Returns:
-        dict[str, tuple[str, str]]: Dictionary mapping block/section names to (description, installation_script) tuples
-    """
-    chunks = txt.split('# --GROUP:')
-    res: dict[str, tuple[str, str]] = {}
-    
-    for chunk in chunks[1:]:  # Skip first chunk before first group
-        lines = chunk.split('\n')
-        # First line contains the group name and description in format "NAME:DESCRIPTION"
-        group_line = lines[0].strip()
-        
-        # Extract group name and description
-        if ':' in group_line:
-            parts = group_line.split(':', 1)  # Split only on first colon
-            group_name = parts[0].strip()
-            group_description = parts[1].strip() if len(parts) > 1 else ""
-        else:
-            group_name = group_line
-            group_description = ""
-        
-        # Rest is the content
-        content = '\n'.join(lines[1:]).strip()
-        
-        if group_name and content:
-            res[group_name] = (group_description, content)
-    
-    return res

machineconfig/utils/io.py

@@ -1,4 +1,3 @@
-from __future__ import annotations
 
 from typing import Any, Union, Optional, Mapping
 from pathlib import Path

machineconfig/utils/path_helper.py

@@ -1,12 +1,11 @@
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.utils.options import choose_from_options
 from machineconfig.utils.source_of_truth import EXCLUDE_DIRS
 from rich.console import Console
 from rich.panel import Panel
 import platform
 import subprocess
 from pathlib import Path
-
+from typing import Optional
 
 console = Console()
 
@@ -83,6 +82,7 @@ def match_file_name(sub_string: str, search_root: PathExtended, suffixes: set[st
         if len(reduced_scripts) == 1:
             return PathExtended(reduced_scripts[0])
         elif len(reduced_scripts) > 1:
+            from machineconfig.utils.options import choose_from_options
             choice = choose_from_options(multi=False, msg="Multiple matches found", options=reduced_scripts, fzf=True)
             return PathExtended(choice)
         print(f"Result: This still generated {len(reduced_scripts)} results.")
@@ -97,19 +97,27 @@ def match_file_name(sub_string: str, search_root: PathExtended, suffixes: set[st
         reduced_scripts = [a_potential_match for a_potential_match in partial_path_matches if sub_string in a_potential_match.as_posix()]
         if len(reduced_scripts) == 1:
             return PathExtended(reduced_scripts[0])
-        print(f"Result: This still generated {len(reduced_scripts)} results.")
+        print(f"Result: This still generated {len(reduced_scripts)} results.")        
+
     try:
-        fzf_cmd = f"cd '{search_root_obj}'; fd --type file --strip-cwd-prefix | fzf --ignore-case --exact --query={sub_string}"
+
+        if len(partial_path_matches) == 0:
+            print("No partial path matches found, trying to do fd with --no-ignore ...")
+            fzf_cmd = f"cd '{search_root_obj}'; fd --no-ignore --type file --strip-cwd-prefix | fzf --ignore-case --exact --query={sub_string}"
+        else:
+            fzf_cmd = f"cd '{search_root_obj}'; fd --type file --strip-cwd-prefix | fzf --ignore-case --exact --query={sub_string}"
         console.print(Panel(f"🔍 Second attempt: SEARCH STRATEGY | Using fd to search for '{sub_string}' in '{search_root_obj}' ...\n{fzf_cmd}", title="Search Strategy", expand=False))
         search_res_raw = subprocess.run(fzf_cmd, stdout=subprocess.PIPE, text=True, check=True, shell=True).stdout
-        search_res = search_res_raw.strip().split("\\n")[:-1]
+        search_res = search_res_raw.strip().split("\n")
     except subprocess.CalledProcessError as cpe:
         console.print(Panel(f"❌ ERROR | FZF search failed with '{sub_string}' in '{search_root_obj}'.\n{cpe}", title="Error", expand=False))
         import sys
-
         sys.exit(f"💥 FILE NOT FOUND | Path {sub_string} does not exist @ root {search_root_obj}. No search results.")
     if len(search_res) == 1:
         return search_root_obj.joinpath(search_res_raw)
+    elif len(search_res) == 0:
+        msg = Panel(f"💥 FILE NOT FOUND | Path {sub_string} does not exist @ root {search_root_obj}. No search results", title="File Not Found", expand=False)
+        raise FileNotFoundError(msg)
 
     print(f"⚠️ WARNING | Multiple search results found for `{sub_string}`:\n'{search_res}'")
     cmd = f"cd '{search_root_obj}'; fd --type file | fzf --select-1 --query={sub_string}"
@@ -121,3 +129,46 @@ def match_file_name(sub_string: str, search_root: PathExtended, suffixes: set[st
         msg = Panel(f"💥 FILE NOT FOUND | Path {sub_string} does not exist @ root {search_root_obj}. No search results", title="File Not Found", expand=False)
         raise FileNotFoundError(msg) from cpe
     return search_root_obj.joinpath(res)
+
+
+def search_for_files_of_interest(path_obj: PathExtended, suffixes: set[str]):
+    if path_obj.joinpath(".venv").exists():
+        path_objects = path_obj.search("*", not_in=[".venv"])
+        files: list[PathExtended] = []
+        for a_path_obj in path_objects:
+            files += search_for_files_of_interest(path_obj=a_path_obj, suffixes=suffixes)
+        return files
+    if path_obj.is_file():
+        return [path_obj]
+    files: list[PathExtended] = []
+    for a_suffix in suffixes:
+        if a_suffix == ".py":
+            files += path_obj.search(pattern="*.py", r=True, not_in=["__init__.py"])
+        else:
+            files += path_obj.search(pattern=f"*{a_suffix}", r=True)
+    return files
+
+
+def get_choice_file(path: str, suffixes: Optional[set[str]]):
+    path_obj = sanitize_path(path)
+    if suffixes is None:
+        import platform
+        if platform.system() == "Windows":
+            suffixes = {".py", ".ps1", ".sh"}
+        elif platform.system() in ["Linux", "Darwin"]:
+            suffixes = {".py", ".sh"}
+        else:
+            suffixes = {".py"}
+    if not path_obj.exists():
+        print(f"🔍 Searching for file matching `{path}` under `{PathExtended.cwd()}`, but only if suffix matches {suffixes}")
+        choice_file = match_file_name(sub_string=path, search_root=PathExtended.cwd(), suffixes=suffixes)
+    elif path_obj.is_dir():
+        print(f"🔍 Searching recursively for Python, PowerShell and Shell scripts in directory `{path_obj}`")
+        files = search_for_files_of_interest(path_obj, suffixes=suffixes)
+        print(f"🔍 Got #{len(files)} results.")
+        from machineconfig.utils.options import choose_from_options
+        choice_file = choose_from_options(multi=False, options=files, fzf=True, msg="Choose one option")
+        choice_file = PathExtended(choice_file)
+    else:
+        choice_file = path_obj
+    return choice_file

machineconfig/utils/ssh.py

@@ -2,13 +2,13 @@ from typing import Callable, Optional, Any, Union, cast
 import os
 from pathlib import Path
 import platform
-from machineconfig.scripts.python.helpers_devops.cli_utils import MachineSpecs
+from machineconfig.scripts.python.helpers_utils.path import MachineSpecs
 import rich.console
 from machineconfig.utils.terminal import Response
 from machineconfig.utils.accessories import pprint, randstr
 from machineconfig.utils.meta import lambda_to_python_script
 UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
-MACHINECONFIG_VERSION = "machineconfig>=7.51"
+MACHINECONFIG_VERSION = "machineconfig>=7.53"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:
@@ -113,7 +113,7 @@ class SSH:
                 if self.progress and self.task is not None:
                     self.progress.update(self.task, completed=transferred, total=total)
         self.tqdm_wrap = RichProgressWrapper
-        from machineconfig.scripts.python.helpers_devops.cli_utils import get_machine_specs
+        from machineconfig.scripts.python.helpers_utils.path import get_machine_specs
         self.local_specs: MachineSpecs = get_machine_specs()
         resp = self.run_shell(command="""~/.local/bin/utils get-machine-specs """, verbose_output=False, description="Getting remote machine specs", strict_stderr=False, strict_return_code=False)
         json_str = resp.op

{machineconfig-7.51.dist-info → machineconfig-7.53.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 7.51
+Version: 7.53
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0
@@ -65,7 +65,9 @@ iex (iwr bit.ly/cfgwindows).Content
 iex (uvx machineconfig define)
 # Permanent install:
 powershell -ExecutionPolicy ByPass -c "irm https://astral.sh/uv/install.ps1 | iex"  # Skip if UV is already installed
-uvx install --upgrade machineconfig
+uv tool install --upgrade  --python 3.14 machineconfig both
+devops config copy-assets
+
 ```
 
 # Install On Linux and MacOS
@@ -77,7 +79,7 @@ uvx install --upgrade machineconfig
 . <(uvx machineconfig define)
 # Permanent install:
 curl -LsSf https://astral.sh/uv/install.sh | sh  # Skip if UV is already installed
-uvx install --upgrade machineconfig
+uv tool install --upgrade --upgrade 3.14 machineconfig
 ```