machineconfig 5.83__py3-none-any.whl → 5.85__py3-none-any.whl

machineconfig/profile/mapper.toml

@@ -33,8 +33,9 @@ config2 = {this = '~/.cli-m365-all-connections.json', to_this = '~/dotfiles/cred
 config3 = {this = '~/.cli-m365-connection.json',      to_this = '~/dotfiles/creds/tokens/.cli-m365-connection.json'}
 # config2 = {this = '~/.cli-m365-tokens.json',        to_this = '~/dotfiles/creds/tokens/.cli-m365-tokens.json'}
 
-[bash_linux]
-bashrc = {this = '~/.inputrc', to_this = '~/dotfiles/shells/bash/.inputrc'}
+# [bash_linux]
+# bashrc = {this = '~/.inputrc', to_this = '~/dotfiles/shells/bash/.inputrc'}
+
 [remmina]
 data = {this = '~/.var/app/org.remmina.Remmina/data/remmina', to_this = '~/dotfiles/creds/RDP/remmina/data/remmina'}
 

machineconfig/scripts/python/croshell.py

@@ -149,7 +149,7 @@ from pathlib import Path
             else:
                 console.print(Panel("❌ Could not determine the local machineconfig repo root. Please ensure the `REPO_ROOT` in `source_of_truth.py` is correctly set to the local path of the machineconfig repo, or do not use the `--local` flag.", title="Error", border_style="red"))
                 return
-        else: ve_line = """--with "machineconfig[plot]>=5.74" """
+        else: ve_line = """--with "machineconfig[plot]>=5.84" """
         fire_line = f"uv run --python 3.14 {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 
     from machineconfig.utils.code import run_shell_script

machineconfig/scripts/python/devops_helpers/cli_config.py

@@ -42,7 +42,7 @@ def path():
     from pathlib import Path
     path = Path(navigator.__file__).resolve().parent.joinpath("path_manager_tui.py")
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(f"""uv run --with "machineconfig>=5.74,textual" {path}""")
+    run_shell_script(f"""uv run --with "machineconfig>=5.84,textual" {path}""")
 
 def pwsh_theme():
     """🔗 Select powershell prompt theme."""
@@ -51,7 +51,7 @@ def pwsh_theme():
     import subprocess
     subprocess.run(["pwsh", "-File", str(file)])
 
-def copy_assets(which: Literal["scripts", "settings", "both"] = typer.Option(..., "--which", "-w", help="Which assets to copy")):
+def copy_assets(which: Literal["scripts", "settings", "both"] = typer.Argument(..., help="Which assets to copy")):
     """🔗 Copy asset files from library to machine."""
     import machineconfig.profile.create_helper as create_helper
     match which:
@@ -64,18 +64,18 @@ def copy_assets(which: Literal["scripts", "settings", "both"] = typer.Option(...
 
 def get_app():
     config_apps = typer.Typer(help="⚙️ [c] configuration subcommands", no_args_is_help=True)
-    config_apps.command("private", no_args_is_help=True, help="🔗  [p] Manage private configuration files.")(private)
-    config_apps.command("p", no_args_is_help=True, help="Manage private configuration files.", hidden=True)(private)
-    config_apps.command("public", no_args_is_help=True, help="🔗  [u] Manage public configuration files.")(public)
-    config_apps.command("u", no_args_is_help=True, help="Manage public configuration files.", hidden=True)(public)
+    config_apps.command("private", no_args_is_help=True, help="🔗  [v] Manage private configuration files.")(private)
+    config_apps.command("v", no_args_is_help=True, hidden=True)(private)
+    config_apps.command("public", no_args_is_help=True, help="🔗  [b] Manage public configuration files.")(public)
+    config_apps.command("b", no_args_is_help=True, help="Manage public configuration files.", hidden=True)(public)
     config_apps.command("dotfile", no_args_is_help=True, help="🔗  [d] Manage dotfiles.")(dotfile)
-    config_apps.command("d", no_args_is_help=True, help="Manage dotfiles.", hidden=True)(dotfile)
+    config_apps.command("d", no_args_is_help=True,  hidden=True)(dotfile)
     config_apps.command("shell", no_args_is_help=False, help="🔗  [s] Configure your shell profile.")(shell)
     config_apps.command("s", no_args_is_help=False, help="Configure your shell profile.", hidden=True)(shell)
-    config_apps.command("path", no_args_is_help=False, help="📚  [a] NAVIGATE PATH variable with TUI")(path)
-    config_apps.command("a", no_args_is_help=False, help="NAVIGATE PATH variable with TUI", hidden=True)(path)
+    config_apps.command("path", no_args_is_help=False, help="📚  [p] NAVIGATE PATH variable with TUI")(path)
+    config_apps.command("p", no_args_is_help=False, help="NAVIGATE PATH variable with TUI", hidden=True)(path)
     config_apps.command("pwsh-theme", no_args_is_help=False, help="🔗  [t] Select powershell prompt theme.")(pwsh_theme)
     config_apps.command("t", no_args_is_help=True, help="Select powershell prompt theme.", hidden=True)(pwsh_theme)
-    config_apps.command("copy-assets", no_args_is_help=True, help="🔗  [c] Copy asset files from library to machine.")
+    config_apps.command("copy-assets", no_args_is_help=True, help="🔗  [c] Copy asset files from library to machine.", hidden=False)(copy_assets)
     config_apps.command("c", no_args_is_help=True, help="Copy asset files from library to machine.", hidden=True)(copy_assets)
     return config_apps

machineconfig/scripts/python/devops_helpers/cli_repos.py

@@ -166,7 +166,7 @@ def get_app():
     repos_apps.command(name="P", help="Pull changes across repositories", hidden=True)(pull)
     repos_apps.command(name="commit", help="💾  [c] Commit changes across repositories")(commit)
     repos_apps.command(name="c", help="Commit changes across repositories", hidden=True)(commit)
-    repos_apps.command(name="sync", help="🔄  [s] Pull, commit, and push changes across repositories")(sync)
+    repos_apps.command(name="sync", help="🔄  [y] Pull, commit, and push changes across repositories")(sync)
     repos_apps.command(name="s", help="Pull, commit, and push changes across repositories", hidden=True)(sync)
     repos_apps.command(name="analyze", help="📊  [a] Analyze repository development over time")(analyze)
     repos_apps.command(name="a", help="Analyze repository development over time", hidden=True)(analyze)

machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -5,7 +5,18 @@ from typing import Optional
 
 def update():
     """🔄 UPDATE uv and machineconfig"""
-    code = """
+    # from machineconfig.utils.source_of_truth import LIBRARY_ROOT
+    # repo_root = LIBRARY_ROOT.parent.parent
+    from pathlib import Path
+    if Path.home().joinpath("code", "machineconfig").exists():
+        code = """
+    uv self update
+    cd ~/code/machineconfig
+    git pull
+    uv tool install --upgrade --editable $HOME/code/machineconfig
+    """
+    else:
+        code = """
     uv self update
     uv tool install --upgrade machineconfig
     """
@@ -30,9 +41,9 @@ def install():
     # main_public_from_parser()
     import platform
     if platform.system() == "Windows":
-        run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.74""")
+        run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.84""")
     else:
-        run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.74""")
+        run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.84""")
 
 def navigate():
     """📚 NAVIGATE command structure with TUI"""
@@ -40,7 +51,7 @@ def navigate():
     from pathlib import Path
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
-    run_shell_script(f"""uv run --with "machineconfig>=5.74,textual" {path}""")
+    run_shell_script(f"""uv run --with "machineconfig>=5.84,textual" {path}""")
 
 
 def run_python(ip: str = typer.Argument(..., help="Python command to run in the machineconfig environment"),
@@ -85,7 +96,7 @@ def get_app():
     cli_app.command("I", no_args_is_help=False, help="CLONE machienconfig locally and incorporate to shell profile for faster execution and nightly updates.", hidden=True)(install)
     cli_app.command("navigate", no_args_is_help=False, help="📚  [n] NAVIGATE command structure with TUI")(navigate)
     cli_app.command("n", no_args_is_help=False, help="NAVIGATE command structure with TUI", hidden=True)(navigate)
-    cli_app.command("python", no_args_is_help=False, help="🐍  [c] python command/file in the machineconfig environment")(run_python)
+    cli_app.command("python", no_args_is_help=False, help="🐍  [c] python command/file in the machineconfig environment", context_settings={"show_help_on_error": True})(run_python)
     cli_app.command("c", no_args_is_help=False, help="RUN python command/file in the machineconfig environment", hidden=True)(run_python)
     cli_app.command("readme", no_args_is_help=False, help="📚  [r] render readme markdown in terminal.")(readme)
     cli_app.command("r", no_args_is_help=False, hidden=True)(readme)

machineconfig/scripts/python/devops_helpers/devops_update_repos.py

@@ -22,7 +22,7 @@ def _process_single_repo(expanded_path: Path, allow_password_prompt: bool) -> tu
     try:
         repo = git.Repo(str(expanded_path), search_parent_directories=True)
         # Update repository and get detailed results
-        result = update_repository(repo, allow_password_prompt=allow_password_prompt, auto_sync=True)
+        result = update_repository(repo, allow_password_prompt=allow_password_prompt, auto_uv_sync=True)
         
         # Keep track of repos with dependency changes for additional uv sync
         repo_path = None

machineconfig/scripts/python/helpers_fire/template.sh

@@ -11,7 +11,7 @@ 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
-agents create \
+ag create \
   --context-path "$CONTEXT_PATH" \
   --tasks-per-prompt 1 \
   --machine docker \
@@ -27,6 +27,6 @@ agents create \
 # 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
+ses run $LAYOUT_PATH_UNBALANCED
 
 # agents collect $AGENTS_DIR "$REPO_ROOT/.ai/agents/$JOB_NAME/collected.txt"

machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -101,7 +101,7 @@ git pull originEnc master
             return "done"
         from machineconfig.utils.meta import function_to_script
         program_1_py = function_to_script(func=func2, call_with_args=None, call_with_kwargs={"remote_repo": str(repo_remote_root), "local_repo": str(repo_local_root), "cloud": cloud_resolved})
-        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=None, executable="""uv run --with "machineconfig>=5.74" """)
+        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=None, executable="""uv run --with "machineconfig>=5.84" """)
         # ================================================================================
         option2 = "Delete local repo and replace it with remote copy:"
         program_2 = f"""
@@ -122,7 +122,7 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
             inspect_repos(repo_local_root=repo_local_root, repo_remote_root=repo_remote_root)
             return "done"
         program_3_py = function_to_script(func=func, call_with_args=None, call_with_kwargs={"repo_local_root": str(repo_local_root), "repo_remote_root": str(repo_remote_root)})
-        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable="""uv run --with "machineconfig>=5.74" """)
+        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable="""uv run --with "machineconfig>=5.84" """)
         # ================================================================================
 
         option4 = "Remove problematic rclone file from repo and replace with remote:"

machineconfig/scripts/python/helpers_repos/secure_repo.py

@@ -1,12 +1,12 @@
 
 import typer
 from typing import Optional, Literal
-
+from pathlib import Path
 
 
 def main(
     cloud: Optional[str] = typer.Option(None, "--cloud", "-c", help="Cloud storage profile name. If not provided, uses default from config."),
-    repo: Optional[str] = typer.Option(None, "--repo", "-r", help="Path to the local repository. Defaults to current working directory."),
+    repo: Optional[str] = typer.Option(Path.cwd().as_posix(), "--repo", "-r", help="Path to the local repository. Defaults to cwd."),
     message: Optional[str] = typer.Option(None, "--message", "-m", help="Commit message for local changes."),
     on_conflict: Literal["ask", "push-local-merge", "overwrite-local", "stop-on-conflict", "remove-rclone-conflict"] = typer.Option("ask", "--on-conflict", "-oc", help="Action to take on merge conflict. Default is 'ask'."),
     pwd: Optional[str] = typer.Option(None, "--password", help="Password for encryption/decryption of the remote repository."),

machineconfig/scripts/python/interactive.py

@@ -130,9 +130,9 @@ def execute_installations(selected_options: list[str]) -> None:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.74""")
+            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install machineconfig>=5.84""")
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.74""")
+            run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.84""")
     if "install_ssh_server" in selected_options:
         console.print(Panel("🔒 [bold red]SSH SERVER[/bold red]\n[italic]Remote access setup[/italic]", border_style="red"))
         import platform

