hydraflow 0.4.5__tar.gz → 0.4.6__tar.gz

{hydraflow-0.4.5 → hydraflow-0.4.6}/.devcontainer/devcontainer.json

@@ -8,6 +8,7 @@
       "extensions": [
         "charliermarsh.ruff",
         "fill-labs.dependi",
+        "markis.code-coverage",
         "ms-python.python",
         "ms-python.vscode-pylance",
         "tamasfe.even-better-toml"

{hydraflow-0.4.5 → hydraflow-0.4.6}/.devcontainer/postCreate.sh

@@ -1,10 +1,11 @@
 #!/bin/bash
 
 echo 'eval "$(starship init bash)"' >> ~/.bashrc
-echo "alias ll='ls -alF'" >> ~/.bashrc
 mkdir -p ~/.config
 cp .devcontainer/starship.toml ~/.config
 
 curl -LsSf https://astral.sh/uv/install.sh | sh
-source $HOME/.cargo/env
-echo 'eval "$(uv generate-shell-completion bash)"' >> ~/.bashrc
+echo 'eval "$(uv generate-shell-completion bash)"' >> ~/.bashrc
+uv tool install ruff@latest
+uv python install
+uv sync -U

{hydraflow-0.4.5 → hydraflow-0.4.6}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.4.5
+Version: 0.4.6
 Summary: Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments.
 Project-URL: Documentation, https://github.com/daizutabi/hydraflow
 Project-URL: Source, https://github.com/daizutabi/hydraflow
@@ -27,6 +27,7 @@ License: MIT License
         LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
         OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
         SOFTWARE.
+License-File: LICENSE
 Classifier: Development Status :: 4 - Beta
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python

{hydraflow-0.4.5 → hydraflow-0.4.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.4.5"
+version = "0.4.6"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -45,7 +45,6 @@ dev-dependencies = [
   "pytest-cov",
   "pytest-randomly",
   "pytest-xdist",
-  "ruff",
 ]
 
 [tool.hatch.build.targets.sdist]
@@ -61,11 +60,16 @@ addopts = [
   "--cov-report=lcov:lcov.info",
 ]
 doctest_optionflags = ["NORMALIZE_WHITESPACE", "IGNORE_EXCEPTION_DETAIL"]
-filterwarnings = ['ignore:pkg_resources is deprecated:DeprecationWarning']
+filterwarnings = [
+  "ignore:pkg_resources is deprecated:DeprecationWarning",
+  "ignore:Support for class-based `config` is deprecated",
+  "ignore:Pydantic V1 style",
+]
 asyncio_default_fixture_loop_scope = "function"
 
 [tool.coverage.report]
 exclude_lines = ["no cov", "raise NotImplementedError", "if TYPE_CHECKING:"]
+skip_covered = true
 
 [tool.ruff]
 line-length = 88
@@ -75,6 +79,7 @@ target-version = "py310"
 select = ["ALL"]
 unfixable = ["F401"]
 ignore = [
+  "A005",
   "ANN003",
   "ANN401",
   "ARG002",

{hydraflow-0.4.5 → hydraflow-0.4.6}/src/hydraflow/__init__.py

@@ -11,6 +11,7 @@ from .utils import (
     get_overrides,
     load_config,
     load_overrides,
+    remove_run,
 )
 
 __all__ = [
@@ -26,6 +27,7 @@ __all__ = [
     "log_run",
     "multi_tasks_progress",
     "parallel_progress",
+    "remove_run",
     "search_runs",
     "select_config",
     "select_overrides",

{hydraflow-0.4.5 → hydraflow-0.4.6}/src/hydraflow/utils.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import shutil
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -9,11 +10,10 @@ import mlflow
 import mlflow.artifacts
 from hydra.core.hydra_config import HydraConfig
 from mlflow.entities import Run
-from mlflow.tracking import artifact_utils
 from omegaconf import DictConfig, OmegaConf
 
 if TYPE_CHECKING:
-    from mlflow.entities import Run
+    from collections.abc import Iterable
 
 
 def get_artifact_dir(run: Run | None = None) -> Path:
@@ -28,10 +28,10 @@ def get_artifact_dir(run: Run | None = None) -> Path:
         The local path to the directory where the artifacts are downloaded.
 
     """
-    if run is None:
-        uri = mlflow.get_artifact_uri()
-    else:
-        uri = artifact_utils.get_artifact_uri(run.info.run_id)
+    uri = mlflow.get_artifact_uri() if run is None else run.info.artifact_uri
+
+    if not (isinstance(uri, str) and uri.startswith("file://")):
+        raise NotImplementedError
 
     return Path(mlflow.artifacts.download_artifacts(uri))
 
@@ -112,3 +112,13 @@ def load_overrides(run: Run) -> list[str]:
     """
     path = get_artifact_dir(run) / ".hydra/overrides.yaml"
     return [str(x) for x in OmegaConf.load(path)]
+
+
+def remove_run(run: Run | Iterable[Run]) -> None:
+    """Remove the given run from the MLflow tracking server."""
+    if not isinstance(run, Run):
+        for r in run:
+            remove_run(r)
+        return
+
+    shutil.rmtree(get_artifact_dir(run).parent)

{hydraflow-0.4.5 → hydraflow-0.4.6}/tests/test_app.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import subprocess
 import sys
 from pathlib import Path
@@ -16,12 +17,14 @@ if TYPE_CHECKING:
     from hydraflow.run_collection import RunCollection
 
 
-@pytest.fixture
-def rc(monkeypatch, tmp_path):
+@pytest.fixture(scope="module")
+def rc(tmp_path_factory: pytest.TempPathFactory):
     import hydraflow
 
+    cwd = Path.cwd()
+
     file = Path("tests/scripts/app.py").absolute()
-    monkeypatch.chdir(tmp_path)
+    os.chdir(tmp_path_factory.mktemp("test_app"))
 
     args = [sys.executable, file.as_posix(), "-m"]
     args += ["host=x,y", "port=1,2", "hydra.job.name=info"]
@@ -30,6 +33,8 @@ def rc(monkeypatch, tmp_path):
     mlflow.set_experiment("_info_")
     yield hydraflow.list_runs()
 
+    os.chdir(cwd)
+
 
 def test_list_runs_all(rc: RunCollection):
     from hydraflow.mlflow import list_runs
@@ -203,8 +208,7 @@ def test_log_run_error(monkeypatch, tmp_path):
     args = [sys.executable, file.as_posix()]
     args += ["host=error", "hydra.job.name=error"]
     cp = subprocess.run(args, check=False, capture_output=True)
-    assert cp.returncode == 1
-    assert b"Error during log_run: error" in cp.stdout
+    assert cp.returncode
 
 
 def test_chdir_artifact(rc: RunCollection):

{hydraflow-0.4.5 → hydraflow-0.4.6}/tests/test_log_run.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import subprocess
 import sys
 from pathlib import Path
@@ -10,10 +11,12 @@ from mlflow.artifacts import download_artifacts
 from mlflow.entities.run import Run
 
 
-@pytest.fixture
-def runs(monkeypatch, tmp_path):
+@pytest.fixture(scope="module")
+def runs(tmp_path_factory: pytest.TempPathFactory):
     file = Path("tests/scripts/app.py").absolute()
-    monkeypatch.chdir(tmp_path)
+
+    cwd = Path.cwd()
+    os.chdir(tmp_path_factory.mktemp("test_log_run"))
 
     args = [sys.executable, file.as_posix(), "-m"]
     args += ["host=x,y", "port=1,2", "hydra.job.name=log_run"]
@@ -21,10 +24,13 @@ def runs(monkeypatch, tmp_path):
 
     mlflow.set_experiment("_log_run_")
     runs = mlflow.search_runs(output_format="list")
+
     assert len(runs) == 4
     assert isinstance(runs, list)
     yield runs
 
+    os.chdir(cwd)
+
 
 @pytest.fixture(params=range(4))
 def run(runs, request):

hydraflow-0.4.6/tests/test_utils.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+import mlflow
+import pytest
+
+from hydraflow.run_collection import RunCollection
+
+
+@pytest.fixture
+def rc(monkeypatch, tmp_path):
+    from hydraflow.mlflow import search_runs
+
+    monkeypatch.chdir(tmp_path)
+
+    mlflow.set_experiment("test_run")
+    for x in range(4):
+        with mlflow.start_run(run_name=f"{x}"):
+            pass
+
+    x = search_runs()
+    assert isinstance(x, RunCollection)
+    yield x
+
+
+def test_remove_run(rc: RunCollection):
+    from hydraflow.utils import get_artifact_dir, remove_run
+
+    paths = [get_artifact_dir(r).parent for r in rc]
+
+    assert all(path.exists() for path in paths)
+
+    remove_run(rc)
+
+    assert not any(path.exists() for path in paths)