liblaf-cherries 0.0.10__tar.gz → 0.0.12__tar.gz

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liblaf-cherries
-Version: 0.0.10
+Version: 0.0.12
 Summary: Add your description here
 Project-URL: Changelog, https://github.com/liblaf/cherries/blob/main/CHANGELOG.md
 Project-URL: Documentation, https://liblaf.github.io/cherries/

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/src/liblaf/cherries/__init__.pyi

@@ -1,6 +1,6 @@
 from . import info, pathutils, plugin, presets, utils
 from ._config import BaseConfig
-from ._run import run
+from ._run import end, run, start
 from .pathutils import (
     as_os_path,
     as_path,
@@ -27,8 +27,8 @@ from .plugin import (
     LogParam,
     Plugin,
     Run,
+    RunStatus,
     Start,
-    end,
     log_artifact,
     log_artifacts,
     log_input,
@@ -37,8 +37,8 @@ from .plugin import (
     log_output,
     log_outputs,
     log_param,
+    log_src,
     set_tag,
-    start,
 )
 
 __all__ = [
@@ -52,6 +52,7 @@ __all__ = [
     "LoggingStart",
     "Plugin",
     "Run",
+    "RunStatus",
     "Start",
     "as_os_path",
     "as_path",
@@ -73,6 +74,7 @@ __all__ = [
     "log_output",
     "log_outputs",
     "log_param",
+    "log_src",
     "outputs",
     "params",
     "path",

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/src/liblaf/cherries/_run.py

@@ -13,9 +13,17 @@ def run[C: pydantic.BaseModel, T](main: Callable[[C], T]) -> T:
     cls: type[C] = next(iter(type_hints.values()))
     cfg: C = cls()
     run.log_param("cherries.config", cfg.model_dump(mode="json"))
-    ret: T = main(cfg)
-    run.end()
-    return ret
+    try:
+        ret: T = main(cfg)
+    except BaseException as e:
+        if isinstance(e, KeyboardInterrupt):
+            run.end("KILLED")
+            raise
+        run.end("FAILED")
+        raise
+    else:
+        run.end()
+        return ret
 
 
 def start() -> plugin.Run:

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/src/liblaf/cherries/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.10'
-__version_tuple__ = version_tuple = (0, 0, 10)
+__version__ = version = '0.0.12'
+__version_tuple__ = version_tuple = (0, 0, 12)

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/src/liblaf/cherries/plugin/__init__.pyi

@@ -5,6 +5,7 @@ from ._abc import (
     LogMetric,
     LogParam,
     Plugin,
+    RunStatus,
     Start,
 )
 from ._dvc import DvcEnd, DvcLogArtifact, DvcLogArtifacts
@@ -30,6 +31,7 @@ from ._run import (
     log_output,
     log_outputs,
     log_param,
+    log_src,
     run,
     set_tag,
     start,
@@ -57,6 +59,7 @@ __all__ = [
     "MlflowStart",
     "Plugin",
     "Run",
+    "RunStatus",
     "Start",
     "end",
     "log_artifact",
@@ -67,6 +70,7 @@ __all__ = [
     "log_output",
     "log_outputs",
     "log_param",
+    "log_src",
     "run",
     "set_tag",
     "start",

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/src/liblaf/cherries/plugin/_abc.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import bisect
+import enum
 import functools
 import operator
 from collections.abc import Iterable
@@ -8,12 +9,20 @@ from pathlib import Path
 from typing import Any, override
 
 import attrs
+import mlflow
+import mlflow.entities
 from loguru import logger
 
 from liblaf.cherries import pathutils as _path
 from liblaf.cherries.typed import PathLike
 
 
+class RunStatus(enum.StrEnum):
+    FAILED = mlflow.entities.RunStatus.to_string(mlflow.entities.RunStatus.FAILED)
+    FINISHED = mlflow.entities.RunStatus.to_string(mlflow.entities.RunStatus.FINISHED)
+    KILLED = mlflow.entities.RunStatus.to_string(mlflow.entities.RunStatus.KILLED)
+
+
 @functools.total_ordering
 @attrs.define
 class Plugin[**P, T]:
@@ -64,8 +73,8 @@ class Plugin[**P, T]:
 @attrs.define
 class End(Plugin):
     @override
-    def __call__(self) -> None:
-        return super().__call__()
+    def __call__(self, status: RunStatus = RunStatus.FINISHED) -> None:
+        return super().__call__(status)
 
 
 @attrs.define

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/src/liblaf/cherries/plugin/_dvc.py

@@ -7,13 +7,13 @@ import attrs
 from liblaf.cherries import pathutils as _path
 from liblaf.cherries.typed import PathLike
 
-from ._abc import End, LogArtifact, LogArtifacts
+from ._abc import End, LogArtifact, LogArtifacts, RunStatus
 
 
 @attrs.define
 class DvcEnd(End):
     @override
-    def __call__(self) -> None:
+    def __call__(self, status: RunStatus = RunStatus.FINISHED) -> None:
         sp.run(["dvc", "status"], check=True)
         sp.run(["dvc", "push"], check=True)
 

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/src/liblaf/cherries/plugin/_git.py

@@ -5,7 +5,7 @@ from environs import env
 
 from liblaf.cherries import info as _info
 
-from ._abc import End, Start
+from ._abc import End, RunStatus, Start
 from ._run import run
 
 
@@ -14,7 +14,7 @@ class GitEnd(End):
     dry_run: bool = env.bool("LIBLAF_CHERRIES_GIT_DRY_RUN", default=False)
 
     @override
-    def __call__(self) -> None:
+    def __call__(self, status: RunStatus = RunStatus.FINISHED) -> None:
         git_auto_commit(
             "chore(cherries): auto commit (on run end)", dry_run=self.dry_run
         )

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/src/liblaf/cherries/plugin/_logging.py

@@ -5,14 +5,14 @@ from loguru import logger
 
 from liblaf import grapes
 
-from ._abc import End, Start
+from ._abc import End, RunStatus, Start
 from ._run import run
 
 
 @attrs.define
 class LoggingEnd(End):
     @override
-    def __call__(self) -> None:
+    def __call__(self, status: RunStatus = RunStatus.FINISHED) -> None:
         logger.complete()
         run.log_artifact(run.exp_dir / "run.log")
         run.log_artifact(run.exp_dir / "run.log.jsonl")

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/src/liblaf/cherries/plugin/_mlflow.py

@@ -3,19 +3,29 @@ from typing import Any, override
 
 import attrs
 import mlflow
+import mlflow.entities
 
 from liblaf.cherries import info as _info
 from liblaf.cherries import pathutils as _path
 from liblaf.cherries.typed import PathLike
 
-from ._abc import End, LogArtifact, LogArtifacts, LogMetric, LogParam, SetTag, Start
+from ._abc import (
+    End,
+    LogArtifact,
+    LogArtifacts,
+    LogMetric,
+    LogParam,
+    RunStatus,
+    SetTag,
+    Start,
+)
 
 
 @attrs.define
 class MlflowEnd(End):
     @override
-    def __call__(self) -> None:
-        mlflow.end_run()
+    def __call__(self, status: RunStatus = RunStatus.FINISHED) -> None:
+        mlflow.end_run(status)
 
 
 @attrs.define

{liblaf_cherries-0.0.10 → liblaf_cherries-0.0.12}/src/liblaf/cherries/plugin/_run.py

@@ -102,3 +102,4 @@ log_input = run.log_input
 log_inputs = run.log_inputs
 log_output = run.log_output
 log_outputs = run.log_outputs
+log_src = run.log_src