Enable validations for cumulative type params

dbt-labs · Jul 1, 2024 · 8924e54 · 8924e54
1 parent 3eee0f5
commit 8924e54
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 29 deletions.
diff --git a/dbt_semantic_interfaces/validations/metrics.py b/dbt_semantic_interfaces/validations/metrics.py
@@ -37,9 +37,6 @@
     validate_safely,
 )
 
-# Temp: undo once cumulative_type_params are supported in MF
-CUMULATIVE_TYPE_PARAMS_SUPPORTED = False
-
 
 class CumulativeMetricRule(SemanticManifestValidationRule[SemanticManifestT], Generic[SemanticManifestT]):
     """Checks that cumulative sum metrics are configured properly."""
@@ -58,7 +55,7 @@ def _validate_cumulative_sum_metric_params(metric: Metric) -> List[ValidationIss
             for field in ("window", "grain_to_date"):
                 type_params_field_value = getattr(metric.type_params, field)
                 # Warn that the old type_params structure has been deprecated.
-                if type_params_field_value and CUMULATIVE_TYPE_PARAMS_SUPPORTED:
+                if type_params_field_value:
                     issues.append(
                         ValidationWarning(
                             context=metric_context,
@@ -78,7 +75,7 @@ def _validate_cumulative_sum_metric_params(metric: Metric) -> List[ValidationIss
                     type_params_field_value
                     and cumulative_type_params_field_value
                     and cumulative_type_params_field_value != type_params_field_value
-                ) and CUMULATIVE_TYPE_PARAMS_SUPPORTED:
+                ):
                     issues.append(
                         ValidationError(
                             context=metric_context,

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "dbt-semantic-interfaces"
-version = "0.6.2.dev3"
+version = "0.6.2"
 description = 'The shared semantic layer definitions that dbt-core and MetricFlow use'
 readme = "README.md"
 requires-python = ">=3.8"

diff --git a/tests/validations/test_metrics.py b/tests/validations/test_metrics.py
@@ -43,7 +43,6 @@
     TimeGranularity,
 )
 from dbt_semantic_interfaces.validations.metrics import (
-    CUMULATIVE_TYPE_PARAMS_SUPPORTED,
     ConversionMetricRule,
     CumulativeMetricRule,
     DefaultGranularityRule,
@@ -692,28 +691,18 @@ def test_cumulative_metrics() -> None:  # noqa: D
     )
 
     build_issues = validation_results.all_issues
-    if CUMULATIVE_TYPE_PARAMS_SUPPORTED:
-        assert len(build_issues) == 8
-        expected_substr1 = "Both window and grain_to_date set for cumulative metric. Please set one or the other."
-        expected_substr2 = "Got differing values for `window`"
-        expected_substr3 = "Got differing values for `grain_to_date`"
-        expected_substr4 = "Cumulative `type_params.window` field has been moved and will soon be deprecated."
-        expected_substr5 = "Cumulative `type_params.grain_to_date` field has been moved and will soon be deprecated."
-        missing_error_strings = set()
-        for expected_str in [expected_substr1, expected_substr2, expected_substr3, expected_substr4, expected_substr5]:
-            if not any(actual_str.as_readable_str().find(expected_str) != -1 for actual_str in build_issues):
-                missing_error_strings.add(expected_str)
-        assert len(missing_error_strings) == 0, "Failed to match one or more expected issues: "
-        f"{missing_error_strings} in {set([x.as_readable_str() for x in build_issues])}"
-    else:
-        assert len(build_issues) == 1
-        expected_substr1 = "Both window and grain_to_date set for cumulative metric. Please set one or the other."
-        missing_error_strings = set()
-        for expected_str in [expected_substr1]:
-            if not any(actual_str.as_readable_str().find(expected_str) != -1 for actual_str in build_issues):
-                missing_error_strings.add(expected_str)
-        assert len(missing_error_strings) == 0, "Failed to match one or more expected issues: "
-        f"{missing_error_strings} in {set([x.as_readable_str() for x in build_issues])}"
+    assert len(build_issues) == 8
+    expected_substr1 = "Both window and grain_to_date set for cumulative metric. Please set one or the other."
+    expected_substr2 = "Got differing values for `window`"
+    expected_substr3 = "Got differing values for `grain_to_date`"
+    expected_substr4 = "Cumulative `type_params.window` field has been moved and will soon be deprecated."
+    expected_substr5 = "Cumulative `type_params.grain_to_date` field has been moved and will soon be deprecated."
+    missing_error_strings = set()
+    for expected_str in [expected_substr1, expected_substr2, expected_substr3, expected_substr4, expected_substr5]:
+        if not any(actual_str.as_readable_str().find(expected_str) != -1 for actual_str in build_issues):
+            missing_error_strings.add(expected_str)
+    assert len(missing_error_strings) == 0, "Failed to match one or more expected issues: "
+    f"{missing_error_strings} in {set([x.as_readable_str() for x in build_issues])}"
 
 
 def test_default_granularity() -> None: