machineconfig 6.45__tar.gz → 6.47__tar.gz

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

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

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

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

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

@@ -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.47" """
         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.47" """
+        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.47"
 # 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.47" """
         # 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.47}/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
-    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.47,textual" """
     else: executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
     run_shell_script(f"""uv run {executable} {path}""")
 

{machineconfig-6.45 → machineconfig-6.47}/src/machineconfig/scripts/python/devops_helpers/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.47" """)
         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.47" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -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.47,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.45 → machineconfig-6.47}/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.47",
 #     "textual",
 #     "pyperclip",
 # ]

{machineconfig-6.45 → machineconfig-6.47}/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.47" """
 
     shell_path = write_shell_script_to_file(shell_script=script)
     command = f". {shell_path}"

{machineconfig-6.45 → machineconfig-6.47}/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.47" 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.47}/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.45" {count_lines_path} analyze-over-time {repo_path}"""
+    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=6.47" {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)
 

{machineconfig-6.45 → machineconfig-6.47}/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.47" 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.47}/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.47" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

{machineconfig-6.45 → machineconfig-6.47}/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.47" mcfg $args
 }
 function d { mcfg devops @args }
 function c { mcfg cloud @args }

{machineconfig-6.45 → machineconfig-6.47}/src/machineconfig/utils/code.py

@@ -1,15 +1,14 @@
+import atexit
 import platform
 from typing import Optional
 import subprocess
-import os
-# import time
 from rich.console import Console
 from rich.panel import Panel
 from rich.syntax import Syntax
 
 from machineconfig.utils.accessories import randstr
 from machineconfig.utils.ve import get_ve_activate_line
-from machineconfig.utils.path_extended import PathExtended
+from machineconfig.utils.path_extended import PathExtended  # type: ignore[import-not-found]
 
 
 def get_shell_script_executing_python_file(python_file: str, func: Optional[str], ve_path: Optional[str], executable: Optional[str], strict_execution: bool = True):
@@ -138,71 +137,33 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
     return proc
 
 
-def run_shell_script_after_exit(script: str, check_interval: float = 0.1, display_script: bool = True) -> subprocess.Popen[bytes]:
-    current_pid = os.getpid()
+def run_shell_script_after_exit(script: str, display_script: bool = True) -> None:
     console = Console()
     
-    if platform.system() == "Windows":
-        monitor_script = f"""$ErrorActionPreference = "Stop"
-$targetPid = {current_pid}
-$checkInterval = {check_interval}
-
-Write-Host "🔍 Monitoring process PID: $targetPid"
-
-while ($true) {{
-    $process = Get-Process -Id $targetPid -ErrorAction SilentlyContinue
-    if (-not $process) {{
-        Write-Host "✅ Process $targetPid has exited. Running script..."
-        break
-    }}
-    Start-Sleep -Seconds $checkInterval
-}}
-
-# Execute the provided script
-{script}
-"""
-        suffix = ".ps1"
-        cmd = ["powershell", "-ExecutionPolicy", "Bypass", "-NoProfile", "-WindowStyle", "Hidden", "-File"]
-    else:
-        monitor_script = f"""#!/bin/bash
-target_pid={current_pid}
-check_interval={check_interval}
-
-echo "🔍 Monitoring process PID: $target_pid"
-
-while kill -0 $target_pid 2>/dev/null; do
-    sleep $check_interval
-done
-
-echo "✅ Process $target_pid has exited. Running script..."
-
-# Execute the provided script
-{script}
-"""
-        suffix = ".sh"
-        cmd = ["bash"]
-    
-    monitor_script_path = PathExtended.tmp().joinpath("tmp_scripts", "monitor", randstr() + suffix)
-    monitor_script_path.parent.mkdir(parents=True, exist_ok=True)
-    monitor_script_path.write_text(monitor_script, encoding="utf-8")
-    
-    if display_script:
-        lexer = "powershell" if platform.system() == "Windows" else "bash"
-        console.print(Panel(Syntax(code=monitor_script, lexer=lexer), title=f"📄 Monitor script @ {monitor_script_path}", subtitle="Will run after current process exits"), style="bold yellow")
-    
-    if platform.system() != "Windows":
-        monitor_script_path.chmod(0o755)
-    
-    cmd.append(str(monitor_script_path))
-    
-    if platform.system() == "Windows":
-        creation_flags = subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS  # type: ignore
-        process = subprocess.Popen(cmd, creationflags=creation_flags, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL)
-    else:
-        process = subprocess.Popen(cmd, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, stdin=subprocess.DEVNULL, start_new_session=True)
-    if display_script:
-        console.print(f"🚀 [green]Monitor process started with PID:[/green] [blue]{process.pid}[/blue]")
-        console.print(f"📍 [yellow]Watching PID:[/yellow] [blue]{current_pid}[/blue]")
+    def execute_script_at_exit() -> None:
+        if platform.system() == "Windows":
+            suffix = ".ps1"
+            lexer = "powershell"
+        else:
+            suffix = ".sh"
+            lexer = "bash"
+        
+        script_path = PathExtended.tmp().joinpath("tmp_scripts", "exit", randstr() + suffix)
+        script_path.parent.mkdir(parents=True, exist_ok=True)
+        script_path.write_text(script, encoding="utf-8")
+        
+        if display_script:
+            console.print(Panel(Syntax(code=script, lexer=lexer), title=f"📄 Exit script @ {script_path}", subtitle="Running at exit"), style="bold yellow")
+        
+        if platform.system() != "Windows":
+            script_path.chmod(0o755)
+        
+        if platform.system() == "Windows":
+            subprocess.run(["powershell", "-ExecutionPolicy", "Bypass", "-NoProfile", "-File", str(script_path)], check=False)
+        else:
+            subprocess.run(["bash", str(script_path)], check=False)
+        
+        script_path.unlink(missing_ok=True)
     
-    return process
+    atexit.register(execute_script_at_exit)
 

{machineconfig-6.45 → machineconfig-6.47}/src/machineconfig/utils/scheduler.py

@@ -170,35 +170,32 @@ class CacheMemory[T]():
     def __call__(self, fresh: bool = False) -> T:
         self.last_call_is_fresh = False
         if fresh or not hasattr(self, "cache"):
-            if self.logger:
-                why = "There was an explicit fresh order." if fresh else "Previous cache never existed."
-                self.logger.warning(f"""
-🆕 ════════════════════ NEW CACHE ════════════════════
-🔄 {self.name} cache: Populating fresh cache from source func
-ℹ️  Reason: {why}
-════════════════════════════════════════════════════════""")
+            why = "There was an explicit fresh order." if fresh else "Previous cache never existed."
+            t0 = time.time()
+            self.logger.warning(f"""
+🆕 ════════════════════ NEW {self.name} CACHE ════════════════════
+ℹ️ Reason: {why}""")
             self.cache = self.source_func()
+            self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
             self.last_call_is_fresh = True
             self.time_produced = datetime.now()
         else:
             age = self.age
             if age > self.expire:
-                if self.logger:
-                    self.logger.warning(f"""
+                self.logger.warning(f"""
 🔄 ════════════════════ CACHE UPDATE ════════════════════
 ⚠️  {self.name} cache: Updating cache from source func
-⏱️  Age = {age} > {self.expire}
-════════════════════════════════════════════════════════""")
+⏱️  Age = {age} > {self.expire}""")
+                t0 = time.time()
                 self.cache = self.source_func()
+                self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
                 self.last_call_is_fresh = True
                 self.time_produced = datetime.now()
             else:
-                if self.logger:
-                    self.logger.warning(f"""
+                self.logger.warning(f"""
 ✅ ════════════════════ USING CACHE ════════════════════
 📦 {self.name} cache: Using cached values
-⏱️  Lag = {age}
-════════════════════════════════════════════════════════""")
+⏱️  Lag = {age}""")
         return self.cache
 
     @staticmethod
@@ -236,19 +233,18 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
                 msg1 = f"""
 📦 ════════════════════ CACHE OPERATION ════════════════════
 🔄 {self.name} cache: Reading cached values from `{self.path}`
-⏱️  Lag = {age}
-════════════════════════════════════════════════════════════"""
+⏱️  Lag = {age}"""
                 try:
                     self.cache = self.reader(self.path)
                 except Exception as ex:
-                    if self.logger:
-                        msg2 = f"""
+                    msg2 = f"""
 ❌ ════════════════════ CACHE ERROR ════════════════════
 ⚠️  {self.name} cache: Cache file is corrupted
-🔍 Error: {ex}
-════════════════════════════════════════════════════════"""
-                        self.logger.warning(msg1 + msg2)
+🔍 Error: {ex}"""
+                    self.logger.warning(msg1 + msg2)
+                    t0 = time.time()
                     self.cache = self.source_func()
+                    self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
                     self.last_call_is_fresh = True
                     self.time_produced = datetime.now()
                     # if self.path is not None:
@@ -256,15 +252,15 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
                     return self.cache
                 return self(fresh=False)  # may be the cache is old ==> check that by passing it through the logic again.
             else:
-                if self.logger:
-                    # Previous cache never existed or there was an explicit fresh order.
-                    why = "There was an explicit fresh order." if fresh else "Previous cache never existed or is corrupted."
-                    self.logger.warning(f"""
+                # Previous cache never existed or there was an explicit fresh order.
+                why = "There was an explicit fresh order." if fresh else "Previous cache never existed or is corrupted."
+                self.logger.warning(f"""
 🆕 ════════════════════ NEW CACHE ════════════════════
 🔄 {self.name} cache: Populating fresh cache from source func
-ℹ️  Reason: {why}
-════════════════════════════════════════════════════════""")
+ℹ️  Reason: {why}""")
+                t0 = time.time()
                 self.cache = self.source_func()  # fresh data.
+                self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
                 self.last_call_is_fresh = True
                 self.time_produced = datetime.now()
                 self.save(self.cache, self.path)
@@ -274,23 +270,21 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
             except AttributeError:  # path doesn't exist (may be deleted) ==> need to repopulate cache form source_func.
                 return self(fresh=True)
             if age > self.expire:
-                if self.logger:
-                    self.logger.warning(f"""
+                self.logger.warning(f"""
 🔄 ════════════════════ CACHE UPDATE ════════════════════
 ⚠️  {self.name} cache: Updating cache from source func
-⏱️  Age = {age} > {self.expire}
-════════════════════════════════════════════════════════""")
+⏱️  Age = {age} > {self.expire}""")
+                t0 = time.time()
                 self.cache = self.source_func()
+                self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
                 self.last_call_is_fresh = True
                 self.time_produced = datetime.now()
                 self.save(self.cache, self.path)
             else:
-                if self.logger:
-                    self.logger.warning(f"""
+                self.logger.warning(f"""
 ✅ ════════════════════ USING CACHE ════════════════════
 📦 {self.name} cache: Using cached values
-⏱️  Lag = {age}
-════════════════════════════════════════════════════════""")
+⏱️  Lag = {age}""")
         return self.cache
 
     @staticmethod

{machineconfig-6.45 → machineconfig-6.47}/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.45"
+MACHINECONFIG_VERSION = "machineconfig>=6.47"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 

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

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