hx-9ed0389d Migrate authoring commands to use ExpectationSuite

- mutations.py: remove_expectation() now operates on umf.expectations
  only, removing legacy quality_checks/validation_rules back-sync
- cli.py: expectation count displays read from umf.expectations;
  validation-remove docstring updated
- preview.py and apply_response.py already use the unified suite
- Tests updated to verify via expectations field, not legacy containers

Governing artifact: ADR-005 (Phase C consumer migration)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: easel

src/tablespec/authoring/mutations.py

@@ -5,7 +5,7 @@
 from typing import Any
 
 from tablespec.expectation_migration import migrate_to_expectation_suite
-from tablespec.models.umf import QualityCheck, QualityChecks, UMF, UMFColumn, ValidationRules
+from tablespec.models.umf import UMF, UMFColumn
 
 
 def add_column(umf: UMF, name: str, data_type: str, **kwargs: Any) -> UMF:
@@ -72,41 +72,6 @@ def _matches(exp: dict[str, Any] | Any) -> bool:
 
     if removed:
         updates["expectations"] = suite.model_copy(update={"expectations": filtered_expectations})
-        raw_expectations = [exp.model_dump() for exp in filtered_expectations if exp.meta.stage != "ingested"]
-        ingested_checks = [
-            QualityCheck(
-                expectation=exp.model_dump(),
-                severity=exp.meta.severity,
-                blocking=exp.meta.blocking,
-                description=exp.meta.description,
-                tags=list(exp.meta.tags),
-            )
-            for exp in filtered_expectations
-            if exp.meta.stage == "ingested"
-        ]
-        updates["validation_rules"] = ValidationRules(
-            expectations=raw_expectations,
-            pending_expectations=[exp.model_dump() for exp in suite.pending],
-        )
-        updates["quality_checks"] = QualityChecks(
-            checks=ingested_checks,
-            thresholds=suite.thresholds,
-            alert_config=suite.alert_config,
-        )
-
-    # Keep legacy containers aligned until split-format saving writes the unified suite.
-    if umf.validation_rules and umf.validation_rules.expectations:
-        original = umf.validation_rules.expectations
-        filtered = [e for e in original if not _matches(e)]
-        new_vr = umf.validation_rules.model_copy(update={"expectations": filtered})
-        updates["validation_rules"] = new_vr
-
-    # Keep legacy containers aligned until split-format saving writes the unified suite.
-    if umf.quality_checks and umf.quality_checks.checks:
-        original_checks = umf.quality_checks.checks
-        filtered_checks = [c for c in original_checks if not _matches(c.expectation)]
-        new_qc = umf.quality_checks.model_copy(update={"checks": filtered_checks})
-        updates["quality_checks"] = new_qc
 
     return umf.model_copy(update=updates) if updates else umf, removed
 

src/tablespec/cli.py

