liblaf-cherries 0.0.11__py3-none-any.whl → 0.0.12__py3-none-any.whl

liblaf/cherries/__init__.pyi

@@ -27,6 +27,7 @@ from .plugin import (
     LogParam,
     Plugin,
     Run,
+    RunStatus,
     Start,
     log_artifact,
     log_artifacts,
@@ -51,6 +52,7 @@ __all__ = [
     "LoggingStart",
     "Plugin",
     "Run",
+    "RunStatus",
     "Start",
     "as_os_path",
     "as_path",

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/_version.py

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

liblaf/cherries/plugin/__init__.pyi

@@ -5,6 +5,7 @@ from ._abc import (
     LogMetric,
     LogParam,
     Plugin,
+    RunStatus,
     Start,
 )
 from ._dvc import DvcEnd, DvcLogArtifact, DvcLogArtifacts
@@ -58,6 +59,7 @@ __all__ = [
     "MlflowStart",
     "Plugin",
     "Run",
+    "RunStatus",
     "Start",
     "end",
     "log_artifact",

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/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/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/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/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.11.dist-info → liblaf_cherries-0.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liblaf-cherries
-Version: 0.0.11
+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.11.dist-info → liblaf_cherries-0.0.12.dist-info}/RECORD

@@ -1,8 +1,8 @@
 liblaf/cherries/__init__.py,sha256=OHb6Xou2v6u42swTgjRfzej4CIlRg4OmgOIQXUiRjKA,97
-liblaf/cherries/__init__.pyi,sha256=F3-WoAFWZ5Kl4DnUcVIuSRFraHF_EWEhcaVBWnuBiXo,1338
+liblaf/cherries/__init__.pyi,sha256=SuZgWY0gRNMTU-rAapdJ5mCHyYqeQmlR9DosaViUx1A,1370
 liblaf/cherries/_config.py,sha256=rm-Y6roi8hBvQYdH-VQh_ovWCyVsX_7R0x1jokBPCDM,741
-liblaf/cherries/_run.py,sha256=NyrhAbOAEu01Xo5Rxyo19PMcwxrCQGj0hbxt1eSnjPE,860
-liblaf/cherries/_version.py,sha256=rk0lhpp6Em5toAI4J7GwApfOdY7w_QTcFpJpUR4GdVY,513
+liblaf/cherries/_run.py,sha256=aJonztFyqBeg9otqMGwkh2AOEjtFh85sC1riBa1ty38,1055
+liblaf/cherries/_version.py,sha256=yXPCLHqHWroxl6PYku74xz7jqX7Xrf288eRJfEDWwBo,513
 liblaf/cherries/_version.pyi,sha256=Pnv4Bxw13LHeuVkPLPsTtnp4N4jOGcAfFJw05uMMgBY,108
 liblaf/cherries/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 liblaf/cherries/typed.py,sha256=mim8QVtwczTSHyw5mhEdfFcXis9o32n0CZyu8BrEorE,50
@@ -16,12 +16,12 @@ liblaf/cherries/pathutils/_convert.py,sha256=JTO9vETXvj7f4GTtIbOmAoDNEDc_4hoEHZ7
 liblaf/cherries/pathutils/_path.py,sha256=igdLrCqk6aIX36V8c1LClhrFViDFWx4WbiR67BcbVIY,1548
 liblaf/cherries/pathutils/_special.py,sha256=b5D3PtW__u0Zpiv69OYoV7TTYc6Dgs4Bu-P8jwrROV4,1415
 liblaf/cherries/plugin/__init__.py,sha256=OHb6Xou2v6u42swTgjRfzej4CIlRg4OmgOIQXUiRjKA,97
-liblaf/cherries/plugin/__init__.pyi,sha256=GH1Hh8uvHdQmne0mJ4OJIM1RhxZAxmlaJ9PVyYO7lw0,1267
-liblaf/cherries/plugin/_abc.py,sha256=Y2IZTd7NPOFl5dv-DeX7H3LE7u4R0Utv9S8ho3pCJGA,3367
-liblaf/cherries/plugin/_dvc.py,sha256=Bl6SoZHDcOu86ybu9uPl-Zk3ezBcaAiW0tTPVuj2-5c,1226
-liblaf/cherries/plugin/_git.py,sha256=87gLkIsOc6_fO7RcNdwsXVzl1FCMzhDSkxeaMZwwXXM,1345
-liblaf/cherries/plugin/_logging.py,sha256=snCmJa1qTtNsJ5GzTkejgcO4ySWA0m0sMH8qY4w08ww,728
-liblaf/cherries/plugin/_mlflow.py,sha256=HlTat251ogGJBvxvw_-ZjDtCEsFtcDhofrjRfJIV2qY,1833
+liblaf/cherries/plugin/__init__.pyi,sha256=2PPdTp-vfgP34sKGnjCR1oMG5ljTmkZkabr_LV74tXA,1299
+liblaf/cherries/plugin/_abc.py,sha256=H-NH6Gpv3dTJKjaekuAKSn_H0TJPxF-TLa5UU51NNjg,3748
+liblaf/cherries/plugin/_dvc.py,sha256=xmMhgZ8QTT-G15_BfpGzYqHjAa7NvspUkuKJvpIinfs,1277
+liblaf/cherries/plugin/_git.py,sha256=AY6AugwyqtcCAaX475zDINFHgHG1UKupWplquEPbjWU,1396
+liblaf/cherries/plugin/_logging.py,sha256=6ZlPQMSv1QmovjOPL6VMmJJOyufU1KCN1W7lOvkGcZs,779
+liblaf/cherries/plugin/_mlflow.py,sha256=1AV_jIUgs2EYZU-7_e0EtkgYN3cBPS2Yjrs5AUu5v1Y,1950
 liblaf/cherries/plugin/_run.py,sha256=XqMOEFDqba8xOaUIynJwS1Dg6JGVpqtWsHG_XJenypk,3287
 liblaf/cherries/presets/__init__.py,sha256=OHb6Xou2v6u42swTgjRfzej4CIlRg4OmgOIQXUiRjKA,97
 liblaf/cherries/presets/__init__.pyi,sha256=ka0zjVDb1kWn1VuDGjAzMX5S9sVKKYcxKelp4EwUBf8,53
@@ -29,7 +29,7 @@ liblaf/cherries/presets/_default.py,sha256=hhe10JzMui8WJhvoLlOfDCHMRlPmdnzRSduFH
 liblaf/cherries/utils/__init__.py,sha256=OHb6Xou2v6u42swTgjRfzej4CIlRg4OmgOIQXUiRjKA,97
 liblaf/cherries/utils/__init__.pyi,sha256=F5aTcXpWVmUoctPbLfmQXKyuXYRspAIjaIzfL1_3Lrw,51
 liblaf/cherries/utils/_functools.py,sha256=0Puwvj1Wq4kp3S--hI-CXwUBZ56AtfkqIzFHllQtuug,181
-liblaf_cherries-0.0.11.dist-info/METADATA,sha256=Fno2MjAvm3-xeK5BLh8S5hicRp3mtX_YTDG337ykay4,1944
-liblaf_cherries-0.0.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-liblaf_cherries-0.0.11.dist-info/licenses/LICENSE,sha256=Ph4NzyU3lGVDeYv-mf8aRmImH8v9rVL9F362FV4G6Ow,1063
-liblaf_cherries-0.0.11.dist-info/RECORD,,
+liblaf_cherries-0.0.12.dist-info/METADATA,sha256=EznK6Za_uBu_9awxVrZzzkpR2DVzMZdpIWry4H5x5RY,1944
+liblaf_cherries-0.0.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+liblaf_cherries-0.0.12.dist-info/licenses/LICENSE,sha256=Ph4NzyU3lGVDeYv-mf8aRmImH8v9rVL9F362FV4G6Ow,1063
+liblaf_cherries-0.0.12.dist-info/RECORD,,