machineconfig 6.62__tar.gz → 6.64__tar.gz

{machineconfig-6.62/src/machineconfig.egg-info → machineconfig-6.64}/PKG-INFO

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

{machineconfig-6.62 → machineconfig-6.64}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "machineconfig"
-version = "6.62"
+version = "6.64"
 description = "Dotfiles management package"
 readme = "README.md"
 license = {text = "Apache 2.0"}
@@ -97,6 +97,7 @@ dev = [
     "numpy>=2.3.3",
     "pandas>=2.3.3",
     "plotly>=6.3.0",
+    "polars>=1.34.0",
     "pre-commit>=4.3.0",
     "pudb>=2025.1",
     "pylint>=3.3.8",

{machineconfig-6.62 → machineconfig-6.64}/src/machineconfig/cluster/remote/distribute.py

@@ -7,7 +7,6 @@
 # from math import ceil, floor
 # from enum import Enum
 # from dataclasses import dataclass
-# import psutil
 
 # from machineconfig.utils.utils2 import randstr
 # from machineconfig.utils.io_save import save_pickle

{machineconfig-6.62 → machineconfig-6.64}/src/machineconfig/cluster/remote/file_manager.py

@@ -85,7 +85,6 @@
 #                 self.execution_log_dir.expanduser().joinpath("status.txt").write_text(status)
 #                 return status
 #             pid: int = int(pid_path.read_text(encoding="utf-8").rstrip())
-#             import psutil
 #             try: proc = psutil.Process(pid=pid)
 #             except psutil.NoSuchProcess:
 #                 print(f"Something wrong happened to job `{self.job_id}`.. Its status log file says `{status}`, but its declared `{pid=}` is dead. Moving to failed.")
@@ -142,7 +141,6 @@
 #                 break
 
 #             # --------------- Clearning up queue_file from dead processes -----------------
-#             import psutil
 #             next_job_in_queue = queue_file[0]  # only consider the first job in the queue
 #             try: _ = psutil.Process(next_job_in_queue.pid)
 #             except psutil.NoSuchProcess:

{machineconfig-6.62 → machineconfig-6.64}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.62 → machineconfig-6.64}/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.61")
+        uv_with.append("machineconfig>=6.64")
     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.62 → machineconfig-6.64}/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.61" """)
+            run_shell_script(r"""& "$HOME\.local\bin\uv.exe" tool install --upgrade "machineconfig>=6.64" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.61" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.64" """)
     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.61,textual" """
+    else: executable = """--with "machineconfig>=6.64,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.62 → machineconfig-6.64}/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.61"]
+        uv_with = ["machineconfig>=6.64"]
         uv_project_dir = None
 
     import tempfile

{machineconfig-6.62 → machineconfig-6.64}/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.61" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.64" 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.62 → machineconfig-6.64}/src/machineconfig/scripts/python/nw/wsl_windows_transfer.py

@@ -54,7 +54,7 @@ def main(
         hostname = platform.node()
         ssh = SSH(host=None, username=username, hostname=hostname, ssh_key_path=sshkey, password=pwd, port=port_int, enable_compression=False)
         print("🌐 Initiating SSH transfer...")
-        ssh.copy_from_here(source_path=path_obj, target_path=Path(destination) if destination else None, compress_with_zip=zip_first, recursive=False, overwrite_existing=False)
+        ssh.copy_from_here(source_path=str(path_obj), target_rel2home=destination, compress_with_zip=zip_first, recursive=False, overwrite_existing=False)
         print("✅ SSH transfer completed successfully!\n")
 
 

{machineconfig-6.62 → machineconfig-6.64}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

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

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

{machineconfig-6.62 → machineconfig-6.64}/src/machineconfig/utils/meta.py

@@ -4,7 +4,32 @@ from collections.abc import Callable
 from typing import Any
 
 
-def lambda_to_python_script(lmb: Callable[[], Any], in_global: bool) -> str:
+def get_import_module_string(py_file: str):
+    from machineconfig.scripts.python.helpers_fire.helpers4 import get_import_module_code
+    from machineconfig.utils.accessories import get_repo_root
+    from pathlib import Path
+    repo_root = get_repo_root(Path(py_file))
+    import_line = get_import_module_code(py_file)
+    if repo_root is not None:
+        repo_root_add = f"""sys.path.append(r'{repo_root}')"""
+    else:
+        repo_root_add = ""
+    txt: str = f"""
+try:
+    {import_line}
+except (ImportError, ModuleNotFoundError) as ex:
+    print(fr"❌ Failed to import `{py_file}` as a module: {{ex}} ")
+    print(fr"⚠️ Attempting import with ad-hoc `$PATH` manipulation. DO NOT pickle any objects in this session as correct deserialization cannot be guaranteed.")
+    import sys
+    sys.path.append(r'{Path(py_file).parent}')
+    {repo_root_add}
+    from {Path(py_file).stem} import *
+    print(fr"✅ Successfully imported `{py_file}`")
+"""
+    return txt
+
+
+def lambda_to_python_script(lmb: Callable[[], Any], in_global: bool, import_module: bool = False) -> str:
     """
     caveats: always use keyword arguments in the lambda call for best results.
     return statement not allowed in the wrapped function (otherwise it can be put in the global space)
