calkit-python 0.32.5__tar.gz → 0.32.6__tar.gz

{calkit_python-0.32.5 → calkit_python-0.32.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: calkit-python
-Version: 0.32.5
+Version: 0.32.6
 Summary: Reproducibility simplified.
 Project-URL: Homepage, https://calkit.org
 Project-URL: Issues, https://github.com/calkit/calkit/issues

{calkit_python-0.32.5 → calkit_python-0.32.6}/calkit/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.32.5"
+__version__ = "0.32.6"
 
 from .core import *  # noqa: F403, I001
 from . import git  # noqa: F401

{calkit_python-0.32.5 → calkit_python-0.32.6}/calkit/cli/check.py

@@ -350,7 +350,6 @@ def check_docker_env(
             "RepoDigests",
             "Architecture",
             "Os",
-            "Size",
             "RootFS",
         ]
         resp = {}

{calkit_python-0.32.5 → calkit_python-0.32.6}/calkit/cli/slurm.py

@@ -111,7 +111,7 @@ def run_sbatch(
             "--job-name",
             name,
             "-o",
-            ".calkit/slurm/logs/%j.out",
+            f".calkit/slurm/logs/{name}.out",
         ]
         + sbatch_opts
         + [script]

{calkit_python-0.32.5 → calkit_python-0.32.6}/calkit/models/pipeline.py

@@ -508,6 +508,16 @@ class SBatchStage(Stage):
     script_path: str
     args: list[str] = []
     sbatch_options: list[str] = []
+    log_storage: Literal["git", "dvc"] | None = "git"
+
+    @property
+    def log_output(self) -> PathOutput:
+        log_path = f".calkit/slurm/logs/{self.name}.out"
+        return PathOutput(
+            path=log_path,
+            storage=self.log_storage,
+            delete_before_run=False,
+        )
 
     @property
     def dvc_deps(self) -> list[str]:
@@ -518,6 +528,12 @@ class SBatchStage(Stage):
         # All outputs must be persistent, since ``calkit slurm batch``
         # handles deletion
         outs = super().dvc_outs
+        # Add log file output
+        log_path = self.log_output.path
+        if self.log_storage == "dvc":
+            outs.append({log_path: {"cache": True, "persist": True}})
+        else:
+            outs.append({log_path: {"cache": False, "persist": True}})
         final_outs = []
         for out in outs:
             if isinstance(out, str):

{calkit_python-0.32.5 → calkit_python-0.32.6}/calkit/pipeline.py

@@ -172,6 +172,8 @@ def to_dvc(
             outputs = stage.outputs.copy()
             if stage.kind == "jupyter-notebook":
                 outputs += stage.notebook_outputs
+            elif stage.kind == "sbatch":
+                outputs.append(stage.log_output)
             # Deal with any gitignore changes necessary
             for out in outputs:
                 if isinstance(out, PathOutput) and out.storage is None: