hydraflow 0.5.4__tar.gz → 0.6.1__tar.gz

{hydraflow-0.5.4 → hydraflow-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hydraflow
-Version: 0.5.4
+Version: 0.6.1
 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.4 → hydraflow-0.6.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.5.4"
+version = "0.6.1"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -68,8 +68,32 @@ target-version = "py310"
 [tool.ruff.lint]
 select = ["ALL"]
 unfixable = ["F401"]
-ignore = ["A005", "ANN003", "ANN401", "B904", "D", "EM101", "PGH003", "TRY003"]
+ignore = [
+  "A005",
+  "ANN003",
+  "ANN401",
+  "B904",
+  "D105",
+  "D107",
+  "D203",
+  "D213",
+  "EM101",
+  "PGH003",
+  "PLR1704",
+  "TRY003",
+]
 
 [tool.ruff.lint.per-file-ignores]
-"tests/*" = ["A001", "ANN", "ARG", "FBT", "PLR", "PT", "S", "SIM108", "SLF"]
+"tests/*" = [
+  "A001",
+  "ANN",
+  "ARG",
+  "D",
+  "FBT",
+  "PLR",
+  "PT",
+  "S",
+  "SIM108",
+  "SLF",
+]
 "apps/*.py" = ["D", "G", "INP"]

{hydraflow-0.5.4 → hydraflow-0.6.1}/src/hydraflow/__init__.py

@@ -1,7 +1,7 @@
 """Integrate Hydra and MLflow to manage and track machine learning experiments."""
 
 from .config import select_config, select_overrides
-from .context import chdir_artifact, chdir_hydra_output, log_run, start_run
+from .context import chdir_artifact, log_run, start_run
 from .mlflow import list_runs, search_runs, set_experiment
 from .run_collection import RunCollection
 from .utils import (
@@ -17,7 +17,6 @@ from .utils import (
 __all__ = [
     "RunCollection",
     "chdir_artifact",
-    "chdir_hydra_output",
     "get_artifact_dir",
     "get_artifact_path",
     "get_hydra_output_dir",

{hydraflow-0.5.4 → hydraflow-0.6.1}/src/hydraflow/config.py

@@ -22,6 +22,7 @@ def collect_params(config: object) -> dict[str, Any]:
 
     Returns:
         dict[str, Any]: A dictionary of collected parameters.
+
     """
     return dict(iter_params(config))
 
@@ -40,6 +41,7 @@ def iter_params(config: object, prefix: str = "") -> Iterator[tuple[str, Any]]:
 
     Yields:
         Key-value pairs representing the parameters in the configuration object.
+
     """
     if config is None:
         return
@@ -113,6 +115,7 @@ def select_config(config: object, names: list[str]) -> dict[str, Any]:
 
     Returns:
         DictConfig: A new configuration object containing only the selected parameters.
+
     """
     if not isinstance(config, DictConfig):
         config = OmegaConf.structured(config)

{hydraflow-0.5.4 → hydraflow-0.6.1}/src/hydraflow/context.py

@@ -13,6 +13,7 @@ import mlflow.artifacts
 from hydra.core.hydra_config import HydraConfig
 
 from hydraflow.mlflow import log_params
+from hydraflow.utils import get_artifact_dir
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
@@ -48,6 +49,7 @@ def log_run(
             # Perform operations within the MLflow run context
             pass
         ```
+
     """
     if config:
         log_params(config, synchronous=synchronous)
@@ -55,7 +57,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)
 
@@ -68,14 +70,43 @@ def log_run(
         raise
 
     finally:
-        # Save output_dir including '.hydra' config directory.
-        mlflow.log_artifacts(output_dir.as_posix())
+        log_text(output_dir)
+
+
+def log_text(directory: Path, pattern: str = "*.log") -> None:
+    """Log text files in the given directory as artifacts.
+
+    Append the text files to the existing text file in the artifact directory.
+
+    Args:
+        directory (Path): The directory to find the logs in.
+        pattern (str): The pattern to match the logs.
+
+    """
+    artifact_dir = get_artifact_dir()
+
+    for file in directory.glob(pattern):
+        if not file.is_file():
+            continue
+
+        file_artifact = artifact_dir / file.name
+        if file_artifact.exists():
+            text = file_artifact.read_text()
+            if not text.endswith("\n"):
+                text += "\n"
+        else:
+            text = ""
+
+        text += file.read_text()
+        mlflow.log_text(text, file.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,
@@ -93,6 +124,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.
@@ -117,7 +151,11 @@ def start_run(  # noqa: PLR0913
         - `mlflow.start_run`: The MLflow function to start a run directly.
         - `log_run`: A context manager to log parameters and manage the MLflow
            run context.
+
     """
+    if run:
+        run_id = run.info.run_id
+
     with (
         mlflow.start_run(
             run_id=run_id,
@@ -131,33 +169,15 @@ 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
-def chdir_hydra_output() -> Iterator[Path]:
-    """Change the current working directory to the hydra output directory.
-
-    This context manager changes the current working directory to the hydra output
-    directory. It ensures that the directory is changed back to the original
-    directory after the context is exited.
-    """
-    curdir = Path.cwd()
-    path = HydraConfig.get().runtime.output_dir
-
-    os.chdir(path)
-    try:
-        yield Path(path)
-
-    finally:
-        os.chdir(curdir)
-
-
-@contextmanager
-def chdir_artifact(
-    run: Run,
-    artifact_path: str | None = None,
-) -> Iterator[Path]:
+def chdir_artifact(run: Run | None = None) -> Iterator[Path]:
     """Change the current working directory to the artifact directory of the given run.
 
     This context manager changes the current working directory to the artifact
@@ -165,18 +185,16 @@ def chdir_artifact(
     to the original directory after the context is exited.
 
     Args:
-        run (Run): The run to get the artifact directory from.
-        artifact_path (str | None): The artifact path.
+        run (Run | None): The run to get the artifact directory from.
+
     """
     curdir = Path.cwd()
-    path = mlflow.artifacts.download_artifacts(
-        run_id=run.info.run_id,
-        artifact_path=artifact_path,
-    )
+    artifact_dir = get_artifact_dir(run)
+
+    os.chdir(artifact_dir)
 
-    os.chdir(path)
     try:
-        yield Path(path)
+        yield artifact_dir
 
     finally:
         os.chdir(curdir)

{hydraflow-0.5.4 → hydraflow-0.6.1}/src/hydraflow/mlflow.py

@@ -16,7 +16,6 @@ Key Features:
 
 from __future__ import annotations
 
-from pathlib import Path
 from typing import TYPE_CHECKING
 
 import joblib
@@ -28,8 +27,11 @@ from mlflow.tracking.fluent import SEARCH_MAX_RESULTS_PANDAS, _get_experiment_id
 
 from hydraflow.config import iter_params
 from hydraflow.run_collection import RunCollection
+from hydraflow.utils import get_artifact_dir
 
 if TYPE_CHECKING:
+    from pathlib import Path
+
     from mlflow.entities.experiment import Experiment
 
 
@@ -54,6 +56,7 @@ def set_experiment(
     Returns:
         Experiment: An instance of `mlflow.entities.Experiment` representing
         the new active experiment.
+
     """
     if uri is not None:
         mlflow.set_tracking_uri(uri)
@@ -77,6 +80,7 @@ def log_params(config: object, *, synchronous: bool | None = None) -> None:
         config (object): The configuration object to log the parameters from.
         synchronous (bool | None): Whether to log the parameters synchronously.
             Defaults to None.
+
     """
     for key, value in iter_params(config):
         mlflow.log_param(key, value, synchronous=synchronous)
@@ -133,6 +137,7 @@ def search_runs(  # noqa: PLR0913
 
     Returns:
         A `RunCollection` object containing the search results.
+
     """
     runs = mlflow.search_runs(
         experiment_ids=experiment_ids,
@@ -177,6 +182,7 @@ def list_runs(
     Returns:
         RunCollection: A `RunCollection` instance containing the runs for the
         specified experiments.
+
     """
     rc = _list_runs(experiment_names, n_jobs)
     if status is None:
@@ -207,16 +213,10 @@ def _list_runs(
 
     for name in experiment_names:
         if experiment := mlflow.get_experiment_by_name(name):
-            loc = experiment.artifact_location
-
-            if isinstance(loc, str):
-                if loc.startswith("file:"):
-                    path = Path(mlflow.artifacts.download_artifacts(loc))
-                elif Path(loc).is_dir():
-                    path = Path(loc)
-                else:
-                    continue  # no cov
+            uri = experiment.artifact_location
 
+            if isinstance(uri, str):
+                path = get_artifact_dir(uri=uri)
                 run_ids.extend(file.stem for file in path.iterdir() if file.is_dir())
 
     it = (joblib.delayed(mlflow.get_run)(run_id) for run_id in run_ids)

{hydraflow-0.5.4 → hydraflow-0.6.1}/src/hydraflow/param.py

@@ -28,6 +28,7 @@ def match(param: str, value: Any) -> bool:  # noqa: PLR0911
     Returns:
         True if the parameter matches the specified value,
         False otherwise.
+
     """
     if callable(value):
         return value(param)
@@ -94,6 +95,7 @@ def to_value(param: str | None, type_: type) -> Any:
 
     Returns:
         The converted value.
+
     """
     if param is None or param == "None":
         return None
@@ -129,6 +131,7 @@ def get_params(run: Run, *names: str | list[str]) -> tuple[str | None, ...]:
     Returns:
         tuple[str | None, ...]: A tuple containing the values of the specified
         parameters in the order they were provided.
+
     """
     names_ = []
     for name in names:
@@ -155,6 +158,7 @@ def get_values(run: Run, names: list[str], types: list[type]) -> tuple[Any, ...]
     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)

{hydraflow-0.5.4 → hydraflow-0.6.1}/src/hydraflow/run_collection.py

@@ -106,6 +106,7 @@ class RunCollection:
 
         Returns:
             A new `RunCollection` instance with the runs from both collections.
+
         """
         return self.__class__(self._runs + other._runs)
 
@@ -118,6 +119,7 @@ class RunCollection:
         Returns:
             A new `RunCollection` instance with the runs that are in this collection
             but not in the other.
+
         """
         runs = [run for run in self._runs if run not in other._runs]  # noqa: SLF001
         return self.__class__(runs)
@@ -150,6 +152,7 @@ class RunCollection:
         Returns:
             A new `RunCollection` instance containing the first n runs if n is
             positive, or the last n runs if n is negative.
+
         """
         if n < 0:
             return self.__class__(self._runs[n:])
@@ -164,6 +167,7 @@ class RunCollection:
 
         Raises:
             ValueError: If the collection does not contain exactly one run.
+
         """
         if len(self._runs) != 1:
             raise ValueError("The collection does not contain exactly one run.")
@@ -176,6 +180,7 @@ class RunCollection:
         Returns:
             The only `Run` instance in the collection, or None if the collection
             does not contain exactly one run.
+
         """
         return self._runs[0] if len(self._runs) == 1 else None
 
@@ -187,6 +192,7 @@ class RunCollection:
 
         Raises:
             ValueError: If the collection is empty.
+
         """
         if not self._runs:
             raise ValueError("The collection is empty.")
@@ -199,6 +205,7 @@ class RunCollection:
         Returns:
             The first `Run` instance in the collection, or None if the collection
             is empty.
+
         """
         return self._runs[0] if self._runs else None
 
@@ -210,6 +217,7 @@ class RunCollection:
 
         Raises:
             ValueError: If the collection is empty.
+
         """
         if not self._runs:
             raise ValueError("The collection is empty.")
@@ -222,6 +230,7 @@ class RunCollection:
         Returns:
             The last `Run` instance in the collection, or None if the collection
             is empty.
+
         """
         return self._runs[-1] if self._runs else None
 
@@ -262,6 +271,7 @@ class RunCollection:
 
         Returns:
             A new `RunCollection` object containing the filtered runs.
+
         """
         return RunCollection(
             filter_runs(
@@ -294,6 +304,7 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
+
         """
         try:
             return self.filter(config, **kwargs).first()
@@ -318,6 +329,7 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
+
         """
         return self.filter(config, **kwargs).try_first()
 
@@ -341,6 +353,7 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
+
         """
         try:
             return self.filter(config, **kwargs).last()
@@ -365,6 +378,7 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
+
         """
         return self.filter(config, **kwargs).try_last()
 
@@ -389,6 +403,7 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
+
         """
         try:
             return self.filter(config, **kwargs).one()
@@ -417,6 +432,7 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
+
         """
         return self.filter(config, **kwargs).try_one()
 
@@ -429,6 +445,7 @@ class RunCollection:
 
         Returns:
             A list of unique parameter names.
+
         """
         param_names = set()
 
@@ -453,6 +470,7 @@ class RunCollection:
         Returns:
             A dictionary where the keys are parameter names and the values are
             lists of parameter values.
+
         """
         params = {}
 
@@ -484,6 +502,7 @@ class RunCollection:
 
         Yields:
             Results obtained by applying the function to each run in the collection.
+
         """
         return (func(run, *args, **kwargs) for run in self)
 
@@ -504,6 +523,7 @@ class RunCollection:
         Yields:
             Results obtained by applying the function to each run id in the
             collection.
+
         """
         return (func(run_id, *args, **kwargs) for run_id in self.info.run_id)
 
@@ -524,6 +544,7 @@ class RunCollection:
         Yields:
             Results obtained by applying the function to each run configuration
             in the collection.
+
         """
         return (func(load_config(run), *args, **kwargs) for run in self)
 
@@ -548,6 +569,7 @@ class RunCollection:
         Yields:
             Results obtained by applying the function to each artifact URI in the
             collection.
+
         """
         return (func(uri, *args, **kwargs) for uri in self.info.artifact_uri)
 
@@ -571,6 +593,7 @@ class RunCollection:
         Yields:
             Results obtained by applying the function to each artifact directory
             in the collection.
+
         """
         return (func(dir, *args, **kwargs) for dir in self.info.artifact_dir)  # noqa: A001
 
@@ -594,6 +617,7 @@ class RunCollection:
             dictionary where the keys are tuples of parameter values and the
             values are `RunCollection` objects containing the runs that match
             those parameter values.
+
         """
         grouped_runs: dict[str | None | tuple[str | None, ...], list[Run]] = {}
         is_list = isinstance(names, list)
@@ -620,6 +644,7 @@ class RunCollection:
             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)
 
@@ -633,6 +658,7 @@ class RunCollection:
 
         Returns:
             A list of values for the specified parameters.
+
         """
         is_list = isinstance(names, list)
 
@@ -664,6 +690,7 @@ class RunCollection:
                 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)
@@ -721,6 +748,7 @@ def filter_runs(
 
     Returns:
         A list of runs that match the specified configuration and key-value pairs.
+
     """
     if override:
         config = select_overrides(config)
@@ -751,6 +779,7 @@ def filter_runs_by_status(
 
     Returns:
         A list of runs that match the specified status.
+
     """
     if isinstance(status, str):
         if status.startswith("!"):

{hydraflow-0.5.4 → hydraflow-0.6.1}/src/hydraflow/run_data.py

@@ -37,6 +37,7 @@ class RunCollectionData:
 
         Returns:
             A DataFrame containing the runs' configurations.
+
         """
         return DataFrame(self._runs.map_config(collect_params))
 

{hydraflow-0.5.4 → hydraflow-0.6.1}/src/hydraflow/utils.py

@@ -3,6 +3,8 @@
 from __future__ import annotations
 
 import shutil
+import urllib.parse
+import urllib.request
 from pathlib import Path
 from typing import TYPE_CHECKING
 
@@ -16,29 +18,40 @@ if TYPE_CHECKING:
     from collections.abc import Iterable
 
 
-def get_artifact_dir(run: Run | None = None) -> Path:
+def get_artifact_dir(run: Run | None = None, uri: str | None = None) -> Path:
     """Retrieve the artifact directory for the given run.
 
     This function uses MLflow to get the artifact directory for the given run.
 
     Args:
         run (Run | None): The run object. Defaults to None.
+        uri (str | None): The URI of the artifact. Defaults to None.
 
     Returns:
         The local path to the directory where the artifacts are downloaded.
+
     """
-    uri = mlflow.get_artifact_uri() if run is None else run.info.artifact_uri
+    if run is not None and uri is not None:
+        raise ValueError("Cannot provide both run and uri")
+
+    if run is None and uri is None:
+        uri = mlflow.get_artifact_uri()
+    elif run:
+        uri = run.info.artifact_uri
 
     if not isinstance(uri, str):
         raise NotImplementedError
 
     if uri.startswith("file:"):
-        return Path(mlflow.artifacts.download_artifacts(uri))
+        return file_uri_to_path(uri)
 
-    if Path(uri).is_dir():
-        return Path(uri)
+    return Path(uri)
 
-    raise NotImplementedError
+
+def file_uri_to_path(uri: str) -> Path:
+    """Convert a file URI to a local path."""
+    path = urllib.parse.urlparse(uri).path
+    return Path(urllib.request.url2pathname(path))  # for Windows
 
 
 def get_artifact_path(run: Run | None, path: str) -> Path:
@@ -52,6 +65,7 @@ def get_artifact_path(run: Run | None, path: str) -> Path:
 
     Returns:
         The local path to the artifact.
+
     """
     return get_artifact_dir(run) / path
 
@@ -74,6 +88,7 @@ def get_hydra_output_dir(run: Run | None = None) -> Path:
     Raises:
         FileNotFoundError: If the Hydra configuration file is not found
             in the artifacts.
+
     """
     if run is None:
         hc = HydraConfig.get()
@@ -102,6 +117,7 @@ def load_config(run: Run) -> DictConfig:
     Returns:
         The loaded configuration as a DictConfig object. Returns an empty
         DictConfig if the configuration file is not found.
+
     """
     path = get_artifact_dir(run) / ".hydra/config.yaml"
     return OmegaConf.load(path)  # type: ignore
@@ -126,6 +142,7 @@ def load_overrides(run: Run) -> list[str]:
     Returns:
         The loaded overrides as a list of strings. Returns an empty list
         if the overrides file is not found.
+
     """
     path = get_artifact_dir(run) / ".hydra/overrides.yaml"
     return [str(x) for x in OmegaConf.load(path)]

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/config/overrides.py

@@ -16,8 +16,7 @@ class Config:
     height: float = 1.7
 
 
-cs = ConfigStore.instance()
-cs.store(name="config", node=Config)
+ConfigStore.instance().store(name="config", node=Config)
 
 
 @hydra.main(version_base=None, config_name="config")

hydraflow-0.6.1/tests/context/chdir.py

@@ -0,0 +1,29 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from pathlib import Path
+
+import hydra
+from hydra.core.config_store import ConfigStore
+
+import hydraflow
+
+
+@dataclass
+class Config:
+    count: int = 0
+
+
+ConfigStore.instance().store(name="config", node=Config)
+
+
+@hydra.main(version_base=None, config_name="config")
+def app(cfg: Config):
+    hydraflow.set_experiment()
+
+    with hydraflow.start_run(cfg, chdir=True):
+        Path("a.txt").write_text(str(cfg.count))
+
+
+if __name__ == "__main__":
+    app()

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/context/context.py

@@ -15,8 +15,7 @@ class Config:
     name: str = "a"
 
 
-cs = ConfigStore.instance()
-cs.store(name="config", node=Config)
+ConfigStore.instance().store(name="config", node=Config)
 
 
 @hydra.main(version_base=None, config_name="config")
@@ -24,9 +23,6 @@ def app(cfg: Config):
     hydraflow.set_experiment()
 
     with hydraflow.start_run(cfg) as run:
-        with hydraflow.chdir_hydra_output():
-            Path("a.txt").write_text("chdir_hydra_output")
-
         with hydraflow.chdir_artifact(run):
             Path("b.txt").write_text("chdir_artifact")
 

hydraflow-0.6.1/tests/context/logging.py

@@ -0,0 +1,40 @@
+from __future__ import annotations
+
+import logging
+from dataclasses import dataclass
+from pathlib import Path
+
+import hydra
+from hydra.core.config_store import ConfigStore
+from hydra.core.hydra_config import HydraConfig
+
+import hydraflow
+
+log = logging.getLogger(__name__)
+
+
+@dataclass
+class Config:
+    count: int = 0
+
+
+ConfigStore.instance().store(name="config", node=Config)
+
+
+@hydra.main(version_base=None, config_name="config")
+def app(cfg: Config):
+    hydraflow.set_experiment()
+
+    run = hydraflow.list_runs().try_get(cfg, override=True)
+
+    with hydraflow.start_run(cfg, run=run):
+        log.info("second" if run else "first")
+        log.info(cfg.count)
+
+        output_dir = Path(HydraConfig.get().runtime.output_dir)
+        (output_dir / "text.log").write_text("text\n")
+        (output_dir / "dir.log").mkdir()
+
+
+if __name__ == "__main__":
+    app()

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/context/preemption.py

@@ -17,8 +17,7 @@ class Config:
     count: int = 0
 
 
-cs = ConfigStore.instance()
-cs.store(name="config", node=Config)
+ConfigStore.instance().store(name="config", node=Config)
 
 
 @hydra.main(version_base=None, config_name="config")

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/context/rerun.py

@@ -17,20 +17,16 @@ class Config:
     count: int = 0
 
 
-cs = ConfigStore.instance()
-cs.store(name="config", node=Config)
+ConfigStore.instance().store(name="config", node=Config)
 
 
 @hydra.main(version_base=None, config_name="config")
 def app(cfg: Config):
     hydraflow.set_experiment()
 
-    if run := hydraflow.list_runs().try_find(cfg, override=True):
-        run_id = run.info.run_id
-    else:
-        run_id = None
+    run = hydraflow.list_runs().try_find(cfg, override=True)
 
-    with hydraflow.start_run(cfg, run_id=run_id) as run:
+    with hydraflow.start_run(cfg, run=run) as run:
         log(hydraflow.get_artifact_dir(run))
 
 

hydraflow-0.6.1/tests/context/test_chdir.py

@@ -0,0 +1,27 @@
+import pytest
+from mlflow.entities import Run
+
+from hydraflow.run_collection import RunCollection
+
+pytestmark = pytest.mark.xdist_group(name="group4")
+
+
+@pytest.fixture(scope="module")
+def rc(collect):
+    return collect("context/chdir.py", ["-m", "count=1,2"])
+
+
+def test_rc_len(rc: RunCollection):
+    assert len(rc) == 2
+
+
+@pytest.fixture(scope="module", params=[1, 2])
+def run(rc: RunCollection, request: pytest.FixtureRequest):
+    return rc.get(count=request.param)
+
+
+def test_run_count(run: Run):
+    from hydraflow.utils import get_artifact_path
+
+    text = get_artifact_path(run, "a.txt").read_text()
+    assert text == run.data.params["count"]

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/context/test_context.py

@@ -2,7 +2,7 @@ import pytest
 from mlflow.entities import Run
 
 from hydraflow.run_collection import RunCollection
-from hydraflow.utils import get_artifact_path, get_hydra_output_dir
+from hydraflow.utils import get_artifact_path
 
 pytestmark = pytest.mark.xdist_group(name="group2")
 
@@ -18,16 +18,6 @@ def run(rc: RunCollection, request: pytest.FixtureRequest):
     return rc[request.param]
 
 
-def test_chdir_hydra_output(run: Run):
-    path = get_hydra_output_dir(run)
-    assert (path / "a.txt").read_text() == "chdir_hydra_output"
-
-
 def test_chdir_artifact(run: Run):
     path = get_artifact_path(run, "b.txt")
     assert path.read_text() == "chdir_artifact"
-
-
-def test_log_run(run: Run):
-    path = get_artifact_path(run, "a.txt")
-    assert path.read_text() == "chdir_hydra_output"

hydraflow-0.6.1/tests/context/test_logging.py

@@ -0,0 +1,51 @@
+import pytest
+from mlflow.entities import Run
+
+from hydraflow.run_collection import RunCollection
+from hydraflow.utils import get_artifact_path
+
+pytestmark = pytest.mark.xdist_group(name="group6")
+
+
+@pytest.fixture(scope="module")
+def rc(collect):
+    collect("context/logging.py", ["count=100"])
+    return collect("context/logging.py", ["count=100"])
+
+
+def test_rc_len(rc: RunCollection):
+    assert len(rc) == 1
+
+
+@pytest.fixture(scope="module")
+def run(rc: RunCollection):
+    return rc[0]
+
+
+@pytest.fixture(scope="module")
+def hydra_log(run: Run, experiment_name: str):
+    path = get_artifact_path(run, f"{experiment_name}.log")
+    return path.read_text()
+
+
+@pytest.mark.parametrize(
+    ("i", "suffix"),
+    [(0, "] - first"), (1, "] - 100"), (2, "] - second"), (3, "] - 100")],
+)
+def test_hydra_log(hydra_log: str, i: int, suffix: str):
+    assert hydra_log.splitlines()[i].endswith(suffix)
+
+
+def test_text_log(run: Run):
+    path = get_artifact_path(run, "text.log")
+    assert path.read_text() == "text\ntext\n"
+
+
+def test_dir_log(run: Run):
+    assert not get_artifact_path(run, "dir.log").exists()
+
+
+def test_config(run: Run):
+    path = get_artifact_path(run, ".hydra/config.yaml")
+    cfg = path.read_text()
+    assert cfg == "count: 100\n"

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/param/params.py

@@ -21,8 +21,7 @@ class Config:
     data: Data = field(default_factory=Data)
 
 
-cs = ConfigStore.instance()
-cs.store(name="config", node=Config)
+ConfigStore.instance().store(name="config", node=Config)
 
 
 @hydra.main(version_base=None, config_name="config")

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/param/test_params.py

@@ -3,7 +3,7 @@ from mlflow.entities import Run
 
 from hydraflow.run_collection import RunCollection
 
-pytestmark = pytest.mark.xdist_group(name="group2")
+pytestmark = pytest.mark.xdist_group(name="group1")
 
 
 @pytest.fixture(scope="module")

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/run/filter.py

@@ -14,8 +14,7 @@ class Config:
     port: int = 3306
 
 
-cs = ConfigStore.instance()
-cs.store(name="config", node=Config)
+ConfigStore.instance().store(name="config", node=Config)
 
 
 @hydra.main(version_base=None, config_name="config")

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/run/run.py

@@ -21,8 +21,7 @@ class Config:
     data: Data = field(default_factory=Data)
 
 
-cs = ConfigStore.instance()
-cs.store(name="config", node=Config)
+ConfigStore.instance().store(name="config", node=Config)
 
 
 @hydra.main(version_base=None, config_name="config")

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/run/test_info.py

@@ -4,7 +4,7 @@ from mlflow.entities import Experiment
 
 from hydraflow.run_collection import RunCollection
 
-pytestmark = pytest.mark.xdist_group(name="group4")
+pytestmark = pytest.mark.xdist_group(name="group7")
 
 
 @pytest.fixture(scope="module")

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/run/test_run.py

@@ -7,7 +7,7 @@ from hydraflow.run_collection import RunCollection
 if TYPE_CHECKING:
     from .run import Config
 
-pytestmark = pytest.mark.xdist_group(name="group4")
+pytestmark = pytest.mark.xdist_group(name="group5")
 
 
 @pytest.fixture(scope="module")

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/utils/test_utils.py

@@ -1,3 +1,4 @@
+import sys
 from typing import TYPE_CHECKING
 
 import pytest
@@ -27,6 +28,30 @@ def run(rc: RunCollection):
     return rc.first()
 
 
+@pytest.mark.parametrize(
+    ("uri", "path"),
+    [("/a/b/c", "/a/b/c"), ("file:///a/b/c", "/a/b/c"), ("file:C:/a/b/c", "C:/a/b/c")],
+)
+def test_file_uri_to_path(uri, path):
+    from hydraflow.utils import file_uri_to_path
+
+    assert file_uri_to_path(uri).as_posix() == path
+
+
+@pytest.mark.skipif(sys.platform != "win32", reason="This test is for Windows")
+def test_file_uri_to_path_win10_11():
+    from hydraflow.utils import file_uri_to_path
+
+    assert file_uri_to_path("file:///C:/a/b/c").as_posix() == "C:/a/b/c"
+
+
+def test_artifact_dir_error(run: Run):
+    from hydraflow.utils import get_artifact_dir
+
+    with pytest.raises(ValueError):
+        get_artifact_dir(run, "a")
+
+
 def test_hydra_output_dir(run: Run):
     from hydraflow.utils import get_artifact_path, get_hydra_output_dir
 

{hydraflow-0.5.4 → hydraflow-0.6.1}/tests/utils/utils.py

@@ -16,8 +16,7 @@ class Config:
     height: float = 1.7
 
 
-cs = ConfigStore.instance()
-cs.store(name="config", node=Config)
+ConfigStore.instance().store(name="config", node=Config)
 
 
 @hydra.main(version_base=None, config_name="config")