machineconfig 6.66__tar.gz → 6.68__tar.gz

{machineconfig-6.66/src/machineconfig.egg-info → machineconfig-6.68}/PKG-INFO

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

{machineconfig-6.66 → machineconfig-6.68}/pyproject.toml

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

{machineconfig-6.66 → machineconfig-6.68}/src/machineconfig/jobs/installer/installer_data.json

@@ -2178,6 +2178,23 @@
         }
       }
     },
+    {
+      "appName": "kilocode",
+      "repoURL": "CMD",
+      "doc": "Kilocode agent extension in the terminal",
+      "fileNamePattern": {
+        "amd64": {
+          "linux": "npm install -g @kilocode/cli@alpha",
+          "windows": "npm install -g @kilocode/cli@alpha",
+          "macos": "npm install -g @kilocode/cli@alpha"
+        },
+        "arm64": {
+          "linux": "npm install -g @kilocode/cli@alpha",
+          "windows": "npm install -g @kilocode/cli@alpha",
+          "macos": "npm install -g @kilocode/cli@alpha"
+        }
+      }
+    },
     {
       "appName": "copilot",
       "repoURL": "CMD",

{machineconfig-6.66 → machineconfig-6.68}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.66 → machineconfig-6.68}/src/machineconfig/scripts/python/helpers_devops/cli_config.py

@@ -46,7 +46,7 @@ def path():
     uv_with = ["textual"]
     uv_project_dir = None
     if not Path.home().joinpath("code/machineconfig").exists():
-        uv_with.append("machineconfig>=6.66")
+        uv_with.append("machineconfig>=6.68")
     else:
         uv_project_dir = str(Path.home().joinpath("code/machineconfig"))
     run_shell_script(get_uv_command_executing_python_script(python_script=path.read_text(encoding="utf-8"), uv_with=uv_with, uv_project_dir=uv_project_dir)[0])

{machineconfig-6.66 → machineconfig-6.68}/src/machineconfig/scripts/python/helpers_devops/cli_self.py

