machineconfig 6.42__tar.gz → 6.43__tar.gz

{machineconfig-6.42/src/machineconfig.egg-info → machineconfig-6.43}/PKG-INFO

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

{machineconfig-6.42 → machineconfig-6.43}/pyproject.toml

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

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/cluster/sessions_managers/zellij_remote.py

@@ -141,8 +141,8 @@ if __name__ == "__main__":
     sample_layout: LayoutConfig = {
         "layoutName": "RemoteBots",
         "layoutTabs": [
-            {"tabName": "🤖Bot1", "startDir": "~/code/bytesense/bithence", "command": "~/scripts/fire -mO go1.py bot1 -- --create_new_bot=True"},
-            {"tabName": "🤖Bot2", "startDir": "~/code/bytesense/bithence", "command": "~/scripts/fire -mO go2.py bot2 -- --create_new_bot=True"},
+            {"tabName": "🤖Bot1", "startDir": "~/code/bytesense/bithence", "command": "fire -mO go1.py bot1 -- --create_new_bot=True"},
+            {"tabName": "🤖Bot2", "startDir": "~/code/bytesense/bithence", "command": "fire -mO go2.py bot2 -- --create_new_bot=True"},
             {"tabName": "📊Monitor", "startDir": "~", "command": "htop"},
             {"tabName": "📝Logs", "startDir": "/var/log", "command": "tail -f /var/log/app.log"},
         ],

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/cluster/sessions_managers/zellij_utils/example_usage.py

@@ -17,8 +17,8 @@ def example_usage():
     sample_layout: LayoutConfig = {
         "layoutName": "ExampleRemoteSession",
         "layoutTabs": [
-            {"tabName": "🤖Bot1", "startDir": "~/code/bytesense/bithence", "command": "~/scripts/fire -mO go1.py bot1 -- --create_new_bot=True"},
-            {"tabName": "🤖Bot2", "startDir": "~/code/bytesense/bithence", "command": "~/scripts/fire -mO go2.py bot2 -- --create_new_bot=True"},
+            {"tabName": "🤖Bot1", "startDir": "~/code/bytesense/bithence", "command": "fire -mO go1.py bot1 -- --create_new_bot=True"},
+            {"tabName": "🤖Bot2", "startDir": "~/code/bytesense/bithence", "command": "fire -mO go2.py bot2 -- --create_new_bot=True"},
             {"tabName": "📊Monitor", "startDir": "~", "command": "htop"},
             {"tabName": "📝Logs", "startDir": "/var/log", "command": "tail -f /var/log/app.log"},
         ],

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/scripts/python/croshell.py

@@ -167,16 +167,16 @@ from pathlib import Path
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv run --with marimo marimo convert {pyfile.name} -o marimo_nb.py
-uv run --with "marimo,machineconfig[plot]>=6.42" marimo edit --host 0.0.0.0 marimo_nb.py
+uv run --with "marimo,machineconfig[plot]>=6.43" marimo edit --host 0.0.0.0 marimo_nb.py
 """
     elif jupyter:
-        fire_line = f"uv run --with 'machineconfig[plot]>=6.42' jupyter-lab {str(nb_target)}"
+        fire_line = f"uv run --with 'machineconfig[plot]>=6.43' 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.42"
+uv add "machineconfig[plot]>=6.43"
 # code serve-web
 code --new-window {str(pyfile)}
 """
@@ -191,7 +191,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.42" """
+        else: ve_line = """--with "machineconfig[plot]>=6.43" """
         # 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.42 → machineconfig-6.43}/src/machineconfig/scripts/python/devops.py

@@ -45,6 +45,7 @@ def get_app():
     app.add_typer(app_utils, name="u", hidden=True)
     return app
 
+
 def main():
     app = get_app()
     app()

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

{machineconfig-6.42 → machineconfig-6.43}/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>=6.42" """)
+        run_shell_script(r"""$HOME\.local\bin\uv.exe tool install "machineconfig>=6.43" """)
     else:
-        run_shell_script("""$HOME/.local/bin/uv tool install "machineconfig>=6.42" """)
+        run_shell_script("""$HOME/.local/bin/uv tool install "machineconfig>=6.43" """)
 
 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>=6.42,textual" {path}""")