@@ -181,10 +181,10 @@ def validate(
                     console.print(f"    [cyan]Columns:[/cyan] {len(umf.columns)}")
                     if umf.file_format and umf.file_format.filename_pattern:
                         console.print("    [cyan]Filename pattern:[/cyan] Valid")
-                    if umf.validation_rules and umf.validation_rules.expectations:
+                    if umf.expectations and umf.expectations.expectations:
                         console.print(
                             f"    [cyan]Expectations:[/cyan] "
-                            f"{len(umf.validation_rules.expectations)}"
+                            f"{len(umf.expectations.expectations)}"
                         )
                     if umf.relationships and umf.relationships.foreign_keys:
                         console.print(
@@ -278,8 +278,8 @@ def info(
                 console.print(f"  [dim]... and {len(umf.columns) - 10} more[/dim]")
 
             # Validation summary
-            if umf.validation_rules and umf.validation_rules.expectations:
-                exp_count = len(umf.validation_rules.expectations)
+            if umf.expectations and umf.expectations.expectations:
+                exp_count = len(umf.expectations.expectations)
                 console.print(f"\n[bold cyan]Validation:[/bold cyan] {exp_count} expectations")
 
             # Relationships
@@ -1033,7 +1033,7 @@ def validation_remove(
 ) -> None:
     """Remove expectations matching a type and optional column.
 
-    Searches both validation_rules and quality_checks.
+    Searches the unified expectations suite.
 
     Examples:
       tablespec validation-remove tables/claims/ --type expect_column_values_to_match_regex --column ssn

tests/unit/test_cli_validation_commands.py

@@ -73,7 +73,7 @@ def test_remove_by_type_and_column(self, tmp_path: Path) -> None:
         assert "1 expectation" in result.output
 
         data = _load_umf(umf_file)
-        exps = data["validation_rules"]["expectations"]
+        exps = data["expectations"]["expectations"]
         assert len(exps) == 2
         # The regex on "name" should be gone, regex on "id" should remain
         regex_cols = [e["kwargs"]["column"] for e in exps if "regex" in e["type"]]
@@ -95,7 +95,7 @@ def test_remove_by_type_all_columns(self, tmp_path: Path) -> None:
         assert "2 expectation" in result.output
 
         data = _load_umf(umf_file)
-        exps = data["validation_rules"]["expectations"]
+        exps = data["expectations"]["expectations"]
         assert len(exps) == 1
         assert exps[0]["type"] == "expect_column_values_to_not_be_null"
 
@@ -121,19 +121,27 @@ def test_remove_specific(self) -> None:
         from tests.builders import UMFBuilder
 
         from tablespec.authoring.mutations import remove_expectation
-        from tablespec.models.umf import ValidationRules
+        from tablespec.models.umf import Expectation, ExpectationMeta, ExpectationSuite
 
         umf = UMFBuilder("test").column("id", "INTEGER").column("name", "VARCHAR").build()
-        vr = ValidationRules(
+        suite = ExpectationSuite(
             expectations=[
-                {"type": "expect_column_values_to_not_be_null", "kwargs": {"column": "id"}},
-                {"type": "expect_column_values_to_match_regex", "kwargs": {"column": "name", "regex": ".*"}},
+                Expectation(
+                    type="expect_column_values_to_not_be_null",
+                    kwargs={"column": "id"},
+                    meta=ExpectationMeta(stage="raw", severity="critical"),
+                ),
+                Expectation(
+                    type="expect_column_values_to_match_regex",
+                    kwargs={"column": "name", "regex": ".*"},
+                    meta=ExpectationMeta(stage="raw", severity="warning"),
+                ),
             ]
         )
-        umf = umf.model_copy(update={"validation_rules": vr})
+        umf = umf.model_copy(update={"expectations": suite})
         updated, count = remove_expectation(umf, "expect_column_values_to_not_be_null", "id")
         assert count == 1
-        assert len(updated.validation_rules.expectations) == 1
+        assert len(updated.expectations.expectations) == 1
 
     def test_remove_returns_zero_when_no_match(self) -> None:
         from tests.builders import UMFBuilder

tests/unit/test_mutations.py

@@ -3,7 +3,14 @@
 import pytest
 
 from tests.builders import UMFBuilder
-from tablespec.authoring.mutations import add_column, modify_column, remove_column, rename_column
+from tablespec.authoring.mutations import (
+    add_column,
+    modify_column,
+    remove_column,
+    remove_expectation,
+    rename_column,
+)
+from tablespec.models.umf import UMF, Expectation, ExpectationMeta, ExpectationSuite
 
 pytestmark = [pytest.mark.fast, pytest.mark.no_spark]
 
@@ -89,3 +96,59 @@ def test_original_unchanged(self):
         result = modify_column(umf, "id", description="Primary key")
         assert umf.columns[0].description is None
         assert result.columns[0].description == "Primary key"
+
+
+class TestRemoveExpectation:
+    @staticmethod
+    def _umf_with_suite() -> UMF:
+        umf = UMFBuilder("t").column("id", "INTEGER").column("amount", "DECIMAL").build()
+        suite = ExpectationSuite(
+            expectations=[
+                Expectation(
+                    type="expect_column_values_to_not_be_null",
+                    kwargs={"column": "id"},
+                    meta=ExpectationMeta(stage="raw", severity="critical"),
+                ),
+                Expectation(
+                    type="expect_column_values_to_be_between",
+                    kwargs={"column": "amount", "min_value": 0},
+                    meta=ExpectationMeta(stage="ingested", severity="warning"),
+                ),
+                Expectation(
+                    type="expect_column_values_to_not_be_null",
+                    kwargs={"column": "amount"},
+                    meta=ExpectationMeta(stage="raw", severity="critical"),
+                ),
+            ],
+        )
+        return umf.model_copy(update={"expectations": suite})
+
+    def test_removes_matching_type_and_column(self):
+        umf = self._umf_with_suite()
+        result, count = remove_expectation(umf, "expect_column_values_to_not_be_null", "id")
+        assert count == 1
+        assert len(result.expectations.expectations) == 2
+
+    def test_removes_all_matching_type(self):
+        umf = self._umf_with_suite()
+        result, count = remove_expectation(umf, "expect_column_values_to_not_be_null")
+        assert count == 2
+        assert len(result.expectations.expectations) == 1
+        assert result.expectations.expectations[0].type == "expect_column_values_to_be_between"
+
+    def test_no_match_returns_original(self):
+        umf = self._umf_with_suite()
+        result, count = remove_expectation(umf, "expect_column_to_exist")
+        assert count == 0
+        assert result is umf
+
+    def test_updates_only_expectations_field(self):
+        """Verify remove_expectation mutates only umf.expectations, not legacy fields."""
+        umf = self._umf_with_suite()
+        result, count = remove_expectation(umf, "expect_column_values_to_be_between")
+        assert count == 1
+        # expectations field is updated
+        assert len(result.expectations.expectations) == 2
+        # legacy fields are untouched (None on the builder-produced UMF)
+        assert result.quality_checks is None
+        assert result.validation_rules is None