xmanager-slurm 0.4.9__py3-none-any.whl → 0.4.11__py3-none-any.whl

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

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. "

{xmanager_slurm-0.4.9.dist-info → xmanager_slurm-0.4.11.dist-info}/METADATA

@@ -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.dist-info → xmanager_slurm-0.4.11.dist-info}/RECORD

@@ -1,6 +1,6 @@
 xm_slurm/__init__.py,sha256=WgRn9HDYa5H3sfIH-HZu33liBOh98jM4GqcR349RaSY,1086
 xm_slurm/batching.py,sha256=GbKBsNz9w8gIc2fHLZpslC0e4K9YUfLXFHmjduRRCfQ,4385
-xm_slurm/config.py,sha256=PvdLG6fSNfbABbtwELbnytx85vWLPtyVfEJtoQsLf94,7084
+xm_slurm/config.py,sha256=i9WuxjfGBgVoHHDNk3BvO7LCwpBTJeRnOiFvTU-FHrk,7330
 xm_slurm/console.py,sha256=UpMqeJ0C8i0pkue1AHnnyyX0bFJ9zZeJ7HBR6yhuA8A,54
 xm_slurm/constants.py,sha256=zefVtlFdflgSolie5g_rVxWV-Zpydxapchm3y0a2FDc,999
 xm_slurm/dependencies.py,sha256=-5gN_tpfs3dOA7H5_MIHO2ratb7F5Pm_yjkR5rZcgI8,6421
@@ -26,7 +26,7 @@ xm_slurm/contrib/clusters/__init__.py,sha256=XFCVnkThiU3_8uA_tUgDByOBanXNHrxDvfm
 xm_slurm/contrib/clusters/drac.py,sha256=ViLYerYBMSuZXnWVbz9RDIPPV7JA8BgBpgTfj1wPP28,5881
 xm_slurm/experimental/parameter_controller.py,sha256=b5LfglHV307F6QcPrHeZX5GJBtyOK9aQydke_SZ3Wto,8457
 xm_slurm/packaging/__init__.py,sha256=dh307yLpUT9KN7rJ1e9fYC6hegGKfZcGboUq9nGpDVQ,233
-xm_slurm/packaging/docker.py,sha256=ZNlTWyBQVJQ1kzOhWNqva5g8F31gAbmWL2-DFY9FJ-w,13677
+xm_slurm/packaging/docker.py,sha256=-DWcB9qqbeHmIEqyfF0-v6xOT25ae90u2x-QZ7kluOw,13579
 xm_slurm/packaging/registry.py,sha256=GrdmQg9MgSo38OiqOzMKWSkQyBuyryOfc3zcdgZ4CUE,1148
 xm_slurm/packaging/router.py,sha256=yPbdA9clrhly97cLgDsSRZG2LZRKE-oz8Hhdb7WtYqk,2070
 xm_slurm/packaging/utils.py,sha256=6EAb17zKQQeuyNY2EV9AoW1RvnDGrQwmIT9wtQEsC4c,632
@@ -44,8 +44,8 @@ xm_slurm/templates/slurm/fragments/monitor.bash.j2,sha256=BJ1brSjhESOe9VX_OYaPyy
 xm_slurm/templates/slurm/fragments/proxy.bash.j2,sha256=VJLglZo-Nvx9R-qe3rHTxr07CylTQ6Z9NwBzvIpAZrA,814
 xm_slurm/templates/slurm/runtimes/apptainer.bash.j2,sha256=lE2EWVCK2O-n08RL4_MJYIikVTvODjcYKuv7Eh73Q2w,1932
 xm_slurm/templates/slurm/runtimes/podman.bash.j2,sha256=3j7K5eyXt_WhXK0EoMlxnhlmFVJ2JyxRKbsMRaDqzSs,1148
-xmanager_slurm-0.4.9.dist-info/METADATA,sha256=WWPRzVrTsK5t8kD732EIejSlNgQ8KP01Ln7eM1Mj4e4,1042
-xmanager_slurm-0.4.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-xmanager_slurm-0.4.9.dist-info/entry_points.txt,sha256=_HLGmLgxuQLOPmF2gOFYDVq2HqtMVD_SzigHvUh8TCY,49
-xmanager_slurm-0.4.9.dist-info/licenses/LICENSE.md,sha256=IxstXr3MPHwTJ5jMrByHrQsR1ZAGQ2U_uz_4qzI_15Y,11756
-xmanager_slurm-0.4.9.dist-info/RECORD,,
+xmanager_slurm-0.4.11.dist-info/METADATA,sha256=f7oAbg0CGJLT3iQUERwjnB4IdhrDzgDoYEL2izYTA0o,1043
+xmanager_slurm-0.4.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+xmanager_slurm-0.4.11.dist-info/entry_points.txt,sha256=_HLGmLgxuQLOPmF2gOFYDVq2HqtMVD_SzigHvUh8TCY,49
+xmanager_slurm-0.4.11.dist-info/licenses/LICENSE.md,sha256=IxstXr3MPHwTJ5jMrByHrQsR1ZAGQ2U_uz_4qzI_15Y,11756
+xmanager_slurm-0.4.11.dist-info/RECORD,,