@@ -41,9 +41,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.66" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.68" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.66" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.68" """)
     from machineconfig.profile.create_shell_profile import create_default_shell_profile
     if not no_copy_assets:
         create_default_shell_profile()   # involves copying assets too
@@ -68,7 +68,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.66,textual" """
+    else: executable = """--with "machineconfig>=6.68,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.66 → machineconfig-6.68}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -80,7 +80,7 @@ git pull originEnc master
         uv_project_dir = f"""{str(Path.home().joinpath("code/machineconfig"))}"""
         uv_with = None
     else:
-        uv_with = ["machineconfig>=6.66"]
+        uv_with = ["machineconfig>=6.68"]
         uv_project_dir = None
 
     import tempfile

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

@@ -130,10 +130,6 @@ def run(ctx: typer.Context,
         print(f"❌ Unsupported platform: {platform.system()}")
 
 
-def kill_process():
-    from machineconfig.utils.procs import main
-    main()
-
 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.helpers_sessions.sessions_multiprocess import create_from_function
@@ -143,8 +139,6 @@ def get_app():
     layouts_app.command("r", no_args_is_help=True, help="Run the selected layout(s)", hidden=True)(run)
     layouts_app.command("balance-load", no_args_is_help=True, help="[b] Balance the load across sessions")(balance_load)
     layouts_app.command("b", no_args_is_help=True, help="Balance the load across sessions", hidden=True)(balance_load)
-    layouts_app.command("kill-process", no_args_is_help=False, help="[k] Choose a process to kill")(kill_process)
-    layouts_app.command("k", no_args_is_help=False, help="Choose a process to kill", hidden=True)(kill_process)
 
     return layouts_app
 

machineconfig-6.68/src/machineconfig/scripts/python/utils.py

@@ -0,0 +1,60 @@
+
+
+from machineconfig.scripts.python.helpers_devops.cli_utils import download, merge_pdfs, get_machine_specs
+import typer
+from typing import Annotated, Optional
+from pathlib import Path
+
+
+def kill_process(
+        # name: Annotated[Optional[str], typer.Option(..., "--name", "-n", help="Name of the process to kill")],
+                #  command: Annotated[str, typer.Option(..., "--command", "-c", help="Match by command line instead of process name")] = "",
+                 interactive: Annotated[bool, typer.Option(..., "--interactive", "-i", help="Interactively choose the process to kill")] = True):
+    from machineconfig.utils.procs import main, ProcessManager
+    if interactive:
+        main()
+        return
+    _ = ProcessManager
+    # pm = ProcessManager()
+    # if command:
+    #     pm.filter_and_kill(name=command
+                        #    )
+
+
+def add_dev_packages(repo_dir: Annotated[Optional[str], typer.Option(..., "--repo-dir", "-r", help="Path to the repository root directory")] = None):
+    if repo_dir is None:
+        r_dir = Path.cwd()
+    else:
+        r_dir = Path(repo_dir).resolve()
+    if not r_dir.exists() or not r_dir.is_dir() or not (r_dir / "pyproject.toml").exists():
+        typer.echo(f"❌ The provided repo directory `{r_dir}` is not valid or does not contain a `pyproject.toml` file.")
+        raise typer.Exit(code=1)
+    command = f"""
+cd "{r_dir}" || exit 1
+uv add nbformat ipdb ipykernel ipython pylint pyright mypy pyrefly ty pytest
+"""
+    from machineconfig.utils.code import run_shell_script
+    typer.echo(f"➡️  Installing dev packages in repo at `{r_dir}`...")
+    run_shell_script(command)
+    typer.echo(f"✅ Dev packages installed successfully in repo at `{r_dir}`.")
+    # TODO: see upgrade packages.
+
+
+
+def get_app() -> typer.Typer:
+    app = typer.Typer(help="🛠️ utilities operations", no_args_is_help=True, add_help_option=False, add_completion=False)
+    app.command(name="kill-process", no_args_is_help=False, help="[k] Choose a process to kill")(kill_process)
+    app.command(name="k", no_args_is_help=False, help="Choose a process to kill", hidden=True)(kill_process)
+    app.command(name="download", no_args_is_help=True, help="[d] Download a file from a URL and optionally decompress it.")(download)
+    app.command(name="d", no_args_is_help=True, hidden=True)(download)
+    app.command(name="merge-pdfs", no_args_is_help=True, help="[m] Merge two PDF files into one.")(merge_pdfs)
+    app.command(name="m", no_args_is_help=True, hidden=True)(merge_pdfs)
+    app.command(name="get-machine-specs", no_args_is_help=False, help="[g] Get machine specifications.")(get_machine_specs)
+    app.command(name="g", no_args_is_help=False, hidden=True)(get_machine_specs)
+    return app
+
+
+
+def main():
+    app = get_app()
+    app()

{machineconfig-6.66 → machineconfig-6.68}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

@@ -7,7 +7,7 @@ $user = ''
 $sharePath = ''
 $driveLetter = ''
 
-uv run --python 3.14 --with "machineconfig>=6.66" python -m machineconfig.scripts.python.mount_ssh
+uv run --python 3.14 --with "machineconfig>=6.68" 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.66 → machineconfig-6.68}/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.66" mcfg "$@"
+    "$HOME/.local/bin/uv" run --python 3.14 --with "machineconfig>=6.68" mcfg "$@"
 }
 alias d="mcfg devops"
 alias c="mcfg cloud"

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

{machineconfig-6.66 → machineconfig-6.68}/src/machineconfig/utils/scheduler.py

@@ -160,11 +160,7 @@ class CacheMemory[T]():
         self.logger = logger
         self.expire = expire
         self.name = name if isinstance(name, str) else self.source_func.__name__
-    @property
-    def age(self) -> timedelta:
-        return datetime.now() - self.time_produced
-
-    def __call__(self, fresh: bool = False) -> T:
+    def __call__(self, fresh: bool = False, tolerance_seconds: int = 1000000000000) -> T:
         if fresh or not hasattr(self, "cache"):
             why = "There was an explicit fresh order." if fresh else "Previous cache never existed."
             t0 = time.time()
@@ -175,8 +171,8 @@ class CacheMemory[T]():
             self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
             self.time_produced = datetime.now()
         else:
-            age = self.age
-            if age > self.expire:
+            age = datetime.now() - self.time_produced
+            if (age > self.expire) or (fresh and (age.total_seconds() > tolerance_seconds)):
                 self.logger.warning(f"""
 🔄 ════════════════════ CACHE UPDATE ════════════════════
 ⚠️  {self.name} cache: Updating cache from source func
@@ -214,14 +210,22 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
         self.logger = logger
         self.expire = expire
         self.name = name if isinstance(name, str) else self.source_func.__name__
