hydraflow 0.3.5__tar.gz → 0.4.0__tar.gz

{hydraflow-0.3.5 → hydraflow-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hydraflow
-Version: 0.3.5
+Version: 0.4.0
 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

{hydraflow-0.3.5 → hydraflow-0.4.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.3.5"
+version = "0.4.0"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = "MIT"

{hydraflow-0.3.5 → hydraflow-0.4.0}/src/hydraflow/__init__.py

@@ -1,6 +1,6 @@
 """Integrate Hydra and MLflow to manage and track machine learning experiments."""
 
-from .config import select_config
+from .config import select_config, select_overrides
 from .context import chdir_artifact, chdir_hydra_output, log_run, start_run, watch
 from .mlflow import list_runs, search_runs, set_experiment
 from .progress import multi_tasks_progress, parallel_progress
@@ -28,6 +28,7 @@ __all__ = [
     "parallel_progress",
     "search_runs",
     "select_config",
+    "select_overrides",
     "set_experiment",
     "start_run",
     "watch",

{hydraflow-0.3.5 → hydraflow-0.4.0}/src/hydraflow/config.py

@@ -6,6 +6,8 @@ from typing import TYPE_CHECKING
 
 from omegaconf import DictConfig, ListConfig, OmegaConf
 
+from hydraflow.utils import get_overrides
+
 if TYPE_CHECKING:
     from collections.abc import Iterator
     from typing import Any
@@ -116,9 +118,9 @@ def select_config(config: object, names: list[str]) -> dict[str, Any]:
 
     """
     if not isinstance(config, DictConfig):
-        cfg = OmegaConf.structured(config)
+        config = OmegaConf.structured(config)
 
-    return {name: _get(cfg, name) for name in names}
+    return {name: _get(config, name) for name in names}  # type: ignore
 
 
 def _get(config: DictConfig, name: str) -> Any:
@@ -128,3 +130,10 @@ def _get(config: DictConfig, name: str) -> Any:
 
     prefix, name = name.split(".", 1)
     return _get(config.get(prefix), name)
+
+
+def select_overrides(config: object) -> dict[str, Any]:
+    """Select the given overrides from the configuration object."""
+    overrides = get_overrides()
+    names = [override.split("=")[0].strip() for override in overrides]
+    return select_config(config, names)

{hydraflow-0.3.5 → hydraflow-0.4.0}/src/hydraflow/run_collection.py

@@ -26,7 +26,7 @@ from typing import TYPE_CHECKING, Any, Concatenate, ParamSpec, TypeVar, overload
 from mlflow.entities import RunStatus
 
 import hydraflow.param
-from hydraflow.config import iter_params
+from hydraflow.config import iter_params, select_config, select_overrides
 from hydraflow.run_data import RunCollectionData
 from hydraflow.run_info import RunCollectionInfo
 from hydraflow.utils import load_config
@@ -603,7 +603,7 @@ class RunCollection:
 def _param_matches(run: Run, key: str, value: Any) -> bool:
     params = run.data.params
     if key not in params:
-        return True
+        return False
 
     param = params[key]
     if param == "None":
@@ -616,6 +616,8 @@ def filter_runs(
     runs: list[Run],
     config: object | None = None,
     *,
+    override: bool = False,
+    select: list[str] | None = None,
     status: str | list[str] | int | list[int] | None = None,
     **kwargs,
 ) -> list[Run]:
@@ -636,17 +638,26 @@ def filter_runs(
 
     Args:
         runs (list[Run]): The list of runs to filter.
-        config (object | None): The configuration object to filter the runs.
-            This can be any object that provides key-value pairs through the
-            `iter_params` function.
-        status (str | list[str] | RunStatus | list[RunStatus] | None): The status of
-            the runs to filter.
+        config (object | None, optional): The configuration object to filter the
+            runs. This can be any object that provides key-value pairs through
+            the `iter_params` function. Defaults to None.
+        override (bool, optional): If True, filter the runs based on
+            the overrides. Defaults to False.
+        select (list[str] | None, optional): The list of parameters to select.
+            Defaults to None.
+        status (str | list[str] | RunStatus | list[RunStatus] | None, optional): The
+            status of the runs to filter. Defaults to None.
         **kwargs: Additional key-value pairs to filter the runs.
 
     Returns:
         A list of runs that match the specified configuration and key-value pairs.
 
     """
+    if override:
+        config = select_overrides(config)
+    elif select:
+        config = select_config(config, select)
+
     for key, value in chain(iter_params(config), kwargs.items()):
         runs = [run for run in runs if _param_matches(run, key, value)]
         if not runs:

{hydraflow-0.3.5 → hydraflow-0.4.0}/src/hydraflow/utils.py

@@ -90,7 +90,7 @@ def load_config(run: Run) -> DictConfig:
 
 def get_overrides() -> list[str]:
     """Retrieve the overrides for the current run."""
-    return HydraConfig.get().overrides.task
+    return list(HydraConfig.get().overrides.task)  # ListConifg -> list
 
 
 def load_overrides(run: Run) -> list[str]:

hydraflow-0.4.0/tests/integ/app.py

@@ -0,0 +1,54 @@
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass, field
+
+import hydra
+from hydra.core.config_store import ConfigStore
+
+import hydraflow
+
+log = logging.getLogger(__name__)
+
+
+@dataclass
+class B:
+    z: float = 0.0
+
+
+@dataclass
+class A:
+    y: str = "y"
+    b: B = field(default_factory=B)
+
+
+@dataclass
+class Config:
+    x: int = 0
+    y: int = 0
+    a: A = field(default_factory=A)
+
+
+cs = ConfigStore.instance()
+cs.store(name="config", node=Config)
+
+
+@hydra.main(version_base=None, config_name="config")
+def app(cfg: Config):
+    hydraflow.set_experiment()
+    rc = hydraflow.list_runs()
+    log.info(rc)
+    log.info(hydraflow.select_overrides(cfg))
+    log.info(rc.filter(cfg, override=True))
+    log.info(rc.filter(cfg, select=["x"]))
+    log.info(rc.try_find_last(cfg, override=True))
+    log.info(rc.try_find_last(cfg, select=["x"]))
+    log.info(rc.filter(cfg))
+
+    cfg.y = 2 * cfg.x
+    with hydraflow.start_run(cfg):
+        pass
+
+
+if __name__ == "__main__":
+    app()

{hydraflow-0.3.5 → hydraflow-0.4.0}/tests/test_run_collection.py

@@ -101,9 +101,9 @@ def test_filter_invalid_param(run_list: list[Run]):
     from hydraflow.run_collection import filter_runs
 
     x = filter_runs(run_list, {"invalid": 0})
-    assert len(x) == 6
+    assert len(x) == 0
     x = filter_runs(run_list, ["invalid=0"])
-    assert len(x) == 6
+    assert len(x) == 0
 
 
 def test_filter_status(run_list: list[Run]):