hydraflow 0.5.3__py3-none-any.whl → 0.6.0__py3-none-any.whl

hydraflow/context.py

@@ -56,7 +56,7 @@ def log_run(
     hc = HydraConfig.get()
     output_dir = Path(hc.runtime.output_dir)
 
-    # Save '.hydra' config directory first.
+    # Save '.hydra' config directory.
     output_subdir = output_dir / (hc.output_subdir or "")
     mlflow.log_artifacts(output_subdir.as_posix(), hc.output_subdir)
 
@@ -69,14 +69,41 @@ def log_run(
         raise
 
     finally:
-        # Save output_dir including '.hydra' config directory.
-        mlflow.log_artifacts(output_dir.as_posix())
+        log_hydra(output_dir)
+
+
+def log_hydra(output_dir: Path) -> None:
+    """Log hydra logs of the current run as artifacts.
+
+    Args:
+        output_dir (Path): The output directory of the Hydra job.
+
+    """
+    uri = mlflow.get_artifact_uri()
+    artifact_dir = Path(mlflow.artifacts.download_artifacts(uri))
+
+    for file_hydra in output_dir.glob("*.log"):
+        if not file_hydra.is_file():
+            continue
+
+        file_artifact = artifact_dir / file_hydra.name
+        if file_artifact.exists():
+            text = file_artifact.read_text()
+            if not text.endswith("\n"):
+                text += "\n"
+        else:
+            text = ""
+
+        text += file_hydra.read_text()
+        mlflow.log_text(text, file_hydra.name)
 
 
 @contextmanager
 def start_run(  # noqa: PLR0913
     config: object,
     *,
+    chdir: bool = False,
+    run: Run | None = None,
     run_id: str | None = None,
     experiment_id: str | None = None,
     run_name: str | None = None,
@@ -94,6 +121,9 @@ def start_run(  # noqa: PLR0913
 
     Args:
         config (object): The configuration object to log parameters from.
+        chdir (bool): Whether to change the current working directory to the
+            artifact directory of the current run. Defaults to False.
+        run (Run | None): The existing run. Defaults to None.
         run_id (str | None): The existing run ID. Defaults to None.
         experiment_id (str | None): The experiment ID. Defaults to None.
         run_name (str | None): The name of the run. Defaults to None.
@@ -120,6 +150,9 @@ def start_run(  # noqa: PLR0913
            run context.
 
     """
+    if run:
+        run_id = run.info.run_id
+
     with (
         mlflow.start_run(
             run_id=run_id,
@@ -133,7 +166,11 @@ def start_run(  # noqa: PLR0913
         ) as run,
         log_run(config if run_id is None else None, synchronous=synchronous),
     ):
-        yield run
+        if chdir:
+            with chdir_artifact(run):
+                yield run
+        else:
+            yield run
 
 
 @contextmanager

hydraflow/param.py

@@ -18,7 +18,7 @@ if TYPE_CHECKING:
     from mlflow.entities import Run
 
 
-def match(param: str, value: Any) -> bool:
+def match(param: str, value: Any) -> bool:  # noqa: PLR0911
     """Check if the string matches the specified value.
 
     Args:
@@ -30,6 +30,9 @@ def match(param: str, value: Any) -> bool:
         False otherwise.
 
     """
+    if callable(value):
+        return value(param)
+
     if any(value is x for x in [None, True, False]):
         return param == str(value)
 

hydraflow/run_collection.py

@@ -234,7 +234,15 @@ class RunCollection:
         """
         return self._runs[-1] if self._runs else None
 
-    def filter(self, config: object | None = None, **kwargs) -> RunCollection:
+    def filter(
+        self,
+        config: object | None = None,
+        *,
+        override: bool = False,
+        select: list[str] | None = None,
+        status: str | list[str] | int | list[int] | None = None,
+        **kwargs,
+    ) -> RunCollection:
         """Filter the `Run` instances based on the provided configuration.
 
         This method filters the runs in the collection according to the
@@ -254,13 +262,27 @@ class RunCollection:
             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.
+            override (bool): If True, override the configuration object with the
+                provided key-value pairs.
+            select (list[str] | None): The list of parameters to select.
+            status (str | list[str] | int | list[int] | None): The status of the
+                runs to filter.
             **kwargs: Additional key-value pairs to filter the runs.
 
         Returns:
             A new `RunCollection` object containing the filtered runs.
 
         """
-        return RunCollection(filter_runs(self._runs, config, **kwargs))
+        return RunCollection(
+            filter_runs(
+                self._runs,
+                config,
+                override=override,
+                select=select,
+                status=status,
+                **kwargs,
+            ),
+        )
 
     def find(self, config: object | None = None, **kwargs) -> Run:
         """Find the first `Run` instance based on the provided configuration.

{hydraflow-0.5.3.dist-info → hydraflow-0.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.5.3
+Version: 0.6.0
 Summary: Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments.
 Project-URL: Documentation, https://daizutabi.github.io/hydraflow/
 Project-URL: Source, https://github.com/daizutabi/hydraflow

{hydraflow-0.5.3.dist-info → hydraflow-0.6.0.dist-info}/RECORD

@@ -1,14 +1,14 @@
 hydraflow/__init__.py,sha256=9XO9FD3uiTTPN6X6UAC9FtkJjEqUQZNqpoAmSrjUHfI,855
 hydraflow/config.py,sha256=MNX9da5bPVDcjnpji7Cm9ndK6ura92pt361m4PRh6_E,4326
-hydraflow/context.py,sha256=3g7OQXWcFvK6PVVbXpQg7Hr8nsJkF9pLFrXNi_3aV5A,5524
+hydraflow/context.py,sha256=rc43zvE2ueki0zEzorCMIthD9cho_PkbLLJYF9WgDqY,6562
 hydraflow/mlflow.py,sha256=h2S_A2wElr_1lAq0D1wkoEfdtDZpPuWFNRcO8mV_VrA,8932
-hydraflow/param.py,sha256=c5sc6NwD6DKwZzVwprXzZD5FSi6qRgSHkc6TXBKQEdg,4502
+hydraflow/param.py,sha256=yu1aMNXRLegXGDL-68vwIkfeDF9CaU784WZENGLwl7Q,4572
 hydraflow/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hydraflow/run_collection.py,sha256=zPrlKwLuzqePj57pXbgKWrE03S_kjxTaxY9trItf6Gc,26772
+hydraflow/run_collection.py,sha256=2GRVOy87_2SPjHuCzzUvRNugO_grtFUVjtTfhznwBAc,27444
 hydraflow/run_data.py,sha256=dpyyfnuH9mCtIZeigMo1iFQo9bafMdEL4i4uI2l0UqY,1525
 hydraflow/run_info.py,sha256=Jf5wrIjRLIV1-k-obHDqwKHa6j_ZonrY8od-rXlbtMo,1024
 hydraflow/utils.py,sha256=oXjcyfQBbPzJNTh3_CbZfl23zgJS-mbNM9GAWBwsn8c,4349
-hydraflow-0.5.3.dist-info/METADATA,sha256=8grWqDq2SBXtVljA72NnKJPJjwaWmjOOXIvGSOP5kqM,4700
-hydraflow-0.5.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hydraflow-0.5.3.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
-hydraflow-0.5.3.dist-info/RECORD,,
+hydraflow-0.6.0.dist-info/METADATA,sha256=xUib1EsbG3Es5jFx0cSkF1QItfTuciBHYM1040GqFzA,4700
+hydraflow-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hydraflow-0.6.0.dist-info/licenses/LICENSE,sha256=IGdDrBPqz1O0v_UwCW-NJlbX9Hy9b3uJ11t28y2srmY,1062
+hydraflow-0.6.0.dist-info/RECORD,,