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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: liblaf-cherries
-Version: 0.0.12
+Version: 0.0.14
 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/
@@ -35,7 +35,7 @@ Requires-Dist: dvc[webdav]<4,>=3.59.2
 Requires-Dist: environs<15,>=14.1.1
 Requires-Dist: gitpython<4,>=3.1.44
 Requires-Dist: lazy-loader<0.5,>=0.4
-Requires-Dist: liblaf-grapes<0.2,>=0.1.21
+Requires-Dist: liblaf-grapes<0.2,>=0.1.25
 Requires-Dist: loguru<0.8,>=0.7.3
 Requires-Dist: mlflow<3,>=2.22.0
 Requires-Dist: pydantic-settings<3,>=2.9.1

{liblaf_cherries-0.0.12 → liblaf_cherries-0.0.14}/pyproject.toml

@@ -64,7 +64,7 @@ dependencies = [
   "environs>=14.1.1,<15",
   "gitpython>=3.1.44,<4",
   "lazy-loader>=0.4,<0.5",
-  "liblaf-grapes>=0.1.21,<0.2",
+  "liblaf-grapes>=0.1.25,<0.2",
   "loguru>=0.7.3,<0.8",
   "mlflow>=2.22.0,<3",
   "pydantic-settings>=2.9.1,<3",
@@ -124,5 +124,4 @@ linux = "6.13"
 
 [tool.pytest.ini_options]
 addopts = ["--showlocals", "--strict-config", "--strict-markers"]
-junit_family = "legacy"
 testpaths = ["benches/", "tests/"]

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

@@ -8,13 +8,13 @@ from .pathutils import (
     config,
     data,
     entrypoint,
-    exp_dir,
     git_root,
     git_root_safe,
     inputs,
     outputs,
     params,
     path,
+    run_dir,
     src,
 )
 from .plugin import (
@@ -61,7 +61,6 @@ __all__ = [
     "data",
     "end",
     "entrypoint",
-    "exp_dir",
     "git_root",
     "git_root_safe",
     "info",
@@ -82,6 +81,7 @@ __all__ = [
     "plugin",
     "presets",
     "run",
+    "run_dir",
     "set_tag",
     "src",
     "start",

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

@@ -17,9 +17,9 @@ def run[C: pydantic.BaseModel, T](main: Callable[[C], T]) -> T:
         ret: T = main(cfg)
     except BaseException as e:
         if isinstance(e, KeyboardInterrupt):
-            run.end("KILLED")
+            run.end(plugin.RunStatus.KILLED)
             raise
-        run.end("FAILED")
+        run.end(plugin.RunStatus.FAILED)
         raise
     else:
         run.end()
@@ -31,7 +31,7 @@ def start() -> plugin.Run:
     run.start()
     run.log_src(_path.entrypoint(absolute=True))
     run.set_tag("cherries.entrypoint", _path.entrypoint(absolute=False))
-    run.set_tag("cherries.exp-dir", _path.exp_dir(absolute=False))
+    run.set_tag("cherries.run-dir", _path.run_dir(absolute=False))
     return plugin.run
 
 

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

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

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

@@ -1,5 +1,5 @@
-from ._exp_name import exp_name
 from ._git import git_auto_commit, git_branch, git_commit_sha, git_commit_url, git_info
+from ._name import exp_name, run_name
 
 __all__ = [
     "exp_name",
@@ -8,4 +8,5 @@ __all__ = [
     "git_commit_sha",
     "git_commit_url",
     "git_info",
+    "run_name",
 ]

liblaf_cherries-0.0.12/src/liblaf/cherries/info/_exp_name.py → liblaf_cherries-0.0.14/src/liblaf/cherries/info/_name.py

@@ -1,7 +1,10 @@
+from pathlib import Path
+
 import git.exc
 from environs import env
 
 from liblaf import grapes
+from liblaf.cherries import pathutils as _path
 
 from ._git import git_info
 
@@ -17,3 +20,11 @@ def exp_name() -> str:
         return "Default"
     else:
         return info.repo
+
+
+def run_name() -> str:
+    run_dir: Path = _path.run_dir(absolute=False)
+    run_name: str = _path.as_posix(run_dir)
+    run_name = run_name.removeprefix("exp")
+    run_name = run_name.removeprefix("/")
+    return run_name

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

@@ -1,5 +1,5 @@
 from ._convert import as_os_path, as_path, as_posix
-from ._path import entrypoint, exp_dir, git_root, git_root_safe
+from ._path import entrypoint, git_root, git_root_safe, run_dir
 from ._special import config, data, inputs, outputs, params, path, src
 
 __all__ = [
@@ -9,12 +9,12 @@ __all__ = [
     "config",
     "data",
     "entrypoint",
-    "exp_dir",
     "git_root",
     "git_root_safe",
     "inputs",
     "outputs",
     "params",
     "path",
+    "run_dir",
     "src",
 ]

{liblaf_cherries-0.0.12 → liblaf_cherries-0.0.14}/src/liblaf/cherries/pathutils/_path.py

@@ -15,13 +15,6 @@ def entrypoint(*, absolute: bool = False) -> Path:
     return _entrypoint_relative()
 
 
-@utils.cache
-def exp_dir(*, absolute: bool = False) -> Path:
-    if absolute:
-        return _exp_dir_absolute()
-    return _exp_dir_relative()
-
-
 @utils.cache
 def git_root() -> Path:
     entrypoint: Path = _entrypoint_absolute()
@@ -38,6 +31,13 @@ def git_root_safe() -> Path:
         return _entrypoint_absolute().parent
 
 
+@utils.cache
+def run_dir(*, absolute: bool = False) -> Path:
+    if absolute:
+        return _run_dir_absolute()
+    return _run_dir_relative()
+
+
 @utils.cache
 def _entrypoint_absolute() -> Path:
     path = Path(sys.argv[0])
@@ -51,7 +51,7 @@ def _entrypoint_relative() -> Path:
 
 
 @utils.cache
-def _exp_dir_absolute() -> Path:
+def _run_dir_absolute() -> Path:
     entrypoint: Path = _entrypoint_absolute()
     for path in entrypoint.parents:
         if (path / "exp.cherries.toml").is_file():
@@ -62,7 +62,7 @@ def _exp_dir_absolute() -> Path:
 
 
 @utils.cache
-def _exp_dir_relative() -> Path:
-    absolute: Path = _exp_dir_absolute()
+def _run_dir_relative() -> Path:
+    absolute: Path = _run_dir_absolute()
     root: Path = git_root_safe()
     return absolute.relative_to(root)

{liblaf_cherries-0.0.12 → liblaf_cherries-0.0.14}/src/liblaf/cherries/pathutils/_special.py

@@ -2,7 +2,7 @@ from pathlib import Path
 
 from liblaf.grapes.typed import PathLike
 
-from ._path import exp_dir
+from ._path import run_dir
 
 
 def config(
@@ -44,7 +44,7 @@ def src(path: PathLike = "", *, mkdir: bool = True, prefix: PathLike = "src") ->
 def _path(path: PathLike = "", *, mkdir: bool = True, prefix: PathLike = "") -> Path:
     path = Path(path)
     if not path.is_absolute():
-        path = exp_dir(absolute=True) / prefix / path
+        path = run_dir(absolute=True) / prefix / path
     if mkdir:
         path.parent.mkdir(parents=True, exist_ok=True)
     return path

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

@@ -3,6 +3,8 @@ from pathlib import Path
 from typing import override
 
 import attrs
+import git
+import git.exc
 
 from liblaf.cherries import pathutils as _path
 from liblaf.cherries.typed import PathLike
@@ -25,7 +27,9 @@ class DvcLogArtifact(LogArtifact):
         self, local_path: PathLike, artifact_path: PathLike | None = None, **kwargs
     ) -> Path:
         local_path: Path = _path.as_path(local_path)
-        sp.run(["dvc", "add", local_path], check=False)
+        if check_ignore(local_path) or tracked_by_git(local_path):
+            return local_path
+        sp.run(["dvc", "add", local_path], check=True)
         return local_path
 
 
@@ -36,7 +40,9 @@ class DvcLogArtifacts(LogArtifacts):
         self, local_dir: PathLike, artifact_path: PathLike | None = None, **kwargs
     ) -> Path:
         local_dir: Path = _path.as_path(local_dir)
-        sp.run(["dvc", "add", local_dir], check=False)
+        if check_ignore(local_dir) or tracked_by_git(local_dir):
+            return local_dir
+        sp.run(["dvc", "add", local_dir], check=True)
         return local_dir
 
 
@@ -45,3 +51,13 @@ def check_ignore(local_path: PathLike) -> bool:
         ["dvc", "check-ignore", local_path], check=False
     )
     return proc.returncode == 0
+
+
+def tracked_by_git(local_path: PathLike) -> bool:
+    local_path: Path = _path.as_path(local_path).absolute()
+    try:
+        repo = git.Repo(search_parent_directories=True)
+        repo.git.ls_files(local_path, error_unmatch=True)
+    except git.exc.GitCommandError:
+        return False
+    return True

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

@@ -25,7 +25,7 @@ class LoggingStart(Start):
         grapes.init_logging(
             handlers=[
                 grapes.logging.rich_handler(),
-                grapes.logging.file_handler(file=run.exp_dir / "run.log"),
-                grapes.logging.jsonl_handler(run.exp_dir / "run.log.jsonl"),
+                grapes.logging.file_handler(sink=run.exp_dir / "run.log"),
+                grapes.logging.jsonl_handler(sink=run.exp_dir / "run.log.jsonl"),
             ]
         )

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

@@ -3,7 +3,6 @@ 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
@@ -34,6 +33,9 @@ class MlflowLogArtifact(LogArtifact):
     def __call__(
         self, local_path: PathLike, artifact_path: PathLike | None = None, **kwargs
     ) -> Path:
+        local_path: Path = _path.as_path(local_path)
+        if (dvc_file := local_path.with_name(local_path.name + ".dvc")).is_file():
+            local_path = dvc_file
         mlflow.log_artifact(
             _path.as_os_path(local_path), _path.as_posix(artifact_path), **kwargs
         )
@@ -46,6 +48,9 @@ class MlflowLogArtifacts(LogArtifacts):
     def __call__(
         self, local_dir: PathLike, artifact_path: PathLike | None = None, **kwargs
     ) -> Path:
+        local_dir: Path = _path.as_path(local_dir)
+        if (dvc_file := local_dir.with_name(local_dir.name + ".dvc")).is_file():
+            local_dir = dvc_file
         mlflow.log_artifact(
             _path.as_os_path(local_dir), _path.as_posix(artifact_path), **kwargs
         )
@@ -80,4 +85,4 @@ class MlflowStart(Start):
     @override
     def __call__(self) -> None:
         mlflow.set_experiment(_info.exp_name())
-        mlflow.start_run()
+        mlflow.start_run(run_name=_info.run_name())

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

@@ -27,7 +27,7 @@ class Run:
 
     @functools.cached_property
     def exp_dir(self) -> Path:
-        return _path.exp_dir(absolute=True)
+        return _path.run_dir(absolute=True)
 
     @property
     def exp_id(self) -> str: