machineconfig 5.56__tar.gz → 5.59__tar.gz

{machineconfig-5.56/src/machineconfig.egg-info → machineconfig-5.59}/PKG-INFO

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

{machineconfig-5.56 → machineconfig-5.59}/pyproject.toml

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

{machineconfig-5.56 → machineconfig-5.59}/src/machineconfig/jobs/installer/linux_scripts/q.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+mkdir -p $HOME/Downloads || true
 cd $HOME/Downloads
 curl --proto '=https' --tlsv1.2 -sSf "https://desktop-release.q.us-east-1.amazonaws.com/latest/q-x86_64-linux.zip" -o "q.zip"
 unzip q.zip

{machineconfig-5.56 → machineconfig-5.59}/src/machineconfig/scripts/python/helpers_repos/cloud_repo_sync.py

@@ -11,7 +11,6 @@ from machineconfig.utils.code import get_shell_file_executing_python_script, wri
 import platform
 import subprocess
 from typing import Optional, Literal
-from pathlib import Path
 
 
 console = Console()
@@ -96,13 +95,14 @@ git pull originEnc master
 
         # ================================================================================
         option1 = "Delete remote copy and push local:"
-        program_1_py = f"""
-from machineconfig.scripts.python.helpers.repo_sync_helpers import delete_remote_repo_copy_and_push_local as func
-func(remote_repo=r'{str(repo_remote_root)}', local_repo=r'{str(repo_local_root)}', cloud=r'{cloud_resolved}')
-"""
-        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=str(Path.home().joinpath("code", "machineconfig", ".venv")))
+        def func2(remote_repo: str, local_repo: str, cloud: str):
+            from machineconfig.scripts.python.repos_helpers.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})
+        shell_file_1 = get_shell_file_executing_python_script(python_script=program_1_py, ve_path=None, executable="uv run --with machineconfig")
         # ================================================================================
-
         option2 = "Delete local repo and replace it with remote copy:"
         program_2 = f"""
 rm -rfd {repo_local_root}
@@ -114,16 +114,15 @@ sudo chmod 600 $HOME/.ssh/*
 sudo chmod 700 $HOME/.ssh
 sudo chmod +x $HOME/dotfiles/scripts/linux -R
 """
-
         shell_file_2 = write_shell_script_to_file(shell_script=program_2)
-
         # ================================================================================
         option3 = "Inspect repos:"
-        program_3_py = f"""
-from machineconfig.scripts.python.helper.repo_sync_helpers import inspect_repos as func
-func(repo_local_root=r'{str(repo_local_root)}', repo_remote_root=r'{str(repo_remote_root)}')
-"""
-        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=str(Path.home().joinpath("code", "machineconfig", ".venv")))
+        def func(repo_local_root: str, repo_remote_root: str):
+            from machineconfig.scripts.python.repos_helpers.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)})
+        shell_file_3 = get_shell_file_executing_python_script(python_script=program_3_py, ve_path=None, executable="uv run --with machineconfig")
         # ================================================================================
 
         option4 = "Remove problematic rclone file from repo and replace with remote:"

machineconfig-5.59/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -0,0 +1,31 @@
+
+
+iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
+function devops {
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig devops $args
+}
+
+function cloud {
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig cloud $args
+}
+
+function croshell {
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig croshell $args
+}
+
+function agents {
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig agents $args
+}
+
+function fire {
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig fire $args
+}
+
+function ftpx {
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig ftpx $args
+}
+
+function sessions {
+    & "$HOME\.local\bin\uv.exe" run --python 3.14 --with machineconfig sessions $args
+}
+

{machineconfig-5.56 → machineconfig-5.59}/src/machineconfig/utils/code.py

@@ -10,14 +10,16 @@ from machineconfig.utils.ve import get_ve_activate_line
 from machineconfig.utils.path_extended import PathExtended
 
 
