machineconfig 6.48__tar.gz → 6.49__tar.gz

{machineconfig-6.48/src/machineconfig.egg-info → machineconfig-6.49}/PKG-INFO

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

{machineconfig-6.48 → machineconfig-6.49}/pyproject.toml

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

{machineconfig-6.48 → machineconfig-6.49}/src/machineconfig/cluster/sessions_managers/utils/maker.py

@@ -6,7 +6,7 @@ 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)
+    py_script =  function_to_script(func, call_with_kwargs=None)
     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)

{machineconfig-6.48 → machineconfig-6.49}/src/machineconfig/scripts/python/croshell.py

@@ -121,7 +121,7 @@ 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.48" """
+        else: requirements = """--with "marimo,machineconfig[plot]>=6.49" """
         fire_line = f"""
 cd {str(pyfile.parent)}
 uv run --with "marimo" marimo convert {pyfile.name} -o marimo_nb.py
@@ -129,14 +129,14 @@ uv run  {requirements} marimo edit --host 0.0.0.0 marimo_nb.py
 """
     elif jupyter:
         if Path.home().joinpath("code/machineconfig").exists(): requirements = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" """
-        else: requirements = """--with "machineconfig[plot]>=6.48" """
+        else: requirements = """--with "machineconfig[plot]>=6.49" """
         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.48"
+uv add "machineconfig[plot]>=6.49"
 # code serve-web
 code --new-window {str(pyfile)}
 """
@@ -151,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.48" """
+        else: ve_line = """--with "machineconfig[plot]>=6.49" """
         # 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.48 → machineconfig-6.49}/src/machineconfig/scripts/python/env_manager/path_manager_tui.py

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

{machineconfig-6.48 → machineconfig-6.49}/src/machineconfig/scripts/python/helpers_devops/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.48,textual" """
+    if not Path.home().joinpath("code/machineconfig").exists(): executable = """--with "machineconfig>=6.49,textual" """
     else: executable = f"""--project "{str(Path.home().joinpath("code/machineconfig"))}" --with textual"""
     run_shell_script(f"""uv run {executable} {path}""")
 

{machineconfig-6.48 → machineconfig-6.49}/src/machineconfig/scripts/python/helpers_devops/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.48" """)
+            run_shell_script(r"""$HOME\.local\bin\uv.exe tool install --upgrade "machineconfig>=6.49" """)
         else:
-            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.48" """)
+            run_shell_script("""$HOME/.local/bin/uv tool install --upgrade "machineconfig>=6.49" """)
     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.48,textual" """
+    else: executable = """--with "machineconfig>=6.49,textual" """
     run_shell_script(f"""uv run {executable} {path}""")
 
 

{machineconfig-6.48 → machineconfig-6.49}/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.48" """
+    else: executable = """uv run --with "machineconfig>=6.49" """
 
     shell_path = write_shell_script_to_file(shell_script=script)
     command = f". {shell_path}"
@@ -100,12 +100,17 @@ git pull originEnc master
 
         # ================================================================================
         option1 = "Delete remote copy and push local:"
+        from machineconfig.utils.meta import function_to_script
         def func2(remote_repo: str, local_repo: str, cloud: str):
             from machineconfig.scripts.python.helpers_repos.sync import delete_remote_repo_copy_and_push_local
             delete_remote_repo_copy_and_push_local(remote_repo=remote_repo, local_repo=local_repo, cloud=cloud)
             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})
+        # def func2(remote_repo: str=str(repo_remote_root), local_repo: str=str(repo_local_root), cloud: str=str(cloud_resolved)):
+        #     from machineconfig.scripts.python.helpers_repos.sync import delete_remote_repo_copy_and_push_local
+        #     delete_remote_repo_copy_and_push_local(remote_repo=remote_repo, local_repo=local_repo, cloud=cloud)
+        #     return "done"
+        # program_1_py = function_to_script(func=func2, call_with_kwargs=None)
+        program_1_py = function_to_script(func=func2, 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=executable)
@@ -128,7 +133,7 @@ sudo chmod +x $HOME/dotfiles/scripts/linux -R
             from machineconfig.scripts.python.helpers_repos.sync import inspect_repos
             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)})
+        program_3_py = function_to_script(func=func, 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=executable)
         # ================================================================================
 

{machineconfig-6.48 → machineconfig-6.49}/src/machineconfig/scripts/python/helpers_repos/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.48" {count_lines_path} analyze-over-time {repo_path}"""
+    cmd = f"""uv run --python 3.14 --with "machineconfig[plot]>=6.49" {count_lines_path} analyze-over-time {repo_path}"""
     from machineconfig.utils.code import run_shell_script
     run_shell_script(cmd)
 