@@ -20,13 +45,15 @@ def lambda_to_python_script(lmb: Callable[[], Any], in_global: bool) -> str:
     Args:
         lmb: A lambda function with no arguments
         in_global: If True, return kwargs as global variable assignments followed by dedented body.
-                   If False (default), return the full function definition with updated defaults.
+                   If False, return the full function definition with updated defaults.
+        import_module: When True, prepend module import bootstrap code for the function's source file.
     """
     # local imports
     import inspect as _inspect
     import ast as _ast
     import textwrap as _textwrap
     import types as _types
+    from pathlib import Path as _Path
 
     # sanity checks
     if not (callable(lmb) and isinstance(lmb, _types.LambdaType)):
@@ -77,6 +104,14 @@ def lambda_to_python_script(lmb: Callable[[], Any], in_global: bool) -> str:
 
     func_name = getattr(func_obj, "__name__", "<unknown>")
 
+    import_prefix: str = ""
+    if import_module:
+        module_file = _inspect.getsourcefile(func_obj)
+        module_path_candidate: str | None = module_file if module_file is not None else _inspect.getfile(func_obj)
+        if module_path_candidate is None:
+            raise RuntimeError("Could not determine source file for function module inspection.")
+        import_prefix = get_import_module_string(str(_Path(module_path_candidate)))
+
     # Evaluate each keyword argument value in the lambda's globals to get real Python objects
     call_kwargs = {}
     for kw in body.keywords:
@@ -174,15 +209,17 @@ def lambda_to_python_script(lmb: Callable[[], Any], in_global: bool) -> str:
         
         # Combine global assignments and body
         if global_assignments:
-            result_parts = ["\n".join(global_assignments), "", dedented_body]
-            return "\n".join(result_parts)
+            result_parts: list[str] = ["\n".join(global_assignments), "", dedented_body]
+            result_text = "\n".join(result_parts)
         else:
-            return dedented_body
-
-    # Compose final function definition text
-    header = f"def {func_name}{new_sig}:\n"
-    final_src = header + body_text
-    return final_src
+            result_text = dedented_body
+    else:
+        header = f"def {func_name}{new_sig}:\n"
+        result_text = header + body_text
+
+    if import_prefix:
+        return f"{import_prefix}{result_text}"
+    return result_text
 
 
 if __name__ == "__main__":

{machineconfig-6.62 → machineconfig-6.64}/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.61"
+MACHINECONFIG_VERSION = "machineconfig>=6.64"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:
@@ -112,10 +112,11 @@ class SSH:
         from machineconfig.scripts.python.helpers_devops.cli_utils import get_machine_specs
         self.local_specs: MachineSpecs = get_machine_specs()
         resp = self.run_shell(command=f"""~/.local/bin/utils get-machine-specs """, verbose_output=False, description="Getting remote machine specs", strict_stderr=False, strict_return_code=False)
-        import json
+        # import json
         json_str = resp.op
-        print(f"Remote machine specs JSON: {resp}")
-        self.remote_specs: MachineSpecs = cast(MachineSpecs, json.loads(json_str))
+        print(f"Remote machine specs JSON: {resp.op}")
+        import ast
+        self.remote_specs: MachineSpecs = cast(MachineSpecs, ast.literal_eval(json_str))
         self.terminal_responses: list[Response] = []
 
     def __enter__(self) -> "SSH":
@@ -181,7 +182,7 @@ class SSH:
         uv_cmd = f"""{UV_RUN_CMD} {with_clause} python {py_path.relative_to(Path.home())}"""
         return self.run_shell(command=uv_cmd, verbose_output=verbose_output, description=description or f"run_py on {self.get_remote_repr(add_machine=False)}", strict_stderr=strict_stderr, strict_return_code=strict_return_code)
 
-    def run_py_func(self, func: Callable[..., Any], uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> Response:
+    def run_lambda_function(self, func: Callable[..., Any], uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> Response:
         command = lambda_to_python_script(lmb=func, in_global=True)
         return self.run_py(python_code=command, uv_with=uv_with, uv_project_dir=uv_project_dir,
                            description=f"run_py_func {func.__name__} on {self.get_remote_repr(add_machine=False)}",
@@ -196,7 +197,7 @@ class SSH:
 
     def create_dir(self, path_rel2home: str, overwrite_existing: bool) -> None:
         """Helper to create a directory on remote machine and return its path."""
-        def create_target_dir(target_rel2home: str, overwrite: bool) -> None:
+        def create_target_dir(target_rel2home: str, overwrite: bool):
             from pathlib import Path
             import shutil
             directory_path = Path(target_rel2home).expanduser()
@@ -206,13 +207,15 @@ class SSH:
                 else:
                     directory_path.unlink()
             directory_path.parent.mkdir(parents=True, exist_ok=True)
-            return
         command = lambda_to_python_script(lmb=lambda: create_target_dir(target_rel2home=path_rel2home, overwrite=overwrite_existing), in_global=True)
         tmp_py_file = Path.home().joinpath(f"{DEFAULT_PICKLE_SUBDIR}/create_target_dir_{randstr()}.py")
         tmp_py_file.parent.mkdir(parents=True, exist_ok=True)
         tmp_py_file.write_text(command, encoding="utf-8")
-        self.copy_from_here(source_path=str(tmp_py_file), target_rel2home=None, compress_with_zip=False, recursive=False, overwrite_existing=True)
-        self.run_shell(command=f"""{UV_RUN_CMD} python {tmp_py_file.as_posix()}""", verbose_output=False, description=f"Creating target dir {path_rel2home}", strict_stderr=True, strict_return_code=True)
+        # self.copy_from_here(source_path=str(tmp_py_file), target_rel2home=".tmp_file.py", compress_with_zip=False, recursive=False, overwrite_existing=True)
+        assert self.sftp is not None
+        tmp_remote_path = ".tmp_pyfile.py"
+        self.sftp.put(localpath=str(tmp_py_file), remotepath=str(Path(self.remote_specs["home_dir"]).joinpath(tmp_remote_path)))
+        self.run_shell(command=f"""{UV_RUN_CMD} python {tmp_remote_path}""", verbose_output=False, description=f"Creating target dir {path_rel2home}", strict_stderr=True, strict_return_code=True)
 
     def copy_from_here(self, source_path: str, target_rel2home: Optional[str], compress_with_zip: bool, recursive: bool, overwrite_existing: bool) -> None:
         if self.sftp is None: raise RuntimeError(f"SFTP connection not available for {self.hostname}. Cannot transfer files.")
@@ -226,7 +229,7 @@ class SSH:
             if not recursive:
                 raise RuntimeError(f"SSH Error: source `{source_obj}` is a directory! Set `recursive=True` for recursive sending or `compress_with_zip=True` to zip it first.")            
             file_paths_to_upload: list[Path] = [file_path for file_path in source_obj.rglob("*") if file_path.is_file()]
-            # self.create_dir(path_rel2home=target_rel2home, overwrite_existing=overwrite_existing)
+            self.create_dir(path_rel2home=target_rel2home, overwrite_existing=overwrite_existing)
             for idx, file_path in enumerate(file_paths_to_upload):
                 print(f"   {idx + 1:03d}. {file_path}")
             for file_path in file_paths_to_upload:
@@ -243,7 +246,7 @@ class SSH:
                 shutil.make_archive(str(zip_path), "zip", source_obj.parent, source_obj.name)
             source_obj = Path(str(zip_path) + ".zip")
             if not target_rel2home.endswith(".zip"): target_rel2home = target_rel2home + ".zip"
-        # remotepath_str = self.create_dir(target_path=target_path, overwrite_existing=overwrite_existing)
+        self.create_dir(path_rel2home=target_rel2home, overwrite_existing=overwrite_existing)
         print(f"""📤 [SFTP UPLOAD] Sending file: {repr(source_obj)}  ==>  Remote Path: {target_rel2home}""")
         try:
             with self.tqdm_wrap(ascii=True, unit="b", unit_scale=True) as pbar:

{machineconfig-6.62 → machineconfig-6.64/src/machineconfig.egg-info}/PKG-INFO

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