params/metrics: support top-level dicts

dvc/repo/metrics/show.py

@@ -36,7 +36,8 @@ def _collect_top_level_metrics(repo):
         wdir = repo.fs.path.relpath(repo.fs.path.parent(dvcfile), repo.root_dir)
         for file in metrics:
             path = repo.fs.path.join(wdir, as_posix(file))
-            yield repo.fs.path.normpath(path)
+            for subpath in repo.fs.find(path):
+                yield repo.fs.path.normpath(subpath)
 
 
 def _collect_metrics(repo, targets, recursive):

dvc/repo/params/show.py

@@ -33,7 +33,8 @@ def _collect_top_level_params(repo):
         wdir = repo.fs.path.relpath(repo.fs.path.parent(dvcfile), repo.root_dir)
         for file in params:
             path = repo.fs.path.join(wdir, as_posix(file))
-            yield repo.fs.path.normpath(path)
+            for subpath in repo.fs.find(path):
+                yield repo.fs.path.normpath(subpath)
 
 
 def _collect_configs(

tests/func/metrics/test_diff.py

@@ -239,6 +239,27 @@ def test_diff_top_level_metrics(tmp_dir, dvc, scm, dvcfile, metrics_file):
     }
 
 
+def test_diff_top_level_metrics_dict(tmp_dir, dvc, scm):
+    dvcfile = "dvc.yaml"
+    metrics_dir = "dir"
+    metrics_files = ["metrics1.yaml", "metrics2.yaml", "metrics3.yaml"]
+    (tmp_dir / metrics_dir).mkdir(exist_ok=True)
+    (tmp_dir / dvcfile).dump({"metrics": [metrics_dir]})
+
+    (tmp_dir / metrics_dir / metrics_files[0]).dump({"foo": 1})
+    (tmp_dir / metrics_dir / metrics_files[1]).dump({"bar": 2})
+    scm.add_commit([tmp_dir / metrics_dir, tmp_dir / dvcfile], message="add metrics")
+
+    (tmp_dir / metrics_dir / metrics_files[0]).dump({"foo": 3})
+    (tmp_dir / metrics_dir / metrics_files[1]).unlink()
+    (tmp_dir / metrics_dir / metrics_files[2]).dump({"baz": 4})
+    assert dvc.metrics.diff() == {
+        "dir/metrics1.yaml": {"foo": {"diff": 2, "new": 3, "old": 1}},
+        "dir/metrics2.yaml": {"bar": {"new": None, "old": 2}},
+        "dir/metrics3.yaml": {"baz": {"new": 4, "old": None}},
+    }
+
+
 def test_metrics_diff_active_branch_unchanged(tmp_dir, scm, dvc, run_copy_metrics):
     def _gen(val):
         metrics = {"a": {"b": {"c": val, "d": 1, "e": str(val)}}}

tests/func/params/test_diff.py

@@ -259,6 +259,27 @@ def test_diff_top_level_params(tmp_dir, dvc, scm, dvcfile, params_file):
     }
 
 
+def test_diff_top_level_params_dict(tmp_dir, dvc, scm):
+    dvcfile = "dvc.yaml"
+    params_dir = "dir"
+    params_files = ["params1.yaml", "params2.yaml", "params3.yaml"]
+    (tmp_dir / params_dir).mkdir(exist_ok=True)
+    (tmp_dir / dvcfile).dump({"params": [params_dir]})
+
+    (tmp_dir / params_dir / params_files[0]).dump({"foo": 1})
+    (tmp_dir / params_dir / params_files[1]).dump({"bar": 2})
+    scm.add_commit([tmp_dir / params_dir, tmp_dir / dvcfile], message="add params")
+
+    (tmp_dir / params_dir / params_files[0]).dump({"foo": 3})
+    (tmp_dir / params_dir / params_files[1]).unlink()
+    (tmp_dir / params_dir / params_files[2]).dump({"baz": 4})
+    assert dvc.params.diff() == {
+        "dir/params1.yaml": {"foo": {"diff": 2, "new": 3, "old": 1}},
+        "dir/params2.yaml": {"bar": {"new": None, "old": 2}},
+        "dir/params3.yaml": {"baz": {"new": 4, "old": None}},
+    }
+
+
 def test_diff_active_branch_no_changes(tmp_dir, scm, dvc):
     tmp_dir.gen("params.yaml", "foo: bar")
     dvc.run(cmd="echo params.yaml", params=["foo"], single_stage=True)