mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-02 07:18:25 +01:00
Feature/hydra config modules (#9783)
* hydra: enable config modules Lets the user specify Hydra configs in installed Python modules as well as inside directories. Adds `hydra.config_module` to `.dvc/config`. Fixes #9740 old tests green tests for config modules * hydra: fix linter errors * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * hydra: fix mypy error * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci * hydra: fix tests * Update dvc/utils/hydra.py Co-authored-by: David de la Iglesia Castro <[email protected]> * address comments * convince mypy not to worry * split long line * fix test * check for raised error in test --------- Co-authored-by: Dom Miketa <[email protected]> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: David de la Iglesia Castro <[email protected]>
This commit is contained in:
co-authored by
David de la Iglesia Castro
Dom Miketa
pre-commit-ci[bot]
parent
43b371c43a
commit
009b238807
@@ -1,3 +1,5 @@
|
||||
from contextlib import nullcontext as does_not_raise
|
||||
|
||||
import pytest
|
||||
|
||||
from dvc.exceptions import InvalidArgumentError
|
||||
@@ -167,16 +169,70 @@ def hydra_setup(tmp_dir, config_dir, config_name):
|
||||
),
|
||||
],
|
||||
)
|
||||
def test_compose_and_dump(tmp_dir, suffix, overrides, expected):
|
||||
def test_compose_and_dump_overrides(tmp_dir, suffix, overrides, expected):
|
||||
from dvc.utils.hydra import compose_and_dump
|
||||
|
||||
config_name = "config"
|
||||
output_file = tmp_dir / f"params.{suffix}"
|
||||
config_dir = hydra_setup(tmp_dir, "conf", "config")
|
||||
compose_and_dump(output_file, config_dir, config_name, overrides)
|
||||
config_module = None
|
||||
compose_and_dump(output_file, config_dir, config_module, config_name, overrides)
|
||||
assert output_file.parse() == expected
|
||||
|
||||
|
||||
def hydra_setup_dir_basic(tmp_dir, config_subdir, config_name, config_content):
|
||||
if config_subdir is None:
|
||||
return None
|
||||
|
||||
config_dir = tmp_dir / config_subdir
|
||||
config_dir.mkdir()
|
||||
(config_dir / f"{config_name}.yaml").dump(config_content)
|
||||
return str(config_dir)
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"config_subdir,config_module,config_content,error_context",
|
||||
[
|
||||
("conf", None, {"normal_yaml_config": False}, does_not_raise()),
|
||||
(
|
||||
None,
|
||||
"hydra.test_utils.configs",
|
||||
{"normal_yaml_config": True},
|
||||
does_not_raise(),
|
||||
),
|
||||
(
|
||||
"conf",
|
||||
"hydra.test_utils.configs",
|
||||
{"normal_yaml_config": False},
|
||||
does_not_raise(),
|
||||
),
|
||||
(
|
||||
None,
|
||||
None,
|
||||
None,
|
||||
pytest.raises(
|
||||
ValueError,
|
||||
match="Either `config_dir` or `config_module` should be provided.",
|
||||
),
|
||||
),
|
||||
],
|
||||
)
|
||||
def test_compose_and_dump_dir_module(
|
||||
tmp_dir, config_subdir, config_module, config_content, error_context
|
||||
):
|
||||
from dvc.utils.hydra import compose_and_dump
|
||||
|
||||
output_file = tmp_dir / "params.yaml"
|
||||
config_name = "config"
|
||||
config_dir = hydra_setup_dir_basic(
|
||||
tmp_dir, config_subdir, config_name, config_content
|
||||
)
|
||||
|
||||
with error_context:
|
||||
compose_and_dump(output_file, config_dir, config_module, config_name, [])
|
||||
assert output_file.parse() == config_content
|
||||
|
||||
|
||||
def test_compose_and_dump_yaml_handles_string(tmp_dir):
|
||||
"""Regression test for https://github.com/iterative/dvc/issues/8583"""
|
||||
from dvc.utils.hydra import compose_and_dump
|
||||
@@ -185,7 +241,7 @@ def test_compose_and_dump_yaml_handles_string(tmp_dir):
|
||||
config.parent.mkdir()
|
||||
config.write_text("foo: 'no'\n")
|
||||
output_file = tmp_dir / "params.yaml"
|
||||
compose_and_dump(output_file, str(config.parent), "config", [])
|
||||
compose_and_dump(output_file, str(config.parent), None, "config", [])
|
||||
assert output_file.read_text() == "foo: 'no'\n"
|
||||
|
||||
|
||||
@@ -197,7 +253,7 @@ def test_compose_and_dump_resolves_interpolation(tmp_dir):
|
||||
config.parent.mkdir()
|
||||
config.dump({"data": {"root": "path/to/root", "raw": "${.root}/raw"}})
|
||||
output_file = tmp_dir / "params.yaml"
|
||||
compose_and_dump(output_file, str(config.parent), "config", [])
|
||||
compose_and_dump(output_file, str(config.parent), None, "config", [])
|
||||
assert output_file.parse() == {
|
||||
"data": {"root": "path/to/root", "raw": "path/to/root/raw"}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user