machineconfig 6.45__tar.gz → 6.48__tar.gz

{machineconfig-6.45/src/machineconfig.egg-info → machineconfig-6.48}/PKG-INFO

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

{machineconfig-6.45 → machineconfig-6.48}/pyproject.toml

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

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/scripts/python/cloud.py

@@ -1,8 +1,8 @@
 
 import typer
-from machineconfig.scripts.python.cloud_helpers.cloud_sync import main as sync_main
-from machineconfig.scripts.python.cloud_helpers.cloud_copy import main as copy_main
-from machineconfig.scripts.python.cloud_helpers.cloud_mount import mount as mount_main
+from machineconfig.scripts.python.helpers_cloud.cloud_sync import main as sync_main
+from machineconfig.scripts.python.helpers_cloud.cloud_copy import main as copy_main
+from machineconfig.scripts.python.helpers_cloud.cloud_mount import mount as mount_main
 
 def get_app():
     app = typer.Typer(add_completion=False, no_args_is_help=True)

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/scripts/python/croshell.py

@@ -5,8 +5,8 @@ croshell
 """
 
 from typing import Annotated, Optional
-from machineconfig.scripts.python.croshell_helpers.crosh import add_print_header_pycode
-from machineconfig.scripts.python.croshell_helpers.crosh import get_read_data_pycode
+from machineconfig.scripts.python.helpers_croshell.crosh import add_print_header_pycode
+from machineconfig.scripts.python.helpers_croshell.crosh import get_read_data_pycode
 import typer
 from machineconfig.utils.path_extended import PathExtended
 from pathlib import Path
@@ -121,20 +121,22 @@ from pathlib import Path
         fire_line = f"uv run --with visidata,pyarrow vd {str(file_obj)}"
     elif marimo:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" """
-        else: requirements = """--with "marimo,machineconfig[plot]>=6.45" """
+        else: requirements = """--with "marimo,machineconfig[plot]>=6.48" """
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv run --with "marimo" marimo convert {pyfile.name} -o marimo_nb.py
 uv run  {requirements} marimo edit --host 0.0.0.0 marimo_nb.py
 """
     elif jupyter:
-        fire_line = f"uv run --with 'machineconfig[plot]>=6.45' jupyter-lab {str(nb_target)}"
+        if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" """
+        else: requirements = """--with "machineconfig[plot]>=6.48" """
+        fire_line = f"uv run {requirements} jupyter-lab {str(nb_target)}"
     elif vscode:
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv init --python 3.14
 uv venv
-uv add "machineconfig[plot]>=6.45"
+uv add "machineconfig[plot]>=6.48"
 # code serve-web
 code --new-window {str(pyfile)}
 """
@@ -149,7 +151,7 @@ code --new-window {str(pyfile)}
             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]>=6.45" """
+        else: ve_line = """--with "machineconfig[plot]>=6.48" """
         # ve_path_maybe, ipython_profile_maybe = get_ve_path_and_ipython_profile(Path.cwd())
         # --python 3.14
         fire_line = f"uv run {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/scripts/python/devops.py

@@ -3,12 +3,12 @@
 import typer
 from typing import Optional, Annotated
 
-import machineconfig.scripts.python.devops_helpers.cli_repos as cli_repos
-import machineconfig.scripts.python.devops_helpers.cli_config as cli_config
-import machineconfig.scripts.python.devops_helpers.cli_self as cli_self
-import machineconfig.scripts.python.devops_helpers.cli_data as cli_data
-import machineconfig.scripts.python.devops_helpers.cli_nw as cli_network
-from machineconfig.scripts.python.devops_helpers.cli_utils import get_app as get_app_utils
+import machineconfig.scripts.python.helpers_devops.cli_repos as cli_repos
+import machineconfig.scripts.python.helpers_devops.cli_config as cli_config
+import machineconfig.scripts.python.helpers_devops.cli_self as cli_self
+import machineconfig.scripts.python.helpers_devops.cli_data as cli_data
+import machineconfig.scripts.python.helpers_devops.cli_nw as cli_network
+from machineconfig.scripts.python.helpers_devops.cli_utils import get_app as get_app_utils
 
 
 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,

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/scripts/python/devops_navigator.py