+    run_shell_script(f"""uv run --with "machineconfig>=6.43,textual" {path}""")
 
 
 def run_python(ip: Annotated[str, typer.Argument(..., help="Python command to run in the machineconfig environment")],

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/scripts/python/devops_helpers/cli_utils.py

@@ -6,15 +6,16 @@ from pathlib import Path
 import subprocess
 import requests
 
-def download(url: Annotated[Optional[str], typer.Argument(..., help="The URL to download the file from." )] = None,
-             decompress: Annotated[bool, typer.Option("--decompress", "-d", help="Decompress the file if it's an archive.")] = False,
-             output: Annotated[Optional[str], typer.Option("--output", "-o", help="The output file path.")] = None) -> None:
+
+def download(
+    url: Annotated[Optional[str], typer.Argument(..., help="The URL to download the file from.")] = None,
+    decompress: Annotated[bool, typer.Option("--decompress", "-d", help="Decompress the file if it's an archive.")] = False,
+    output: Annotated[Optional[str], typer.Option("--output", "-o", help="The output file path.")] = None,
+) -> None:
     if url is None:
         typer.echo("❌ Error: URL is required.", err=True)
         raise typer.Exit(code=1)
-    
-    typer.echo(f"📥 Downloading from: {url}")
-    
+    typer.echo(f"📥 Downloading from: {url}")    
     download_path = Path(output) if output else Path(url.split("/")[-1])
     
     try:
@@ -48,16 +49,21 @@ def download(url: Annotated[Optional[str], typer.Argument(..., help="The URL to
     if decompress:
         typer.echo(f"📦 Decompressing: {download_path}")
         
-        output_dir = download_path.parent if output else Path.cwd()
+        base_name = download_path.name
+        parts = base_name.split('.')
+        base_name = parts[0] if parts else download_path.stem
+        
+        extract_dir = download_path.parent / base_name
+        extract_dir.mkdir(parents=True, exist_ok=True)
         
         try:
-            _result = subprocess.run(
-                ["ouch", "decompress", str(download_path), "--dir", str(output_dir)],
+            subprocess.run(
+                ["ouch", "decompress", str(download_path), "--dir", str(extract_dir)],
                 check=True,
                 capture_output=True,
                 text=True
             )
-            typer.echo(f"✅ Decompressed to: {output_dir}")
+            typer.echo(f"✅ Decompressed to: {extract_dir}")
             
             if download_path.exists():
                 download_path.unlink()

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -103,7 +103,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>=6.42" """)
+        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=None, executable="""uv run --with "machineconfig>=6.43" """)
         # ================================================================================
         option2 = "Delete local repo and replace it with remote copy:"
         program_2 = f"""
@@ -124,7 +124,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>=6.42" """)
+        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable="""uv run --with "machineconfig>=6.43" """)
         # ================================================================================
 
         option4 = "Remove problematic rclone file from repo and replace with remote:"

{machineconfig-6.42 → machineconfig-6.43}/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>=6.42" """)
+            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install "machineconfig>=6.43" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install "machineconfig>=6.42" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install "machineconfig>=6.43" """)
     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-6.42 → machineconfig-6.43}/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.42" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.43" 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.42 → machineconfig-6.43}/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]>=6.42" {count_lines_path} analyze-over-time {repo_path}"""
+    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=6.43" {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)
 

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.42" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.43" 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.42 → machineconfig-6.43}/src/machineconfig/settings/lf/linux/exe/fzf_nano.sh

@@ -2,7 +2,7 @@
 # 🔍 Fuzzy Finder with Nano Editor Integration
 
 # 📝 Open selected file in nano
-nano (~/scripts/fzf2g)  # space used for precedence in execution
+nano (fzf2g)  # space used for precedence in execution
 
 # 💡 Alternative commands (commented):
 # 🔎 FZF with bat preview:
@@ -12,5 +12,5 @@ nano (~/scripts/fzf2g)  # space used for precedence in execution
 # & "C:\Program Files\Git\usr\bin\nano.exe" (fzf --ansi --preview-window 'right:60%' --preview 'bat --color=always --style=numbers,grid,header --line-range :300 {}')
 
 # 📜 PowerShell script integration:
-# fzf | ~/scripts/nano.ps1
+# fzf | nano.ps1
 

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/settings/lf/linux/lfrc

@@ -14,8 +14,8 @@ set number true  # show line numbers
 
 set preview true        # preview file on the right pane
 # set previewer chafa --format sixel --work 9 --optimize 9 --stretch --zoom --size 140x80
-set previewer ~/code/machineconfig/src/machineconfig/settings/lf/linux/exe/previewer.sh
-set cleaner ~/code/machineconfig/src/machineconfig/settings/lf/linux/exe/cleaner.sh
+set previewer ~/.config/machineconfig/settings/lf/linux/exe/previewer.sh
+set cleaner ~/.config/machineconfig/settings/lf/linux/exe/cleaner.sh
 # set previewer pistol
 
 # set sixels true
@@ -48,7 +48,7 @@ set ratios '1:2:3'  # ratio of pane widths
 
 
 # test image viewer
-map Q !~/code/machineconfig/src/machineconfig/settings/lf/linux/exe/previewer.sh "$f"
+map Q !~/.config/machineconfig/settings/lf/linux/exe/previewer.sh "$f"
 
 # key bindings
 map vmap v  # default is invert
