Behavior change cumulative type param

.changes/unreleased/Under the Hood-20241031-094609.yaml

@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Behavior change for cumulative metric type param
+time: 2024-10-31T09:46:09.757879-05:00
+custom:
+    Author: DevonFulcher
+    Issue: "10960"

core/dbt/contracts/graph/semantic_manifest.py

@@ -1,4 +1,4 @@
-from typing import List, Optional
+from typing import List, Optional, Set
 
 from dbt import deprecations
 from dbt.constants import (
@@ -32,10 +32,16 @@
 from dbt_semantic_interfaces.implementations.time_spine_table_configuration import (
     PydanticTimeSpineTableConfiguration as LegacyTimeSpine,
 )
+from dbt_semantic_interfaces.references import MetricModelReference
 from dbt_semantic_interfaces.type_enums import TimeGranularity
 from dbt_semantic_interfaces.validations.semantic_manifest_validator import (
     SemanticManifestValidator,
 )
+from dbt_semantic_interfaces.validations.validator_helpers import (
+    FileContext,
+    MetricContext,
+    ValidationError,
+)
 
 
 class SemanticManifest:
@@ -60,6 +66,35 @@
         semantic_manifest = self._get_pydantic_semantic_manifest()
         validator = SemanticManifestValidator[PydanticSemanticManifest]()
         validation_results = validator.validate_semantic_manifest(semantic_manifest)
+        validation_result_errors = list(validation_results.errors)
+
+        metrics_using_old_params: Set[str] = set()
+        for metric in semantic_manifest.metrics or []:
+            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:
+                    metrics_using_old_params.add(metric.name)
+        if metrics_using_old_params:
+            if get_flags().require_nested_cumulative_type_params is False:
+                deprecations.warn(
+                    "mf-cumulative-type-params-deprecation",
+                )
+            else:
+                validation_result_errors.extend(
+                    [
+                        ValidationError(
+                            context=MetricContext(
+                                # We don't have the file context at this point.
+                                file_context=FileContext(),
+                                metric=MetricModelReference(metric_name=m),
+                            ),
+                            message=f"Cumulative metric {m} fields `type_params.window` and `type_params.grain_to_date` should be nested under `type_params.cumulative_type_params.window` and `type_params.cumulative_type_params.grain_to_date`. See documentation on behavior changes: https://docs.getdbt.com/reference/global-configs/behavior-changes.",
+                        )
+                        for m in metrics_using_old_params
+                    ]
+                )
+
         time_spines = semantic_manifest.project_configuration.time_spines
         legacy_time_spines = (
             semantic_manifest.project_configuration.time_spine_table_configurations
@@ -80,10 +115,10 @@
         for warning in validation_results.warnings:
             fire_event(SemanticValidationFailure(msg=warning.message))
 
-        for error in validation_results.errors:
+        for error in validation_result_errors:
             fire_event(SemanticValidationFailure(msg=error.message), EventLevel.ERROR)
 
-        return not validation_results.errors
+        return not validation_result_errors
 
     def write_json_to_file(self, file_path: str):
         semantic_manifest = self._get_pydantic_semantic_manifest()

core/dbt/contracts/project.py

@@ -345,6 +345,7 @@ class ProjectFlags(ExtensibleDbtClassMixin):
     state_modified_compare_more_unrendered_values: bool = False
     state_modified_compare_vars: bool = False
     require_yaml_configuration_for_mf_time_spines: bool = False
+    require_nested_cumulative_type_params: bool = False
 
     @property
     def project_only_flags(self) -> Dict[str, Any]:
@@ -356,6 +357,7 @@ def project_only_flags(self) -> Dict[str, Any]:
             "state_modified_compare_more_unrendered_values": self.state_modified_compare_more_unrendered_values,
             "state_modified_compare_vars": self.state_modified_compare_vars,
             "require_yaml_configuration_for_mf_time_spines": self.require_yaml_configuration_for_mf_time_spines,
+            "require_nested_cumulative_type_params": self.require_nested_cumulative_type_params,
         }
 
 

core/dbt/deprecations.py

@@ -123,6 +123,11 @@ class MFTimespineWithoutYamlConfigurationDeprecation(DBTDeprecation):
     _event = "MFTimespineWithoutYamlConfigurationDeprecation"
 
 
+class MFCumulativeTypeParamsDeprecation(DBTDeprecation):
+    _name = "mf-cumulative-type-params-deprecation"
+    _event = "MFCumulativeTypeParamsDeprecation"
+
+
 def renamed_env_var(old_name: str, new_name: str):
     class EnvironmentVariableRenamed(DBTDeprecation):
         _name = f"environment-variable-renamed:{old_name}"
@@ -172,6 +177,7 @@ def show_callback():
     ResourceNamesWithSpacesDeprecation(),
     SourceFreshnessProjectHooksNotRun(),
     MFTimespineWithoutYamlConfigurationDeprecation(),
+    MFCumulativeTypeParamsDeprecation(),
 ]
 
 deprecations: Dict[str, DBTDeprecation] = {d.name: d for d in deprecations_list}

core/dbt/events/core_types.proto

@@ -453,6 +453,14 @@ message MFTimespineWithoutYamlConfigurationDeprecationMsg {
     MFTimespineWithoutYamlConfigurationDeprecation data = 2;
 }
 
