hydraflow 0.16.0__py3-none-any.whl → 0.16.2__py3-none-any.whl

hydraflow/core/io.py

@@ -5,9 +5,12 @@ from __future__ import annotations
 import fnmatch
 import urllib.parse
 import urllib.request
+from functools import cache
 from pathlib import Path
 from typing import TYPE_CHECKING
 
+from omegaconf import OmegaConf
+
 if TYPE_CHECKING:
     from collections.abc import Callable, Iterator
 
@@ -74,27 +77,37 @@ def log_text(run: Run, from_dir: Path, pattern: str = "*.log") -> None:
         mlflow.log_text(text, file.name)
 
 
-def get_experiment_name(path: Path) -> str | None:
-    """Get the experiment name from the meta file."""
-    metafile = path / "meta.yaml"
-    if not metafile.exists():
-        return None
-    lines = metafile.read_text().splitlines()
-    for line in lines:
-        if line.startswith("name:"):
-            return line.split(":")[1].strip()
-    return None
+@cache
+def get_experiment_name(experiment_dir: Path) -> str:
+    """Get the job name from an experiment directory.
+
+    Extracts the job name from the meta.yaml file. Returns an empty string
+    if the file does not exist or if the job name cannot be found.
+
+    Args:
+        experiment_dir: Path to the experiment directory containing the meta.yaml file
+
+    Returns:
+        The job name as a string, or an empty string if the file does not exist
+
+    """
+    path = experiment_dir / "meta.yaml"
+    if not path.exists():
+        return ""
+
+    meta = OmegaConf.load(experiment_dir / "meta.yaml")
+    return OmegaConf.select(meta, "name", default="")
 
 
 def predicate_experiment_dir(
-    path: Path,
+    experiment_dir: Path,
     experiment_names: list[str] | Callable[[str], bool] | None = None,
 ) -> bool:
     """Predicate an experiment directory based on the path and experiment names."""
-    if not path.is_dir() or path.name in [".trash", "0"]:
+    if not experiment_dir.is_dir() or experiment_dir.name in [".trash", "0"]:
         return False
 
-    name = get_experiment_name(path)
+    name = get_experiment_name(experiment_dir)
     if not name:
         return False
 
@@ -108,9 +121,14 @@ def predicate_experiment_dir(
 
 
 def get_experiment_names(tracking_dir: str | Path) -> list[str]:
-    """Get the experiment names from the tracking directory."""
+    """Get the experiment names from the tracking directory.
+
+    Returns:
+        list[str]: A list of experiment names sorted by the name.
+
+    """
     names = [get_experiment_name(path) for path in Path(tracking_dir).iterdir()]
-    return [name for name in names if name is not None and name != "Default"]
+    return sorted(name for name in names if name and name != "Default")
 
 
 def iter_experiment_dirs(

hydraflow/core/main.py

@@ -82,7 +82,12 @@ def main[C](
         rerun_finished: If True, allows rerunning completed runs. Defaults to
             False.
         update: A function that takes a configuration and returns a new
-            configuration. Defaults to None.
+            configuration or None. The function can modify the configuration in-place
+            and/or return it. If the function returns None, the original (potentially
+            modified) configuration is used. Changes made by this function are saved
+            to the configuration file. This is useful for adding derived parameters,
+            ensuring consistency between related values, or adding runtime information
+            to the configuration. Defaults to None.
 
     """
     import mlflow

hydraflow/core/run_info.py

@@ -11,11 +11,11 @@ was created.
 from __future__ import annotations
 
 from dataclasses import dataclass
-from functools import cache, cached_property
+from functools import cached_property
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-from omegaconf import OmegaConf
+from .io import get_experiment_name
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -50,7 +50,7 @@ class RunInfo:
         Hydra configuration file (e.g., if the file does not exist or does not
         contain the expected format).
         """
-        return get_job_name(self.run_dir.parent)
+        return get_experiment_name(self.run_dir.parent)
 
     def to_dict(self) -> dict[str, Any]:
         """Convert the RunInfo to a dictionary."""
@@ -59,25 +59,3 @@ class RunInfo:
             "run_dir": self.run_dir.as_posix(),
             "job_name": self.job_name,
         }
-
-
-@cache
-def get_job_name(experiment_dir: Path) -> str:
-    """Get the job name from an experiment directory.
-
-    Extracts the job name from the meta.yaml file. Returns an empty string
-    if the file does not exist or if the job name cannot be found.
-
-    Args:
-        experiment_dir: Path to the experiment directory containing the meta.yaml file
-
-    Returns:
-        The job name as a string, or an empty string if the file does not exist
-
-    """
-    path = experiment_dir / "meta.yaml"
-    if not path.exists():
-        return ""
-
-    meta = OmegaConf.load(experiment_dir / "meta.yaml")
-    return OmegaConf.select(meta, "name")

{hydraflow-0.16.0.dist-info → hydraflow-0.16.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.16.0
+Version: 0.16.2
 Summary: HydraFlow seamlessly integrates Hydra and MLflow to streamline ML experiment management, combining Hydra's configuration management with MLflow's tracking capabilities.
 Project-URL: Documentation, https://daizutabi.github.io/hydraflow/
 Project-URL: Source, https://github.com/daizutabi/hydraflow
@@ -194,10 +194,6 @@ For detailed documentation, visit our [documentation site](https://daizutabi.git
 - [User Guide](https://daizutabi.github.io/hydraflow/part1-applications/) - Detailed documentation of HydraFlow's capabilities
 - [API Reference](https://daizutabi.github.io/hydraflow/api/hydraflow/) - Complete API documentation
 
-## Contributing
-
-We welcome contributions! Please see our [contributing guide](CONTRIBUTING.md) for details.
-
 ## License
 
-This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details.
+This project is licensed under the MIT License.

{hydraflow-0.16.0.dist-info → hydraflow-0.16.2.dist-info}/RECORD

@@ -3,19 +3,19 @@ hydraflow/cli.py,sha256=3rGr___wwp8KazjLGQ7JO_IgAMqLyMlcVSs_QJK7g0Y,3135
 hydraflow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hydraflow/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hydraflow/core/context.py,sha256=igE17oQESGjH-sBnICI8HkZbngY_crkHTgx2E-YkmEo,4155
-hydraflow/core/io.py,sha256=gIH3-Lzs4d5TL3b9y-Nb064Aya7cXQHAuc7EjgKzxII,4694
-hydraflow/core/main.py,sha256=mnYcm1SaCaJwpMCKLEm337LcjW6P5G5LMUjOf78ejkk,5574
+hydraflow/core/io.py,sha256=B3-jPuJWttRgpbIpy_XA-Z2qpXzNF1ATwyYEwA7Pv3w,5172
+hydraflow/core/main.py,sha256=pgr2b9A4VoZuwbApE71NElmV64MFJv8UKda05q4uCqk,6010
 hydraflow/core/run.py,sha256=SugX6JLdBqsfz3JTrB66I3muo03rrmwDvITVZQaF48w,12685
 hydraflow/core/run_collection.py,sha256=cbaJO68WzE-QNlTc8NhOyQ1pHDNberJs-31qTY7P9Fo,19495
-hydraflow/core/run_info.py,sha256=DTuT2eYhOj1WEeIsesOLjY0yltCw6f3Y-5hhvIbDROQ,2518
+hydraflow/core/run_info.py,sha256=B5sueHKVH9KEwty8fWuYzGC3M0-_g3TF_iwDM_2dyJs,1885
 hydraflow/executor/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hydraflow/executor/aio.py,sha256=xXsmBPIPdBlopv_1h0FdtOvoKUcuW7PQeKCV2d_lN9I,2122
 hydraflow/executor/conf.py,sha256=8Xq4UAenRKJIl1NBgNbSfv6VUTJhdwPLayZIEAsiBR0,414
 hydraflow/executor/io.py,sha256=18wnHpCMQRGYL-oN2841h9W2aSW_X2SmO68Lx-3FIbU,1043
 hydraflow/executor/job.py,sha256=6QeJ18OMeocXeM04rCYL46GgArfX1SvZs9_4HTomTgE,5436
 hydraflow/executor/parser.py,sha256=RxP8qpDaJ8VLqZ51VlPFyVitWctObhkE_3iPIsY66Cs,14610
-hydraflow-0.16.0.dist-info/METADATA,sha256=g8PnKA-cAU6P0YCPg-hU9E-hpvljNk4v9tOgV3bT_dw,7691
-hydraflow-0.16.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hydraflow-0.16.0.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
-hydraflow-0.16.0.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
-hydraflow-0.16.0.dist-info/RECORD,,
+hydraflow-0.16.2.dist-info/METADATA,sha256=3UWuHRuYrTCwXopZeqP9xBDKYn2_pUpL4Q2MBSOJhaA,7535
+hydraflow-0.16.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hydraflow-0.16.2.dist-info/entry_points.txt,sha256=XI0khPbpCIUo9UPqkNEpgh-kqK3Jy8T7L2VCWOdkbSM,48
+hydraflow-0.16.2.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
+hydraflow-0.16.2.dist-info/RECORD,,