dvcyaml: write to cwd instead of git root (#729)

* dvcyaml: write to cwd instead of git root

* revert changes to lightning tests

* refactor dvcyaml

Author: Dave Berenbaum

src/dvclive/live.py

@@ -63,7 +63,7 @@ def __init__(
         resume: bool = False,
         report: Optional[str] = None,
         save_dvc_exp: bool = True,
-        dvcyaml: Union[str, bool] = True,
+        dvcyaml: Union[str, bool] = "dvc.yaml",
         cache_images: bool = False,
         exp_name: Optional[str] = None,
         exp_message: Optional[str] = None,
@@ -191,13 +191,7 @@ def _init_dvc_file(self) -> str:
             if os.path.basename(self._dvcyaml) == "dvc.yaml":
                 return self._dvcyaml
             raise InvalidDvcyamlError
-        if self._dvc_repo is not None:
-            return os.path.join(self._dvc_repo.root_dir, "dvc.yaml")
-        logger.warning(
-            "Can't infer dvcyaml path without a DVC repo. "
-            "`dvc.yaml` file will not be written."
-        )
-        return ""
+        return "dvc.yaml"
 
     def _init_dvc_pipeline(self):
         if os.getenv(env.DVC_EXP_BASELINE_REV, None):
@@ -543,8 +537,7 @@ def make_report(self):
 
     @catch_and_warn(DvcException, logger)
     def make_dvcyaml(self):
-        if self.dvc_file:
-            make_dvcyaml(self)
+        make_dvcyaml(self)
 
     @catch_and_warn(DvcException, logger)
     def post_to_studio(self, event):

tests/test_dvc.py

@@ -34,7 +34,7 @@ def test_exp_save_on_end(tmp_dir, save, mocked_dvc_repo):
         assert live._exp_name is not None
         mocked_dvc_repo.experiments.save.assert_called_with(
             name=live._exp_name,
-            include_untracked=[live.dir, str(tmp_dir / "dvc.yaml")],
+            include_untracked=[live.dir, "dvc.yaml"],
             force=True,
             message=None,
         )
@@ -79,7 +79,7 @@ def test_exp_save_run_on_dvc_repro(tmp_dir, mocker):
 
     dvc_repo.experiments.save.assert_called_with(
         name=live._exp_name,
-        include_untracked=[live.dir, str(tmp_dir / "dvc.yaml")],
+        include_untracked=[live.dir, "dvc.yaml"],
         force=True,
         message=None,
     )
@@ -102,7 +102,7 @@ def test_exp_save_with_dvc_files(tmp_dir, mocker):
 
     dvc_repo.experiments.save.assert_called_with(
         name=live._exp_name,
-        include_untracked=[live.dir, str(tmp_dir / "dvc.yaml")],
+        include_untracked=[live.dir, "dvc.yaml"],
         force=True,
         message=None,
     )
@@ -175,7 +175,7 @@ def test_exp_save_message(tmp_dir, mocked_dvc_repo):
     live.end()
     mocked_dvc_repo.experiments.save.assert_called_with(
         name=live._exp_name,
-        include_untracked=[live.dir, str(tmp_dir / "dvc.yaml")],
+        include_untracked=[live.dir, "dvc.yaml"],
         force=True,
         message="Custom message",
     )
@@ -186,7 +186,7 @@ def test_exp_save_name(tmp_dir, mocked_dvc_repo):
     live.end()
     mocked_dvc_repo.experiments.save.assert_called_with(
         name="custom-name",
-        include_untracked=[live.dir, str(tmp_dir / "dvc.yaml")],
+        include_untracked=[live.dir, "dvc.yaml"],
         force=True,
         message=None,
     )

tests/test_log_artifact.py

@@ -58,7 +58,7 @@ def test_log_artifact_with_save_dvc_exp(tmp_dir, mocker, mocked_dvc_repo):
         live.log_artifact("data")
     mocked_dvc_repo.experiments.save.assert_called_with(
         name=live._exp_name,
-        include_untracked=[live.dir, "data", ".gitignore", str(tmp_dir / "dvc.yaml")],
+        include_untracked=[live.dir, "data", ".gitignore", "dvc.yaml"],
         force=True,
         message=None,
     )

tests/test_make_dvcyaml.py

@@ -440,18 +440,33 @@ def test_make_dvcyaml(tmp_dir, mocked_dvc_repo, dvcyaml):
 
 
 def test_make_dvcyaml_no_repo(tmp_dir, mocker):
-    logger = mocker.patch("dvclive.live.logger")
     dvclive = Live("logs")
     dvclive.make_dvcyaml()
 
-    assert not os.path.exists("dvc.yaml")
-    assert not dvclive.dvc_file
-    logger.warning.assert_any_call(
-        "Can't infer dvcyaml path without a DVC repo. "
-        "`dvc.yaml` file will not be written."
-    )
+    assert os.path.exists("dvc.yaml")
 
 
 def test_make_dvcyaml_invalid(tmp_dir, mocker):
     with pytest.raises(InvalidDvcyamlError):
         Live("logs", dvcyaml="invalid")
+
+
+def test_make_dvcyaml_on_end(tmp_dir, mocker):
+    dvclive = Live("logs")
+    dvclive.end()
+
+    assert os.path.exists("dvc.yaml")
+
+
+def test_make_dvcyaml_false(tmp_dir, mocker):
+    dvclive = Live("logs", dvcyaml=False)
+    dvclive.end()
+
+    assert not os.path.exists("dvc.yaml")
+
+
+def test_make_dvcyaml_none(tmp_dir, mocker):
+    dvclive = Live("logs", dvcyaml=None)
+    dvclive.end()
+
+    assert not os.path.exists("dvc.yaml")