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

hydraflow/context.py

@@ -10,6 +10,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 import mlflow
+import mlflow.artifacts
 from hydra.core.hydra_config import HydraConfig
 from watchdog.events import FileModifiedEvent, PatternMatchingEventHandler
 from watchdog.observers import Observer

hydraflow/mlflow.py

@@ -21,6 +21,7 @@ from typing import TYPE_CHECKING
 
 import joblib
 import mlflow
+import mlflow.artifacts
 from hydra.core.hydra_config import HydraConfig
 from mlflow.entities import ViewType
 from mlflow.tracking.fluent import SEARCH_MAX_RESULTS_PANDAS, _get_experiment_id

hydraflow/param.py

@@ -10,7 +10,12 @@ matching for list and tuple types respectively.
 
 from __future__ import annotations
 
-from typing import Any
+from typing import TYPE_CHECKING, Any
+
+from omegaconf import ListConfig, OmegaConf
+
+if TYPE_CHECKING:
+    from mlflow.entities import Run
 
 
 def match(param: str, value: Any) -> bool:
@@ -25,7 +30,7 @@ def match(param: str, value: Any) -> bool:
         False otherwise.
 
     """
-    if value in [None, True, False]:
+    if any(value is x for x in [None, True, False]):
         return param == str(value)
 
     if isinstance(value, list) and (m := _match_list(param, value)) is not None:
@@ -34,12 +39,12 @@ def match(param: str, value: Any) -> bool:
     if isinstance(value, tuple) and (m := _match_tuple(param, value)) is not None:
         return m
 
+    if isinstance(value, int | float):
+        return float(param) == value
+
     if isinstance(value, str):
         return param == value
 
-    if isinstance(value, int | float):
-        return type(value)(param) == value
-
     return param == str(value)
 
 
@@ -76,3 +81,82 @@ def _match_tuple(param: str, value: tuple) -> bool | None:
         return None
 
     return value[0] <= type(value[0])(param) <= value[1]  # type: ignore
+
+
+def to_value(param: str | None, type_: type) -> Any:
+    """Convert the parameter to the specified type.
+
+    Args:
+        param (str | None): The parameter to convert.
+        type_ (type): The type to convert to.
+
+    Returns:
+        The converted value.
+
+    """
+    if param is None or param == "None":
+        return None
+
+    if type_ is int:
+        return int(param)
+
+    if type_ is float:
+        return float(param)
+
+    if type_ is bool:
+        return param == "True"
+
+    if type_ is list or type_ is ListConfig:
+        return list(OmegaConf.create(param))
+
+    return param
+
+
+def get_params(run: Run, *names: str | list[str]) -> tuple[str | None, ...]:
+    """Retrieve the values of specified parameters from the given run.
+
+    This function extracts the values of the parameters identified by the
+    provided names from the specified run. It can accept both individual
+    parameter names and lists of parameter names.
+
+    Args:
+        run (Run): The run object from which to extract parameter values.
+        *names (str | list[str]): The names of the parameters to retrieve.
+            This can be a single parameter name or multiple names provided
+            as separate arguments or as a list.
+
+    Returns:
+        tuple[str | None, ...]: A tuple containing the values of the specified
+        parameters in the order they were provided.
+
+    """
+    names_ = []
+    for name in names:
+        if isinstance(name, list):
+            names_.extend(name)
+        else:
+            names_.append(name)
+
+    params = run.data.params
+    return tuple(params.get(name) for name in names_)
+
+
+def get_values(run: Run, names: list[str], types: list[type]) -> tuple[Any, ...]:
+    """Retrieve the values of specified parameters from the given run.
+
+    This function extracts the values of the parameters identified by the
+    provided names from the specified run.
+
+    Args:
+        run (Run): The run object from which to extract parameter values.
+        names (list[str]): The names of the parameters to retrieve.
+        types (list[type]): The types to convert to.
+
+    Returns:
+        tuple[Any, ...]: A tuple containing the values of the specified
+        parameters in the order they were provided.
+
+    """
+    params = get_params(run, names)
+    it = zip(params, types, strict=True)
+    return tuple(to_value(param, type_) for param, type_ in it)

hydraflow/run_collection.py

@@ -27,6 +27,7 @@ from mlflow.entities import RunStatus
 
 import hydraflow.param
 from hydraflow.config import iter_params, select_config, select_overrides
+from hydraflow.param import get_params, get_values
 from hydraflow.run_data import RunCollectionData
 from hydraflow.run_info import RunCollectionInfo
 from hydraflow.utils import load_config
@@ -132,25 +133,6 @@ class RunCollection:
 
         return self.__class__(self._runs[:n])
 
-    def sort(
-        self,
-        key: Callable[[Run], Any] | None = None,
-        *,
-        reverse: bool = False,
-    ) -> None:
-        """Sort the runs in the collection.
-
-        Sort the runs in the collection according to the provided key function
-        and optional reverse flag.
-
-        Args:
-            key (Callable[[Run], Any] | None): A function that takes a run and returns
-                a value to sort by.
-            reverse (bool): If True, sort in descending order.
-
-        """
-        self._runs.sort(key=key or (lambda x: x.info.start_time), reverse=reverse)
-
     def one(self) -> Run:
         """Get the only `Run` instance in the collection.
 
@@ -599,6 +581,73 @@ class RunCollection:
 
         return {key: RunCollection(runs) for key, runs in grouped_runs.items()}
 
+    def sort(
+        self,
+        key: Callable[[Run], Any] | None = None,
+        *,
+        reverse: bool = False,
+    ) -> None:
+        """Sort the runs in the collection.
+
+        Sort the runs in the collection according to the provided key function
+        and optional reverse flag.
+
+        Args:
+            key (Callable[[Run], Any] | None): A function that takes a run and returns
+                a value to sort by.
+            reverse (bool): If True, sort in descending order.
+
+        """
+        self._runs.sort(key=key or (lambda x: x.info.start_time), reverse=reverse)
+
+    def values(self, names: str | list[str]) -> list[Any]:
+        """Get the values of specified parameters from the runs.
+
+        Args:
+            names (str | list[str]): The names of the parameters to get the values.
+                This can be a single parameter name or multiple names provided
+                as separate arguments or as a list.
+
+        Returns:
+            A list of values for the specified parameters.
+
+        """
+        is_list = isinstance(names, list)
+
+        if isinstance(names, str):
+            names = [names]
+
+        config = load_config(self.first())
+        types = [type(v) for v in select_config(config, names).values()]
+        values = [get_values(run, names, types) for run in self]
+
+        if is_list:
+            return values
+
+        return [v[0] for v in values]
+
+    def sort_by(
+        self,
+        names: str | list[str],
+        *,
+        reverse: bool = False,
+    ) -> RunCollection:
+        """Sort the runs in the collection by specified parameter names.
+
+        Sort the runs in the collection based on the values of the specified
+        parameters.
+
+        Args:
+            names (str | list[str]): The names of the parameters to sort by.
+                This can be a single parameter name or multiple names provided
+                as separate arguments or as a list.
+            reverse (bool): If True, sort in descending order.
+
+        """
+        values = self.values(names)
+        index = sorted(range(len(self)), key=lambda i: values[i], reverse=reverse)
+        return RunCollection([self[i] for i in index])
+
 
 def _param_matches(run: Run, key: str, value: Any) -> bool:
     params = run.data.params
@@ -703,31 +752,3 @@ def _to_lower(status: str | int) -> str:
         return status.lower()
 
     return RunStatus.to_string(status).lower()
