Revert dvcyaml (#398)

* log_sklearn_plot: fix .json replacement

* dvcyaml: only write if saving exp

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: Dave Berenbaum

src/dvclive/live.py

@@ -193,7 +193,14 @@ def next_step(self):
             self._step = 0
 
         self.make_summary()
-        make_dvcyaml(self)
+
+        if (
+            self._dvc_repo is not None
+            and not self._inside_dvc_exp
+            and self._save_dvc_exp
+        ):
+            make_dvcyaml(self)
+
         self.make_report()
         self.make_checkpoint()
         self.step += 1
@@ -297,7 +304,6 @@ def make_report(self):
 
     def end(self):
         self.make_summary(update_step=False)
-        make_dvcyaml(self)
         if self._studio_url and self._studio_token:
             if "done" not in self._studio_events_to_skip:
                 if not post_to_studio(self, "done", logger):
@@ -311,6 +317,7 @@ def end(self):
             and not self._inside_dvc_exp
             and self._save_dvc_exp
         ):
+            make_dvcyaml(self)
             self._dvc_repo.experiments.save(
                 name=self._exp_name, include_untracked=self.dir
             )

tests/test_dvc.py

@@ -20,39 +20,44 @@ def test_get_dvc_repo(tmp_dir):
     assert isinstance(get_dvc_repo(), Repo)
 
 
-def test_make_dvcyaml(tmp_dir):
+def test_make_dvcyaml_empty(tmp_dir):
     live = Live()
     make_dvcyaml(live)
 
     assert load_yaml(live.dvc_file) == {}
 
+
+def test_make_dvcyaml_param(tmp_dir):
     live = Live()
     live.log_param("foo", 1)
-    live.next_step()
+    make_dvcyaml(live)
 
     assert load_yaml(live.dvc_file) == {
         "params": ["params.yaml"],
     }
 
+
+def test_make_dvcyaml_metrics(tmp_dir):
+    live = Live()
     live.log_metric("bar", 2)
-    live.end()
+    make_dvcyaml(live)
 
     assert load_yaml(live.dvc_file) == {
         "metrics": ["metrics.json"],
-        "params": ["params.yaml"],
         "plots": [os.path.join("plots", "metrics")],
     }
 
 
 def test_make_dvcyaml_all_plots(tmp_dir):
-    with Live() as live:
-        live.log_param("foo", 1)
-        live.log_metric("bar", 2)
-        live.log_image("img.png", Image.new("RGB", (10, 10), (250, 250, 250)))
-        live.log_sklearn_plot("confusion_matrix", [0, 0, 1, 1], [0, 1, 1, 0])
-        live.log_sklearn_plot(
-            "roc", [0, 0, 1, 1], [0.0, 0.5, 0.5, 0.0], "custom_name_roc"
-        )
+    live = Live()
+    live.log_param("foo", 1)
+    live.log_metric("bar", 2)
+    live.log_image("img.png", Image.new("RGB", (10, 10), (250, 250, 250)))
+    live.log_sklearn_plot("confusion_matrix", [0, 0, 1, 1], [0, 1, 1, 0])
+    live.log_sklearn_plot(
+        "roc", [0, 0, 1, 1], [0.0, 0.5, 0.5, 0.0], "custom_name_roc"
+    )
+    make_dvcyaml(live)
 
     assert load_yaml(live.dvc_file) == {
         "metrics": ["metrics.json"],
@@ -138,6 +143,7 @@ def test_exp_save_on_end(tmp_dir, mocker, save):
         assert live._baseline_rev is None
         assert live._exp_name is None
         dvc_repo.experiments.save.assert_not_called()
+        assert not (tmp_dir / live.dvc_file).exists()
 
 
 def test_exp_save_skip_on_env_vars(tmp_dir, monkeypatch, mocker):
@@ -152,6 +158,7 @@ def test_exp_save_skip_on_env_vars(tmp_dir, monkeypatch, mocker):
     assert live._baseline_rev == "foo"
     assert live._exp_name == "bar"
     assert live._inside_dvc_exp
+    assert not (tmp_dir / live.dvc_file).exists()
 
 
 def test_exp_save_skip_on_dvc_repro(tmp_dir, mocker):
@@ -165,3 +172,17 @@ def test_exp_save_skip_on_dvc_repro(tmp_dir, mocker):
         live.end()
 
     dvc_repo.experiments.save.assert_not_called()
+    assert not (tmp_dir / live.dvc_file).exists()
+
+
+@pytest.mark.parametrize("save", [True, False])
+def test_dvcyaml_on_next_step(tmp_dir, mocker, save):
+    dvc_repo = mocker.MagicMock()
+    dvc_repo.index.stages = []
+    with mocker.patch("dvclive.live.get_dvc_repo", return_value=dvc_repo):
+        live = Live(save_dvc_exp=save)
+        live.next_step()
+    if save:
+        assert (tmp_dir / live.dvc_file).exists()
+    else:
+        assert not (tmp_dir / live.dvc_file).exists()