ssh properties as launcher method

Author: jlewitt1

runhouse/resources/hardware/cluster.py

@@ -160,6 +160,7 @@ def __init__(
 
         self._ips = ips
         self._http_client = None
+        self._ssh_properties = ssh_properties
         self.den_auth = den_auth or False
         self.cert_config = TLSCertConfig(cert_path=ssl_certfile, key_path=ssl_keyfile)
 
@@ -169,7 +170,6 @@ def __init__(
         self.server_port = server_port
         self.client_port = client_port
         self.ssh_port = ssh_port or self.DEFAULT_SSH_PORT
-        self.ssh_properties = ssh_properties or {}
         self.server_host = server_host
         self.domain = domain
         self.compute_properties = {}
@@ -200,6 +200,16 @@ def head_ip(self):
         """Head IP"""
         return self.ips[0] if self.ips else None
 
+    @property
+    def ssh_properties(self):
+        return self._ssh_properties or {}
+
+    @ssh_properties.setter
+    def ssh_properties(self, value):
+        if not isinstance(value, dict):
+            raise ValueError(f"SSH properties must be a dict, not {type(value)}.")
+        self._ssh_properties = value
+
     @property
     def client(self):
         def check_connect_server():

runhouse/resources/hardware/launcher_utils.py

@@ -93,7 +93,7 @@ def log_processor(cls, cluster_name: str):
         return LogProcessor(cluster_name)
 
     @classmethod
-    def up(cls, cluster, verbose: bool = True):
+    def up(cls, cluster, verbose: bool = True, force: bool = False):
         """Abstract method for launching a cluster."""
         raise NotImplementedError
 
@@ -107,6 +107,10 @@ def keep_warm(cls, cluster, mins: int):
         """Abstract method for keeping a cluster warm."""
         raise NotImplementedError
 
+    @classmethod
+    def ssh_properties(cls, cluster):
+        raise NotImplementedError
+
     @staticmethod
     def supported_providers():
         """Return the base list of Sky supported providers."""
@@ -360,6 +364,10 @@ def load_creds(cls):
 
         return secret
 
+    @classmethod
+    def ssh_properties(cls, cluster):
+        return cluster._ssh_properties
+
 
 class LocalLauncher(Launcher):
     """Launcher APIs for operations handled locally via Sky."""
@@ -375,7 +383,7 @@ def _validate_provider(cls, cluster):
             )
 
     @classmethod
-    def up(cls, cluster, verbose: bool = True):
+    def up(cls, cluster, verbose: bool = True, force: bool = False):
         """Launch the cluster locally."""
         import sky
 
@@ -462,6 +470,18 @@ def keep_warm(cls, cluster, mins: int):
             set_cluster_autostop_cmd = _cluster_set_autostop_command(mins)
             cluster.run_bash_over_ssh([set_cluster_autostop_cmd], node=cluster.head_ip)
 
+    @classmethod
+    def ssh_properties(cls, cluster):
+        ssh_properties = cluster._ssh_properties
+        # Note: Sky requires the ssh private key path to be in this specific path
+        ssh_properties["ssh_private_key"] = "~/.ssh/ssh-sky-key"
+        return ssh_properties
+
+    @classmethod
+    def load_creds(cls):
+        # Note: We rely on Sky for handling creds with local launching
+        return None
+
     @staticmethod
     def _set_docker_env_vars(image, task):
         """Helper method to set Docker login environment variables."""

runhouse/resources/hardware/on_demand_cluster.py

@@ -146,6 +146,19 @@ def ips(self):
     def internal_ips(self):
         return self.compute_properties.get("internal_ips", [])
 
+    @property
+    def ssh_properties(self):
+        if self.launcher == LauncherType.LOCAL:
+            return LocalLauncher.ssh_properties(self)
+        if self.launcher == LauncherType.DEN:
+            return DenLauncher.ssh_properties(self)
+
+    @ssh_properties.setter
+    def ssh_properties(self, value):
+        if not isinstance(value, dict):
+            raise ValueError(f"SSH properties must be a dict, not {type(value)}.")
+        self._ssh_properties = value
+
     @property
     def client(self):
         try:
@@ -177,10 +190,10 @@ def autostop_mins(self, mins):
         else:
             self.call_client_method("set_settings", {"autostop_mins": mins})
 
-            if self.launcher == "local":
+            if self.launcher == LauncherType.LOCAL:
                 LocalLauncher.keep_warm(self, mins)
 
-            elif self.launcher == "den":
+            elif self.launcher == LauncherType.DEN:
                 DenLauncher.keep_warm(self, mins)
 
     @property