{machineconfig-6.48 → machineconfig-6.49}/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.48" python -m machineconfig.scripts.python.mount_nfs
+uv run --python 3.14 --with "machineconfig>=6.49" 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.48 → machineconfig-6.49}/src/machineconfig/scripts/windows/mounts/mount_ssh.ps1

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

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

{machineconfig-6.48 → machineconfig-6.49}/src/machineconfig/utils/code.py

@@ -19,7 +19,7 @@ def get_shell_script_executing_python_file(python_file: str, func: Optional[str]
     if ve_path is None: ve_activate_line = ""
     else: ve_activate_line = get_ve_activate_line(ve_path)
     shell_script = f"""
-echo "Executing `{exec_line}`"
+echo "Executing {exec_line}"
 {ve_activate_line}
 {exec_line}
 deactivate || true

{machineconfig-6.48 → machineconfig-6.49}/src/machineconfig/utils/meta.py

@@ -90,6 +90,17 @@ def _extract_imports(func: FunctionType) -> str:
             if isinstance(node.value, ast.Name):
                 used_names.add(node.value.id)
     
+    for node in ast.walk(tree):
+        if isinstance(node, ast.FunctionDef):
+            for default in node.args.defaults + node.args.kw_defaults:
+                if default is not None:
+                    for subnode in ast.walk(default):
+                        if isinstance(subnode, ast.Name):
+                            used_names.add(subnode.id)
+                        elif isinstance(subnode, ast.Attribute):
+                            if isinstance(subnode.value, ast.Name):
+                                used_names.add(subnode.value.id)
+    
     for name in used_names:
         if name in func_globals:
             obj = func_globals[name]
@@ -101,7 +112,20 @@ def _extract_imports(func: FunctionType) -> str:
                 else:
                     import_statements.add(f"import {module_name} as {name}")
             
-            elif hasattr(obj, '__module__') and obj.__module__ != '__main__':
+            elif isinstance(obj, type) and hasattr(obj, '__module__') and obj.__module__ != '__main__':
+                try:
+                    module_name = obj.__module__
+                    obj_name = obj.__name__ if hasattr(obj, '__name__') else name
+                    
+                    if module_name and module_name != 'builtins':
+                        if obj_name == name:
+                            import_statements.add(f"from {module_name} import {obj_name}")
+                        else:
+                            import_statements.add(f"from {module_name} import {obj_name} as {name}")
+                except AttributeError:
+                    pass
+            
+            elif callable(obj) and not isinstance(obj, type) and hasattr(obj, '__module__') and obj.__module__ != '__main__':
                 try:
                     module_name = obj.__module__
                     obj_name = obj.__name__ if hasattr(obj, '__name__') else name
@@ -120,6 +144,7 @@ def _extract_imports(func: FunctionType) -> str:
 def _extract_globals(func: FunctionType) -> str:
     """Extract global variables needed by the function."""
     global_assignments: list[str] = []
+    needed_types: set[type] = set()
     
     source = _get_function_source(func)
     func_globals = func.__globals__
@@ -137,6 +162,17 @@ def _extract_globals(func: FunctionType) -> str:
             if isinstance(node.value, ast.Name):
                 used_names.add(node.value.id)
     
+    for node in ast.walk(tree):
+        if isinstance(node, ast.FunctionDef):
+            for default in node.args.defaults + node.args.kw_defaults:
+                if default is not None:
+                    for subnode in ast.walk(default):
+                        if isinstance(subnode, ast.Name):
+                            used_names.add(subnode.id)
+                        elif isinstance(subnode, ast.Attribute):
+                            if isinstance(subnode.value, ast.Name):
+                                used_names.add(subnode.value.id)
+    
     for name in used_names:
         if name in func_globals:
             obj = func_globals[name]
@@ -144,13 +180,35 @@ def _extract_globals(func: FunctionType) -> str:
             if not isinstance(obj, (ModuleType, FunctionType, type)):
                 if not (hasattr(obj, '__module__') and hasattr(obj, '__name__')):
                     try:
-                        repr_str = repr(obj)
-                        if len(repr_str) < 1000 and '\n' not in repr_str:
-                            global_assignments.append(f"{name} = {repr_str}")
-                    except Exception:
-                        global_assignments.append(f"# Warning: Could not serialize global variable '{name}'")
+                        obj_type = type(obj)
+                        
+                        if obj_type.__name__ == 'PathExtended' and obj_type.__module__ == 'machineconfig.utils.path_extended':
+                            global_assignments.append(f"{name} = PathExtended('{str(obj)}')")
+                            if obj_type.__module__ not in ['builtins', '__main__']:
+                                needed_types.add(obj_type)
+                        else:
+                            repr_str = repr(obj)
+                            if len(repr_str) < 1000 and '\n' not in repr_str and all(ord(c) < 128 or c in [' ', '\n', '\t'] for c in repr_str):
+                                global_assignments.append(f"{name} = {repr_str}")
+                                if obj_type.__module__ not in ['builtins', '__main__']:
+                                    needed_types.add(obj_type)
+                            else:
+                                global_assignments.append(f"# Warning: Could not serialize global variable '{name}' (repr too complex or contains non-ASCII)")
+                    except Exception as e:
+                        global_assignments.append(f"# Warning: Could not serialize global variable '{name}': {e}")
+    
+    result_parts: list[str] = []
+    
+    if needed_types:
+        for obj_type in sorted(needed_types, key=lambda t: (t.__module__, t.__name__)):
+            module_name = obj_type.__module__
+            type_name = obj_type.__name__
+            result_parts.append(f"from {module_name} import {type_name}")
+        result_parts.append("")
+    
+    result_parts.extend(global_assignments)
     
-    return "\n".join(global_assignments)
+    return "\n".join(result_parts)
 
 
 def _prepare_call_kwargs(func: FunctionType, call_with_kwargs: Mapping[str, object] | None) -> dict[str, object] | None:

{machineconfig-6.48 → machineconfig-6.49}/src/machineconfig/utils/scheduler.py

@@ -1,10 +1,10 @@
+
 from pathlib import Path
 from typing import Callable, Optional, Union, Any, Protocol, List, TypeVar
 import logging
 import time
 from datetime import datetime, timezone, timedelta
 from machineconfig.utils.io import from_pickle
-from machineconfig.utils.path_extended import PathExtended
 
 
 class LoggerTemplate(Protocol):
@@ -147,7 +147,6 @@ class Scheduler:
 T2 = TypeVar("T2")
 def to_pickle(obj: Any, path: Path) -> None:
     import pickle
-    path.parent.mkdir(parents=True, exist_ok=True)
     path.write_bytes(pickle.dumps(obj))
 
 
@@ -160,15 +159,12 @@ class CacheMemory[T]():
         self.time_produced = datetime.now()
         self.logger = logger
         self.expire = expire
-        self.name = name if isinstance(name, str) else str(self.source_func)
-        self.last_call_is_fresh = False
-
+        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:
-        self.last_call_is_fresh = False
         if fresh or not hasattr(self, "cache"):
             why = "There was an explicit fresh order." if fresh else "Previous cache never existed."
             t0 = time.time()
@@ -177,7 +173,6 @@ class CacheMemory[T]():
 ℹ️ 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
@@ -189,7 +184,6 @@ class CacheMemory[T]():
                 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:
                 self.logger.warning(f"""
@@ -212,21 +206,19 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
     ) -> None:
         self.cache: T
         self.source_func = source_func  # function which when called returns a fresh object to be frozen.
