hydraflow 0.3.5__py3-none-any.whl → 0.4.0__py3-none-any.whl

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/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/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/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.3.5.dist-info → hydraflow-0.4.0.dist-info}/METADATA

@@ -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.dist-info → hydraflow-0.4.0.dist-info}/RECORD

@@ -1,16 +1,16 @@
-hydraflow/__init__.py,sha256=p0GzgI2RYXuaBdgoDgmihkn2esUlcbPJlSwoXBdbZEw,866
+hydraflow/__init__.py,sha256=VbrHKs2Cg93QJ8K9WHYxkXmzOpb8o9ugiwV-mXDT0JE,908
 hydraflow/asyncio.py,sha256=-i1C8KAmNDImrjHnk92Csaa1mpjdK8Vp4ZVaQV-l94s,6634
-hydraflow/config.py,sha256=mQYEW_-kr-5cz64hGxI_gkK8XK_54M-3DX-YlE44A9A,3992
+hydraflow/config.py,sha256=MNX9da5bPVDcjnpji7Cm9ndK6ura92pt361m4PRh6_E,4326
 hydraflow/context.py,sha256=p1UYHvSCPrp10cBn9TUI9mXMv0h_I0Eou24Wp1rZZ0k,8740
 hydraflow/mlflow.py,sha256=JELqXFCJ9MsEJaQWT5dyleTFk8BHL7cQwW_gzhkPoIg,8729
 hydraflow/param.py,sha256=CO-6PRlnHo-7hlY_P6j_cGlC7vPY6t-Rr7p3OqeqDyU,1995
 hydraflow/progress.py,sha256=zvKX1HCN8_xDOsgYOEcLLhkhdPdep-U8vHrc0XZ-6SQ,6163
 hydraflow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hydraflow/run_collection.py,sha256=OiPibp8zM4gpsvqpHr9sBh4_1zmHRuXfPcmen7xND-s,24792
+hydraflow/run_collection.py,sha256=-PEN8vO4beQkxhEQH9xh0_TzEIO34-eulwRt7WidrIA,25295
 hydraflow/run_data.py,sha256=qeFX1iRvNAorXA9QQIjzr0o2_82TI44eZKp7llKG8GI,1549
 hydraflow/run_info.py,sha256=sMXOo20ClaRIommMEzuAbO_OrcXx7M1Yt4FMV7spxz0,998
-hydraflow/utils.py,sha256=qNN0JDbQJweTkcRMpZwMXTIuK_LVpoDJ2rOwfe01f3U,3500
-hydraflow-0.3.5.dist-info/METADATA,sha256=UVUeGwlz9ZcdqOX-tWJ3MJX1KD05i4lkPj455J2vAik,3840
-hydraflow-0.3.5.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-hydraflow-0.3.5.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
-hydraflow-0.3.5.dist-info/RECORD,,
+hydraflow/utils.py,sha256=gNI0Ln2VBHfMBzNB9SNxJfjCLf14irYt0EBeeMXMeyk,3528
+hydraflow-0.4.0.dist-info/METADATA,sha256=w0gsff6RLwx4l8_Qlw-1SOu0dY4ySPCq2psm0THmvcY,3840
+hydraflow-0.4.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+hydraflow-0.4.0.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
+hydraflow-0.4.0.dist-info/RECORD,,