-
-
-def get_params(run: Run, *names: str | list[str]) -> tuple[str | None, ...]:
-    """Retrieve the values of specified parameters from the given run.
-
-    This function extracts the values of the parameters identified by the
-    provided names from the specified run. It can accept both individual
-    parameter names and lists of parameter names.
-
-    Args:
-        run (Run): The run object from which to extract parameter values.
-        *names (str | list[str]): The names of the parameters to retrieve.
-            This can be a single parameter name or multiple names provided
-            as separate arguments or as a list.
-
-    Returns:
-        tuple[str | None, ...]: A tuple containing the values of the specified
-        parameters in the order they were provided.
-
-    """
-    names_ = []
-    for name in names:
-        if isinstance(name, list):
-            names_.extend(name)
-        else:
-            names_.append(name)
-
-    return tuple(run.data.params.get(name) for name in names_)

hydraflow/utils.py

@@ -6,6 +6,7 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 
 import mlflow
+import mlflow.artifacts
 from hydra.core.hydra_config import HydraConfig
 from mlflow.entities import Run
 from mlflow.tracking import artifact_utils

{hydraflow-0.4.0.dist-info → hydraflow-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: hydraflow
-Version: 0.4.0
+Version: 0.4.2
 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.4.2.dist-info/RECORD

@@ -0,0 +1,16 @@
+hydraflow/__init__.py,sha256=VbrHKs2Cg93QJ8K9WHYxkXmzOpb8o9ugiwV-mXDT0JE,908
+hydraflow/asyncio.py,sha256=-i1C8KAmNDImrjHnk92Csaa1mpjdK8Vp4ZVaQV-l94s,6634
+hydraflow/config.py,sha256=MNX9da5bPVDcjnpji7Cm9ndK6ura92pt361m4PRh6_E,4326
+hydraflow/context.py,sha256=a6bHmiY16hZ1wvzVzoa7eGDBFjz0GX0iuZNG0EW0wkE,8764
+hydraflow/mlflow.py,sha256=kWVK_Xw2hkRnTg33jSP3VW13UZF6_hBGhN52mPmLgvk,8753
+hydraflow/param.py,sha256=c5sc6NwD6DKwZzVwprXzZD5FSi6qRgSHkc6TXBKQEdg,4502
+hydraflow/progress.py,sha256=zvKX1HCN8_xDOsgYOEcLLhkhdPdep-U8vHrc0XZ-6SQ,6163
+hydraflow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+hydraflow/run_collection.py,sha256=zO7OARn0QOGeK3FQH8GnuuDKCnYFqn1fbsKnOuGCa9M,25938
+hydraflow/run_data.py,sha256=qeFX1iRvNAorXA9QQIjzr0o2_82TI44eZKp7llKG8GI,1549
+hydraflow/run_info.py,sha256=sMXOo20ClaRIommMEzuAbO_OrcXx7M1Yt4FMV7spxz0,998
+hydraflow/utils.py,sha256=Xq78F2iOkgi9JnCYfX1reQw_Y9K6o8oNYBDEwrf18cI,3552
+hydraflow-0.4.2.dist-info/METADATA,sha256=YFnNdasT6OaEKeQy8Uw7AH3uZ5ecjbDjvXSsclhvoJc,3840
+hydraflow-0.4.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+hydraflow-0.4.2.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
+hydraflow-0.4.2.dist-info/RECORD,,

hydraflow-0.4.0.dist-info/RECORD

@@ -1,16 +0,0 @@
-hydraflow/__init__.py,sha256=VbrHKs2Cg93QJ8K9WHYxkXmzOpb8o9ugiwV-mXDT0JE,908
-hydraflow/asyncio.py,sha256=-i1C8KAmNDImrjHnk92Csaa1mpjdK8Vp4ZVaQV-l94s,6634
-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=-PEN8vO4beQkxhEQH9xh0_TzEIO34-eulwRt7WidrIA,25295
-hydraflow/run_data.py,sha256=qeFX1iRvNAorXA9QQIjzr0o2_82TI44eZKp7llKG8GI,1549
-hydraflow/run_info.py,sha256=sMXOo20ClaRIommMEzuAbO_OrcXx7M1Yt4FMV7spxz0,998
-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,,