metrics: diff: add --no-path

Part of iterative#3690

Author: efiop

dvc/command/metrics.py

@@ -87,7 +87,7 @@ def run(self):
         return 0
 
 
-def _show_diff(diff, markdown=False):
+def _show_diff(diff, markdown=False, no_path=False):
     from collections import OrderedDict
 
     from dvc.utils.diff import table
@@ -96,16 +96,18 @@ def _show_diff(diff, markdown=False):
     for fname, mdiff in diff.items():
         sorted_mdiff = OrderedDict(sorted(mdiff.items()))
         for metric, change in sorted_mdiff.items():
-            rows.append(
-                [
-                    fname,
-                    metric,
-                    change["new"],
-                    change.get("diff", "diff not supported"),
-                ]
-            )
+            row = [] if no_path else [fname]
+            row.append(metric)
+            row.append(change["new"])
+            row.append(change.get("diff", "diff not supported"))
+            rows.append(row)
+
+    header = [] if no_path else ["Path"]
+    header.append("Metric")
+    header.append("Value")
+    header.append("Change")
 
-    return table(["Path", "Metric", "Value", "Change"], rows, markdown)
+    return table(header, rows, markdown)
 
 
 class CmdMetricsDiff(CmdBase):
@@ -124,7 +126,7 @@ def run(self):
 
                 logger.info(json.dumps(diff))
             else:
-                table = _show_diff(diff, self.args.show_md)
+                table = _show_diff(diff, self.args.show_md, self.args.no_path)
                 if table:
                     logger.info(table)
 
@@ -269,6 +271,12 @@ def add_parser(subparsers, parent_parser):
         default=False,
         help="Show tabulated output in the Markdown format (GFM).",
     )
+    metrics_diff_parser.add_argument(
+        "--no-path",
+        action="store_true",
+        default=False,
+        help="Don't show metric path.",
+    )
     metrics_diff_parser.set_defaults(func=CmdMetricsDiff)
 
     METRICS_REMOVE_HELP = "Remove metric mark on a DVC-tracked file."

scripts/completion/dvc.bash

@@ -38,7 +38,7 @@ _dvc_lock_COMPGEN=_dvc_compgen_DVCFiles
 _dvc_metrics='add diff modify remove show'
 _dvc_metrics_add='-t --type -x --xpath'
 _dvc_metrics_add_COMPGEN=_dvc_compgen_files
-_dvc_metrics_diff='--targets -t --type -x --xpath -R --show-json --show-md'
+_dvc_metrics_diff='--targets -t --type -x --xpath -R --show-json --show-md --no-path'
 _dvc_metrics_modify='-t --type -x --xpath'
 _dvc_metrics_modify_COMPGEN=_dvc_compgen_files
 _dvc_metrics_remove=''

tests/unit/command/test_metrics.py

@@ -17,6 +17,8 @@ def test_metrics_diff(dvc, mocker):
             "--targets",
             "target1",
             "target2",
+            "--show-md",
+            "--no-path",
         ]
     )
     assert cli_args.func == CmdMetricsDiff
@@ -174,3 +176,22 @@ def test_metrics_diff_markdown():
         | metrics.yaml | a.d.e    | 4       | 1                  |
         | metrics.yaml | x.b      | 6       | diff not supported |"""
     )
+
+
+def test_metrics_diff_no_path():
+    assert _show_diff(
+        {
+            "metrics.yaml": {
+                "x.b": {"old": 5, "new": 6, "diff": 1},
+                "a.d.e": {"old": 3, "new": 4, "diff": 1},
+                "a.b.c": {"old": 1, "new": 2, "diff": 1},
+            }
+        },
+        no_path=True,
+    ) == textwrap.dedent(
+        """\
+        Metric    Value    Change
+        a.b.c     2        1
+        a.d.e     4        1
+        x.b       6        1"""
+    )