machineconfig 5.99__tar.gz → 6.21__tar.gz

{machineconfig-5.99/src/machineconfig.egg-info → machineconfig-6.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.99
+Version: 6.21
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

{machineconfig-5.99 → machineconfig-6.21}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "5.99"
+version = "6.21"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}

{machineconfig-5.99 → machineconfig-6.21}/src/machineconfig/scripts/python/cloud_helpers/cloud_copy.py

@@ -65,16 +65,16 @@ def get_securely_shared_file(url: Optional[str] = None, folder: Optional[str] =
 def main(
     source: Annotated[str, typer.Argument(help="📂 file/folder path to be taken from here.")],
     target: Annotated[str, typer.Argument(help="🎯 file/folder path to be be sent to here.")],
-    overwrite: Annotated[bool, typer.Option(help="✍️ Overwrite existing file.")] = ArgsDefaults.overwrite,
-    share: Annotated[bool, typer.Option(help="🔗 Share file / directory")] = ArgsDefaults.share,
-    rel2home: Annotated[bool, typer.Option(help="🏠 Relative to `myhome` folder")] = ArgsDefaults.rel2home,
-    root: Annotated[Optional[str], typer.Option(help="🌳 Remote root. None is the default, unless rel2home is raied, making the default `myhome`.")] = ArgsDefaults.root,
-    key: Annotated[Optional[str], typer.Option(help="🔑 Key for encryption")] = ArgsDefaults.key,
-    pwd: Annotated[Optional[str], typer.Option(help="🔒 Password for encryption")] = ArgsDefaults.pwd,
-    encrypt: Annotated[bool, typer.Option(help="🔐 Encrypt before sending.")] = ArgsDefaults.encrypt,
+    overwrite: Annotated[bool, typer.Option("--overwrite", "-o", help="✍️ Overwrite existing file.")] = ArgsDefaults.overwrite,
+    share: Annotated[bool, typer.Option("--share", "-s", help="🔗 Share file / directory")] = ArgsDefaults.share,
+    rel2home: Annotated[bool, typer.Option("--relative2home", "-r", help="🏠 Relative to `myhome` folder")] = ArgsDefaults.rel2home,
+    root: Annotated[Optional[str], typer.Option("--root", "-R", help="🌳 Remote root. None is the default, unless rel2home is raied, making the default `myhome`.")] = ArgsDefaults.root,
+    key: Annotated[Optional[str], typer.Option("--key", "-k", help="🔑 Key for encryption")] = ArgsDefaults.key,
+    pwd: Annotated[Optional[str], typer.Option("--password", "-p", help="🔒 Password for encryption")] = ArgsDefaults.pwd,
+    encrypt: Annotated[bool, typer.Option("--encrypt", "-e", help="🔐 Encrypt before sending.")] = ArgsDefaults.encrypt,
     zip_: Annotated[bool, typer.Option("--zip", "-z", help="📦 unzip after receiving.")] = ArgsDefaults.zip_,
-    os_specific: Annotated[bool, typer.Option(help="💻 choose path specific for this OS.")] = ArgsDefaults.os_specific,
-    config: Annotated[Optional[str], typer.Option(help="⚙️ path to cloud.json file.")] = None,
+    os_specific: Annotated[bool, typer.Option("--os-specific", "-O", help="💻 choose path specific for this OS.")] = ArgsDefaults.os_specific,
+    config: Annotated[Optional[str], typer.Option("--config", "-c", help="⚙️ path to cloud.json file.")] = None,
 ) -> None:
     """📤 Upload or 📥 Download files/folders to/from cloud storage services like Google Drive, Dropbox, OneDrive, etc."""
     console.print(Panel("☁️  Cloud Copy Utility", title="[bold blue]Cloud Copy[/bold blue]", border_style="blue", width=152))

{machineconfig-5.99 → machineconfig-6.21}/src/machineconfig/scripts/python/devops.py

@@ -10,7 +10,7 @@ import machineconfig.scripts.python.devops_helpers.cli_data as cli_data
 import machineconfig.scripts.python.devops_helpers.cli_nw as cli_network
 
 
-def install(which: Annotated[Optional[str], typer.Argument(..., help="Comma-separated list of program names to install, or group name if --group flag is set.")],
+def install(which: Annotated[Optional[str], typer.Argument(..., help="Comma-separated list of program names to install, or group name if --group flag is set.")] = None,
         group: Annotated[bool, typer.Option(..., "--group", "-g", help="Treat 'which' as a group name. A group is bundle of apps.")] = False,
         interactive: Annotated[bool, typer.Option(..., "--interactive", "-ia", help="Interactive selection of programs to install.")] = False,
     ) -> None:

machineconfig-6.21/src/machineconfig/scripts/python/helpers_fire/template.ps1

@@ -0,0 +1,14 @@
+# Set error action preference to stop on error, like set -e
+$ErrorActionPreference = "Stop"
+
+$JOB_NAME = "outpatient_mapping"
+$REPO_ROOT = "$HOME/code/work/winter_planning/"
+$CONTEXT_PATH = "$REPO_ROOT/data/outpatient_mapping/op_services.csv"
+$PROMPT_PATH = "$REPO_ROOT/data/outpatient_mapping/prompt"
+$AGENTS_DIR = "$REPO_ROOT/.ai/agents/$JOB_NAME"
+
+agents create --agents crush --host docker --model x-ai/grok-4-fast:free --provider openrouter --context-path $CONTEXT_PATH --prompt-path $PROMPT_PATH --job-name $JOB_NAME --agents-dir $AGENTS_DIR
+sessions balance-load "$AGENTS_DIR/layout.json" --max-thresh 6 --breaking-method moreLayouts --thresh-type number --output-path "$AGENTS_DIR/layout_balanced.json"
+sessions run "$AGENTS_DIR/layout_balanced.json" --kill-upon-completion
+
+# agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"

machineconfig-6.21/src/machineconfig/scripts/python/helpers_fire/template.sh

@@ -0,0 +1,15 @@
+
+#!/bin/bash
+# set -e # Exit immediately if a command exits with a non-zero status.
+
+JOB_NAME="outpatient_mapping"
+REPO_ROOT="$HOME/code/work/winter_planning/"
+CONTEXT_PATH="$REPO_ROOT/data/outpatient_mapping/op_services.csv"
+PROMPT_PATH="$REPO_ROOT/data/outpatient_mapping/prompt"
+AGENTS_DIR="$REPO_ROOT/.ai/agents/$JOB_NAME"
+agents create --agents crush --host docker --model x-ai/grok-4-fast:free --provider openrouter --context-path $CONTEXT_PATH --prompt-path $PROMPT_PATH --job-name $JOB_NAME --agents-dir $AGENTS_DIR
+sessions balance-load "$AGENTS_DIR/layout.json" --max-thresh 6 --breaking-method moreLayouts --thresh-type number --output-path "$AGENTS_DIR/layout_balanced.json"
+sessions run "$AGENTS_DIR/layout_balanced.json" --kill-upon-completion
+
+
+# agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"

{machineconfig-5.99 → machineconfig-6.21}/src/machineconfig/scripts/python/repos_helpers/clone.py

@@ -8,7 +8,7 @@ from git.exc import GitCommandError
 from rich import print as pprint
 from rich.progress import BarColumn, MofNCompleteColumn, Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
 
-from machineconfig.utils.schemas.repos.repos_types import RepoRecordDict, RepoRecordFile, RepoRemote
+from machineconfig.utils.schemas.repos.repos_types import RepoRecordDict, RepoRemote
 from machineconfig.utils.io import read_json
 
 
@@ -95,8 +95,7 @@ def clone_single_repo(repo_spec: RepoRecordDict, preferred_remote: Optional[str]
 
 
 def clone_repos(spec_path: Path, preferred_remote: Optional[str], checkout_branch_flag: bool, checkout_commit_flag: bool) -> list[tuple[CloneStatus, str]]:
-    data = cast(RepoRecordFile, read_json(path=spec_path))
-    repos = data["repos"]
+    repos = cast(list[RepoRecordDict], read_json(path=spec_path))
     results: list[tuple[CloneStatus, str]] = []
     with Progress(SpinnerColumn(), TextColumn("[progress.description]{task.description}"), BarColumn(), MofNCompleteColumn(), TimeElapsedColumn()) as progress:
         task_id = progress.add_task("Processing repositories...", total=len(repos))

{machineconfig-5.99 → machineconfig-6.21}/src/machineconfig/scripts/python/sessions.py

@@ -71,7 +71,7 @@ def find_layout_file(layout_path: str, ) -> Path:
 def run(ctx: typer.Context,
            layout_path: Annotated[Optional[str], typer.Argument(..., help="Path to the layout.json file")] = None,
         max_tabs: Annotated[int, typer.Option(..., help="A Sanity checker that throws an error if any layout exceeds the maximum number of tabs to launch.")] = 10,
-        max_layouts: Annotated[int, typer.Option(..., help="A Sanity checker that throws an error if the total number of layouts exceeds this number.")] = 10,
+        max_layouts: Annotated[int, typer.Option(..., help="A Sanity checker that throws an error if the total number of *parallel layouts exceeds this number.")] = 10,
         sleep_inbetween: Annotated[float, typer.Option(..., help="Sleep time in seconds between launching layouts")] = 1.0,
         monitor: Annotated[bool, typer.Option(..., "--monitor", "-m", help="Monitor the layout sessions for completion")] = False,
         parallel: Annotated[bool, typer.Option(..., "--parallel", "-p", help="Launch multiple layouts in parallel")] = False,
@@ -89,7 +89,7 @@ def run(ctx: typer.Context,
     layouts_selected = select_layout(layouts_json_file=layout_path_resolved, selected_layouts_names=choose.split(",") if choose else None, select_interactively=choose_interactively)
 
     # ============= Basic sanity checks =============
-    if len(layouts_selected) > max_layouts:
+    if parallel and len(layouts_selected) > max_layouts:
         raise ValueError(f"Number of layouts {len(layouts_selected)} exceeds the maximum allowed {max_layouts}. Please adjust your layout file.")
     for a_layout in layouts_selected:
         if len(a_layout["layoutTabs"]) > max_tabs:
@@ -98,7 +98,6 @@ def run(ctx: typer.Context,
             if not confirm:
                 typer.echo("Aborting launch.")
                 raise typer.Exit(0)
-
     import time
     import platform
     if platform.system() == "Linux" or platform.system() == "Darwin":

{machineconfig-5.99 → machineconfig-6.21}/src/machineconfig/utils/installer.py

@@ -125,10 +125,9 @@ def get_all_installer_data_files() -> list[InstallerData]:
     return res_final
 
 
-def get_installers_system_groups():
+def dynamically_extract_installers_system_groups_from_scripts():
     res_final: list[InstallerData] = []
     from platform import system
-
     if system() == "Windows":
         options_system = parse_apps_installer_windows(LIBRARY_ROOT.joinpath("setup_windows/apps.ps1").read_text(encoding="utf-8"))
     elif system() == "Linux" or system() == "Darwin":

{machineconfig-5.99 → machineconfig-6.21}/src/machineconfig/utils/installer_utils/installer.py

@@ -1,6 +1,6 @@
 """Devops Devapps Install"""
 
-from machineconfig.utils.installer import get_installers_system_groups
+from machineconfig.utils.installer import dynamically_extract_installers_system_groups_from_scripts
 import typer
 from rich.console import Console
 from rich.panel import Panel
@@ -68,6 +68,26 @@ def main(
                 return install_group(package_group=a_group)
         else:
             return install_clis(clis_names=[x.strip() for x in which.split(",") if x.strip() != ""])
+    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()
+            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)
+            table.add_column("AppsBundled", style="green", overflow="fold")
+            for display, group_name in res.items():
+                # Parse display
+                if "   --   " in display:
+                    group_part, items_part = display.split("   --   ", 1)
+                    group_name_parsed = group_part.replace("📦 ", "").strip()
+                    items_str = items_part.strip()
+                else:
+                    group_name_parsed = display
+                    items_str = group_name
+                table.add_row(group_name_parsed, items_str)
+            console.print(table)
+            raise typer.Exit(1)
     typer.echo("❌ You must provide either a program name/group name, or use --interactive/-ia option.")
     import click
     ctx = click.get_current_context()
@@ -75,6 +95,19 @@ def main(
     raise typer.Exit(1)
 
 
+def get_static_groups_combined_with_dynamic_groups_extracted():
+    # 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
+
+
 def install_interactively():
     from machineconfig.utils.options import choose_from_options
     from machineconfig.utils.schemas.installer.installer_types import get_normalized_arch, get_os_name
@@ -84,16 +117,8 @@ def install_interactively():
     installer_options = []
     for x in installers:
         installer_options.append(Installer(installer_data=x).get_description())
-    # 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 = get_installers_system_groups()
-    for item in options_system:
-        display = f"📦 {item['appName']:<20}   --   {item['doc']:<60}"
-        category_display_to_name[display] = item['appName']
-    
+
+    category_display_to_name = get_static_groups_combined_with_dynamic_groups_extracted()
     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)
     installation_messages: list[str] = []
@@ -123,7 +148,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_)
     else:
-        options_system = get_installers_system_groups()
+        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:

{machineconfig-5.99 → machineconfig-6.21/src/machineconfig.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: machineconfig
-Version: 5.99
+Version: 6.21
 Summary: Dotfiles management package
 Author-email: Alex Al-Saffar <programmer@usa.com>
 License: Apache 2.0

machineconfig-5.99/src/machineconfig/scripts/python/helpers_fire/template.ps1

@@ -1,29 +0,0 @@
-#Requires -Version 5.1
-
-$JOB_NAME = "outpatient_mapping"
-$REPO_ROOT = "$HOME/code/ machineconfig"
-$CONTEXT_PATH = "$REPO_ROOT/src/machineconfig/scripts/python/fire_jobs.py"
-$PROMPT_PATH = "$REPO_ROOT/src/machineconfig/scripts/python/helpers_fire/prompt.txt"
-
-$AGENTS_DIR = "$REPO_ROOT/.ai/agents/$JOB_NAME"
-$LAYOUT_PATH_UNBALANCED = "$REPO_ROOT/.ai/agents/$JOB_NAME/layout_unbalanced.json"
-
-agents create `
-  --context-path "$CONTEXT_PATH" `
-  --tasks-per-prompt 1 `
-  --machine docker `
-  --agent crush `
-  --model "zai/glm-4.6" `
-  --provider openrouter `
-  --separator 'def ' `
-  --prompt-path "$PROMPT_PATH" `
-  --output-path "$LAYOUT_PATH_UNBALANCED" `
-  --agents-dir "$AGENTS_DIR"
-
-# $LAYOUT_BALANCED_PATH = "$REPO_ROOT/.ai/agents/$JOB_NAME/layout_balanced.json"
-# sessions balance-load $LAYOUT_PATH --max-thresh 6 --breaking-method moreLayouts --thresh-type number  --output-path $LAYOUT_BALANCED_PATH
-# sessions run $LAYOUT_BALANCED_PATH --kill-upon-completion
-
-sessions run $LAYOUT_PATH_UNBALANCED
-
-# agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"

machineconfig-5.99/src/machineconfig/scripts/python/helpers_fire/template.sh

@@ -1,32 +0,0 @@
-
-#!/bin/bash
-# set -e # Exit immediately if a command exits with a non-zero status.
-
-JOB_NAME="outpatient_mapping"
-REPO_ROOT="$HOME/code/ machineconfig"
-CONTEXT_PATH="$REPO_ROOT/src/machineconfig/scripts/python/fire_jobs.py"
-PROMPT_PATH="$REPO_ROOT/src/machineconfig/scripts/python/helpers_fire/prompt.txt"
-
-AGENTS_DIR="$REPO_ROOT/.ai/agents/$JOB_NAME"
-LAYOUT_PATH_UNBALANCED="$REPO_ROOT/.ai/agents/$JOB_NAME/layout_unbalanced.json"
-
-# agents make-todo --output-path $CONTEXT_PATH
-ag create \
-  --context-path "$CONTEXT_PATH" \
-  --tasks-per-prompt 1 \
-  --machine docker \
-  --agent crush \
-  --model "zai/glm-4.6" \
-  --provider openrouter \
-  --separator 'def ' \
-  --prompt-path "$PROMPT_PATH" \
-  --output-path "$LAYOUT_PATH_UNBALANCED" \
-  --agents-dir "$AGENTS_DIR"
-
-# LAYOUT_BALANCED_PATH="$REPO_ROOT/.ai/agents/$JOB_NAME/layout_balanced.json"
-# sessions balance-load $LAYOUT_PATH --max-thresh 6 --breaking-method moreLayouts --thresh-type number  --output-path $LAYOUT_BALANCED_PATH
-# sessions run $LAYOUT_BALANCED_PATH --kill-upon-completion
-
-ses run $LAYOUT_PATH_UNBALANCED
-
-# agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"