machineconfig 6.65__tar.gz → 6.66__tar.gz

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

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

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

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

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

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

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

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

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

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

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

{machineconfig-6.65 → machineconfig-6.66}/src/machineconfig/utils/accessories.py

@@ -72,7 +72,6 @@ def split_list[T](sequence: list[T], every: Optional[int]=None, to: Optional[int
 
 def pprint(obj: dict[Any, Any], title: str) -> None:
     from rich import inspect
-
     inspect(type("TempStruct", (object,), obj)(), value=False, title=title, docs=False, dunder=False, sort=False)
 
 

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

@@ -8,10 +8,14 @@ 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.65"
+MACHINECONFIG_VERSION = "machineconfig>=6.66"
 DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
 
 class SSH:
+    @staticmethod
+    def from_config_file(host: str) -> "SSH":
+        """Create SSH instance from SSH config file entry."""
+        return SSH(host=host, username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)
     def __init__(
         self, host: Optional[str], username: Optional[str], hostname: Optional[str], ssh_key_path: Optional[str], password: Optional[str], port: int, enable_compression: bool):
         self.password = password
@@ -112,12 +116,36 @@ 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
         json_str = resp.op
-        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] = []
+        
+        from rich import inspect
+        
+        local_info = dict(distro=self.local_specs.get("distro"), system=self.local_specs.get("system"), home_dir=self.local_specs.get("home_dir"))
+        remote_info = dict(distro=self.remote_specs.get("distro"), system=self.remote_specs.get("system"), home_dir=self.remote_specs.get("home_dir"))
+        
+        console = rich.console.Console()
+        
+        from io import StringIO
+        local_buffer = StringIO()
+        remote_buffer = StringIO()
+        
+        local_console = rich.console.Console(file=local_buffer, width=40)
+        remote_console = rich.console.Console(file=remote_buffer, width=40)
+        
+        inspect(type("LocalInfo", (object,), local_info)(), value=False, title="SSHing From", docs=False, dunder=False, sort=False, console=local_console)
+        inspect(type("RemoteInfo", (object,), remote_info)(), value=False, title="SSHing To", docs=False, dunder=False, sort=False, console=remote_console)
+        
+        local_lines = local_buffer.getvalue().split("\n")
+        remote_lines = remote_buffer.getvalue().split("\n")
+        
+        max_lines = max(len(local_lines), len(remote_lines))
+        for i in range(max_lines):
+            left = local_lines[i] if i < len(local_lines) else ""
+            right = remote_lines[i] if i < len(remote_lines) else ""
+            console.print(f"{left:<42} {right}")
 
     def __enter__(self) -> "SSH":
         return self
@@ -165,8 +193,8 @@ class SSH:
             res.capture().print_if_unsuccessful(desc=description, strict_err=strict_stderr, strict_returncode=strict_return_code, assert_success=False)
         # self.terminal_responses.append(res)
         return res
-    def run_py(self, python_code: str, uv_with: Optional[list[str]], uv_project_dir: Optional[str],
-               description: str, verbose_output: bool, strict_stderr: bool, strict_return_code: bool) -> Response:
+
+    def _run_py_prep(self, python_code: str, uv_with: Optional[list[str]], uv_project_dir: Optional[str],) -> str:
         py_path = Path.home().joinpath(f"{DEFAULT_PICKLE_SUBDIR}/runpy_{randstr()}.py")
         py_path.parent.mkdir(parents=True, exist_ok=True)
         py_path.write_text(python_code, encoding="utf-8")
@@ -180,13 +208,29 @@ class SSH:
         else:
             with_clause += ""
         uv_cmd = f"""{UV_RUN_CMD} {with_clause} python {py_path.relative_to(Path.home())}"""
+        return uv_cmd
+
+    def run_py(self, python_code: str, uv_with: Optional[list[str]], uv_project_dir: Optional[str],
+               description: str, verbose_output: bool, strict_stderr: bool, strict_return_code: bool) -> Response:
+        uv_cmd = self._run_py_prep(python_code=python_code, uv_with=uv_with, uv_project_dir=uv_project_dir)
         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_lambda_function(self, func: Callable[..., Any], import_module: bool, uv_with: Optional[list[str]], uv_project_dir: Optional[str]) -> Response:
+    def run_lambda_function(self, func: Callable[..., Any], import_module: bool, uv_with: Optional[list[str]], uv_project_dir: Optional[str]):
         command = lambda_to_python_script(lmb=func, in_global=True, import_module=import_module)
-        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)}",
-                           verbose_output=True, strict_stderr=True, strict_return_code=True)
+        # turns ou that the code below for some reason runs but zellij doesn't start, looks like things are assigned to different user.
+        # 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)}",
+        #                    verbose_output=True, strict_stderr=True, strict_return_code=True)
+        uv_cmd = self._run_py_prep(python_code=command, uv_with=uv_with, uv_project_dir=uv_project_dir)
+        if self.remote_specs["system"] == "Linux":
+            uv_cmd_modified = f'bash -l -c "{uv_cmd}"'
+        else: uv_cmd_modified = uv_cmd
+        # This works even withou the modified uv cmd:
+        # from machineconfig.utils.code import run_shell_script
+        # assert self.host is not None, "SSH host must be specified to run remote commands"
+        # process = run_shell_script(f"ssh {self.host} -n '. ~/.profile; . ~/.bashrc; {uv_cmd}'")
+        # return process
+        return self.run_shell(command=uv_cmd_modified, verbose_output=True, description=f"run_py_func {func.__name__} on {self.get_remote_repr(add_machine=False)}", strict_stderr=True, strict_return_code=True)
 
     def _simple_sftp_get(self, remote_path: str, local_path: Path) -> None:
         """Simple SFTP get without any recursion or path expansion - for internal use only."""

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

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