xmanager-slurm 0.4.9__tar.gz → 0.4.11__tar.gz

{xmanager_slurm-0.4.9 → xmanager_slurm-0.4.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xmanager-slurm
-Version: 0.4.9
+Version: 0.4.11
 Summary: Slurm backend for XManager.
 Project-URL: GitHub, https://github.com/jessefarebro/xm-slurm
 Author-email: Jesse Farebrother <jfarebro@cs.mcgill.ca>

{xmanager_slurm-0.4.9 → xmanager_slurm-0.4.11}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "hatchling.build"
 [project]
 name = "xmanager-slurm"
 description = "Slurm backend for XManager."
-version = "0.4.9"
+version = "0.4.11"
 # readme = "README.md"
 requires-python = ">=3.10"
 license = { text = "MIT" }

{xmanager_slurm-0.4.9 → xmanager_slurm-0.4.11}/uv.lock

@@ -2251,7 +2251,7 @@ wheels = [
 
 [[package]]
 name = "xmanager-slurm"
-version = "0.4.9"
+version = "0.4.11"
 source = { editable = "." }
 dependencies = [
     { name = "aiofile" },

{xmanager_slurm-0.4.9 → xmanager_slurm-0.4.11}/xm_slurm/config.py

@@ -62,9 +62,14 @@ class SlurmSSHConfig:
         if self.host_public_key is None:
             return None
 
-        return asyncssh.import_known_hosts(
-            f"[{self.host}]:{self.port} {self.host_public_key.algorithm} {self.host_public_key.key}"
+        hostname = f"{self.host}"
+        if self.port is not None and self.port != asyncssh.DEFAULT_PORT:
+            hostname = f"[{hostname}]:{self.port}"
+
+        known_hosts = asyncssh.import_known_hosts(
+            f"{hostname} {self.host_public_key.algorithm} {self.host_public_key.key}"
         )
+        return known_hosts
 
     @functools.cached_property
     def config(self) -> asyncssh.config.SSHConfig:
@@ -117,9 +122,9 @@ class SlurmSSHConfig:
     def connection_options(self) -> asyncssh.SSHClientConnectionOptions:
         options = asyncssh.SSHClientConnectionOptions(
             config=None,
-            kbdint_auth=False,
             disable_trivial_auth=True,
             known_hosts=self.known_hosts,
+            server_host_key_algs=self.host_public_key.algorithm if self.host_public_key else None,
         )
         options.prepare(last_config=self.config)
         return options

{xmanager_slurm-0.4.9 → xmanager_slurm-0.4.11}/xm_slurm/packaging/docker.py

@@ -139,15 +139,12 @@ class DockerClient:
                 )
                 return _parse_credentials_from_config(podman_config_path)
 
-    def inspect(
-        self, image: ImageURI, element: str | None = None, type: tp.Literal["image"] = "image"
-    ) -> dict[str, tp.Any]:
+    def inspect(self, image: ImageURI, element: str) -> dict[str, tp.Any]:
         output = utils.run_command(
             xm.merge_args(
                 self._client_call,
-                ["inspect"],
-                ["--format", f"{{{{json .{element}}}}}"] if element else [],
-                ["--type", type] if type else [],
+                ["buildx", "imagetools", "inspect"],
+                ["--format", f"{{{{json .{element}}}}}"],
                 [str(image)],
             ),
             check=True,
@@ -259,7 +256,7 @@ class DockerClient:
             uri = ImageURI(target.value.executor_spec.tag).with_digest(
                 executable_metadata["containerimage.digest"]
             )
-            config = self.inspect(uri, "Config")
+            config = self.inspect(uri, "Image.Config")
             if "WorkingDir" not in config:
                 raise ValueError(
                     "Docker image does not have a working directory. "
@@ -320,7 +317,7 @@ def _(
 
         uri = ImageURI(target.value.executable_spec.image)
 
-        config = client.inspect(uri, "Config")
+        config = client.inspect(uri, "Image.Config")
         if "WorkingDir" not in config:
             raise ValueError(
                 "Docker image does not have a working directory. "