@@ -2,7 +2,7 @@
 TUI for navigating through machineconfig command structure using Textual.
 """
 
-from machineconfig.scripts.python.helper_navigator import CommandNavigatorApp
+from machineconfig.scripts.python.helpers_navigator import CommandNavigatorApp
 
 
 if __name__ == "__main__":

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

@@ -2,7 +2,7 @@
 # /// script
 # requires-python = ">=3.13"
 # dependencies = [
-#     "machineconfig>=6.45",
+#     "machineconfig>=6.48",
 #     "textual",
 #     "pyperclip",
 # ]

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/scripts/python/ftpx.py

@@ -12,7 +12,7 @@ from rich.panel import Panel
 
 from machineconfig.utils.ssh import SSH
 from machineconfig.utils.path_extended import PathExtended
-from machineconfig.scripts.python.cloud_helpers.helpers2 import ES
+from machineconfig.scripts.python.helpers_cloud.helpers2 import ES
 from machineconfig.utils.accessories import pprint
 
 

{machineconfig-6.45/src/machineconfig/scripts/python/cloud_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_cloud}/cloud_copy.py

@@ -10,8 +10,8 @@ from typing import Optional, Annotated
 
 import typer
 
-from machineconfig.scripts.python.cloud_helpers.helpers2 import parse_cloud_source_target
-from machineconfig.scripts.python.cloud_helpers.cloud_helpers import ArgsDefaults, Args
+from machineconfig.scripts.python.helpers_cloud.helpers2 import parse_cloud_source_target
+from machineconfig.scripts.python.helpers_cloud.cloud_helpers import ArgsDefaults, Args
 from rich.console import Console
 from rich.panel import Panel
 from rich.progress import Progress

{machineconfig-6.45/src/machineconfig/scripts/python/cloud_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_cloud}/cloud_sync.py

@@ -2,9 +2,9 @@
 TODO: use typer or typed-argument-parser to parse args
 """
 
-from machineconfig.scripts.python.cloud_helpers.helpers2 import parse_cloud_source_target
-from machineconfig.scripts.python.cloud_helpers.cloud_helpers import Args
-from machineconfig.scripts.python.cloud_helpers.cloud_mount import get_mprocs_mount_txt
+from machineconfig.scripts.python.helpers_cloud.helpers2 import parse_cloud_source_target
+from machineconfig.scripts.python.helpers_cloud.cloud_helpers import Args
+from machineconfig.scripts.python.helpers_cloud.cloud_mount import get_mprocs_mount_txt
 
 from typing import Annotated, Optional
 import typer

{machineconfig-6.45/src/machineconfig/scripts/python/cloud_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_cloud}/helpers2.py

@@ -1,4 +1,4 @@
-from machineconfig.scripts.python.cloud_helpers.cloud_helpers import Args, ArgsDefaults, absolute, find_cloud_config, get_secure_share_cloud_config
+from machineconfig.scripts.python.helpers_cloud.cloud_helpers import Args, ArgsDefaults, absolute, find_cloud_config, get_secure_share_cloud_config
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.source_of_truth import DEFAULTS_PATH
 from machineconfig.utils.accessories import pprint

{machineconfig-6.45/src/machineconfig/scripts/python/devops_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_devops}/cli_config.py

@@ -27,7 +27,7 @@ def dotfile(file: Annotated[str, typer.Argument(help="file/folder path.")],
     dest: Annotated[str, typer.Option("--dest", "-d", help="destination folder")] = "",
     ):
     """🔗 Manage dotfiles."""
-    import machineconfig.scripts.python.devops_helpers.cli_config_dotfile as dotfile_module
+    import machineconfig.scripts.python.helpers_devops.cli_config_dotfile as dotfile_module
     dotfile_module.main(file=file, overwrite=overwrite, dest=dest)
 
 
@@ -42,14 +42,14 @@ 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
-    if not Path.home().joinpath("code/machineconfig").exists(): executable = """--with "machineconfig>=6.45,textual" """
+    if not Path.home().joinpath("code/machineconfig").exists(): executable = """--with "machineconfig>=6.48,textual" """
     else: executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
     run_shell_script(f"""uv run {executable} {path}""")
 
 
 def pwsh_theme():
     """🔗 Select powershell prompt theme."""
-    import machineconfig.scripts.python.devops_helpers.themes as themes
+    import machineconfig.scripts.python.helpers_devops.themes as themes
     file = Path(themes.__file__).parent / "choose_pwsh_theme.ps1"
     import subprocess
     subprocess.run(["pwsh", "-File", str(file)])

{machineconfig-6.45/src/machineconfig/scripts/python/devops_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_devops}/cli_data.py

@@ -5,14 +5,14 @@ from typing import Annotated, Optional
 def backup(cloud: Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁️  Cloud configuration name (rclone config name)")] = None,
            which: Annotated[Optional[str], typer.Option("--which", "-w", help="📝 Comma-separated list of items to BACKUP (from backup.toml), or 'all' for all items")] = None):
     """💾 BACKUP"""
-    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
+    from machineconfig.scripts.python.helpers_devops.devops_backup_retrieve import main_backup_retrieve
     main_backup_retrieve(direction="BACKUP", which=which, cloud=cloud)
 
 
 def retrieve(cloud: Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁️  Cloud configuration name (rclone config name)")] = None,
              which: Annotated[Optional[str], typer.Option("--which", "-w", help="📝 Comma-separated list of items to RETRIEVE (from backup.toml), or 'all' for all items")] = None):
     """📥 RETRIEVE"""
-    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
+    from machineconfig.scripts.python.helpers_devops.devops_backup_retrieve import main_backup_retrieve
     main_backup_retrieve(direction="RETRIEVE", which=which, cloud=cloud)
 
 

{machineconfig-6.45/src/machineconfig/scripts/python/devops_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_devops}/cli_nw.py

@@ -1,6 +1,6 @@
 
-import machineconfig.scripts.python.devops_helpers.cli_terminal as cli_terminal
-import machineconfig.scripts.python.devops_helpers.cli_share_server as cli_share_server
+import machineconfig.scripts.python.helpers_devops.cli_terminal as cli_terminal
+import machineconfig.scripts.python.helpers_devops.cli_share_server as cli_share_server
 import typer
 from typing import Optional, Annotated
 

{machineconfig-6.45/src/machineconfig/scripts/python/devops_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_devops}/cli_repos.py

