Skip to content

studio: Fix passing rev in dvc repro execution. #401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2022
Merged

studio: Fix passing rev in dvc repro execution. #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/dvclive/live.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ def _init_cleanup(self):

def _init_dvc(self):
self._dvc_repo = get_dvc_repo()

if self._dvc_repo is not None:
self._baseline_rev = self._dvc_repo.scm.get_rev()

if os.getenv(env.DVC_EXP_BASELINE_REV, None):
# `dvc exp` execution
self._baseline_rev = os.getenv(env.DVC_EXP_BASELINE_REV, "")
Expand All @@ -111,7 +115,6 @@ def _init_dvc(self):
self._save_dvc_exp = False
else:
# `DVCLive Only` execution
self._baseline_rev = self._dvc_repo.scm.get_rev()
self._exp_name = random_exp_name(
self._dvc_repo, self._baseline_rev
)
Expand Down
4 changes: 2 additions & 2 deletions tests/test_dvc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def test_exp_save_on_end(tmp_dir, mocker, save):
)
assert (tmp_dir / live.dvc_file).exists()
else:
assert live._baseline_rev is None
assert live._baseline_rev is not None
assert live._exp_name is None
dvc_repo.experiments.save.assert_not_called()
assert not (tmp_dir / live.dvc_file).exists()
Expand All @@ -167,7 +167,7 @@ def test_exp_save_skip_on_dvc_repro(tmp_dir, mocker):
with mocker.patch("dvclive.live.get_dvc_repo", return_value=dvc_repo):
live = Live(save_dvc_exp=True)
assert not live._save_dvc_exp
assert live._baseline_rev is None
assert live._baseline_rev is not None
assert live._exp_name is None
live.end()

Expand Down
10 changes: 6 additions & 4 deletions tests/test_studio.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@


def test_post_to_studio(tmp_dir, mocker, monkeypatch):
mocker.patch("dvclive.live.get_dvc_repo")
dvc_repo = mocker.MagicMock()
dvc_repo.scm.get_rev.return_value = "current_rev"
mocker.patch("dvclive.live.get_dvc_repo", return_value=dvc_repo)
mocked_response = mocker.MagicMock()
mocked_response.status_code = 200
mocked_post = mocker.patch("requests.post", return_value=mocked_response)
Expand All @@ -32,7 +34,7 @@ def test_post_to_studio(tmp_dir, mocker, monkeypatch):
json={
"type": "start",
"repo_url": "STUDIO_REPO_URL",
"rev": mocker.ANY,
"rev": "current_rev",
"client": "dvclive",
},
headers={
Expand All @@ -50,7 +52,7 @@ def test_post_to_studio(tmp_dir, mocker, monkeypatch):
json={
"type": "data",
"repo_url": "STUDIO_REPO_URL",
"rev": mocker.ANY,
"rev": "current_rev",
"step": 0,
"metrics": {live.metrics_file: {"data": {"step": 0, "foo": 1}}},
"plots": {scalar_path: {"data": [{"step": 0, "foo": 1.0}]}},
Expand All @@ -71,7 +73,7 @@ def test_post_to_studio(tmp_dir, mocker, monkeypatch):
json={
"type": "data",
"repo_url": "STUDIO_REPO_URL",
"rev": mocker.ANY,
"rev": "current_rev",
"step": 1,
"metrics": {live.metrics_file: {"data": {"step": 1, "foo": 2}}},
"plots": {scalar_path: {"data": [{"step": 1, "foo": 2.0}]}},
Expand Down