machineconfig/scripts/python/nw/mount_nfs

@@ -5,7 +5,7 @@
 # mkdir ~/data/local
 # sudo mount -o nolock,noatime,nodiratime,proto=tcp,timeo=600,retrans=2,noac alex-p51s-5:/home/alex/data/local ./data/local
 
-uv run --python 3.14 --with "machineconfig>=5.74" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=5.84" python -m machineconfig.scripts.python.mount_nfs
 # Check if remote server is reachable and share folder exists
 if ! ping -c 1 "$remote_server" &> /dev/null; then
   echo "💥 Error: Remote server $remote_server is not reachable."

machineconfig/scripts/python/repos_helpers/action.py

@@ -154,7 +154,7 @@ def git_action(path: PathExtended, action: GitAction, mess: Optional[str] = None
         elif action == GitAction.pull:
             # Use the enhanced update function with uv sync support
             try:
-                update_repository(repo, auto_sync=auto_sync, allow_password_prompt=False)
+                update_repository(repo, auto_uv_sync=auto_sync, allow_password_prompt=False)
                 print("✅ Pull completed")
                 return GitOperationResult(
                     repo_path=path,
@@ -310,7 +310,7 @@ def print_git_operations_summary(summary: GitOperationSummary, operations_perfor
             console.print(f"\n[bold green]⚖️ SUMMARY: {total_operations}/{total_operations} operations succeeded (100% success rate)[/bold green]")
 
 
-def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, push: bool, recursive: bool, auto_sync: bool) -> None:
+def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, push: bool, recursive: bool, auto_uv_sync: bool) -> None:
     """Perform git operations on all repositories and provide detailed summary."""
     print(f"\n🔄 Performing Git actions on repositories @ `{repos_root}`...")
     summary = GitOperationSummary()
@@ -341,7 +341,7 @@ def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, p
                 
             # Now perform the actual operations
             if pull:
-                result = git_action(path=a_path, action=GitAction.pull, r=recursive, auto_sync=auto_sync)
+                result = git_action(path=a_path, action=GitAction.pull, r=recursive, auto_sync=auto_uv_sync)
                 summary.pulls_attempted += 1
                 if result.success:
                     summary.pulls_successful += 1
@@ -350,7 +350,7 @@ def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, p
                     summary.failed_operations.append(result)
                     
             if commit:
-                result = git_action(a_path, action=GitAction.commit, r=recursive, auto_sync=auto_sync)
+                result = git_action(a_path, action=GitAction.commit, r=recursive, auto_sync=auto_uv_sync)
                 summary.commits_attempted += 1
                 if result.success:
                     if result.had_changes:
@@ -362,7 +362,7 @@ def perform_git_operations(repos_root: PathExtended, pull: bool, commit: bool, p
                     summary.failed_operations.append(result)
                     
             if push:
-                result = git_action(a_path, action=GitAction.push, r=recursive, auto_sync=auto_sync)
+                result = git_action(a_path, action=GitAction.push, r=recursive, auto_sync=auto_uv_sync)
                 summary.pushes_attempted += 1
                 if result.success:
                     summary.pushes_successful += 1

machineconfig/scripts/python/repos_helpers/count_lines_frontend.py

@@ -7,7 +7,7 @@ def analyze_repo_development(repo_path: str = typer.Argument(..., help="Path to
     from pathlib import Path
     count_lines_path = Path(count_lines.__file__)
     # --project $HOME/code/ machineconfig --group plot
-    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=5.74" {count_lines_path} analyze-over-time {repo_path}"""
+    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=5.84" {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)
 

machineconfig/scripts/python/repos_helpers/entrypoint.py

@@ -24,7 +24,7 @@ def git_operations(
 ) -> None:
     
     repos_root = resolve_directory(directory)
-    auto_sync = not no_sync
+    auto_uv_sync = not no_sync
     from machineconfig.scripts.python.repos_helpers.action import perform_git_operations
     from machineconfig.utils.path_extended import PathExtended
     perform_git_operations(
@@ -33,7 +33,7 @@ def git_operations(
         commit=commit,
         push=push,
         recursive=recursive,
-        auto_sync=auto_sync,
+        auto_uv_sync=auto_uv_sync,
     )
 def resolve_spec_path(directory: Optional[str], cloud: Optional[str]) -> Path:
     repos_root = resolve_directory(directory)

machineconfig/scripts/python/repos_helpers/update.py

@@ -65,7 +65,7 @@ def get_file_hash(file_path: Path) -> str | None:
     return hashlib.sha256(file_path.read_bytes()).hexdigest()
 
 
-def update_repository(repo: git.Repo, auto_sync: bool, allow_password_prompt: bool) -> RepositoryUpdateResult:
+def update_repository(repo: git.Repo, auto_uv_sync: bool, allow_password_prompt: bool) -> RepositoryUpdateResult:
     """Update a single repository and return detailed information about what happened."""
     repo_path = Path(repo.working_dir)
     print(f"🔄 {'Updating ' + str(repo_path):.^80}")
@@ -253,7 +253,7 @@ def update_repository(repo: git.Repo, auto_sync: bool, allow_password_prompt: bo
                 print(f"✅ Set permissions for {lf_exe_path}")
 
         # Run uv sync if dependencies changed and auto_sync is enabled
-        if result["dependencies_changed"] and auto_sync:
+        if result["dependencies_changed"] and auto_uv_sync:
             result["uv_sync_ran"] = True
             result["uv_sync_success"] = run_uv_sync(repo_path)
 

machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=5.74" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=5.84" python -m machineconfig.scripts.python.mount_ssh
 
 net use T: \\sshfs.kr\$user@$host.local
 # this worked: net use T: \\sshfs\alex@alex-p51s-5.local