-def get_shell_script_executing_python_file(python_file: str, func: Optional[str], ve_path: str, strict_execution: bool = True):
-    if func is None:
-        exec_line = f"""python {python_file}"""
-    else:
-        exec_line = f"""python -m fire {python_file} {func}"""
+def get_shell_script_executing_python_file(python_file: str, func: Optional[str], ve_path: Optional[str], executable: Optional[str], strict_execution: bool = True):
+    if executable is None: exe_resolved = "python"
+    else: exe_resolved = executable
+    if func is None: exec_line = f"""{exe_resolved} {python_file}"""
+    else: exec_line = f"""{exe_resolved} -m fire {python_file} {func}"""
+    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}`"
-{get_ve_activate_line(ve_path)}
+{ve_activate_line}
 {exec_line}
 deactivate || true
 """
@@ -31,7 +33,7 @@ deactivate || true
     return shell_script
 
 
-def get_shell_file_executing_python_script(python_script: str, ve_path: str, verbose: bool = True):
+def get_shell_file_executing_python_script(python_script: str, ve_path: Optional[str], executable: Optional[str], verbose: bool = True):
     if verbose:
         python_script = f"""
 code = r'''{python_script}'''
@@ -47,7 +49,7 @@ except ImportError:
     python_file = PathExtended.tmp().joinpath("tmp_scripts", "python", randstr() + ".py")
     python_file.parent.mkdir(parents=True, exist_ok=True)
     python_file.write_text(python_script, encoding="utf-8")
-    shell_script = get_shell_script_executing_python_file(python_file=str(python_file), func=None, ve_path=ve_path)
+    shell_script = get_shell_script_executing_python_file(python_file=str(python_file), func=None, ve_path=ve_path, executable=executable)
     shell_file = write_shell_script_to_file(shell_script)
     return shell_file
 
@@ -113,9 +115,7 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
     if display_script:
         from rich.syntax import Syntax
         console.print(Panel(Syntax(code=script, lexer=lexer), title=f"📄 shell script @ {temp_script_path}", subtitle="shell script being executed"), style="bold red")
-
     env = {} if clean_env else None
-
     if platform.system() == "Windows":
         import subprocess
         proc = subprocess.run(f'powershell -ExecutionPolicy Bypass -File "{temp_script_path}"', check=True, shell=True, env=env)
@@ -133,14 +133,4 @@ def run_shell_script(script: str, display_script: bool = True, clean_env: bool =
         console.print(f"⚠️  [yellow]Script executed with warnings (return code {proc.returncode}):[/yellow] [blue]{temp_script_path}[/blue]")    
     temp_script_path.unlink(missing_ok=True)
     console.print(f"🗑️  [blue]Temporary script deleted:[/blue] [green]{temp_script_path}[/green]")
-
-
-# def run_command(command: str, description: str) -> bool:
-#     """Execute a shell command and return success status."""
-#     console.print(f"\n🔧 {description}", style="bold cyan")
-#     try:
-#         result = subprocess.run(command, shell=True, check=True, capture_output=False)
-#         return result.returncode == 0
-#     except subprocess.CalledProcessError as e:
-#         console.print(f"❌ Error executing command: {e}", style="bold red")
-#         return False
+    return proc

{machineconfig-5.56 → machineconfig-5.59}/src/machineconfig/utils/installer_utils/installer_class.py

@@ -39,9 +39,7 @@ class Installer:
             result_old = subprocess.run(f"{exe_name} --version", shell=True, capture_output=True, text=True)
             old_version_cli = result_old.stdout.strip()
             print(f"📊 Current version: {old_version_cli or 'Not installed'}")
-
             self.install(version=version)
-
             result_new = subprocess.run(f"{exe_name} --version", shell=True, capture_output=True, text=True)
             new_version_cli = result_new.stdout.strip()
             print(f"📊 New version: {new_version_cli}")
@@ -77,8 +75,10 @@ class Installer:
                 desc = package_manager + " installation"
                 version_to_be_installed = package_manager + "Latest"
                 print(f"🚀 Running: {installer_arch_os}")
-                result = subprocess.run(installer_arch_os, shell=True, capture_output=True, text=True)
-                success = result.returncode == 0 and result.stderr == ""
+                # result = subprocess.run(installer_arch_os, shell=True, capture_output=True, text=True)
+                from machineconfig.utils.code import run_shell_script
+                result = run_shell_script(installer_arch_os)
+                success = result.returncode == 0 and result.stderr == "".encode()
                 if not success:
                     print(f"❌ {desc} failed")
                     if result.stdout:

machineconfig-5.59/src/machineconfig/utils/meta.py

@@ -0,0 +1,166 @@
+"""Metaprogramming utilities for analyzing and serializing Python functions."""
+
+import ast
+import inspect
+import textwrap
+from types import FunctionType, ModuleType
+from typing import Any
+
+
+def function_to_script(func: FunctionType, call_with_args: tuple[Any, ...] | None = None, call_with_kwargs: dict[str, Any] | None = None) -> str:
+    """Convert a function to a standalone executable Python script.
+    
+    This function analyzes a given function and generates a complete Python script
+    that includes all necessary imports, global variables, the function definition,
+    and optionally a function call.
+    
+    Args:
+        func: The function to convert to a script
+        call_with_args: Optional tuple of positional arguments to call the function with
+        call_with_kwargs: Optional dict of keyword arguments to call the function with
+    
+    Returns:
+        A complete Python script as a string that can be executed independently
+    
+    Raises:
+        ValueError: If the function cannot be inspected or analyzed
+    """
+    if not callable(func) or not hasattr(func, '__code__'):
+        raise ValueError(f"Expected a function, got {type(func)}")
+    
+    call_with_args = call_with_args or ()
+    call_with_kwargs = call_with_kwargs or {}
+    
+    imports = _extract_imports(func)
+    globals_needed = _extract_globals(func)
+    source_code = _get_function_source(func)
+    call_statement = _generate_call_statement(func, call_with_args, call_with_kwargs)
+    
+    script_parts: list[str] = []
+    
+    if imports:
+        script_parts.append(imports)
+        script_parts.append("")
+    
+    if globals_needed:
+        script_parts.append(globals_needed)
+        script_parts.append("")
+    
+    script_parts.append(source_code)
+    script_parts.append("")
+    
+    if call_statement:
+        script_parts.append("")
+        script_parts.append("if __name__ == '__main__':")
+        script_parts.append(f"    {call_statement}")
+    
+    return "\n".join(script_parts)
+
+
+def _get_function_source(func: FunctionType) -> str:
+    """Extract the source code of a function."""
+    try:
+        source = inspect.getsource(func)
+        return textwrap.dedent(source)
+    except (OSError, TypeError) as e:
+        raise ValueError(f"Cannot get source code for function {func.__name__}: {e}") from e
+
+
+def _extract_imports(func: FunctionType) -> str:
+    """Extract all import statements needed by the function."""
+    import_statements: set[str] = set()
+    
+    source = _get_function_source(func)
+    func_globals = func.__globals__
+    
+    try:
+        tree = ast.parse(source)
+    except SyntaxError as e:
+        raise ValueError(f"Failed to parse function source: {e}") from e
+    
+    used_names: set[str] = set()
+    for node in ast.walk(tree):
+        if isinstance(node, ast.Name):
+            used_names.add(node.id)
+        elif isinstance(node, ast.Attribute):
+            if isinstance(node.value, ast.Name):
+                used_names.add(node.value.id)
+    
+    for name in used_names:
+        if name in func_globals:
+            obj = func_globals[name]
+            
+            if isinstance(obj, ModuleType):
+                module_name = obj.__name__
+                if name == module_name.split('.')[-1]:
+                    import_statements.add(f"import {module_name}")
+                else:
+                    import_statements.add(f"import {module_name} as {name}")
+            
+            elif 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
+    
+    return "\n".join(sorted(import_statements))
+
+
+def _extract_globals(func: FunctionType) -> str:
+    """Extract global variables needed by the function."""
+    global_assignments: list[str] = []
+    
+    source = _get_function_source(func)
+    func_globals = func.__globals__
+    
+    try:
+        tree = ast.parse(source)
+    except SyntaxError as e:
+        raise ValueError(f"Failed to parse function source: {e}") from e
+    
+    used_names: set[str] = set()
+    for node in ast.walk(tree):
+        if isinstance(node, ast.Name):
+            used_names.add(node.id)
+        elif isinstance(node, ast.Attribute):
+            if isinstance(node.value, ast.Name):
+                used_names.add(node.value.id)
+    
+    for name in used_names:
+        if name in func_globals:
+            obj = func_globals[name]
+            
+            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}'")
+    
+    return "\n".join(global_assignments)
+
+
+def _generate_call_statement(func: FunctionType, args: tuple[Any, ...], kwargs: dict[str, Any]) -> str:
+    """Generate a function call statement with the given arguments."""
+    if not args and not kwargs:
+        return f"{func.__name__}()"
+    
+    arg_parts: list[str] = []
+    
+    for arg in args:
+        arg_parts.append(repr(arg))
+    
+    for key, value in kwargs.items():
+        arg_parts.append(f"{key}={repr(value)}")
+    
+    args_str = ", ".join(arg_parts)
+    return f"{func.__name__}({args_str})"

{machineconfig-5.56 → machineconfig-5.59}/src/machineconfig/utils/ssh.py

@@ -214,12 +214,11 @@ class SSH:  # inferior alternative: https://github.com/fabric/fabric
             res.print()
         self.terminal_responses.append(res)
         return res
-
     def run_py(self, cmd: str, desc: str = "", return_obj: bool = False, verbose: bool = True, strict_err: bool = False, strict_returncode: bool = False) -> Union[Any, Response]:
         assert '"' not in cmd, 'Avoid using `"` in your command. I dont know how to handle this when passing is as command to python in pwsh command.'
         if not return_obj:
             return self.run(
-                cmd=f"""$HOME/.local/bin/devops self run-python -c "{cmd}\n""" + '"',
+                cmd=f"""$HOME/.local/bin/uv run --with machineconfig python -c "{cmd}\n""" + '"',
                 desc=desc or f"run_py on {self.get_remote_repr()}",
                 verbose=verbose,
                 strict_err=strict_err,
@@ -252,18 +251,16 @@ print(path)""", desc=desc, verbose=verbose, strict_err=True, strict_returncode=T
             if r is False:
                 raise RuntimeError(f"Meta.SSH Error: source `{source_obj}` is a directory! either set `r=True` for recursive sending or raise `z=True` flag to zip it first.")
             source_list: list[PathExtended] = source_obj.search("*", folders=False, files=True, r=True)
-            remote_root = (
-                self.run_py(
-                    f"""
-from machineconfig.utils.path_extended import PathExtended as P
-path=P(r'{PathExtended(target).as_posix()}').expanduser()
-{'path.delete(sure=True)' if overwrite else ''}
-print(path.create())""",
+            def func(item: PathExtended, overwrite: bool) -> None:
+                from machineconfig.utils.path_extended import PathExtended as P
+                path=P(r'{PathExtended(target).as_posix()}').expanduser()
+                if overwrite: path.delete(sure=True)
+                path.parent.mkdir(parents=True, exist_ok=True)
+            from machineconfig.utils.meta import function_to_script
+            command = function_to_script(func=func, call_with_kwargs={"item": PathExtended(target).as_posix(), "overwrite": overwrite})
+            remote_root = (self.run_py(command,
                     desc=f"Creating Target directory `{PathExtended(target).as_posix()}` @ {self.get_remote_repr()}",
-                    verbose=False,
-                ).op
-                or ""
-            )
+                    verbose=False,).op or "")
             for idx, item in enumerate(source_list):
                 print(f"   {idx + 1:03d}. {item}")
             for item in source_list:

{machineconfig-5.56 → machineconfig-5.59/src/machineconfig.egg-info}/PKG-INFO

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

{machineconfig-5.56 → machineconfig-5.59}/src/machineconfig.egg-info/SOURCES.txt

@@ -381,6 +381,7 @@ src/machineconfig/utils/code.py
 src/machineconfig/utils/installer.py
 src/machineconfig/utils/io.py
 src/machineconfig/utils/links.py
+src/machineconfig/utils/meta.py
 src/machineconfig/utils/notifications.py
 src/machineconfig/utils/options.py
 src/machineconfig/utils/path_extended.py

machineconfig-5.56/src/machineconfig/setup_windows/web_shortcuts/interactive.ps1

@@ -1,31 +0,0 @@
-
-
-iex (iwr "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/main/src/machineconfig/setup_windows/uv.ps1").Content
-function devops {
-    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig devops $args
-}
-
-function cloud {
-    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig cloud $args
-}
-
-function croshell {
-    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig croshell $args
-}
-
-function agents {
-    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig agents $args
-}
-
-function fire {
-    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig fire $args
-}
-
-function ftpx {
-    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig ftpx $args
-}
-
-function sessions {
-    & "$HOME\.local\bin\uv.exe" run --python 3.13 --with machineconfig sessions $args
-}
-