+// D019
+message MFCumulativeTypeParamsDeprecation {}
+
+message MFCumulativeTypeParamsDeprecationMsg {
+    CoreEventInfo info = 1;
+    MFCumulativeTypeParamsDeprecation data = 2;
+}
+
 // I065
 message DeprecatedModel {
     string model_name = 1;

core/dbt/events/types.py

@@ -476,6 +476,16 @@ def message(self) -> str:
         return line_wrap_message(warning_tag(description))
 
 
+class MFCumulativeTypeParamsDeprecation(WarnLevel):
+    def code(self) -> str:
+        return "D019"
+
+    def message(self) -> str:
+        description = "Cumulative fields `type_params.window` and `type_params.grain_to_date` have been moved and will soon be deprecated. Please nest those values under `type_params.cumulative_type_params.window` and `type_params.cumulative_type_params.grain_to_date`. See documentation on behavior changes: https://docs.getdbt.com/reference/global-configs/behavior-changes."
+
+        return line_wrap_message(warning_tag(description))
+
+
 # =======================================================
 # I - Project parsing
 # =======================================================

tests/unit/contracts/graph/test_semantic_manifest.py

@@ -3,8 +3,16 @@
 import pytest
 
 from core.dbt.contracts.graph.manifest import Manifest
-from core.dbt.contracts.graph.nodes import ModelNode
+from core.dbt.contracts.graph.nodes import Metric, ModelNode
+from dbt.artifacts.resources.types import NodeType
+from dbt.artifacts.resources.v1.metric import (
+    CumulativeTypeParams,
+    MetricTimeWindow,
+    MetricTypeParams,
+)
 from dbt.contracts.graph.semantic_manifest import SemanticManifest
+from dbt_semantic_interfaces.type_enums import TimeGranularity
+from dbt_semantic_interfaces.type_enums.metric_type import MetricType
 
 
 # Overwrite the default nods to construct the manifest
@@ -46,3 +54,105 @@ def test_require_yaml_configuration_for_mf_time_spines(
             sm_manifest = SemanticManifest(manifest)
             assert sm_manifest.validate()
             assert patched_deprecations.warn.call_count == 1
+
+    @pytest.mark.parametrize(
+        "metric_type_params, num_warns, should_error, flag_value",
+        [
+            (
+                MetricTypeParams(grain_to_date=TimeGranularity.MONTH),
+                1,
+                False,
+                False,
+            ),
+            (
+                MetricTypeParams(
+                    window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH)
+                ),
+                1,
+                False,
+                False,
+            ),
+            (
+                MetricTypeParams(
+                    cumulative_type_params=CumulativeTypeParams(
+                        grain_to_date=TimeGranularity.MONTH,
+                    )
+                ),
+                0,
+                False,
+                False,
+            ),
+            (
+                MetricTypeParams(
+                    cumulative_type_params=CumulativeTypeParams(
+                        window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH),
+                    )
+                ),
+                0,
+                False,
+                False,
+            ),
+            (
+                MetricTypeParams(grain_to_date=TimeGranularity.MONTH),
+                0,
+                True,
+                True,
+            ),
+            (
+                MetricTypeParams(
+                    window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH)
+                ),
+                0,
+                True,
+                True,
+            ),
+            (
+                MetricTypeParams(
+                    cumulative_type_params=CumulativeTypeParams(
+                        grain_to_date=TimeGranularity.MONTH,
+                    )
+                ),
+                0,
+                False,
+                True,
+            ),
+            (
+                MetricTypeParams(
+                    cumulative_type_params=CumulativeTypeParams(
+                        window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH),
+                    )
+                ),
+                0,
+                False,
+                True,
+            ),
+        ],
+    )
+    def test_deprecate_cumulative_type_params(
+        self,
+        manifest: Manifest,
+        metric_type_params: MetricTypeParams,
+        num_warns: int,
+        should_error: bool,
+        flag_value: bool,
+    ):
+        with patch("dbt.contracts.graph.semantic_manifest.get_flags") as patched_get_flags, patch(
+            "dbt.contracts.graph.semantic_manifest.deprecations"
+        ) as patched_deprecations:
+            patched_get_flags.return_value.require_nested_cumulative_type_params = flag_value
+            manifest.metrics["metric.test.my_metric"] = Metric(
+                name="my_metric",
+                type=MetricType.CUMULATIVE,
+                type_params=metric_type_params,
+                resource_type=NodeType.Metric,
+                package_name="test",
+                path="models/test/my_metric.yml",
+                original_file_path="models/test/my_metric.yml",
+                unique_id="metric.test.my_metric",
+                fqn=["test", "my_metric"],
+                description="My metric",
+                label="My Metric",
+            )
+            sm_manifest = SemanticManifest(manifest)
+            assert sm_manifest.validate() != should_error
+            assert patched_deprecations.warn.call_count == num_warns

tests/unit/test_events.py

@@ -158,6 +158,7 @@ def test_event_codes(self):
     ),
     core_types.SourceFreshnessProjectHooksNotRun(),
     core_types.MFTimespineWithoutYamlConfigurationDeprecation(),
+    core_types.MFCumulativeTypeParamsDeprecation(),
     # E - DB Adapter ======================
     adapter_types.AdapterEventDebug(),
     adapter_types.AdapterEventInfo(),