machineconfig 6.23__tar.gz → 6.26__tar.gz

{machineconfig-6.23/src/machineconfig.egg-info → machineconfig-6.26}/PKG-INFO

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

{machineconfig-6.23 → machineconfig-6.26}/pyproject.toml

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

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/cluster/sessions_managers/utils/load_balancer.py

@@ -2,7 +2,7 @@
 from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
 # from machineconfig.utils.accessories import split_list
 from typing import Literal, Protocol
-from machineconfig.cluster.sessions_managers.utils.load_balancer_helper import restrict_num_tabs_helper1, restrict_num_tabs_helper2, restrict_num_tabs_helper3, restrict_num_tabs_helper4
+from machineconfig.cluster.sessions_managers.helpers.load_balancer_helper import restrict_num_tabs_helper1, restrict_num_tabs_helper2, restrict_num_tabs_helper3, restrict_num_tabs_helper4
 
 class COMMAND_SPLITTER(Protocol):
     def __call__(self, command: str, to: int) -> list[str]: ...

machineconfig-6.26/src/machineconfig/cluster/sessions_managers/utils/maker.py

@@ -0,0 +1,48 @@
+
+from types import FunctionType
+from typing import Literal
+from machineconfig.utils.schemas.layouts.layout_types import TabConfig, LayoutConfig
+from pathlib import Path
+
+def get_fire_command_and_artifact_files(func: FunctionType):
+    from machineconfig.utils.meta import function_to_script
+    py_script =  function_to_script(func)
+    from pathlib import Path
+    from machineconfig.utils.accessories import randstr
+    py_script_path = Path.home().joinpath("tmp_results", "tmp_py_scripts", f"tmp_{randstr(10)}.py")
+    py_script_path.parent.mkdir(parents=True, exist_ok=True)
+    py_script_path.write_text(py_script, encoding="utf-8")
+    command_to_run = f"uv run --project $HOME/code/bitsense {py_script_path}"
+    tab_config: TabConfig = {
+        "command": command_to_run,
+        "startDir": "$HOME",
+        "tabName": func.__name__
+    }
+    return tab_config, py_script_path
+def get_fire_command_and_artifact_files_v2(func: FunctionType):
+    command_to_run = f"fire {func.__module__}.{func.__name__}"
+    tab_config: TabConfig = {
+        "command": command_to_run,
+        "startDir": str(Path(func.__module__).parent),
+        "tabName": func.__name__
+    }
+    return tab_config
+
+
+def make_layout_from_functions(functions: list[FunctionType], layout_name: str, method: Literal["script", "fire"]="fire") -> LayoutConfig:
+    tabs2artifacts: dict[TabConfig, list[Path]] = {}
+    for a_func in functions:
+        match method:
+            case "script":
+                tab_config, artifact_files_1 = get_fire_command_and_artifact_files(a_func)
+                artifact_files = [artifact_files_1]
+            case "fire":
+                tab_config = get_fire_command_and_artifact_files_v2(a_func)
+                artifact_files = []
+        tabs2artifacts[tab_config] = artifact_files
+    list_of_tabs = list(tabs2artifacts.keys())
+    layout_config: LayoutConfig = {
+        "layoutName": layout_name,
+        "layoutTabs": list_of_tabs,
+    }
+    return layout_config

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/cluster/sessions_managers/zellij_local.py

@@ -7,8 +7,8 @@ from rich.console import Console
 
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
 from machineconfig.cluster.sessions_managers.zellij_utils.monitoring_types import ComprehensiveStatus, CommandStatus
-from machineconfig.cluster.sessions_managers.helpers.zellij_local_helper import validate_layout_config, create_tab_section, check_command_status, check_zellij_session_status
-from machineconfig.cluster.sessions_managers.helpers.zellij_local_helper_restart import restart_tab_process
+from machineconfig.cluster.sessions_managers.zellij_utils.zellij_local_helper import validate_layout_config, create_tab_section, check_command_status, check_zellij_session_status
+from machineconfig.cluster.sessions_managers.zellij_utils.zellij_local_helper_restart import restart_tab_process
 
 
 logging.basicConfig(level=logging.INFO)
@@ -170,7 +170,7 @@ class ZellijLayoutGenerator:
         return restart_tab_process(tab_name=tab_name, layout_config=self.layout_config, session_name=self.session_name)
 
     def run(self):
-        from machineconfig.cluster.sessions_managers.utils.enhanced_command_runner import enhanced_zellij_session_start
+        from machineconfig.cluster.sessions_managers.helpers.enhanced_command_runner import enhanced_zellij_session_start
         enhanced_zellij_session_start(session_name=self.session_name, layout_path=str(self.layout_path))
 
 

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/cluster/sessions_managers/zellij_local_manager.py

@@ -11,7 +11,7 @@ from machineconfig.cluster.sessions_managers.zellij_utils.monitoring_types impor
 from machineconfig.utils.scheduler import Scheduler
 from machineconfig.cluster.sessions_managers.zellij_local import ZellijLayoutGenerator
 from machineconfig.utils.schemas.layouts.layout_types import LayoutConfig
-from machineconfig.cluster.sessions_managers.helpers import zellij_local_manager_helper as helper
+from machineconfig.cluster.sessions_managers.zellij_utils import zellij_local_manager_helper as helper
 
 
 logging.basicConfig(level=logging.INFO)
@@ -133,7 +133,7 @@ class ZellijLocalManager:
             session_name = manager.session_name
 
             # Get session status using the helper function
-            from machineconfig.cluster.sessions_managers.helpers.zellij_local_helper import check_zellij_session_status
+            from machineconfig.cluster.sessions_managers.zellij_utils.zellij_local_helper import check_zellij_session_status
             session_status = check_zellij_session_status(session_name)
 
             # Get commands status for this session

{machineconfig-6.23/src/machineconfig/cluster/sessions_managers/helpers → machineconfig-6.26/src/machineconfig/cluster/sessions_managers/zellij_utils}/zellij_local_helper_with_panes.py

@@ -224,5 +224,5 @@ if __name__ == "__main__":
     layout_path_3 = create_zellij_layout_with_panes(layout_config=sample_layout, output_path="/tmp/zellij_test_12345.kdl", panes_per_tab=3, split_direction="horizontal")
     print(f"✅ Layout created: {layout_path_3}")
 
-    from machineconfig.cluster.sessions_managers.utils.enhanced_command_runner import enhanced_zellij_session_start
+    from machineconfig.cluster.sessions_managers.helpers.enhanced_command_runner import enhanced_zellij_session_start
     enhanced_zellij_session_start(session_name="tmp", layout_path=layout_path_3)

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/jobs/installer/installer_data.json

@@ -613,6 +613,23 @@
         }
       }
     },
+    {
+      "appName": "clifm",
+      "repoURL": "https://github.com/leo-arch/clifm",
+      "doc": "📂 A terminal file manager with vim-like keybindings.",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "clifm-{version}-linux-x86_64.tar.gz",
+          "macos": null,
+          "windows": null
+        },
+        "arm64": {
+          "linux": null,
+          "macos": null,
+          "windows": null
+        }
+      }
+    },
     {
       "appName": "lsd",
       "repoURL": "https://github.com/lsd-rs/lsd",

{machineconfig-6.23 → machineconfig-6.26}/src/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.87" """
+        else: ve_line = """--with "machineconfig[plot]>=6.25" """
         fire_line = f"uv run --python 3.14 {ve_line} {interpreter} {interactivity} {profile} {str(pyfile)}"
 
     from machineconfig.utils.code import run_shell_script

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/scripts/python/devops.py

@@ -30,8 +30,9 @@ def get_app():
     app_config = cli_config.get_app()
     app.add_typer(app_config, name="config")
     app.add_typer(app_config, name="c", hidden=True)
-    app.add_typer(cli_data.app_data, name="data")
-    app.add_typer(cli_data.app_data, name="d", hidden=True)
+    app_data = cli_data.get_app()
+    app.add_typer(app_data, name="data")
+    app.add_typer(app_data, name="d", hidden=True)
     app_self = cli_self.get_app()
     app.add_typer(app_self, name="self")
     app.add_typer(app_self, name="s", hidden=True)

{machineconfig-6.23 → machineconfig-6.26}/src/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.87,textual" {path}""")
+    run_shell_script(f"""uv run --with "machineconfig>=6.25,textual" {path}""")
 
 def pwsh_theme():
     """🔗 Select powershell prompt theme."""

machineconfig-6.26/src/machineconfig/scripts/python/devops_helpers/cli_data.py

@@ -0,0 +1,25 @@
+
+import typer
+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
+    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
+    main_backup_retrieve(direction="RETRIEVE", which=which, cloud=cloud)
+
+
+def get_app() -> typer.Typer:
+    app = typer.Typer(name="data", help="💾 [d] Backup and Retrieve configuration files and directories to/from cloud storage using rclone.", no_args_is_help=True)
+    app.command(name="backup", no_args_is_help=True, hidden=False, help="💾 [b] Backup files and directories to cloud storage using rclone.")(backup)
+    app.command(name="b", no_args_is_help=True, hidden=True,)(backup)
+    app.command(name="retrieve", no_args_is_help=True, hidden=False, help="📥 [r] Retrieve files and directories from cloud storage using rclone.")(retrieve)
+    app.command(name="r", no_args_is_help=True, hidden=True, )(retrieve)
+    return app

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/scripts/python/devops_helpers/cli_repos.py

@@ -47,11 +47,9 @@ def capture(directory: DirectoryArgument = None, cloud: CloudOption = None) -> N
     """📝 Record repositories into a repos.json specification."""
     from machineconfig.scripts.python.repos_helpers.entrypoint import resolve_directory
     repos_root = resolve_directory(directory)
-    from machineconfig.scripts.python.repos_helpers.record import main as record_repos
-
+    from machineconfig.scripts.python.repos_helpers.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:
         PathExtended(save_path).to_cloud(rel2home=True, cloud=cloud)
 

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/scripts/python/devops_helpers/cli_self.py

@@ -54,9 +54,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.87""")
+        run_shell_script(r"""$HOME\.local\bin\uv.exe tool install "machineconfig>=6.25" """)
     else:
-        run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.87""")
+        run_shell_script("""$HOME/.local/bin/uv tool install "machineconfig>=6.25" """)
 
 def navigate():
     """📚 NAVIGATE command structure with TUI"""
@@ -64,7 +64,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.87,textual" {path}""")
+    run_shell_script(f"""uv run --with "machineconfig>=6.25,textual" {path}""")
 
 
 def run_python(ip: Annotated[str, typer.Argument(..., help="Python command to run in the machineconfig environment")],

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/scripts/python/devops_helpers/devops_backup_retrieve.py

@@ -17,18 +17,15 @@ import tomllib
 OPTIONS = Literal["BACKUP", "RETRIEVE"]
 
 
-def main_backup_retrieve(direction: OPTIONS, which: Optional[str] = None) -> None:
+def main_backup_retrieve(direction: OPTIONS, which: Optional[str], cloud: Optional[str]) -> None:
     console = Console()
-
     try:
-        cloud: str = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
+        cloud = read_ini(DEFAULTS_PATH)["general"]["rclone_config_name"]
         console.print(Panel(f"⚠️  DEFAULT CLOUD CONFIGURATION\n🌥️  Using default cloud: {cloud}", title="[bold blue]Cloud Configuration[/bold blue]", border_style="blue"))
     except (FileNotFoundError, KeyError, IndexError):
         console.print(Panel("🔍 DEFAULT CLOUD NOT FOUND\n🔄 Please select a cloud configuration from the options below", title="[bold red]Error: Cloud Not Found[/bold red]", border_style="red"))
         cloud = choose_cloud_interactively()
-
     bu_file: dict[str, Any] = tomllib.loads(LIBRARY_ROOT.joinpath("profile/backup.toml").read_text(encoding="utf-8"))
-
     console.print(Panel(f"🧰 LOADING BACKUP CONFIGURATION\n📄 File: {LIBRARY_ROOT.joinpath('profile/backup.toml')}", title="[bold blue]Backup Configuration[/bold blue]", border_style="blue"))
 
     if system() == "Linux":

{machineconfig-6.23 → machineconfig-6.26}/src/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.87" """)
+        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=None, executable="""uv run --with "machineconfig>=6.25" """)
         # ================================================================================
         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.87" """)
+        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable="""uv run --with "machineconfig>=6.25" """)
         # ================================================================================
 
         option4 = "Remove problematic rclone file from repo and replace with remote:"

{machineconfig-6.23 → machineconfig-6.26}/src/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.87""")
+            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install "machineconfig>=6.25" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install machineconfig>=5.87""")
+            run_shell_script("""$HOME/.local/bin/uv tool install "machineconfig>=6.25" """)
     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
@@ -165,7 +165,7 @@ Set-Service -Name sshd -StartupType 'Automatic'"""
         console.print("🔧 Retrieving backup data", style="bold cyan")
         try:
             from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
-            main_backup_retrieve(direction="RETRIEVE")
+            main_backup_retrieve(direction="RETRIEVE", cloud=None, which=None)
             console.print("✅ Backup data retrieved successfully", style="bold green")
         except Exception as e:
             console.print(f"❌ Error retrieving backup data: {e}", style="bold red")

{machineconfig-6.23 → machineconfig-6.26}/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>=5.87" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.25" 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.23 → machineconfig-6.26}/src/machineconfig/scripts/python/repos_helpers/count_lines_frontend.py

@@ -8,7 +8,7 @@ def analyze_repo_development(repo_path: Annotated[str, typer.Argument(..., help=
     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.87" {count_lines_path} analyze-over-time {repo_path}"""
+    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=6.25" {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)
 

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/scripts/python/repos_helpers/record.py

@@ -186,7 +186,7 @@ def record_repos_recursively(repos_root: str, r: bool, progress: Progress | None
     return res
 
 
-def main(repos_root: Path):
+def main_record(repos_root: Path):
     print("\n📝 Recording repositories...")
     repos_root = PathExtended(repos_root).expanduser().absolute()
 

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=5.87" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.25" 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.23 → machineconfig-6.26}/src/machineconfig/settings/shells/wt/settings.json

@@ -6,19 +6,19 @@
     "copyOnSelect": true,
     "defaultProfile": "{574e775e-4f2a-5b96-ac1e-a2962a402336}",
     "focusFollowMouse": true,
-    "keybindings":
+    "keybindings": 
     [
         {
-            "id": "Terminal.TogglePaneZoom",
-            "keys": "ctrl+shift+z"
+            "id": "Terminal.FindText",
+            "keys": "ctrl+shift+f"
         },
         {
             "id": "Terminal.PasteFromClipboard",
             "keys": "ctrl+v"
         },
         {
-            "id": "Terminal.FindText",
-            "keys": "ctrl+shift+f"
+            "id": "Terminal.TogglePaneZoom",
+            "keys": "ctrl+shift+z"
         },
         {
             "id": "Terminal.DuplicatePaneAuto",
@@ -38,27 +38,27 @@
         }
     ],
     "launchMode": "fullscreen",
-    "newTabMenu":
+    "newTabMenu": 
     [
         {
             "type": "remainingProfiles"
         }
     ],
-    "profiles":
+    "profiles": 
     {
-        "defaults":
+        "defaults": 
         {
             "colorScheme": "Campbell (modified)",
             "padding": "0",
             "useAcrylic": false
         },
-        "list":
+        "list": 
         [
             {
                 "commandline": "pwsh",
                 "cursorColor": "#D4D8E1",
                 "cursorShape": "filledBox",
-                "font":
+                "font": 
                 {
                     "face": "CaskaydiaCove Nerd Font"
                 },
@@ -84,7 +84,7 @@
             },
             {
                 "commandline": "%SystemRoot%\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
-                "font":
+                "font": 
                 {
                     "face": "CaskaydiaCove Nerd Font"
                 },
@@ -139,10 +139,16 @@
                 "hidden": false,
                 "name": "Ubuntu 22.04.3 LTS",
                 "source": "CanonicalGroupLimited.Ubuntu22.04LTS_79rhkp1fndgsc"
+            },
+            {
+                "guid": "{988a16a9-2179-5ba2-8367-4854ea3de17d}",
+                "hidden": false,
+                "name": "Ubuntu-24.04",
+                "source": "Microsoft.WSL"
             }
         ]
     },
-    "schemes":
+    "schemes": 
     [
         {
             "background": "#000000",

{machineconfig-6.23 → machineconfig-6.26}/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>=5.87" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.25" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

{machineconfig-6.23 → machineconfig-6.26}/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>=5.87" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.25" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/utils/path_extended.py

@@ -909,9 +909,10 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
             rp = localpath.get_remote_path(root=root, os_specific=os_specific, rel2home=rel2home, strict=strict)  # if rel2home else (P(root) / localpath if root is not None else localpath)
         else:
             rp = PathExtended(remotepath)
-
         from rclone_python import rclone
+        print(f"⬆️ UPLOADING {repr(localpath)} TO {cloud}:{rp.as_posix()}`") if verbose else None
         rclone.copyto(in_path=localpath.as_posix(), out_path=f"{cloud}:{rp.as_posix()}", )
+
         _ = [item.delete(sure=True) for item in to_del]
         if verbose:
             print(f"{'⬆️' * 5} UPLOAD COMPLETED.")
@@ -922,7 +923,6 @@ class PathExtended(type(Path()), Path):  # type: ignore # pylint: disable=E0241
             command = f"rclone link '{cloud}:{rp.as_posix()}'"
             completed = _run_shell_command(command, shell_to_use)
             from machineconfig.utils.terminal import Response
-
             res = Response.from_completed_process(completed).capture()
             tmp = res.op2path(strict_err=False, strict_returncode=False)
             if tmp is None:

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig/utils/ssh.py

@@ -6,7 +6,7 @@ from machineconfig.utils.terminal import Response, MACHINE
 from machineconfig.utils.accessories import pprint
 
 UV_RUN_CMD = "$HOME/.local/bin/uv run"
-MACHINECONFIG_VERSION = "machineconfig>=5.87"
+MACHINECONFIG_VERSION = "machineconfig>=6.25"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 

{machineconfig-6.23 → machineconfig-6.26/src/machineconfig.egg-info}/PKG-INFO

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

{machineconfig-6.23 → machineconfig-6.26}/src/machineconfig.egg-info/SOURCES.txt

@@ -31,13 +31,10 @@ src/machineconfig/cluster/sessions_managers/zellij_local.py
 src/machineconfig/cluster/sessions_managers/zellij_local_manager.py
 src/machineconfig/cluster/sessions_managers/zellij_remote.py
 src/machineconfig/cluster/sessions_managers/zellij_remote_manager.py
-src/machineconfig/cluster/sessions_managers/helpers/zellij_local_helper.py
-src/machineconfig/cluster/sessions_managers/helpers/zellij_local_helper_restart.py
-src/machineconfig/cluster/sessions_managers/helpers/zellij_local_helper_with_panes.py
-src/machineconfig/cluster/sessions_managers/helpers/zellij_local_manager_helper.py
-src/machineconfig/cluster/sessions_managers/utils/enhanced_command_runner.py
+src/machineconfig/cluster/sessions_managers/helpers/enhanced_command_runner.py
+src/machineconfig/cluster/sessions_managers/helpers/load_balancer_helper.py
 src/machineconfig/cluster/sessions_managers/utils/load_balancer.py
-src/machineconfig/cluster/sessions_managers/utils/load_balancer_helper.py
+src/machineconfig/cluster/sessions_managers/utils/maker.py
 src/machineconfig/cluster/sessions_managers/wt_utils/layout_generator.py
 src/machineconfig/cluster/sessions_managers/wt_utils/process_monitor.py
 src/machineconfig/cluster/sessions_managers/wt_utils/remote_executor.py
@@ -50,6 +47,10 @@ src/machineconfig/cluster/sessions_managers/zellij_utils/process_monitor.py
 src/machineconfig/cluster/sessions_managers/zellij_utils/remote_executor.py
 src/machineconfig/cluster/sessions_managers/zellij_utils/session_manager.py
 src/machineconfig/cluster/sessions_managers/zellij_utils/status_reporter.py
+src/machineconfig/cluster/sessions_managers/zellij_utils/zellij_local_helper.py
+src/machineconfig/cluster/sessions_managers/zellij_utils/zellij_local_helper_restart.py
+src/machineconfig/cluster/sessions_managers/zellij_utils/zellij_local_helper_with_panes.py
+src/machineconfig/cluster/sessions_managers/zellij_utils/zellij_local_manager_helper.py
 src/machineconfig/cluster/templates/__init__.py
 src/machineconfig/cluster/templates/cli_trogon.py
 src/machineconfig/jobs/__init__.py

machineconfig-6.23/src/machineconfig/scripts/python/devops_helpers/cli_data.py

@@ -1,18 +0,0 @@
-
-import typer
-
-app_data = typer.Typer(help="💾 [d] data subcommands", no_args_is_help=True)
-
-@app_data.command()
-def backup():
-    """💾 BACKUP"""
-    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
-    main_backup_retrieve(direction="BACKUP")
-
-
-@app_data.command()
-def retrieve():
-    """📥 RETRIEVE"""
-    from machineconfig.scripts.python.devops_helpers.devops_backup_retrieve import main_backup_retrieve
-    main_backup_retrieve(direction="RETRIEVE")
-