hydraflow 0.7.2__tar.gz → 0.7.3__tar.gz

{hydraflow-0.7.2 → hydraflow-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.7.2
+Version: 0.7.3
 Summary: Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments.
 Project-URL: Documentation, https://daizutabi.github.io/hydraflow/
 Project-URL: Source, https://github.com/daizutabi/hydraflow

{hydraflow-0.7.2 → hydraflow-0.7.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.7.2"
+version = "0.7.3"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = { file = "LICENSE" }

{hydraflow-0.7.2 → hydraflow-0.7.3}/src/hydraflow/main.py

@@ -23,10 +23,9 @@ def main(
     node: Any,
     config_name: str = "config",
     *,
-    chdir: bool = True,
-    skip_finished: bool = True,
+    chdir: bool = False,
     force_new_run: bool = False,
-    override: bool = True,
+    skip_finished: bool = True,
 ):
     """Main decorator."""
 
@@ -42,7 +41,7 @@ def main(
                 run = None
             else:
                 rc = hydraflow.search_runs()
-                run = rc.try_get(cfg, override=override)
+                run = rc.try_get(cfg, override=True)
 
                 if skip_finished and run and run.info.status == FINISHED:
                     return

hydraflow-0.7.3/tests/main/base.py

@@ -0,0 +1,27 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+import hydraflow
+
+if TYPE_CHECKING:
+    from mlflow.entities import Run
+
+
+@dataclass
+class Config:
+    count: int = 0
+
+
+@hydraflow.main(Config)
+def app(run: Run, cfg: Config):
+    path = hydraflow.get_artifact_dir() / "a.txt"
+    path.write_text(f"{run.info.run_id},{cfg.count}")
+    path = hydraflow.get_artifact_dir() / "b.txt"
+    path.write_text(f"{Path.cwd().absolute().as_posix()}")
+
+
+if __name__ == "__main__":
+    app()

{hydraflow-0.7.2 → hydraflow-0.7.3}/tests/main/force_new_run.py

@@ -15,7 +15,7 @@ class Config:
     count: int = 0
 
 
-@hydraflow.main(Config, force_new_run=True)
+@hydraflow.main(Config, chdir=True, force_new_run=True)
 def app(run: Run, cfg: Config):
     file = Path("a.txt")
     text = file.read_text() if file.exists() else ""

{hydraflow-0.7.2 → hydraflow-0.7.3}/tests/main/restart.py

@@ -15,7 +15,7 @@ class Config:
     count: int = 0
 
 
-@hydraflow.main(Config, skip_finished=False)
+@hydraflow.main(Config, chdir=True, skip_finished=False)
 def app(run: Run, cfg: Config):
     file = Path("a.txt")
     text = file.read_text() if file.exists() else ""

{hydraflow-0.7.2 → hydraflow-0.7.3}/tests/main/skip.py

@@ -15,7 +15,7 @@ class Config:
     count: int = 0
 
 
-@hydraflow.main(Config)
+@hydraflow.main(Config, chdir=True)
 def app(run: Run, cfg: Config):
     file = Path("a.txt")
     text = file.read_text() if file.exists() else ""

hydraflow-0.7.3/tests/main/test_base.py

@@ -0,0 +1,58 @@
+from pathlib import Path
+
+import pytest
+from mlflow.entities import Run
+
+from hydraflow.run_collection import RunCollection
+
+pytestmark = pytest.mark.xdist_group(name="group5")
+
+
+@pytest.fixture(scope="module")
+def rc(collect):
+    filename = "main/base.py"
+    args = ["-m", "count=1,2,3"]
+
+    return collect(filename, args)
+
+
+def test_rc_len(rc: RunCollection):
+    assert len(rc) == 3
+
+
+@pytest.fixture(scope="module", params=[1, 2, 3])
+def run(rc: RunCollection, request: pytest.FixtureRequest):
+    return rc.get(count=request.param)
+
+
+@pytest.fixture(scope="module")
+def count(run: Run):
+    return int(run.data.params["count"])
+
+
+@pytest.fixture(scope="module")
+def text(run: Run):
+    from hydraflow.utils import get_artifact_path
+
+    path = get_artifact_path(run, "a.txt")
+    return path.read_text()
+
+
+def test_run_id(run: Run, text: str):
+    assert text.split(",")[0] == run.info.run_id
+
+
+def test_count(text: str, count: int):
+    assert text.split(",")[1] == str(count)
+
+
+@pytest.fixture(scope="module")
+def cwd(run: Run):
+    from hydraflow.utils import get_artifact_path
+
+    path = get_artifact_path(run, "b.txt")
+    return Path(path.read_text())
+
+
+def test_cwd(cwd: Path, experiment_name: str):
+    assert cwd.name == experiment_name