Improve snow dcm test and refresh output

- refresh: add a green/red summary line ("N Dynamic Tables refreshed
  successfully." / "N failures.") and append the === divider after output
- test: switch summary wording to "Ran T data quality tests: P passed,
  F failed." with correct pluralisation
- base.py: append the === divider after every DCM reporter output so
  command results are visually separated in the terminal
- Consolidate shared kind-table helpers and success-contract logic
  across reporters (test + refresh)

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: sfc-gh-jsommerfeld

src/snowflake/cli/_plugins/dcm/reporters/base.py

@@ -34,6 +34,11 @@
 
 T = TypeVar("T")
 
+# Visual divider printed after every DCM command's reporter output so the
+# command's final line is clearly separated from the next shell prompt
+# (or from a CliError box on failure).
+_REPORT_SEPARATOR = "=" * 80
+
 
 class Reporter(ABC, Generic[T]):
     def __init__(self, save_output: bool = False) -> None:
@@ -78,6 +83,13 @@ def print_summary(self) -> None:
             cli_console.styled_message(renderable.plain, style=renderable.style)
         cli_console.styled_message("\n")
 
+    def print_separator(self) -> None:
+        """Print a divider line that marks the end of the command's output.
+
+        Automatically muted in JSON/CSV output formats (cf. `cli_console`)."""
+        cli_console.styled_message(_REPORT_SEPARATOR, style="dim")
+        cli_console.styled_message("\n")
+
     def _try_save_response(self, result_json: Dict[str, Any]) -> None:
         """Save raw JSON response if save_output is enabled and raw data is available."""
         if self.save_output:
@@ -96,10 +108,15 @@ def process_payload(self, result_json: Dict[str, Any]) -> None:
         self.print_renderables(parsed_data)
         if self._is_success():
             self.print_summary()
+            self.print_separator()
         else:
             message = "".join(
                 renderable.plain for renderable in self._generate_summary_renderables()
             )
+            # Print the separator before raising so the user still sees a
+            # clean divider between the partial body output and the error
+            # box that the CLI framework renders for the CliError.
+            self.print_separator()
             raise CliError(message)
 
     @staticmethod

src/snowflake/cli/_plugins/dcm/reporters/refresh.py

@@ -16,6 +16,7 @@
 from enum import Enum
 from typing import Any, Dict, Iterator, List, Optional
 
+import typer
 from pydantic import BaseModel, Field, ValidationError
 from rich.text import Text
 from snowflake.cli._plugins.dcm import styles
@@ -152,11 +153,16 @@ class RefreshReporter(Reporter[RefreshRow]):
     class Summary:
         up_to_date: int = 0
         refreshed: int = 0
-        unknown: int = 0
+        failed: int = 0
+
+        @property
+        def successful(self) -> int:
+            """Tables that completed without error (refreshed or already up-to-date)."""
+            return self.up_to_date + self.refreshed
 
         @property
         def total(self):
-            return self.up_to_date + self.refreshed + self.unknown
+            return self.successful + self.failed
 
     def __init__(self, save_output: bool = False):
         super().__init__(save_output=save_output)
@@ -187,7 +193,7 @@ def parse_data(self, data: List[RefreshTableResult]) -> Iterator[RefreshRow]:
             elif parsed.status == RefreshStatus.REFRESHED:
                 self._summary.refreshed += 1
             else:
-                self._summary.unknown += 1
+                self._summary.failed += 1
             yield parsed
 
     def print_renderables(self, data: Iterator[RefreshRow]) -> None:
@@ -208,25 +214,44 @@ def print_renderables(self, data: Iterator[RefreshRow]) -> None:
             cli_console.styled_message("\n")
 
     def _generate_summary_renderables(self) -> List[Text]:
-        total = self._summary.total
-        if total == 0:
+        if self._summary.total == 0:
             return [Text("No dynamic tables found in the project.")]
 
-        parts = []
-        if (refreshed := self._summary.refreshed) > 0:
-            parts.append(f"{refreshed} refreshed")
-        if (up_to_date := self._summary.up_to_date) > 0:
-            parts.append(f"{up_to_date} up-to-date")
-        if (unknown := self._summary.unknown) > 0:
-            parts.append(f"{unknown} unknown")
-
-        summary = ""
-        for i, part in enumerate(parts):
-            if i > 0:
-                summary += ", "
-            summary += part
-        summary += "."
-        return [Text(summary)]
+        renderables: List[Text] = []
+        successful = self._summary.successful
+        failed = self._summary.failed
+
+        if successful > 0:
+            tables_word = "Dynamic Table" if successful == 1 else "Dynamic Tables"
+            renderables.append(
+                Text(
+                    f"{successful} {tables_word} refreshed successfully.",
+                    styles.PASS_STYLE,
+                )
+            )
+
+        if failed > 0:
+            refreshes_word = "Refresh" if failed == 1 else "Refreshes"
+            if renderables:
+                renderables.append(Text("\n"))
+            renderables.append(
+                Text(f"{failed} {refreshes_word} failed.", styles.FAIL_STYLE)
+            )
+
+        return renderables
 
     def _is_success(self) -> bool:
-        return self._summary.unknown == 0
+        # Always treat the run as "success" from the base reporter's perspective
+        # so that `print_summary()` is always called — we want the styled
+        # green/red summary rendered above the divider on every run (cf.
+        # AnalyzeErrorsReporter). Exit code is set separately in
+        # ``process_payload``.
+        return True
+
+    def process_payload(self, result_json: Dict[str, Any]) -> None:
+        super().process_payload(result_json)
+        if self._summary.failed > 0:
+            # Failures fail the command, but the styled summary is already on
+            # screen — exit silently so we don't double-render the message
+            # inside an "Error" box.
+            raise typer.Exit(code=1)

src/snowflake/cli/_plugins/dcm/reporters/test.py

@@ -16,6 +16,7 @@
 from enum import Enum
 from typing import Any, Dict, Iterator, List, Optional
 
+import typer
 from rich.text import Text
 from snowflake.cli._plugins.dcm import styles
 from snowflake.cli._plugins.dcm.reporters.base import Reporter, cli_console
@@ -151,18 +152,47 @@ def _generate_summary_renderables(self) -> List[Text]:
         if total == 0:
             return [Text("No expectations found in the project.")]
 
-        result = [
-            (Text(f"{self._summary.passed} passed", styles.PASS_STYLE)),
-            (Text(", ")),
-            (Text(f"{self._summary.failed} failed", styles.FAIL_STYLE)),
+        test_word = "test" if total == 1 else "tests"
+        # The trailing noun (``expectation`` / ``expectations``) attaches to
+        # the last visible bucket — ``unknown`` if present, otherwise
+        # ``failed`` — and pluralizes with that bucket's count.
+        trailing_count = (
+            self._summary.unknown if self._summary.unknown > 0 else self._summary.failed
+        )
+        noun = "expectation" if trailing_count == 1 else "expectations"
+
+        result: List[Text] = [
+            Text("Ran "),
+            Text(f"{total}", styles.BOLD_STYLE),
+            Text(f" data quality {test_word}: "),
+            Text(f"{self._summary.passed} passed", styles.PASS_STYLE),
+            Text(", "),
         ]
         if self._summary.unknown > 0:
+            result.append(Text(f"{self._summary.failed} failed", styles.FAIL_STYLE))
             result.append(Text(", "))
-            result.append(Text(f"{self._summary.unknown} unknown", styles.FAIL_STYLE))
-        result.append(Text(" out of "))
-        result.append(Text(f"{total}", styles.BOLD_STYLE))
-        result.append(Text(" total."))
+            result.append(
+                Text(f"{self._summary.unknown} unknown {noun}", styles.FAIL_STYLE)
+            )
+        else:
+            result.append(
+                Text(f"{self._summary.failed} failed {noun}", styles.FAIL_STYLE)
+            )
+        result.append(Text("."))
         return result
 
     def _is_success(self) -> bool:
-        return self._summary.failed + self._summary.unknown == 0
+        # Always treat the run as "success" from the base reporter's
+        # perspective so that ``print_summary()`` is always called — the
+        # styled "✓ N passed, ✗ M failed" summary should render on every run
+        # (cf. ``AnalyzeErrorsReporter`` / ``RefreshReporter``). Exit code is
+        # set separately by ``process_payload`` below.
+        return True
+
+    def process_payload(self, result_json: Dict[str, Any]) -> None:
+        super().process_payload(result_json)
+        if self._summary.failed + self._summary.unknown > 0:
+            # Failures fail the command, but the styled summary is already
+            # on screen — exit silently so we don't double-render the
+            # message inside an "Error" box.
+            raise typer.Exit(code=1)

tests/dcm/__snapshots__/test_commands.ambr

@@ -2,56 +2,67 @@
 # name: TestDCMRefresh.test_refresh_with_fresh_tables
   '''
 
+  
   UP-TO-DATE        0       0 JW_DCM_TESTALL.ANALYTICS.DYNAMIC_EMPLOYEES
 
-  1 up-to-date.
+  1 Dynamic Table refreshed successfully.
+  ================================================================================
 
   '''
 # ---
 # name: TestDCMRefresh.test_refresh_with_no_dynamic_tables
   '''
 
 
+  
   No dynamic tables found in the project.
+  ================================================================================
 
   '''
 # ---
 # name: TestDCMRefresh.test_refresh_with_outdated_tables
   '''
 
+  
   REFRESHED    +12.3k   -999B JW_DCM_TESTALL.ANALYTICS.DYNAMIC_EMPLOYEES
 
-  1 refreshed.
+  1 Dynamic Table refreshed successfully.
+  ================================================================================
 
   '''
 # ---
 # name: TestDCMTest.test_test_all_passing
   '''
 
+  
   ✓ PASS      DB.SCHEMA.EMPLOYEES (ROW_COUNT_CHECK)
   ✓ PASS      DB.SCHEMA.ORDERS (NULL_CHECK)
 
-  2 passed, 0 failed out of 2 total.
+  Ran 2 data quality tests: 2 passed, 0 failed expectations.
+  ================================================================================
 
   '''
 # ---
 # name: TestDCMTest.test_test_no_expectations
   '''
 
 
+  
   No expectations found in the project.
+  ================================================================================
 
   '''
 # ---
 # name: TestDCMTest.test_test_with_failures
   '''
 
+  
   ✓ PASS      DB.SCHEMA.EMPLOYEES (ROW_COUNT_CHECK)
   ✗ FAIL      DB.SCHEMA.ORDERS (NULL_CHECK)
     └─ Expected: = 0, Got: 15 (Metric: null_count)
-  +- Error ----------------------------------------------------------------------+
-  | 1 passed, 1 failed out of 2 total.                                           |
-  +------------------------------------------------------------------------------+
+  
+  Ran 2 data quality tests: 1 passed, 1 failed expectation.
+  ================================================================================
 
   '''
 # ---

tests/dcm/test_reporters/__snapshots__/test_refresh_reporter.ambr

@@ -3,7 +3,8 @@
   '''
   UP-TO-DATE        0       0 DB.SCHEMA.RED_TABLE
 
-  1 up-to-date.
+  1 Dynamic Table refreshed successfully.
+  ================================================================================
 
   '''
 # ---
@@ -18,23 +19,38 @@
   REFRESHED     +1.5B   -999M DB.SCHEMA.BILLIONS
   REFRESHED     +2.5T   -100B DB.SCHEMA.TRILLIONS
 
-  2 refreshed.
+  2 Dynamic Tables refreshed successfully.
+  ================================================================================
 
   '''
 # ---
 # name: TestRefreshReporter.test_missing_statistics
   '''
   UNKNOWN                     DB.SCHEMA.NO_STATS
 
-  1 unknown.
+  1 Refresh failed.
+  ================================================================================
 
   '''
 # ---
 # name: TestRefreshReporter.test_missing_table_name
   '''
   REFRESHED      +100       0 UNKNOWN
 
-  1 refreshed.
+  1 Dynamic Table refreshed successfully.
+  ================================================================================
+  
+  '''
+# ---
+# name: TestRefreshReporter.test_mixed_success_and_failure
+  '''
+  REFRESHED       +10       0 DB.SCHEMA.OK_REFRESHED
+  UP-TO-DATE        0       0 DB.SCHEMA.OK_UP_TO_DATE
+  UNKNOWN                     DB.SCHEMA.FAILED
+  
+  2 Dynamic Tables refreshed successfully.
+  1 Refresh failed.
+  ================================================================================
 
   '''
 # ---
@@ -45,46 +61,52 @@
   UP-TO-DATE        0       0 DB.SCHEMA.TABLE_C
   REFRESHED     +999k    -500 DB.SCHEMA.TABLE_D
 
-  2 refreshed, 2 up-to-date.
+  4 Dynamic Tables refreshed successfully.
+  ================================================================================
 
   '''
 # ---
 # name: TestRefreshReporter.test_no_dynamic_tables
   '''
 
   No dynamic tables found in the project.
+  ================================================================================
 
   '''
 # ---
 # name: TestRefreshReporter.test_only_deletions
   '''
   REFRESHED         0     -3k DB.SCHEMA.DELETES_ONLY
 
-  1 refreshed.
+  1 Dynamic Table refreshed successfully.
+  ================================================================================
 
   '''
 # ---
 # name: TestRefreshReporter.test_only_insertions
   '''
   REFRESHED       +5k       0 DB.SCHEMA.INSERTS_ONLY
 
-  1 refreshed.
+  1 Dynamic Table refreshed successfully.
+  ================================================================================
 
   '''
 # ---
 # name: TestRefreshReporter.test_single_refreshed_table
   '''
   REFRESHED     +1.5k    -200 DB.SCHEMA.CUSTOMERS
 
-  1 refreshed.
+  1 Dynamic Table refreshed successfully.
+  ================================================================================
 
   '''
 # ---
 # name: TestRefreshReporter.test_single_up_to_date_table
   '''
   UP-TO-DATE        0       0 DB.SCHEMA.ORDERS
 
-  1 up-to-date.
+  1 Dynamic Table refreshed successfully.
+  ================================================================================
 
   '''
 # ---