@@ -19,34 +19,34 @@ CloudOption = Annotated[Optional[str], typer.Option("--cloud", "-c", help="☁
 
 def push(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_uv_sync: NO_UVsyncOption = False) -> None:
     """🚀 Push changes across repositories."""
-    from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
+    from machineconfig.scripts.python.helpers_repos.entrypoint import git_operations
     git_operations(directory, pull=False, commit=False, push=True, recursive=recursive, auto_uv_sync=not no_uv_sync)
 
 
 def pull(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_uv_sync: NO_UVsyncOption = False) -> None:
     """⬇️ Pull changes across repositories."""
-    from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
+    from machineconfig.scripts.python.helpers_repos.entrypoint import git_operations
 
     git_operations(directory, pull=True, commit=False, push=False, recursive=recursive, auto_uv_sync=not no_uv_sync)
 
 
 def commit(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_uv_sync: NO_UVsyncOption = False) -> None:
     """💾 Commit changes across repositories."""
-    from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
+    from machineconfig.scripts.python.helpers_repos.entrypoint import git_operations
     git_operations(directory, pull=False, commit=True, push=False, recursive=recursive, auto_uv_sync=not no_uv_sync)
 
 
 def sync(directory: DirectoryArgument = None, recursive: RecursiveOption = False, no_uv_sync: NO_UVsyncOption = False) -> None:
     """🔄 Pull, commit, and push changes across repositories."""
-    from machineconfig.scripts.python.repos_helpers.entrypoint import git_operations
+    from machineconfig.scripts.python.helpers_repos.entrypoint import git_operations
     git_operations(directory, pull=True, commit=True, push=True, recursive=recursive, auto_uv_sync=not no_uv_sync)
 
 
 def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """📝 Record repositories into a repos.json specification."""
-    from machineconfig.scripts.python.repos_helpers.entrypoint import resolve_directory
+    from machineconfig.scripts.python.helpers_repos.entrypoint import resolve_directory
     repos_root = resolve_directory(directory)
-    from machineconfig.scripts.python.repos_helpers.record import main_record as record_repos
+    from machineconfig.scripts.python.helpers_repos.record import main_record as record_repos
     save_path = record_repos(repos_root=repos_root)
     from machineconfig.utils.path_extended import PathExtended
     if cloud is not None:
@@ -55,26 +55,26 @@ def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> N
 
 def clone(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """📥 Clone repositories described by a repos.json specification."""
-    from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs
+    from machineconfig.scripts.python.helpers_repos.entrypoint import clone_from_specs
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=False)
 
 
 def checkout_command(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """🔀 Check out specific commits listed in the specification."""
-    from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs    
+    from machineconfig.scripts.python.helpers_repos.entrypoint import clone_from_specs    
     clone_from_specs(directory, cloud, checkout_branch_flag=False, checkout_commit_flag=True)
 
 
 def checkout_to_branch_command(directory: DirectoryArgument = None, cloud: CloudOption = None) -> None:
     """🔀 Check out to the main branch defined in the specification."""
-    from machineconfig.scripts.python.repos_helpers.entrypoint import clone_from_specs
+    from machineconfig.scripts.python.helpers_repos.entrypoint import clone_from_specs
     clone_from_specs(directory, cloud, checkout_branch_flag=True, checkout_commit_flag=False)
 
 
 def analyze(directory: DirectoryArgument = None) -> None:
     """📊 Analyze repository development over time."""
     repo_path = directory if directory is not None else "."
-    from machineconfig.scripts.python.repos_helpers.count_lines_frontend import analyze_repo_development
+    from machineconfig.scripts.python.helpers_repos.count_lines_frontend import analyze_repo_development
     analyze_repo_development(repo_path=repo_path)
 
 

{machineconfig-6.45/src/machineconfig/scripts/python/devops_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_devops}/cli_self.py

@@ -40,9 +40,9 @@ def install(no_copy_assets: Annotated[bool, typer.Option("--no-assets-copy", "-n
     else:
         import platform
         if platform.system() == "Windows":
-            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install --upgrade "machineconfig>=6.45" """)
+            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install --upgrade "machineconfig>=6.48" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.45" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.48" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -56,7 +56,7 @@ def interactive():
 
 def status():
     """📊 STATUS of machine, shell profile, apps, symlinks, dotfiles, etc."""
-    import machineconfig.scripts.python.devops_helpers.devops_status as helper
+    import machineconfig.scripts.python.helpers_devops.devops_status as helper
     helper.main()
 
 
@@ -67,7 +67,7 @@ def navigate():
     path = Path(navigator.__file__).resolve().parent.joinpath("devops_navigator.py")
     from machineconfig.utils.code import run_shell_script
     if Path.home().joinpath("code/machineconfig").exists(): executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
-    else: executable = """--with "machineconfig>=6.45,textual" """
+    else: executable = """--with "machineconfig>=6.48,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.45/src/machineconfig/scripts/python/devops_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_devops}/devops_backup_retrieve.py

@@ -6,7 +6,7 @@ from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.source_of_truth import LIBRARY_ROOT, DEFAULTS_PATH
 from machineconfig.utils.code import print_code
 from machineconfig.utils.options import choose_cloud_interactively, choose_from_options
-from machineconfig.scripts.python.cloud_helpers.helpers2 import ES
+from machineconfig.scripts.python.helpers_cloud.helpers2 import ES
 from platform import system
 from typing import Any, Literal, Optional
 from rich.console import Console

{machineconfig-6.45/src/machineconfig/scripts/python/devops_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_devops}/devops_update_repos.py

@@ -9,7 +9,7 @@ from rich.panel import Panel
 from rich.table import Table
 from rich.text import Text
 
-from machineconfig.scripts.python.repos_helpers.update import RepositoryUpdateResult, run_uv_sync, update_repository
+from machineconfig.scripts.python.helpers_repos.update import RepositoryUpdateResult, run_uv_sync, update_repository
 from machineconfig.utils.io import read_ini
 from machineconfig.utils.source_of_truth import DEFAULTS_PATH
 

machineconfig-6.48/src/machineconfig/scripts/python/helpers_navigator/__init__.py

@@ -0,0 +1,20 @@
+"""
+Helper modules for the devops navigator TUI application.
+"""
+
+from machineconfig.scripts.python.helpers_navigator.data_models import CommandInfo, ArgumentInfo
+from machineconfig.scripts.python.helpers_navigator.command_builder import CommandBuilderScreen
+from machineconfig.scripts.python.helpers_navigator.command_tree import CommandTree
+from machineconfig.scripts.python.helpers_navigator.command_detail import CommandDetail
+from machineconfig.scripts.python.helpers_navigator.search_bar import SearchBar
+from machineconfig.scripts.python.helpers_navigator.main_app import CommandNavigatorApp
+
+__all__ = [
+    "CommandInfo",
+    "ArgumentInfo",
+    "CommandBuilderScreen",
+    "CommandTree",
+    "CommandDetail",
+    "SearchBar",
+    "CommandNavigatorApp",
+]

{machineconfig-6.45/src/machineconfig/scripts/python/helper_navigator → machineconfig-6.48/src/machineconfig/scripts/python/helpers_navigator}/command_builder.py

@@ -7,7 +7,7 @@ from textual.app import ComposeResult
 from textual.containers import Horizontal, VerticalScroll
 from textual.widgets import Static, Input, Label, Button
 from textual.screen import ModalScreen
-from machineconfig.scripts.python.helper_navigator.data_models import CommandInfo, ArgumentInfo
+from machineconfig.scripts.python.helpers_navigator.data_models import CommandInfo, ArgumentInfo
 
 
 class CommandBuilderScreen(ModalScreen[str]):

{machineconfig-6.45/src/machineconfig/scripts/python/helper_navigator → machineconfig-6.48/src/machineconfig/scripts/python/helpers_navigator}/command_detail.py

@@ -6,7 +6,7 @@ from typing import Optional
 from textual.widgets import Static
 from rich.panel import Panel
 from rich.text import Text
-from machineconfig.scripts.python.helper_navigator.data_models import CommandInfo
+from machineconfig.scripts.python.helpers_navigator.data_models import CommandInfo
 
 
 class CommandDetail(Static):

{machineconfig-6.45/src/machineconfig/scripts/python/helper_navigator → machineconfig-6.48/src/machineconfig/scripts/python/helpers_navigator}/command_tree.py

@@ -3,7 +3,7 @@ Command tree widget for displaying command hierarchy.
 """
 
 from textual.widgets import Tree
-from machineconfig.scripts.python.helper_navigator.data_models import CommandInfo
+from machineconfig.scripts.python.helpers_navigator.data_models import CommandInfo
 
 
 class CommandTree(Tree[CommandInfo]):

{machineconfig-6.45/src/machineconfig/scripts/python/helper_navigator → machineconfig-6.48/src/machineconfig/scripts/python/helpers_navigator}/main_app.py

@@ -6,11 +6,11 @@ import subprocess
 from textual.app import App, ComposeResult
 from textual.widgets import Header, Footer, Input, Tree
 from textual.binding import Binding
-from machineconfig.scripts.python.helper_navigator.command_builder import CommandBuilderScreen
-from machineconfig.scripts.python.helper_navigator.command_tree import CommandTree
-from machineconfig.scripts.python.helper_navigator.command_detail import CommandDetail
-from machineconfig.scripts.python.helper_navigator.search_bar import SearchBar
-from machineconfig.scripts.python.helper_navigator.data_models import CommandInfo
+from machineconfig.scripts.python.helpers_navigator.command_builder import CommandBuilderScreen
+from machineconfig.scripts.python.helpers_navigator.command_tree import CommandTree
+from machineconfig.scripts.python.helpers_navigator.command_detail import CommandDetail
+from machineconfig.scripts.python.helpers_navigator.search_bar import SearchBar
+from machineconfig.scripts.python.helpers_navigator.data_models import CommandInfo
 
 
 class CommandNavigatorApp(App[None]):

{machineconfig-6.45/src/machineconfig/scripts/python/repos_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_repos}/action.py

@@ -1,6 +1,6 @@
 from machineconfig.utils.path_extended import PathExtended
 from machineconfig.utils.accessories import randstr
-from machineconfig.scripts.python.repos_helpers.update import update_repository
+from machineconfig.scripts.python.helpers_repos.update import update_repository
 
 from typing import Optional
 from dataclasses import dataclass

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -77,7 +77,7 @@ git pull originEnc master
 """
 
     if Path.home().joinpath("code/machineconfig").exists(): executable = f"""uv run --project "{str(Path.home().joinpath("code/machineconfig"))}" """
-    else: executable = """uv run --with "machineconfig>=6.45" """
+    else: executable = """uv run --with "machineconfig>=6.48" """
 
     shell_path = write_shell_script_to_file(shell_script=script)
     command = f". {shell_path}"
@@ -101,7 +101,7 @@ git pull originEnc master
         # ================================================================================
         option1 = "Delete remote copy and push local:"
         def func2(remote_repo: str, local_repo: str, cloud: str):
-            from machineconfig.scripts.python.repos_helpers.sync import delete_remote_repo_copy_and_push_local
+            from machineconfig.scripts.python.helpers_repos.sync import delete_remote_repo_copy_and_push_local
             delete_remote_repo_copy_and_push_local(remote_repo=remote_repo, local_repo=local_repo, cloud=cloud)
             return "done"
         from machineconfig.utils.meta import function_to_script
@@ -125,7 +125,7 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
         # ================================================================================
         option3 = "Inspect repos:"
         def func(repo_local_root: str, repo_remote_root: str):
-            from machineconfig.scripts.python.repos_helpers.sync import inspect_repos
+            from machineconfig.scripts.python.helpers_repos.sync import inspect_repos
             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)})

{machineconfig-6.45/src/machineconfig/scripts/python/repos_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_repos}/count_lines_frontend.py

@@ -4,11 +4,11 @@ from typing import Annotated
 
 
 def analyze_repo_development(repo_path: Annotated[str, typer.Argument(..., help="Path to the git repository")]):
-    from machineconfig.scripts.python.repos_helpers import count_lines
+    from machineconfig.scripts.python.helpers_repos import count_lines
     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]>=6.45" {count_lines_path} analyze-over-time {repo_path}"""
+    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=6.48" {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)
 

{machineconfig-6.45/src/machineconfig/scripts/python/repos_helpers → machineconfig-6.48/src/machineconfig/scripts/python/helpers_repos}/entrypoint.py

@@ -24,7 +24,7 @@ def git_operations(
 ) -> None:
     
     repos_root = resolve_directory(directory)
-    from machineconfig.scripts.python.repos_helpers.action import perform_git_operations
+    from machineconfig.scripts.python.helpers_repos.action import perform_git_operations
     from machineconfig.utils.path_extended import PathExtended
     perform_git_operations(
         repos_root=PathExtended(repos_root),
@@ -67,7 +67,7 @@ def clone_from_specs(
     
     typer.echo("\n📥 Cloning or checking out repositories...")
     spec_path = resolve_spec_path(directory, cloud)
-    from machineconfig.scripts.python.repos_helpers.clone import clone_repos
+    from machineconfig.scripts.python.helpers_repos.clone import clone_repos
     clone_repos(
         spec_path=spec_path,
         preferred_remote=None,

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/scripts/python/interactive.py

@@ -128,7 +128,7 @@ def execute_installations(selected_options: list[str]) -> None:
 
     if "install_machineconfig" in selected_options:
         console.print(Panel("🐍 [bold green]PYTHON ENVIRONMENT[/bold green]\n[italic]Virtual environment setup[/italic]", border_style="green"))
-        from machineconfig.scripts.python.devops_helpers.cli_self import install
+        from machineconfig.scripts.python.helpers_devops.cli_self import install
         install()
 
     if "install_ssh_server" in selected_options:
@@ -155,14 +155,14 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
 
     if "retrieve_repositories" in selected_options:
         console.print(Panel("📚 [bold bright_magenta]REPOSITORIES[/bold bright_magenta]\n[italic]Project code retrieval[/italic]", border_style="bright_magenta"))
-        from machineconfig.scripts.python.devops_helpers import cli_repos
+        from machineconfig.scripts.python.helpers_devops import cli_repos
         cli_repos.clone(directory=str(Path.home() / "code"), cloud="odg1")
 
     if "retrieve_data" in selected_options:
         console.print(Panel("💾 [bold bright_cyan]DATA RETRIEVAL[/bold bright_cyan]\n[italic]Backup restoration[/italic]", border_style="bright_cyan"))
         console.print("🔧 Retrieving backup data", style="bold cyan")
         try:
-            from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
+            from machineconfig.scripts.python.helpers_devops.devops_backup_retrieve import main_backup_retrieve
             main_backup_retrieve(direction="RETRIEVE", cloud=None, which=None)
             console.print("✅ Backup data retrieved successfully", style="bold green")
         except Exception as e:

{machineconfig-6.45 → machineconfig-6.48}/src/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>=6.45" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.48" 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-6.45 → machineconfig-6.48}/src/machineconfig/scripts/python/sessions.py

@@ -136,7 +136,7 @@ def kill_process():
 
 def get_app():
     layouts_app = typer.Typer(help="Layouts management subcommands", no_args_is_help=True, add_help_option=False, add_completion=False)
-    from machineconfig.scripts.python.sessions_helpers.sessions_multiprocess import create_from_function
+    from machineconfig.scripts.python.helpers_sessions.sessions_multiprocess import create_from_function
     layouts_app.command("create-from-function", no_args_is_help=True, help="[c] Create a layout from a function")(create_from_function)
     layouts_app.command("c", no_args_is_help=True, help="Create a layout from a function", hidden=True)(create_from_function)
     layouts_app.command("run", no_args_is_help=True, help="[r] Run the selected layout(s)")(run)

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.45" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.48" 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

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/setup_linux/web_shortcuts/interactive.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 . <( curl -sSL "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_linux/uv.sh")
 mcfg() {
-    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.45" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.48" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

{machineconfig-6.45 → machineconfig-6.48}/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -2,7 +2,7 @@
 
 iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
 function mcfg {
-    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.45" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.48" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }