plots: add dvc plots -e/--experiment option (#4488)

* plots: add -e/--experiment option for plots diff

* experiments: add method to get baseline for a given experiment

* plots: default to diff against baseline instead of workspace/head for experiments

* use exact match for experiments RE since name-rev may return relative
commits
This commit is contained in:
Peter Rowlands (변기호)
2020-08-29 00:57:28 +03:00
committed by GitHub
parent be2e0778b4
commit d6bb4341dd
8 changed files with 109 additions and 17 deletions
@@ -76,3 +76,27 @@ def test_checkout(tmp_dir, scm, dvc):
dvc.experiments.checkout(exp_b)
assert (tmp_dir / "params.yaml").read_text().strip() == "foo: 3"
assert (tmp_dir / "metrics.yaml").read_text().strip() == "foo: 3"
def test_get_baseline(tmp_dir, scm, dvc):
tmp_dir.gen("copy.py", COPY_SCRIPT)
tmp_dir.gen("params.yaml", "foo: 1")
stage = dvc.run(
cmd="python copy.py params.yaml metrics.yaml",
metrics_no_cache=["metrics.yaml"],
params=["foo"],
name="copy-file",
)
scm.add(["dvc.yaml", "dvc.lock", "copy.py", "params.yaml", "metrics.yaml"])
scm.commit("init")
expected = scm.get_rev()
assert dvc.experiments.get_baseline(expected) is None
dvc.reproduce(stage.addressing, experiment=True, params=["foo=2"])
rev = dvc.experiments.scm.get_rev()
assert dvc.experiments.get_baseline(rev) == expected
dvc.reproduce(
stage.addressing, experiment=True, params=["foo=3"], queue=True
)
assert dvc.experiments.get_baseline("stash@{0}") == expected
+4 -2
View File
@@ -2,7 +2,7 @@ from dvc.cli import parse_args
from dvc.command.plots import CmdPlotsDiff, CmdPlotsShow
def test_metrics_diff(dvc, mocker):
def test_plots_diff(dvc, mocker):
cli_args = parse_args(
[
"plots",
@@ -24,6 +24,7 @@ def test_metrics_diff(dvc, mocker):
"x_title",
"--y-label",
"y_title",
"--experiment",
"HEAD",
"tag1",
"tag2",
@@ -50,10 +51,11 @@ def test_metrics_diff(dvc, mocker):
"x_label": "x_title",
"y_label": "y_title",
},
experiment=True,
)
def test_metrics_show(dvc, mocker):
def test_plots_show(dvc, mocker):
cli_args = parse_args(
[
"plots",
+24 -1
View File
@@ -13,4 +13,27 @@ from dvc.repo.plots.diff import _revisions
],
)
def test_revisions(mocker, arg_revisions, is_dirty, expected_revisions):
assert _revisions(arg_revisions, is_dirty) == expected_revisions
mock_scm = mocker.Mock()
mock_scm.configure_mock(**{"is_dirty.return_value": is_dirty})
mock_repo = mocker.Mock(scm=mock_scm)
assert _revisions(mock_repo, arg_revisions, False) == expected_revisions
@pytest.mark.parametrize(
"arg_revisions,baseline,expected_revisions",
[
(["v1"], "v0", ["v1", "v0"]),
(["v1"], None, ["v1", "workspace"]),
(["v1", "v2"], "v0", ["v1", "v2"]),
(["v1", "v2"], None, ["v1", "v2"]),
],
)
def test_revisions_experiment(
mocker, arg_revisions, baseline, expected_revisions
):
mock_scm = mocker.Mock()
mock_scm.configure_mock(**{"is_dirty.return_value": False})
mock_experiments = mocker.Mock()
mock_experiments.configure_mock(**{"get_baseline.return_value": baseline})
mock_repo = mocker.Mock(scm=mock_scm, experiments=mock_experiments)
assert _revisions(mock_repo, arg_revisions, True) == expected_revisions