mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-19 15:28:28 +01:00
experiments: add dvc exp push/pull/list (#5042)
* git: add support for on_diverged in push_refspec * experiments: update executor for push-refspec changes * experiments: implement push() * tests: add tests for experiments.push * git: add iter_remote_refs * roughly equivalent to `git ls-remote --refs` * experiments: add experiments.list for listing local and remote experiments * refactor git upstream/downstream in tests * experiments: add experiments.pull * experiments: add CLI commands for push/pull/list * exp list: drop short options * experiments: s/list/ls/ * dulwich: catch not repo errors when creating remote client * fix remote rev resolution for list * fix command test * add tests for push/pull with ambiguous experiment names
This commit is contained in:
@@ -5,14 +5,13 @@ import stat
|
||||
import pytest
|
||||
from funcy import first
|
||||
|
||||
from dvc.repo.experiments.utils import exp_refs_by_rev
|
||||
from dvc.utils.serialize import PythonFileCorruptedError
|
||||
from tests.func.test_repro_multistage import COPY_SCRIPT
|
||||
|
||||
|
||||
@pytest.mark.parametrize("name", [None, "foo"])
|
||||
def test_new_simple(tmp_dir, scm, dvc, exp_stage, mocker, name):
|
||||
from dvc.repo.experiments.utils import exp_refs_by_rev
|
||||
|
||||
baseline = scm.get_rev()
|
||||
tmp_dir.gen("params.yaml", "foo: 2")
|
||||
|
||||
@@ -397,3 +396,35 @@ def test_packed_args_exists(tmp_dir, scm, dvc, exp_stage, caplog):
|
||||
with caplog.at_level(logging.WARNING):
|
||||
dvc.experiments.run(exp_stage.addressing)
|
||||
assert "Temporary DVC file" in caplog.text
|
||||
|
||||
|
||||
def test_list(tmp_dir, scm, dvc, exp_stage):
|
||||
baseline_a = scm.get_rev()
|
||||
results = dvc.experiments.run(exp_stage.addressing, params=["foo=2"])
|
||||
exp_a = first(results)
|
||||
ref_info_a = first(exp_refs_by_rev(scm, exp_a))
|
||||
|
||||
results = dvc.experiments.run(exp_stage.addressing, params=["foo=3"])
|
||||
exp_b = first(results)
|
||||
ref_info_b = first(exp_refs_by_rev(scm, exp_b))
|
||||
|
||||
tmp_dir.scm_gen("new", "new", commit="new")
|
||||
baseline_c = scm.get_rev()
|
||||
results = dvc.experiments.run(exp_stage.addressing, params=["foo=4"])
|
||||
exp_c = first(results)
|
||||
ref_info_c = first(exp_refs_by_rev(scm, exp_c))
|
||||
|
||||
assert dvc.experiments.ls() == {
|
||||
baseline_c: [ref_info_c.name],
|
||||
}
|
||||
|
||||
exp_list = dvc.experiments.ls(rev=ref_info_a.baseline_sha)
|
||||
assert {key: set(val) for key, val in exp_list.items()} == {
|
||||
baseline_a: {ref_info_a.name, ref_info_b.name}
|
||||
}
|
||||
|
||||
exp_list = dvc.experiments.ls(all_=True)
|
||||
assert {key: set(val) for key, val in exp_list.items()} == {
|
||||
baseline_a: {ref_info_a.name, ref_info_b.name},
|
||||
baseline_c: {ref_info_c.name},
|
||||
}
|
||||
|
||||
@@ -0,0 +1,240 @@
|
||||
import pytest
|
||||
from funcy import first
|
||||
|
||||
from dvc.exceptions import DvcException
|
||||
from dvc.repo.experiments.utils import exp_refs_by_rev
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def git_upstream(tmp_dir, erepo_dir):
|
||||
url = "file://{}".format(erepo_dir.resolve().as_posix())
|
||||
tmp_dir.scm.gitpython.repo.create_remote("upstream", url)
|
||||
erepo_dir.remote = "upstream"
|
||||
erepo_dir.url = url
|
||||
return erepo_dir
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def git_downstream(tmp_dir, erepo_dir):
|
||||
url = "file://{}".format(tmp_dir.resolve().as_posix())
|
||||
erepo_dir.scm.gitpython.repo.create_remote("upstream", url)
|
||||
erepo_dir.remote = "upstream"
|
||||
erepo_dir.url = url
|
||||
return erepo_dir
|
||||
|
||||
|
||||
@pytest.mark.parametrize("use_url", [True, False])
|
||||
def test_push(tmp_dir, scm, dvc, git_upstream, exp_stage, use_url):
|
||||
from dvc.exceptions import InvalidArgumentError
|
||||
|
||||
remote = git_upstream.url if use_url else git_upstream.remote
|
||||
with pytest.raises(InvalidArgumentError):
|
||||
dvc.experiments.push(remote, "foo")
|
||||
|
||||
results = dvc.experiments.run(exp_stage.addressing, params=["foo=2"])
|
||||
exp = first(results)
|
||||
ref_info = first(exp_refs_by_rev(scm, exp))
|
||||
|
||||
dvc.experiments.push(remote, ref_info.name)
|
||||
assert git_upstream.scm.get_ref(str(ref_info)) == exp
|
||||
|
||||
git_upstream.scm.remove_ref(str(ref_info))
|
||||
|
||||
dvc.experiments.push(remote, str(ref_info))
|
||||
assert git_upstream.scm.get_ref(str(ref_info)) == exp
|
||||
|
||||
|
||||
def test_push_diverged(tmp_dir, scm, dvc, git_upstream, exp_stage):
|
||||
git_upstream.scm_gen("foo", "foo", commit="init")
|
||||
remote_rev = git_upstream.scm.get_rev()
|
||||
|
||||
results = dvc.experiments.run(exp_stage.addressing, params=["foo=2"])
|
||||
exp = first(results)
|
||||
ref_info = first(exp_refs_by_rev(scm, exp))
|
||||
|
||||
git_upstream.scm.set_ref(str(ref_info), remote_rev)
|
||||
|
||||
with pytest.raises(DvcException):
|
||||
dvc.experiments.push(git_upstream.remote, ref_info.name)
|
||||
assert git_upstream.scm.get_ref(str(ref_info)) == remote_rev
|
||||
|
||||
dvc.experiments.push(git_upstream.remote, ref_info.name, force=True)
|
||||
assert git_upstream.scm.get_ref(str(ref_info)) == exp
|
||||
|
||||
|
||||
def test_push_checkpoint(tmp_dir, scm, dvc, git_upstream, checkpoint_stage):
|
||||
results = dvc.experiments.run(
|
||||
checkpoint_stage.addressing, params=["foo=2"]
|
||||
)
|
||||
exp_a = first(results)
|
||||
ref_info_a = first(exp_refs_by_rev(scm, exp_a))
|
||||
|
||||
dvc.experiments.push(git_upstream.remote, ref_info_a.name, force=True)
|
||||
assert git_upstream.scm.get_ref(str(ref_info_a)) == exp_a
|
||||
|
||||
results = dvc.experiments.run(
|
||||
checkpoint_stage.addressing, checkpoint_resume=exp_a
|
||||
)
|
||||
exp_b = first(results)
|
||||
ref_info_b = first(exp_refs_by_rev(scm, exp_b))
|
||||
|
||||
tmp_dir.scm_gen("new", "new", commit="new")
|
||||
|
||||
dvc.experiments.push(git_upstream.remote, ref_info_b.name, force=True)
|
||||
assert git_upstream.scm.get_ref(str(ref_info_b)) == exp_b
|
||||
|
||||
|
||||
def test_push_ambiguous_name(tmp_dir, scm, dvc, git_upstream, exp_stage):
|
||||
from dvc.exceptions import InvalidArgumentError
|
||||
|
||||
remote = git_upstream.remote
|
||||
|
||||
results = dvc.experiments.run(
|
||||
exp_stage.addressing, params=["foo=2"], name="foo"
|
||||
)
|
||||
exp_a = first(results)
|
||||
ref_info_a = first(exp_refs_by_rev(scm, exp_a))
|
||||
|
||||
tmp_dir.scm_gen("new", "new", commit="new")
|
||||
results = dvc.experiments.run(
|
||||
exp_stage.addressing, params=["foo=3"], name="foo"
|
||||
)
|
||||
exp_b = first(results)
|
||||
ref_info_b = first(exp_refs_by_rev(scm, exp_b))
|
||||
|
||||
dvc.experiments.push(remote, "foo")
|
||||
assert git_upstream.scm.get_ref(str(ref_info_b)) == exp_b
|
||||
|
||||
tmp_dir.scm_gen("new", "new 2", commit="new 2")
|
||||
|
||||
with pytest.raises(InvalidArgumentError):
|
||||
dvc.experiments.push(remote, "foo")
|
||||
|
||||
dvc.experiments.push(remote, str(ref_info_a))
|
||||
assert git_upstream.scm.get_ref(str(ref_info_a)) == exp_a
|
||||
|
||||
|
||||
@pytest.mark.parametrize("use_url", [True, False])
|
||||
def test_list_remote(tmp_dir, scm, dvc, git_downstream, exp_stage, use_url):
|
||||
baseline_a = scm.get_rev()
|
||||
results = dvc.experiments.run(exp_stage.addressing, params=["foo=2"])
|
||||
exp_a = first(results)
|
||||
ref_info_a = first(exp_refs_by_rev(scm, exp_a))
|
||||
|
||||
results = dvc.experiments.run(exp_stage.addressing, params=["foo=3"])
|
||||
exp_b = first(results)
|
||||
ref_info_b = first(exp_refs_by_rev(scm, exp_b))
|
||||
|
||||
tmp_dir.scm_gen("new", "new", commit="new")
|
||||
baseline_c = scm.get_rev()
|
||||
results = dvc.experiments.run(exp_stage.addressing, params=["foo=4"])
|
||||
exp_c = first(results)
|
||||
ref_info_c = first(exp_refs_by_rev(scm, exp_c))
|
||||
|
||||
remote = git_downstream.url if use_url else git_downstream.remote
|
||||
|
||||
assert git_downstream.scm.get_ref("HEAD") != scm.get_ref("HEAD")
|
||||
downstream_exp = git_downstream.dvc.experiments
|
||||
assert downstream_exp.ls(git_remote=remote) == {}
|
||||
|
||||
exp_list = downstream_exp.ls(rev=baseline_a, git_remote=remote)
|
||||
assert {key: set(val) for key, val in exp_list.items()} == {
|
||||
baseline_a: {ref_info_a.name, ref_info_b.name}
|
||||
}
|
||||
|
||||
exp_list = downstream_exp.ls(all_=True, git_remote=remote)
|
||||
assert {key: set(val) for key, val in exp_list.items()} == {
|
||||
baseline_a: {ref_info_a.name, ref_info_b.name},
|
||||
baseline_c: {ref_info_c.name},
|
||||
}
|
||||
|
||||
|
||||
@pytest.mark.parametrize("use_url", [True, False])
|
||||
def test_pull(tmp_dir, scm, dvc, git_downstream, exp_stage, use_url):
|
||||
from dvc.exceptions import InvalidArgumentError
|
||||
|
||||
remote = git_downstream.url if use_url else git_downstream.remote
|
||||
downstream_exp = git_downstream.dvc.experiments
|
||||
with pytest.raises(InvalidArgumentError):
|
||||
downstream_exp.pull(remote, "foo")
|
||||
|
||||
results = dvc.experiments.run(exp_stage.addressing, params=["foo=2"])
|
||||
exp = first(results)
|
||||
ref_info = first(exp_refs_by_rev(scm, exp))
|
||||
|
||||
downstream_exp.pull(remote, ref_info.name)
|
||||
assert git_downstream.scm.get_ref(str(ref_info)) == exp
|
||||
|
||||
git_downstream.scm.remove_ref(str(ref_info))
|
||||
|
||||
downstream_exp.pull(remote, str(ref_info))
|
||||
assert git_downstream.scm.get_ref(str(ref_info)) == exp
|
||||
|
||||
|
||||
def test_pull_diverged(tmp_dir, scm, dvc, git_downstream, exp_stage):
|
||||
git_downstream.scm_gen("foo", "foo", commit="init")
|
||||
remote_rev = git_downstream.scm.get_rev()
|
||||
|
||||
results = dvc.experiments.run(exp_stage.addressing, params=["foo=2"])
|
||||
exp = first(results)
|
||||
ref_info = first(exp_refs_by_rev(scm, exp))
|
||||
|
||||
git_downstream.scm.set_ref(str(ref_info), remote_rev)
|
||||
|
||||
downstream_exp = git_downstream.dvc.experiments
|
||||
with pytest.raises(DvcException):
|
||||
downstream_exp.pull(git_downstream.remote, ref_info.name)
|
||||
assert git_downstream.scm.get_ref(str(ref_info)) == remote_rev
|
||||
|
||||
downstream_exp.pull(git_downstream.remote, ref_info.name, force=True)
|
||||
assert git_downstream.scm.get_ref(str(ref_info)) == exp
|
||||
|
||||
|
||||
def test_pull_checkpoint(tmp_dir, scm, dvc, git_downstream, checkpoint_stage):
|
||||
results = dvc.experiments.run(
|
||||
checkpoint_stage.addressing, params=["foo=2"]
|
||||
)
|
||||
exp_a = first(results)
|
||||
ref_info_a = first(exp_refs_by_rev(scm, exp_a))
|
||||
|
||||
downstream_exp = git_downstream.dvc.experiments
|
||||
downstream_exp.pull(git_downstream.remote, ref_info_a.name, force=True)
|
||||
assert git_downstream.scm.get_ref(str(ref_info_a)) == exp_a
|
||||
|
||||
results = dvc.experiments.run(
|
||||
checkpoint_stage.addressing, checkpoint_resume=exp_a
|
||||
)
|
||||
exp_b = first(results)
|
||||
ref_info_b = first(exp_refs_by_rev(scm, exp_b))
|
||||
|
||||
downstream_exp.pull(git_downstream.remote, ref_info_b.name, force=True)
|
||||
assert git_downstream.scm.get_ref(str(ref_info_b)) == exp_b
|
||||
|
||||
|
||||
def test_pull_ambiguous_name(tmp_dir, scm, dvc, git_downstream, exp_stage):
|
||||
from dvc.exceptions import InvalidArgumentError
|
||||
|
||||
results = dvc.experiments.run(
|
||||
exp_stage.addressing, params=["foo=2"], name="foo"
|
||||
)
|
||||
exp_a = first(results)
|
||||
ref_info_a = first(exp_refs_by_rev(scm, exp_a))
|
||||
|
||||
tmp_dir.scm_gen("new", "new", commit="new")
|
||||
results = dvc.experiments.run(
|
||||
exp_stage.addressing, params=["foo=3"], name="foo"
|
||||
)
|
||||
exp_b = first(results)
|
||||
ref_info_b = first(exp_refs_by_rev(scm, exp_b))
|
||||
|
||||
remote = git_downstream.remote
|
||||
downstream_exp = git_downstream.dvc.experiments
|
||||
with pytest.raises(InvalidArgumentError):
|
||||
downstream_exp.pull(remote, "foo")
|
||||
|
||||
downstream_exp.pull(remote, str(ref_info_b))
|
||||
assert git_downstream.scm.get_ref(str(ref_info_b)) == exp_b
|
||||
|
||||
with git_downstream.scm.detach_head(ref_info_a.baseline_sha):
|
||||
downstream_exp.pull(remote, "foo")
|
||||
assert git_downstream.scm.get_ref(str(ref_info_a)) == exp_a
|
||||
Reference in New Issue
Block a user