machineconfig 5.15__py3-none-any.whl → 7.98__py3-none-any.whl

machineconfig/utils/ssh.py

@@ -1,73 +1,40 @@
-from typing import Optional, Any, Union, List
+from typing import Callable, Optional, Any, cast, Union, Literal
 import os
-from dataclasses import dataclass
+from pathlib import Path
+import platform
+from machineconfig.scripts.python.helpers_utils.path import MachineSpecs
+from machineconfig.utils.code import get_uv_run_command
 import rich.console
-from machineconfig.utils.terminal import Response, MACHINE
-from machineconfig.utils.path_extended import PathExtended, PLike, OPLike
-from machineconfig.utils.accessories import pprint
-# from machineconfig.utils.ve import get_ve_activate_line
-
-
-def get_header(wdir: OPLike, toolbox: bool):
-    if toolbox:
-        toobox_code = """
-try:
-from crocodile.toolbox import *
-except ImportError:
-print("Crocodile not found, skipping import.")
-pass
-"""
-    else:
-        toobox_code = "# No toolbox import."
-    return f"""
-# >> Code prepended
-{toobox_code}
-{'''sys.path.insert(0, r'{wdir}') ''' if wdir is not None else "# No path insertion."}
-# >> End of header, start of script passed
-"""
-
-
-@dataclass
-class Scout:
-    source_full: PathExtended
-    source_rel2home: PathExtended
-    exists: bool
-    is_dir: bool
-    files: Optional[List[PathExtended]]
-
-
-def scout(source: PLike, z: bool = False, r: bool = False) -> Scout:
-    source_full = PathExtended(source).expanduser().absolute()
-    source_rel2home = source_full.collapseuser()
-    exists = source_full.exists()
-    is_dir = source_full.is_dir() if exists else False
-    if z and exists:
-        try:
-            source_full = source_full.zip()
-        except Exception as ex:
-            raise Exception(f"Could not zip {source_full} due to {ex}") from ex  # type: ignore # pylint: disable=W0719
-        source_rel2home = source_full.zip()
-    if r and exists and is_dir:
-        files = [item.collapseuser() for item in source_full.search(folders=False, r=True)]
-    else:
-        files = None
-    return Scout(source_full=source_full, source_rel2home=source_rel2home, exists=exists, is_dir=is_dir, files=files)
-
-
-class SSH:  # inferior alternative: https://github.com/fabric/fabric
+from machineconfig.utils.terminal import Response
+from machineconfig.utils.accessories import pprint, randstr
+from machineconfig.utils.meta import lambda_to_python_script
+from machineconfig.utils.ssh_utils.abc import DEFAULT_PICKLE_SUBDIR
+
+
+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] = None, username: Optional[str] = None, hostname: Optional[str] = None, sshkey: Optional[str] = None, pwd: Optional[str] = None, port: int = 22, ve: Optional[str] = ".venv", compress: bool = False
-    ):  # https://stackoverflow.com/questions/51027192/execute-command-script-using-different-shell-in-ssh-paramiko
-        self.pwd = pwd
-        self.ve = ve
-        self.compress = compress  # Defaults: (1) use localhost if nothing provided.
+        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
+        self.enable_compression = enable_compression
 
         self.host: Optional[str] = None
         self.hostname: str
         self.username: str
         self.port: int = port
         self.proxycommand: Optional[str] = None
-        import platform
         import paramiko  # type: ignore
         import getpass
 
@@ -75,26 +42,28 @@ class SSH:  # inferior alternative: https://github.com/fabric/fabric
             try:
                 import paramiko.config as pconfig
 
-                config = pconfig.SSHConfig.from_path(str(PathExtended.home().joinpath(".ssh/config")))
+                config = pconfig.SSHConfig.from_path(str(Path.home().joinpath(".ssh/config")))
                 config_dict = config.lookup(host)
                 self.hostname = config_dict["hostname"]
                 self.username = config_dict["user"]
                 self.host = host
                 self.port = int(config_dict.get("port", port))
-                tmp = config_dict.get("identityfile", sshkey)
-                if isinstance(tmp, list):
-                    sshkey = tmp[0]
+                identity_file_value = config_dict.get("identityfile", ssh_key_path)
+                if isinstance(identity_file_value, list):
+                    ssh_key_path = identity_file_value[0]
                 else:
-                    sshkey = tmp
+                    ssh_key_path = identity_file_value
                 self.proxycommand = config_dict.get("proxycommand", None)
-                if sshkey is not None:
-                    tmp = config.lookup("*").get("identityfile", sshkey)
-                    if isinstance(tmp, list):
-                        sshkey = tmp[0]
+                if ssh_key_path is not None:
+                    wildcard_identity_file = config.lookup("*").get("identityfile", ssh_key_path)
+                    if isinstance(wildcard_identity_file, list):
+                        ssh_key_path = wildcard_identity_file[0]
                     else:
-                        sshkey = tmp
+                        ssh_key_path = wildcard_identity_file
             except (FileNotFoundError, KeyError):
-                assert "@" in host or ":" in host, f"Host must be in the form of `username@hostname:port` or `username@hostname` or `hostname:port`, but it is: {host}"
+                assert "@" in host or ":" in host, (
+                    f"Host must be in the form of `username@hostname:port` or `username@hostname` or `hostname:port`, but it is: {host}"
+                )
                 if "@" in host:
                     self.username, self.hostname = host.split("@")
                 else:
@@ -110,31 +79,52 @@ class SSH:  # inferior alternative: https://github.com/fabric/fabric
             print(f"Provided values: host={host}, username={username}, hostname={hostname}")
             raise ValueError("Either host or username and hostname must be provided.")
 
-        self.sshkey = str(PathExtended(sshkey).expanduser().absolute()) if sshkey is not None else None  # no need to pass sshkey if it was configured properly already
+        self.ssh_key_path = str(Path(ssh_key_path).expanduser().absolute()) if ssh_key_path is not None else None
         self.ssh = paramiko.SSHClient()
         self.ssh.load_system_host_keys()
         self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
-        pprint(dict(host=self.host, hostname=self.hostname, username=self.username, password="***", port=self.port, key_filename=self.sshkey, ve=self.ve), title="SSHing To")
+        pprint(
+            dict(host=self.host, hostname=self.hostname, username=self.username, password="***", port=self.port, key_filename=self.ssh_key_path),
+            title="SSHing To",
+        )
         sock = paramiko.ProxyCommand(self.proxycommand) if self.proxycommand is not None else None
         try:
-            if pwd is None:
+            if password is None:
                 allow_agent = True
                 look_for_keys = True
             else:
                 allow_agent = False
                 look_for_keys = False
-            self.ssh.connect(hostname=self.hostname, username=self.username, password=self.pwd, port=self.port, key_filename=self.sshkey, compress=self.compress, sock=sock, allow_agent=allow_agent, look_for_keys=look_for_keys)  # type: ignore
+            self.ssh.connect(
+                hostname=self.hostname,
+                username=self.username,
+                password=self.password,
+                port=self.port,
+                key_filename=self.ssh_key_path,
+                compress=self.enable_compression,
+                sock=sock,
+                allow_agent=allow_agent,
+                look_for_keys=look_for_keys,
+            )  # type: ignore
         except Exception as _err:
             rich.console.Console().print_exception()
-            self.pwd = getpass.getpass(f"Enter password for {self.username}@{self.hostname}: ")
-            self.ssh.connect(hostname=self.hostname, username=self.username, password=self.pwd, port=self.port, key_filename=self.sshkey, compress=self.compress, sock=sock, allow_agent=False, look_for_keys=False)  # type: ignore
+            self.password = getpass.getpass(f"Enter password for {self.username}@{self.hostname}: ")
+            self.ssh.connect(
+                hostname=self.hostname,
+                username=self.username,
+                password=self.password,
+                port=self.port,
+                key_filename=self.ssh_key_path,
+                compress=self.enable_compression,
+                sock=sock,
+                allow_agent=False,
+                look_for_keys=False,
+            )  # type: ignore
         try:
             self.sftp: Optional[paramiko.SFTPClient] = self.ssh.open_sftp()
         except Exception as err:
             self.sftp = None
-            print(f"""⚠️  WARNING: Failed to open SFTP connection to {hostname}.
-   Error Details: {err}\nData transfer may be affected!""")
-
+            print(f"""⚠️  WARNING: Failed to open SFTP connection to {self.hostname}. Error Details: {err}\nData transfer may be affected!""")
         from rich.progress import Progress, SpinnerColumn, TextColumn, BarColumn, FileSizeColumn, TransferSpeedColumn
 
         class RichProgressWrapper:
@@ -144,7 +134,9 @@ class SSH:  # inferior alternative: https://github.com/fabric/fabric
                 self.task: Optional[Any] = None
 
             def __enter__(self) -> "RichProgressWrapper":
-                self.progress = Progress(SpinnerColumn(), TextColumn("[bold blue]{task.description}"), BarColumn(), FileSizeColumn(), TransferSpeedColumn())
+                self.progress = Progress(
+                    SpinnerColumn(), TextColumn("[bold blue]{task.description}"), BarColumn(), FileSizeColumn(), TransferSpeedColumn()
+                )
                 self.progress.start()
                 self.task = self.progress.add_task("Transferring...", total=0)
                 return self
@@ -156,216 +148,213 @@ class SSH:  # inferior alternative: https://github.com/fabric/fabric
             def view_bar(self, transferred: int, total: int) -> None:
                 if self.progress and self.task is not None:
                     self.progress.update(self.task, completed=transferred, total=total)
-
         self.tqdm_wrap = RichProgressWrapper
-        self._local_distro: Optional[str] = None
-        self._remote_distro: Optional[str] = None
-        self._remote_machine: Optional[MACHINE] = None
+        from machineconfig.scripts.python.helpers_utils.path import get_machine_specs
+        self.local_specs: MachineSpecs = get_machine_specs()
+        resp = self.run_shell_cmd_on_remote(
+            command="""~/.local/bin/utils get-machine-specs """,
+            verbose_output=False,
+            description="Getting remote machine specs",
+            strict_stderr=False,
+            strict_return_code=False,
+        )
+        json_str = resp.op
+        import ast
+        self.remote_specs: MachineSpecs = cast(MachineSpecs, ast.literal_eval(json_str))
         self.terminal_responses: list[Response] = []
-        self.platform = platform
 
-    def get_remote_machine(self) -> MACHINE:
-        if self._remote_machine is None:
-            if self.run("$env:OS", verbose=False, desc="Testing Remote OS Type").op == "Windows_NT" or self.run("echo %OS%", verbose=False, desc="Testing Remote OS Type Again").op == "Windows_NT":
-                self._remote_machine = "Windows"
-            else:
-                self._remote_machine = "Linux"
-        return self._remote_machine  # echo %OS% TODO: uname on linux
-
-    def get_local_distro(self) -> str:
-        if self._local_distro is None:
-            command = """uv run --with distro python -c "import distro; print(distro.name(pretty=True))" """
-            import subprocess
-
-            res = subprocess.run(command, shell=True, capture_output=True, text=True).stdout.strip()
-            self._local_distro = res
-            return res
-        return self._local_distro
-
-    def get_remote_distro(self):
-        if self._remote_distro is None:
-            res = self.run("""~/.local/bin/uv run --with distro python -c "import distro; print(distro.name(pretty=True))" """)
-            self._remote_distro = res.op_if_successfull_or_default() or ""
-        return self._remote_distro
-
-    def restart_computer(self):
-        self.run("Restart-Computer -Force" if self.get_remote_machine() == "Windows" else "sudo reboot")
-
-    def send_ssh_key(self):
-        self.copy_from_here("~/.ssh/id_rsa.pub")
-        assert self.get_remote_machine() == "Windows"
+        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,), dict(self.local_specs))(), value=False, title="SSHing From", docs=False, dunder=False, sort=False, console=local_console
+        )
+        inspect(
+            type("RemoteInfo", (object,), dict(self.remote_specs))(), 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:<50} {right}")
+
+    def __enter__(self) -> "SSH":
+        return self
+
+    def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
+        self.close()
+
+    def close(self) -> None:
+        if self.sftp is not None:
+            self.sftp.close()
+            self.sftp = None
+        self.ssh.close()
+
+    def restart_computer(self) -> Response:
+        return self.run_shell_cmd_on_remote(
+            command="Restart-Computer -Force" if self.remote_specs["system"] == "Windows" else "sudo reboot",
+            verbose_output=True,
+            description="",
+            strict_stderr=False,
+            strict_return_code=False,
+        )
+
+    def send_ssh_key(self) -> Response:
+        self.copy_from_here(source_path="~/.ssh/id_rsa.pub", target_rel2home=None, compress_with_zip=False, recursive=False, overwrite_existing=False)
+        if self.remote_specs["system"] != "Windows":
+            raise RuntimeError("send_ssh_key is only supported for Windows remote machines")
         code_url = "https://raw.githubusercontent.com/thisismygitrepo/machineconfig/refs/heads/main/src/machineconfig/setup_windows/openssh-server_add-sshkey.ps1"