-        self.path: PathExtended = PathExtended(path)
+        self.path: Path = path
+        _ = self.path.parent.mkdir(parents=True, exist_ok=True)
         self.time_produced = datetime.now()  # if path is None else
         self.save = saver
         self.reader = reader
         self.logger = logger
         self.expire = expire
-        self.name = name if isinstance(name, str) else str(self.source_func)
-        self.last_call_is_fresh = False
-
+        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:
-        self.last_call_is_fresh = False
         if fresh or not hasattr(self, "cache"):  # populate cache for the first time
             if not fresh and self.path.exists():
                 age = datetime.now() - datetime.fromtimestamp(self.path.stat().st_mtime)
@@ -245,10 +237,8 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
                     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:
-                    #     self.save(self.cache, self.path)
+                    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:
@@ -261,7 +251,6 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
                 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)
         else:  # cache exists
@@ -277,7 +266,6 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
                 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:
@@ -294,5 +282,4 @@ class Cache[T]():  # This class helps to accelrate access to latest data coming
         def decorator(source_func: Callable[[], T2]) -> Cache["T2"]:
             res = Cache(source_func=source_func, expire=expire, logger=logger, path=path, name=name, reader=reader, saver=saver)
             return res
-
         return decorator

{machineconfig-6.48 → machineconfig-6.49}/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.48"
+MACHINECONFIG_VERSION = "machineconfig>=6.49"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 

{machineconfig-6.48 → machineconfig-6.49/src/machineconfig.egg-info}/PKG-INFO

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