-    @property
-    def age(self):
-        """Throws AttributeError if called before cache is populated and path doesn't exists"""
-        return datetime.now() - self.time_produced
-    def __call__(self, fresh: bool = False) -> T:
-        if fresh or not hasattr(self, "cache"):  # populate cache for the first time
-            if not fresh and self.path.exists():
+    def __call__(self, fresh: bool = False, tolerance_seconds: int = 1000000000000) -> T:
+        if not hasattr(self, "cache"):  # populate cache for the first time: we have two options, populate from disk or from source func.
+            if self.path.exists():  # prefer to read from disk over source func as a default source of cache.
                 age = datetime.now() - datetime.fromtimestamp(self.path.stat().st_mtime)
+                if (age > self.expire) or (fresh and (age.total_seconds() > tolerance_seconds)):  # cache is old or if fresh flag is raised
+                    self.logger.warning(f"""
+🔄 ════════════════════ CACHE STALE ════════════════════
+📦 {self.name} cache: Populating fresh cache from source func
+⏱️  Lag = {age}""")
+                    t0 = time.time()
+                    self.cache = self.source_func()  # fresh data.
+                    self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
+                    self.time_produced = datetime.now()
+                    self.save(self.cache, self.path)
+                    return self.cache
+
                 msg1 = f"""
 📦 ════════════════════ CACHE OPERATION ════════════════════
 🔄 {self.name} cache: Reading cached values from `{self.path}`
@@ -240,10 +244,8 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
                     self.time_produced = datetime.now()
                     self.save(self.cache, self.path)
                     return self.cache
-                return self(fresh=False)  # may be the cache is old ==> check that by passing it through the logic again.
-            else:
-                # 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."
+            else:  # disk cache does not exist, populate from source func.
+                why = "Previous cache never existed."
                 self.logger.warning(f"""
 🆕 ════════════════════ NEW CACHE ════════════════════
 🔄 {self.name} cache: Populating fresh cache from source func
@@ -253,12 +255,9 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
                 self.logger.warning(f"⏱️  Cache population took {time.time() - t0:.2f} seconds.")
                 self.time_produced = datetime.now()
                 self.save(self.cache, self.path)
-        else:  # cache exists
-            try:
-                age = self.age
-            except AttributeError:  # path doesn't exist (may be deleted) ==> need to repopulate cache form source_func.
-                return self(fresh=True)
-            if age > self.expire:
+        else:  # memory cache exists
+            age = datetime.now() - self.time_produced
+            if (age > self.expire) or (fresh and (age.total_seconds() > tolerance_seconds)):  # cache is old or if fresh flag is raised
                 self.logger.warning(f"""
 🔄 ════════════════════ CACHE UPDATE ════════════════════
 ⚠️  {self.name} cache: Updating cache from source func

{machineconfig-6.66 → machineconfig-6.68}/src/machineconfig/utils/ssh.py

@@ -8,7 +8,7 @@ from machineconfig.utils.terminal import Response
 from machineconfig.utils.accessories import pprint, randstr
 from machineconfig.utils.meta import lambda_to_python_script
 UV_RUN_CMD = "$HOME/.local/bin/uv run" if platform.system() != "Windows" else """& "$env:USERPROFILE/.local/bin/uv" run"""
-MACHINECONFIG_VERSION = "machineconfig>=6.66"
+MACHINECONFIG_VERSION = "machineconfig>=6.68"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:

{machineconfig-6.66 → machineconfig-6.68/src/machineconfig.egg-info}/PKG-INFO

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

machineconfig-6.66/src/machineconfig/scripts/python/utils.py

@@ -1,22 +0,0 @@
-
-
-from machineconfig.scripts.python.helpers_devops.cli_utils import download, merge_pdfs, get_machine_specs
-import typer
-
-
-
-def get_app() -> typer.Typer:
-    app = typer.Typer(help="🛠️ utilities operations", no_args_is_help=True, add_help_option=False, add_completion=False)
-    app.command(name="download", no_args_is_help=True, help="[d] Download a file from a URL and optionally decompress it.")(download)
-    app.command(name="d", no_args_is_help=True, hidden=True)(download)
-    app.command(name="merge-pdfs", no_args_is_help=True, help="[m] Merge two PDF files into one.")(merge_pdfs)
-    app.command(name="m", no_args_is_help=True, hidden=True)(merge_pdfs)
-    app.command(name="get-machine-specs", no_args_is_help=False, help="[g] Get machine specifications.")(get_machine_specs)
-    app.command(name="g", no_args_is_help=False, hidden=True)(get_machine_specs)
-    return app
-
-
-
-def main():
-    app = get_app()
-    app()