-        code = PathExtended(code_url).download().read_text(encoding="utf-8")
-        self.run(code)
+        import urllib.request
 
-    def copy_env_var(self, name: str):
-        assert self.get_remote_machine() == "Linux"
-        return self.run(f"{name} = {os.environ[name]}; export {name}")
+        with urllib.request.urlopen(code_url) as response:
+            code = response.read().decode("utf-8")
+        return self.run_shell_cmd_on_remote(command=code, verbose_output=True, description="", strict_stderr=False, strict_return_code=False)
 
     def get_remote_repr(self, add_machine: bool = False) -> str:
-        return f"{self.username}@{self.hostname}:{self.port}" + (f" [{self.get_remote_machine()}][{self.get_remote_distro()}]" if add_machine else "")
-
+        return f"{self.username}@{self.hostname}:{self.port}" + (
+            f" [{self.remote_specs['system']}][{self.remote_specs['distro']}]" if add_machine else ""
+        )
     def get_local_repr(self, add_machine: bool = False) -> str:
         import getpass
+        return f"{getpass.getuser()}@{platform.node()}" + (f" [{platform.system()}][{self.local_specs['distro']}]" if add_machine else "")
+
+    def get_ssh_conn_str(self, command: str) -> str:
+        return (
+            "ssh "
+            + (f" -i {self.ssh_key_path}" if self.ssh_key_path else "")
+            + self.get_remote_repr(add_machine=False).replace(":", " -p ")
+            + (f" -t {command} " if command != "" else " ")
+        )
 
-        return f"{getpass.getuser()}@{self.platform.node()}" + (f" [{self.platform.system()}][{self.get_local_distro()}]" if add_machine else "")
-
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"local {self.get_local_repr(add_machine=True)} >>> SSH TO >>> remote {self.get_remote_repr(add_machine=True)}"
 
-    def run_locally(self, command: str):
-        print(f"""💻 [LOCAL EXECUTION] Running command on node: {self.platform.node()} Command: {command}""")
+    def run_shell_cmd_on_local(self, command: str) -> Response:
+        print(f"""💻 [LOCAL EXECUTION] Running command on node: {self.local_specs["system"]} Command: {command}""")
         res = Response(cmd=command)
         res.output.returncode = os.system(command)
         return res
 
-    def get_ssh_conn_str(self, cmd: str = ""):
-        return "ssh " + (f" -i {self.sshkey}" if self.sshkey else "") + self.get_remote_repr().replace(":", " -p ") + (f" -t {cmd} " if cmd != "" else " ")
-
-    def run(self, cmd: str, verbose: bool = True, desc: str = "", strict_err: bool = False, strict_returncode: bool = False) -> Response:
-        raw = self.ssh.exec_command(cmd)
-        res = Response(stdin=raw[0], stdout=raw[1], stderr=raw[2], cmd=cmd, desc=desc)  # type: ignore
-        if not verbose:
-            res.capture().print_if_unsuccessful(desc=desc, strict_err=strict_err, strict_returncode=strict_returncode, assert_success=False)
-        else:
+    def run_shell_cmd_on_remote(self, command: str, verbose_output: bool, description: str, strict_stderr: bool, strict_return_code: bool) -> Response:
+        raw = self.ssh.exec_command(command)
+        res = Response(stdin=raw[0], stdout=raw[1], stderr=raw[2], cmd=command, desc=description)  # type: ignore
+        if verbose_output:
             res.print()
