hx-2c3c331f Migrate remaining consumers to read from ExpectationSuite

Migrate validator.py, excel_converter.py, and umf_diff.py to prefer
umf.expectations (ExpectationSuite) over legacy umf.validation_rules,
with backward-compatible fallback for UMF instances not loaded via
UMFLoader.

This completes ADR-005 Phase C: all runtime consumers now read from
ExpectationSuite. Legacy quality_checks and validation_rules fields
are retained for backward-compatible loading only.

Governing: docs/helix/02-design/adr/ADR-005-unified-expectation-model.md
Verification: 222 tests pass (validator, excel, diff, loader, migration, suite), pyright clean

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

Author: easel

src/tablespec/excel_converter.py

@@ -416,7 +416,7 @@ def convert(self, umf: UMF) -> openpyxl.Workbook:
         self._create_columns_sheet(umf)
         self._create_survivorship_sheet(umf)
 
-        if umf.validation_rules:
+        if (umf.expectations and umf.expectations.expectations) or umf.validation_rules:
             self._create_validation_sheet(umf)
 
         if umf.relationships:
@@ -899,6 +899,15 @@ def _create_survivorship_sheet(self, umf: UMF) -> None:
         ws.column_dimensions["H"].width = 30  # Source
         ws.column_dimensions["I"].width = 100  # Explanation/Reason (very wide for readability)
 
+    @staticmethod
+    def _get_expectation_dicts_for_export(umf: "UMF") -> list[dict[str, Any]]:
+        """Get expectation dicts for Excel export, preferring ExpectationSuite."""
+        if umf.expectations and umf.expectations.expectations:
+            return [exp.to_gx_dict() for exp in umf.expectations.expectations]
+        if umf.validation_rules and umf.validation_rules.expectations:
+            return umf.validation_rules.expectations
+        return []
+
     def _prepare_validation_expectations_with_index(
         self, expectations: list[dict[str, Any]]
     ) -> tuple[list[tuple[str, str, str, int, dict[str, Any]]], list[str]]:
@@ -1026,9 +1035,10 @@ def _create_validation_sheet(self, umf: UMF) -> None:
         ]
         self._add_header_row(ws, headers)
 
-        if umf.validation_rules and umf.validation_rules.expectations:
+        exp_list = self._get_expectation_dicts_for_export(umf)
+        if exp_list:
             expectations_with_index, _ = self._prepare_validation_expectations_with_index(
-                umf.validation_rules.expectations
+                exp_list
             )
 
             default_font = self._get_default_font()

src/tablespec/umf_diff.py

@@ -334,12 +334,14 @@ def _get_expectations(self, umf: UMF) -> list[dict]:
             List of expectation dicts
 
         """
+        # Prefer unified ExpectationSuite (ADR-005)
+        if umf.expectations and umf.expectations.expectations:
+            return [exp.to_gx_dict() for exp in umf.expectations.expectations]
+        # Fallback to legacy validation_rules
         if not umf.validation_rules:
             return []
-        # Support expectations attribute (used in pulseflow UMF format)
         if hasattr(umf.validation_rules, "expectations"):
             return list(getattr(umf.validation_rules, "expectations", None) or [])
-        # Support dict-based validation_rules
         if isinstance(umf.validation_rules, dict):
             return umf.validation_rules.get("expectations", [])
         return []

src/tablespec/validator.py

@@ -38,6 +38,15 @@
 _UMF_JSON_SCHEMA: dict[str, Any] = UMF.model_json_schema()
 
 
+def _get_expectation_dicts(umf: UMF) -> list[dict[str, Any]]:
+    """Get expectation dicts from ExpectationSuite, falling back to legacy fields."""
+    if umf.expectations and umf.expectations.expectations:
+        return [exp.to_gx_dict() for exp in umf.expectations.expectations]
+    if umf.validation_rules and umf.validation_rules.expectations:
+        return umf.validation_rules.expectations
+    return []
+
+
 @dataclass
 class ValidationContext:
     """Context for validation operations with process-lifetime UMF caching.
@@ -183,7 +192,8 @@ def validate_table(
                 table_names.update(a.lower() for a in t.aliases)
 
         # 5. Validate expectations if present
-        if umf.validation_rules and umf.validation_rules.expectations:
+        exp_dicts = _get_expectation_dicts(umf)
+        if exp_dicts:
             # Validate expectation configuration through the consolidated GX executor.
             gx_executor = None
             if GXSuiteExecutor is not None:
@@ -194,7 +204,7 @@ def validate_table(
 
             column_names = {col.name for col in umf.columns}
 
-            for i, exp in enumerate(umf.validation_rules.expectations):
+            for i, exp in enumerate(exp_dicts):
                 exp_type = exp.get("type")
                 if not exp_type:
                     errors.append(f"Expectation {i}: Missing 'type' field")
@@ -398,10 +408,8 @@ def show_table_info(
             ],
         },
         "validation": {
-            "has_rules": bool(umf.validation_rules and umf.validation_rules.expectations),
-            "expectation_count": len(umf.validation_rules.expectations)
-            if umf.validation_rules and umf.validation_rules.expectations
-            else 0,
+            "has_rules": bool(_get_expectation_dicts(umf)),
+            "expectation_count": len(_get_expectation_dicts(umf)),
         },
         "relationships": {
             "foreign_keys": len(umf.relationships.foreign_keys or []) if umf.relationships else 0,