hydraflow 0.5.3__tar.gz → 0.5.4__tar.gz

{hydraflow-0.5.3 → hydraflow-0.5.4}/.devcontainer/postCreate.sh

@@ -5,7 +5,4 @@ mkdir -p ~/.config
 cp .devcontainer/starship.toml ~/.config
 
 curl -LsSf https://astral.sh/uv/install.sh | sh
-echo 'eval "$(uv generate-shell-completion bash)"' >> ~/.bashrc
-uv tool install ruff@latest
-uv python install
-uv sync -U
+echo 'eval "$(uv generate-shell-completion bash)"' >> ~/.bashrc

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

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

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "hydraflow"
-version = "0.5.3"
+version = "0.5.4"
 description = "Hydraflow integrates Hydra and MLflow to manage and track machine learning experiments."
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -33,6 +33,9 @@ dev-dependencies = [
   "mkdocs-material",
   "mkdocs>=1.6",
   "pytest-cov",
+  "pytest-order",
+  "pytest-randomly",
+  "pytest-xdist",
 ]
 
 [tool.hatch.build.targets.sdist]
@@ -43,11 +46,11 @@ packages = ["src/hydraflow"]
 
 [tool.pytest.ini_options]
 addopts = [
-  "--doctest-modules",
   "--cov=hydraflow",
   "--cov-report=lcov:lcov.info",
+  "-n8",
+  "--dist=loadgroup",
 ]
-doctest_optionflags = ["NORMALIZE_WHITESPACE", "IGNORE_EXCEPTION_DETAIL"]
 filterwarnings = [
   "ignore:pkg_resources is deprecated:DeprecationWarning",
   "ignore:Support for class-based `config` is deprecated",
@@ -65,35 +68,8 @@ target-version = "py310"
 [tool.ruff.lint]
 select = ["ALL"]
 unfixable = ["F401"]
-ignore = [
-  "A005",
-  "ANN003",
-  "ANN401",
-  "ARG002",
-  "B904",
-  "D105",
-  "D107",
-  "D203",
-  "D213",
-  "EM101",
-  "PGH003",
-  "TRY003",
-]
-exclude = ["tests/scripts/*.py"]
+ignore = ["A005", "ANN003", "ANN401", "B904", "D", "EM101", "PGH003", "TRY003"]
 
 [tool.ruff.lint.per-file-ignores]
-"tests/*" = [
-  "A001",
-  "ANN",
-  "ARG",
-  "D",
-  "FBT",
-  "PD",
-  "PLR",
-  "PT",
-  "S",
-  "SIM117",
-  "TID",
-  "SLF",
-]
-"apps/*.py" = ["INP", "D", "G", "T"]
+"tests/*" = ["A001", "ANN", "ARG", "FBT", "PLR", "PT", "S", "SIM108", "SLF"]
+"apps/*.py" = ["D", "G", "INP"]

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

@@ -22,7 +22,6 @@ def collect_params(config: object) -> dict[str, Any]:
 
     Returns:
         dict[str, Any]: A dictionary of collected parameters.
-
     """
     return dict(iter_params(config))
 
@@ -41,7 +40,6 @@ 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
@@ -115,7 +113,6 @@ 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.3 → hydraflow-0.5.4}/src/hydraflow/context.py

@@ -48,7 +48,6 @@ def log_run(
             # Perform operations within the MLflow run context
             pass
         ```
-
     """
     if config:
         log_params(config, synchronous=synchronous)
@@ -118,7 +117,6 @@ 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.
-
     """
     with (
         mlflow.start_run(
@@ -169,7 +167,6 @@ def chdir_artifact(
     Args:
         run (Run): The run to get the artifact directory from.
         artifact_path (str | None): The artifact path.
-
     """
     curdir = Path.cwd()
     path = mlflow.artifacts.download_artifacts(

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

@@ -54,7 +54,6 @@ 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)
@@ -78,7 +77,6 @@ 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)
@@ -135,7 +133,6 @@ def search_runs(  # noqa: PLR0913
 
     Returns:
         A `RunCollection` object containing the search results.
-
     """
     runs = mlflow.search_runs(
         experiment_ids=experiment_ids,
@@ -180,7 +177,6 @@ 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:

{hydraflow-0.5.3 → hydraflow-0.5.4}/src/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:
@@ -28,8 +28,10 @@ def match(param: str, value: Any) -> bool:
     Returns:
         True if the parameter matches the specified value,
         False otherwise.
-
     """
+    if callable(value):
+        return value(param)
+
     if any(value is x for x in [None, True, False]):
         return param == str(value)
 
@@ -92,7 +94,6 @@ def to_value(param: str | None, type_: type) -> Any:
 
     Returns:
         The converted value.
-
     """
     if param is None or param == "None":
         return None
@@ -128,7 +129,6 @@ 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,7 +155,6 @@ 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.3 → hydraflow-0.5.4}/src/hydraflow/run_collection.py

@@ -106,7 +106,6 @@ class RunCollection:
 
         Returns:
             A new `RunCollection` instance with the runs from both collections.
-
         """
         return self.__class__(self._runs + other._runs)
 
@@ -119,7 +118,6 @@ 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)
@@ -152,7 +150,6 @@ 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:])
@@ -167,7 +164,6 @@ 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.")
@@ -180,7 +176,6 @@ 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
 
@@ -192,7 +187,6 @@ class RunCollection:
 
         Raises:
             ValueError: If the collection is empty.
-
         """
         if not self._runs:
             raise ValueError("The collection is empty.")
@@ -205,7 +199,6 @@ 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
 
@@ -217,7 +210,6 @@ class RunCollection:
 
         Raises:
             ValueError: If the collection is empty.
-
         """
         if not self._runs:
             raise ValueError("The collection is empty.")
@@ -230,11 +222,18 @@ 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
 
-    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 +253,26 @@ 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.
@@ -282,7 +294,6 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
-
         """
         try:
             return self.filter(config, **kwargs).first()
@@ -307,7 +318,6 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
-
         """
         return self.filter(config, **kwargs).try_first()
 
@@ -331,7 +341,6 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
-
         """
         try:
             return self.filter(config, **kwargs).last()
@@ -356,7 +365,6 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
-
         """
         return self.filter(config, **kwargs).try_last()
 
@@ -381,7 +389,6 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
-
         """
         try:
             return self.filter(config, **kwargs).one()
@@ -410,7 +417,6 @@ class RunCollection:
 
         See Also:
             `filter`: Perform the actual filtering logic.
-
         """
         return self.filter(config, **kwargs).try_one()
 
@@ -423,7 +429,6 @@ class RunCollection:
 
         Returns:
             A list of unique parameter names.
-
         """
         param_names = set()
 
@@ -448,7 +453,6 @@ class RunCollection:
         Returns:
             A dictionary where the keys are parameter names and the values are
             lists of parameter values.
-
         """
         params = {}
 
@@ -480,7 +484,6 @@ class RunCollection:
 
         Yields:
             Results obtained by applying the function to each run in the collection.
-
         """
         return (func(run, *args, **kwargs) for run in self)
 
@@ -501,7 +504,6 @@ 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)
 
@@ -522,7 +524,6 @@ 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)
 
@@ -547,7 +548,6 @@ 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,7 +571,6 @@ 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
 
@@ -595,7 +594,6 @@ 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)
@@ -622,7 +620,6 @@ 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)
 
@@ -636,7 +633,6 @@ class RunCollection:
 
         Returns:
             A list of values for the specified parameters.
-
         """
         is_list = isinstance(names, list)
 
@@ -668,7 +664,6 @@ 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)
@@ -726,7 +721,6 @@ def filter_runs(
 
     Returns:
         A list of runs that match the specified configuration and key-value pairs.
-
     """
     if override:
         config = select_overrides(config)
@@ -757,7 +751,6 @@ 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.3 → hydraflow-0.5.4}/src/hydraflow/run_data.py

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

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

@@ -26,7 +26,6 @@ def get_artifact_dir(run: Run | None = None) -> Path:
 
     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
 
@@ -53,7 +52,6 @@ def get_artifact_path(run: Run | None, path: str) -> Path:
 
     Returns:
         The local path to the artifact.
-
     """
     return get_artifact_dir(run) / path
 
@@ -76,7 +74,6 @@ 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()
@@ -105,7 +102,6 @@ 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
@@ -130,7 +126,6 @@ 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.3/tests/config/test_hydra.py → hydraflow-0.5.4/tests/config/test_overrides.py

@@ -6,11 +6,13 @@ from mlflow.entities import Run
 
 from hydraflow.run_collection import RunCollection
 
+pytestmark = pytest.mark.xdist_group(name="group1")
+
 
 @pytest.fixture(scope="module")
 def rc(collect):
     args = ["-m", "name=a,b", "height=3"]
-    return collect("config/config.py", args)
+    return collect("config/overrides.py", args)
 
 
 @pytest.fixture(scope="module")

{hydraflow-0.5.3 → hydraflow-0.5.4}/tests/conftest.py

@@ -15,7 +15,7 @@ def experiment_name(tmp_path_factory: pytest.TempPathFactory):
     cwd = Path.cwd()
     name = str(uuid.uuid4())
 
-    os.chdir(tmp_path_factory.mktemp(name))
+    os.chdir(tmp_path_factory.mktemp(name, numbered=False))
 
     yield name
 

hydraflow-0.5.4/tests/context/preemption.py

@@ -0,0 +1,49 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import TYPE_CHECKING
+
+import hydra
+from hydra.core.config_store import ConfigStore
+
+import hydraflow
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+@dataclass
+class Config:
+    count: int = 0
+
+
+cs = ConfigStore.instance()
+cs.store(name="config", node=Config)
+
+
+@hydra.main(version_base=None, config_name="config")
+def app(cfg: Config):
+    hydraflow.set_experiment()
+
+    rc = hydraflow.list_runs()
+
+    if rc.filter(cfg, status="finished", override=True):
+        return
+
+    if run := rc.try_find(cfg, override=True):
+        run_id = run.info.run_id
+    else:
+        run_id = None
+
+    with hydraflow.start_run(cfg, run_id=run_id) as run:
+        log(hydraflow.get_artifact_dir(run))
+
+
+def log(path: Path):
+    file = path / "a.txt"
+    text = file.read_text() if file.exists() else ""
+    file.write_text(text + "a")
+
+
+if __name__ == "__main__":
+    app()

hydraflow-0.5.4/tests/context/rerun.py

@@ -0,0 +1,44 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import TYPE_CHECKING
+
+import hydra
+from hydra.core.config_store import ConfigStore
+
+import hydraflow
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+@dataclass
+class Config:
+    count: int = 0
+
+
+cs = ConfigStore.instance()
+cs.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
+
+    with hydraflow.start_run(cfg, run_id=run_id) as run:
+        log(hydraflow.get_artifact_dir(run))
+
+
+def log(path: Path):
+    file = path / "a.txt"
+    text = file.read_text() if file.exists() else ""
+    file.write_text(text + "a")
+
+
+if __name__ == "__main__":
+    app()

hydraflow-0.5.3/tests/context/test_hydra.py → hydraflow-0.5.4/tests/context/test_context.py

@@ -4,6 +4,8 @@ from mlflow.entities import Run
 from hydraflow.run_collection import RunCollection
 from hydraflow.utils import get_artifact_path, get_hydra_output_dir
 
+pytestmark = pytest.mark.xdist_group(name="group2")
+
 
 @pytest.fixture(scope="module")
 def rc(collect):

hydraflow-0.5.4/tests/context/test_preemption.py

@@ -0,0 +1,41 @@
+import pytest
+from mlflow.entities import Run, RunStatus
+from mlflow.tracking import MlflowClient
+
+from hydraflow.run_collection import RunCollection
+
+pytestmark = pytest.mark.xdist_group(name="group4")
+
+
+@pytest.fixture(scope="module")
+def rc(collect):
+    client = MlflowClient()
+    running = RunStatus.to_string(RunStatus.RUNNING)
+
+    filename = "context/preemption.py"
+    args = ["-m", "count=1,2,3"]
+
+    rc = collect(filename, args)
+    client.set_terminated(rc.get(count=2).info.run_id, status=running)
+    client.set_terminated(rc.get(count=3).info.run_id, status=running)
+    rc = collect(filename, args)
+    client.set_terminated(rc.get(count=3).info.run_id, status=running)
+    return collect(filename, args)
+
+
+def test_rc_len(rc: RunCollection):
+    assert len(rc) == 3
+
+
+@pytest.fixture(scope="module", params=[1, 2, 3])
+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
+
+    count = int(run.data.params["count"])
+    path = get_artifact_path(run, "a.txt")
+    text = path.read_text()
+    assert len(text) == count

hydraflow-0.5.4/tests/context/test_rerun.py

@@ -0,0 +1,31 @@
+import pytest
+from mlflow.entities import Run
+
+from hydraflow.run_collection import RunCollection
+
+pytestmark = pytest.mark.xdist_group(name="group3")
+
+
+@pytest.fixture(scope="module")
+def rc(collect):
+    collect("context/rerun.py", ["-m", "count=1,2,3"])
+    collect("context/rerun.py", ["-m", "count=2,3"])
+    return collect("context/rerun.py", ["-m", "count=3"])
+
+
+def test_rc_len(rc: RunCollection):
+    assert len(rc) == 3
+
+
+@pytest.fixture(scope="module", params=[1, 2, 3])
+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
+
+    count = int(run.data.params["count"])
+    path = get_artifact_path(run, "a.txt")
+    text = path.read_text()
+    assert len(text) == count

{hydraflow-0.5.3 → hydraflow-0.5.4}/tests/param/test_param.py

@@ -5,6 +5,8 @@ import pytest
 
 from hydraflow.param import match
 
+pytestmark = pytest.mark.xdist_group(name="group2")
+
 
 @pytest.fixture
 def param(monkeypatch: pytest.MonkeyPatch, tmp_path: Path):
@@ -51,6 +53,14 @@ def test_param(param, x, y):
     assert match(p, x)
 
 
+@pytest.mark.parametrize(
+    ("param", "value"),
+    [("1.0", lambda x: float(x) > 0), ("-1.0", lambda x: float(x) < 0)],
+)
+def test_match_callable(param, value):
+    assert match(param, value)
+
+
 @pytest.mark.parametrize(
     ("param", "value"),
     [("1.0", 1.0), ("1.0", 1), ("0.0", 0), ("0.0", 0.0)],

hydraflow-0.5.3/tests/param/test_hydra.py → hydraflow-0.5.4/tests/param/test_params.py

@@ -3,11 +3,13 @@ from mlflow.entities import Run
 
 from hydraflow.run_collection import RunCollection
 
+pytestmark = pytest.mark.xdist_group(name="group2")
+
 
 @pytest.fixture(scope="module")
 def rc(collect):
     args = ["host=a"]
-    return collect("param/param.py", args)
+    return collect("param/params.py", args)
 
 
 @pytest.fixture(scope="module")

{hydraflow-0.5.3 → hydraflow-0.5.4}/tests/run/test_collection.py

@@ -7,6 +7,8 @@ from mlflow.entities import Experiment, Run, RunStatus
 from hydraflow.mlflow import list_runs
 from hydraflow.run_collection import RunCollection, filter_runs
 
+pytestmark = pytest.mark.xdist_group(name="group3")
+
 
 @pytest.fixture(scope="module")
 def experiment(experiment_name: str):

{hydraflow-0.5.3 → hydraflow-0.5.4}/tests/run/test_data.py

@@ -4,6 +4,8 @@ from mlflow.entities import Experiment
 
 from hydraflow.run_collection import RunCollection
 
+pytestmark = pytest.mark.xdist_group(name="group3")
+
 
 @pytest.fixture(scope="module")
 def experiment(experiment_name: str):

{hydraflow-0.5.3 → hydraflow-0.5.4}/tests/run/test_filter.py

@@ -2,6 +2,8 @@ import pytest
 
 from hydraflow.run_collection import RunCollection
 
+pytestmark = pytest.mark.xdist_group(name="group7")
+
 
 @pytest.fixture(scope="module")
 def rc(collect):

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

@@ -4,6 +4,8 @@ from mlflow.entities import Experiment
 
 from hydraflow.run_collection import RunCollection
 
+pytestmark = pytest.mark.xdist_group(name="group4")
+
 
 @pytest.fixture(scope="module")
 def experiment(experiment_name: str):

hydraflow-0.5.3/tests/run/test_hydra.py → hydraflow-0.5.4/tests/run/test_run.py

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

{hydraflow-0.5.3 → hydraflow-0.5.4}/tests/test_mlflow.py

@@ -4,12 +4,14 @@ import mlflow
 import pytest
 from mlflow.entities import Experiment, Run, RunStatus
 
+pytestmark = pytest.mark.xdist_group(name="group0")
+
 
 @pytest.fixture(scope="module")
 def experiment(experiment_name: str):
     from hydraflow.mlflow import log_params, set_experiment
 
-    experiment = set_experiment(uri="mlruns", name="e")
+    experiment = set_experiment(uri="test_mlflow", name="e")
 
     with mlflow.start_run():
         log_params({"name": experiment_name})
@@ -20,13 +22,11 @@ def experiment(experiment_name: str):
     mlflow.start_run()
     mlflow.end_run(status=RunStatus.to_string(RunStatus.FAILED))
 
-    yield experiment
-
-    mlflow.set_tracking_uri("")
+    return experiment
 
 
 def test_set_experiment_uri(experiment: Experiment):
-    assert mlflow.get_tracking_uri() == "mlruns"
+    assert mlflow.get_tracking_uri() == "test_mlflow"
 
 
 def test_set_experiment_location(experiment: Experiment):
@@ -35,7 +35,7 @@ def test_set_experiment_location(experiment: Experiment):
     if loc.startswith("file:"):  # for windows
         loc = loc[loc.index("C:") :]
 
-    path = Path.cwd() / "mlruns" / experiment.experiment_id
+    path = Path.cwd() / "test_mlflow" / experiment.experiment_id
     assert path == Path(loc)
 
 

{hydraflow-0.5.3 → hydraflow-0.5.4}/tests/utils/test_run.py

@@ -4,6 +4,8 @@ from mlflow.entities import Experiment, Run
 
 from hydraflow.run_collection import RunCollection
 
+pytestmark = pytest.mark.xdist_group(name="group5")
+
 
 @pytest.fixture(scope="module")
 def experiment(experiment_name: str):
@@ -28,6 +30,7 @@ def run(rc: RunCollection):
     return rc.first()
 
 
+@pytest.mark.order(0)
 def test_hydra_output_dir(run: Run):
     from hydraflow.utils import get_hydra_output_dir
 
@@ -35,6 +38,7 @@ def test_hydra_output_dir(run: Run):
         get_hydra_output_dir(run)
 
 
+@pytest.mark.order(1)
 def test_remove_run(rc: RunCollection):
     from hydraflow.utils import get_artifact_dir, remove_run
 

hydraflow-0.5.3/tests/utils/test_hydra.py → hydraflow-0.5.4/tests/utils/test_utils.py

@@ -8,13 +8,20 @@ from hydraflow.run_collection import RunCollection
 if TYPE_CHECKING:
     from .utils import Config
 
+pytestmark = pytest.mark.xdist_group(name="group6")
+
 
 @pytest.fixture(scope="module")
 def rc(collect):
     args = ["-m", "name=a,b", "age=10"]
+
     return collect("utils/utils.py", args)
 
 
+def test_rc_len(rc: RunCollection):
+    assert len(rc) == 2
+
+
 @pytest.fixture(scope="module")
 def run(rc: RunCollection):
     return rc.first()