-        self.terminal_responses.append(res)
+        else:
+            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, 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"""uv run --no-dev --project $HOME/code/machineconfig -c "{get_header(wdir=None, toolbox=True)}{cmd}\n""" + '"',
-                desc=desc or f"run_py on {self.get_remote_repr()}",
-                verbose=verbose,
-                strict_err=strict_err,
-                strict_returncode=strict_returncode,
-            )
-        assert "obj=" in cmd, "The command sent to run_py must have `obj=` statement if return_obj is set to True"
-        source_file = self.run_py(f"""{cmd}\npath = Save.pickle(obj=obj, path=P.tmpfile(suffix='.pkl'))\nprint(path)""", desc=desc, verbose=verbose, strict_err=True, strict_returncode=True).op.split("\n")[-1]
-        res = self.copy_to_here(source=source_file, target=PathExtended.tmpfile(suffix=".pkl"))
-        import pickle
-
-        return pickle.loads(res.read_bytes())
-
-    def copy_from_here(self, source: PLike, target: OPLike = None, z: bool = False, r: bool = False, overwrite: bool = False, init: bool = True) -> Union[PathExtended, list[PathExtended]]:
-        if init:
-            print(f"{'⬆️' * 5} [SFTP UPLOAD] FROM `{source}` TO `{target}`")  # TODO: using return_obj do all tests required in one go.
-        source_obj = PathExtended(source).expanduser().absolute()
-        if not source_obj.exists():
-            raise RuntimeError(f"Meta.SSH Error: source `{source_obj}` does not exist!")
-        if target is None:
-            target = PathExtended(source_obj).expanduser().absolute().collapseuser(strict=True)
-            assert target.is_relative_to("~"), "If target is not specified, source must be relative to home."
-            if z:
-                target += ".zip"
-        if not z and source_obj.is_dir():
-            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"path=P(r'{PathExtended(target).as_posix()}').expanduser()\n{'path.delete(sure=True)' if overwrite else ''}\nprint(path.create())",
-                    desc=f"Creating Target directory `{PathExtended(target).as_posix()}` @ {self.get_remote_repr()}",
-                    verbose=False,
-                ).op
-                or ""
-            )
-            for idx, item in enumerate(source_list):
-                print(f"   {idx + 1:03d}. {item}")
-            for item in source_list:
-                a__target = PathExtended(remote_root).joinpath(item.relative_to(source_obj))
-                self.copy_from_here(source=item, target=a__target)
-            return list(source_list)
-        if z:
-            print("🗜️ ZIPPING ...")
-            source_obj = PathExtended(source_obj).expanduser().zip(content=True)  # .append(f"_{randstr()}", inplace=True)  # eventually, unzip will raise content flag, so this name doesn't matter.
-        remotepath = (
-            self.run_py(
-                f"path=P(r'{PathExtended(target).as_posix()}').expanduser()\n{'path.delete(sure=True)' if overwrite else ''}\nprint(path.parent.create())",
-                desc=f"Creating Target directory `{PathExtended(target).parent.as_posix()}` @ {self.get_remote_repr()}",
-                verbose=False,
-            ).op
-            or ""
-        )
-        remotepath = PathExtended(remotepath.split("\n")[-1]).joinpath(PathExtended(target).name)
-        print(f"""📤 [SFTP UPLOAD] Sending file: {repr(PathExtended(source_obj))}  ==>  Remote Path: {remotepath.as_posix()}""")
-        with self.tqdm_wrap(ascii=True, unit="b", unit_scale=True) as pbar:
-            self.sftp.put(localpath=PathExtended(source_obj).expanduser(), remotepath=remotepath.as_posix(), callback=pbar.view_bar)  # type: ignore # pylint: disable=E1129
-        if z:
-            _resp = self.run_py(f"""P(r'{remotepath.as_posix()}').expanduser().unzip(content=False, inplace=True, overwrite={overwrite})""", desc=f"UNZIPPING {remotepath.as_posix()}", verbose=False, strict_err=True, strict_returncode=True)
-            source_obj.delete(sure=True)
-            print("\n")
-        return source_obj
-
-    def copy_to_here(self, source: PLike, target: OPLike = None, z: bool = False, r: bool = False, init: bool = True) -> PathExtended:
-        if init:
-            print(f"{'⬇️' * 5} SFTP DOWNLOADING FROM `{source}` TO `{target}`")
-        if not z and self.run_py(f"print(P(r'{source}').expanduser().absolute().is_dir())", desc=f"Check if source `{source}` is a dir", verbose=False, strict_returncode=True, strict_err=True).op.split("\n")[-1] == "True":
-            if r is False:
-                raise RuntimeError(f"source `{source}` is a directory! either set r=True for recursive sending or raise zip_first flag.")
-            source_list = self.run_py(f"obj=P(r'{source}').search(folders=False, r=True).collapseuser(strict=False)", desc="Searching for files in source", return_obj=True, verbose=False)
-            assert isinstance(source_list, List), f"Could not resolve source path {source} due to error"
-            for file in source_list:
-                self.copy_to_here(source=file.as_posix(), target=PathExtended(target).joinpath(PathExtended(file).relative_to(source)) if target else None, r=False)
-        if z:
-            tmp: Response = self.run_py(f"print(P(r'{source}').expanduser().zip(inplace=False, verbose=False))", desc=f"Zipping source file {source}", verbose=False)
-            tmp2 = tmp.op2path(strict_returncode=True, strict_err=True)
-            if not isinstance(tmp2, PathExtended):
-                raise RuntimeError(f"Could not zip {source} due to {tmp.err}")
-            else:
-                source = tmp2
-        if target is None:
-            tmpx = self.run_py(f"print(P(r'{PathExtended(source).as_posix()}').collapseuser(strict=False).as_posix())", desc="Finding default target via relative source path", strict_returncode=True, strict_err=True, verbose=False).op2path()
-            if isinstance(tmpx, PathExtended):
-                target = tmpx
-            else:
-                raise RuntimeError(f"Could not resolve target path {target} due to error")
-            assert target.is_relative_to("~"), f"If target is not specified, source must be relative to home.\n{target=}"
-        target_obj = PathExtended(target).expanduser().absolute()
-        target_obj.parent.mkdir(parents=True, exist_ok=True)
-        if z and ".zip" not in target_obj.suffix:
-            target_obj += ".zip"
-        if "~" in str(source):
-            tmp3 = self.run_py(f"print(P(r'{source}').expanduser())", desc="# Resolving source path address by expanding user", strict_returncode=True, strict_err=True, verbose=False).op2path()
-            if isinstance(tmp3, PathExtended):
-                source = tmp3
-            else:
-                raise RuntimeError(f"Could not resolve source path {source} due to")
+    def _run_py_prep(self, python_code: str, uv_with: Optional[list[str]], uv_project_dir: Optional[str], on: Literal["local", "remote"]) -> 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")
+        self.copy_from_here(source_path=str(py_path), target_rel2home=None, compress_with_zip=False, recursive=False, overwrite_existing=False)
+        if uv_with is not None and len(uv_with) > 0:
+            with_clause = " --with " + '"' + ",".join(uv_with) + '"'
         else:
-            source = PathExtended(source)
-        print(f"""📥 [DOWNLOAD] Receiving: {source}  ==>  Local Path: {target_obj}""")
-        with self.tqdm_wrap(ascii=True, unit="b", unit_scale=True) as pbar:  # type: ignore # pylint: disable=E1129
-            assert self.sftp is not None, f"Could not establish SFTP connection to {self.hostname}."
-            self.sftp.get(remotepath=source.as_posix(), localpath=str(target_obj), callback=pbar.view_bar)  # type: ignore
-        if z:
-            target_obj = target_obj.unzip(inplace=True, content=True)
-            self.run_py(f"P(r'{source.as_posix()}').delete(sure=True)", desc="Cleaning temp zip files @ remote.", strict_returncode=True, strict_err=True, verbose=False)
-        print("\n")
-        return target_obj
-
-    def receieve(self, source: PLike, target: OPLike = None, z: bool = False, r: bool = False) -> PathExtended:
-        scout = self.run_py(cmd=f"obj=scout(r'{source}', z={z}, r={r})", desc=f"Scouting source `{source}` path on remote", return_obj=True, verbose=False)
-        assert isinstance(scout, Scout)
-        if not z and scout.is_dir and scout.files is not None:
-            if r:
-                tmp: list[PathExtended] = [self.receieve(source=file.as_posix(), target=PathExtended(target).joinpath(PathExtended(file).relative_to(source)) if target else None, r=False) for file in scout.files]
-                return tmp[0]
-            else:
-                print("Source is a directory! either set `r=True` for recursive sending or raise `zip_first=True` flag.")
-        if target:
-            target = PathExtended(target).expanduser().absolute()
+            with_clause = ""
+        if uv_project_dir is not None:
+            with_clause += f" --project {uv_project_dir}"
         else:
-            target = scout.source_rel2home.expanduser().absolute()
-        target.parent.mkdir(parents=True, exist_ok=True)
-        if z and ".zip" not in target.suffix:
-            target += ".zip"
-        source = scout.source_full
-        with self.tqdm_wrap(ascii=True, unit="b", unit_scale=True) as pbar:
-            self.sftp.get(remotepath=source.as_posix(), localpath=target.as_posix(), callback=pbar.view_bar)  # type: ignore # pylint: disable=E1129
-        if z:
-            target = target.unzip(inplace=True, content=True)
-            self.run_py(f"P(r'{source.as_posix()}').delete(sure=True)", desc="Cleaning temp zip files @ remote.", strict_returncode=True, strict_err=True)
-        print("\n")
-        return target
+            with_clause += ""
+        match on:
+            case "local":
+                uv_run_cmd = get_uv_run_command(platform=self.local_specs["system"])
+            case "remote":
+                uv_run_cmd = get_uv_run_command(platform=self.remote_specs["system"])
+            case _:
+                raise ValueError(f"Invalid value for 'on': {on}. Must be 'local' or 'remote'")
+        uv_cmd = f"""{uv_run_cmd} {with_clause} python {py_path.relative_to(Path.home())}"""
+        return uv_cmd
+
+    def run_py_remotely(
+        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, on="remote")
+        return self.run_shell_cmd_on_remote(
+            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]):
+        command = lambda_to_python_script(func,
+            in_global=True, import_module=import_module)
+        # 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, on="remote")
+        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_cmd_on_remote(
+            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."""
+        if self.sftp is None:
+            raise RuntimeError(f"SFTP connection not available for {self.hostname}")
+        local_path.parent.mkdir(parents=True, exist_ok=True)
+        self.sftp.get(remotepath=remote_path, localpath=str(local_path))
+
+    def create_parent_dir_and_check_if_exists(self, path_rel2home: str, overwrite_existing: bool) -> None:
+        from machineconfig.utils.ssh_utils.utils import create_dir_and_check_if_exists
+        return create_dir_and_check_if_exists(self, path_rel2home=path_rel2home, overwrite_existing=overwrite_existing)
+
+    def check_remote_is_dir(self, source_path: Union[str, Path]) -> bool:
+        from machineconfig.utils.ssh_utils.utils import check_remote_is_dir
+        return check_remote_is_dir(self, source_path=source_path)
+
+    def expand_remote_path(self, source_path: Union[str, Path]) -> str:
+        from machineconfig.utils.ssh_utils.utils import expand_remote_path
+        return expand_remote_path(self, source_path=source_path)
+
+    def copy_from_here(self, source_path: str, target_rel2home: Optional[str], compress_with_zip: bool, recursive: bool, overwrite_existing: bool) -> None:
+        from machineconfig.utils.ssh_utils.copy_from_here import copy_from_here
+        return copy_from_here(self, source_path=source_path, target_rel2home=target_rel2home, compress_with_zip=compress_with_zip, recursive=recursive, overwrite_existing=overwrite_existing)
+
+    def copy_to_here(self, source: Union[str, Path], target: Optional[Union[str, Path]], compress_with_zip: bool, recursive: bool, internal_call: bool = False) -> None:
+        from machineconfig.utils.ssh_utils.copy_to_here import copy_to_here
+        return copy_to_here(self, source=source, target=target, compress_with_zip=compress_with_zip, recursive=recursive, internal_call=internal_call)
+
+    
+
+
+if __name__ == "__main__":
+    ssh = SSH(host="p51s", username=None, hostname=None, ssh_key_path=None, password=None, port=22, enable_compression=False)

machineconfig/utils/ssh_utils/abc.py

@@ -0,0 +1,5 @@
+
+
+MACHINECONFIG_VERSION = "machineconfig>=7.98"
+DEFAULT_PICKLE_SUBDIR = "tmp_results/tmp_scripts/ssh"
+