@@ -70,7 +70,6 @@ map <c-u>  # half-up
 # e edit
 map e  # edit modal key.
 map eh $hx $f
-map eH !source ~/code/machineconfig/.venv/bin/activate;hx $f
 map en $nano $f
 map el $lvim $f
 map ev $nvim $f
@@ -84,12 +83,12 @@ map <enter> open
 map w
 map ww bash
 # map wp $powershell
-map wr $~/scripts/croshell
+map wr $croshell
 # map wm $cmd
-map i !~/code/machineconfig/src/machineconfig/settings/lf/linux/exe/previewer.sh $f
+map i !~/.config/machineconfig/settings/lf/linux/exe/previewer.sh $f
 map I !cat $f | gum pager
-map R $~/scripts/croshell -r $f
-map O $~/scripts/croshell -rj $f
+map R $croshell $f
+map O $croshell -j $f
 
 
 # o file/folder Operations
@@ -118,8 +117,8 @@ map jD cd ~/Downloads
 map jx cd ~/dotfiles
 # map jm cd ~/code/machineconfig/src/machineconfig
 map jh cd ~
-map jj $~/scripts/croshell -j --read $f
-# map jj $lvim ~/code/machineconfig/src/machineconfig/settings/lf/linux/lfrc
+map jj $croshell -j --read $f
+# map jj $lvim ~/.config/machineconfig/settings/lf/linux/lfrc
 
 # from https://github.com/gokcehan/lf/wiki/Integrations#zoxide
 cmd zi ${{
@@ -163,7 +162,7 @@ cmd fzf_jump ${{
 }}
 
 
-cmd fzf2g $(~/scripts/fzf2g.sh $args[1])
+cmd fzf2g $(fzf2g.sh $args[1])
 # map F $nano fzf2g $args[1]
 
 

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/settings/lf/windows/fzf_edit.ps1

@@ -1,6 +1,6 @@
 
-~/scripts/nano.ps1 (~/scripts/fzfb)  # space use for presedence in execution.
+nano.ps1 (fzfb)  # space use for presedence in execution.
 # fzf --ansi --preview-window 'right:60%' --preview 'bat --color=always --style=numbers,grid,header --line-range :300 {}'
 # & "C:\Program Files\Git\usr\bin\nano.exe" (fzf --ansi --preview-window 'right:60%' --preview 'bat --color=always --style=numbers,grid,header --line-range :300 {}')
-# fzf | ~/scripts/nano.ps1
+# fzf | nano.ps1
 

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/settings/lf/windows/lfrc

@@ -58,7 +58,7 @@ map r reload
 
 # e edit
 map e  # edit modal key.
-map en $~/scripts/nano $env:f
+map en $nano $env:f
 map el $pwsh -File $env:USERPROFILE/.local/bin/lvim.ps1 -- $env:f
 map ev $nvim $env:f
 map ec $code $env:f
@@ -71,7 +71,7 @@ map <enter> open
 map w
 map ww $powershell
 map wp $pwsh
-map wc $~/scripts/croshell.ps1
+map wc $croshell.ps1
 map wm $cmd
 map i $~/.config/machineconfig/settings/lf/windows/previewer.ps1 $env:f
 map R $powershell $env:USERPROFILE/scripts/croshell.ps1 -r $env:f

{machineconfig-6.42 → machineconfig-6.43}/src/machineconfig/settings/lf/windows/mkfile.ps1

@@ -1,3 +1,3 @@
 
 $name = Read-Host "Input File Name"
-~/scripts/nano.ps1 $name
+nano.ps1 $name

{machineconfig-6.42 → machineconfig-6.43}/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.42" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.43" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"
@@ -9,5 +9,5 @@ alias a="mcfg agents"
 alias s="mcfg sessions"
 alias ff="mcfg ftpx"
 alias f="mcfg fire"
-alias cs="mcfg croshell"
+alias r="mcfg croshell"
 echo "mcfg command is now defined in this shell session."

{machineconfig-6.42 → machineconfig-6.43}/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.42" mcfg $args
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with "machineconfig>=6.43" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }
@@ -10,5 +10,5 @@ function a { mcfg agents @args }
 function s { mcfg sessions @args }
 function ff { mcfg ftpx @args }
 function f { mcfg fire @args }
-function cs { mcfg croshell @args }
+function r { mcfg croshell @args }
 Write-Host "mcfg command aliases are now defined in this PowerShell session."

{machineconfig-6.42 → machineconfig-6.43}/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>=6.42"
+MACHINECONFIG_VERSION = "machineconfig>=6.43"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 

{machineconfig-6.42 → machineconfig-6.43/src/machineconfig.egg-info}/PKG-INFO

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