Upgrade DSI to 0.8.0 and fix class changes

core/dbt/artifacts/resources/v1/metric.py

@@ -46,7 +46,7 @@ def post_aggregation_measure_reference(self) -> MeasureReference:
 @dataclass
 class MetricTimeWindow(dbtClassMixin):
     count: int
-    granularity: TimeGranularity
+    granularity: str
 
 
 @dataclass
@@ -55,7 +55,7 @@ class MetricInput(dbtClassMixin):
     filter: Optional[WhereFilterIntersection] = None
     alias: Optional[str] = None
     offset_window: Optional[MetricTimeWindow] = None
-    offset_to_grain: Optional[TimeGranularity] = None
+    offset_to_grain: Optional[str] = None
 
     def as_reference(self) -> MetricReference:
         return MetricReference(element_name=self.name)
@@ -83,7 +83,7 @@ class ConversionTypeParams(dbtClassMixin):
 @dataclass
 class CumulativeTypeParams(dbtClassMixin):
     window: Optional[MetricTimeWindow] = None
-    grain_to_date: Optional[TimeGranularity] = None
+    grain_to_date: Optional[str] = None
     period_agg: PeriodAggregation = PeriodAggregation.FIRST
 
 
@@ -95,7 +95,9 @@ class MetricTypeParams(dbtClassMixin):
     denominator: Optional[MetricInput] = None
     expr: Optional[str] = None
     window: Optional[MetricTimeWindow] = None
-    grain_to_date: Optional[TimeGranularity] = None
+    grain_to_date: Optional[TimeGranularity] = (
+        None  # legacy, use cumulative_type_params.grain_to_date
+    )
     metrics: Optional[List[MetricInput]] = None
     conversion_type_params: Optional[ConversionTypeParams] = None
     cumulative_type_params: Optional[CumulativeTypeParams] = None
@@ -121,7 +123,7 @@ class Metric(GraphResource):
     type_params: MetricTypeParams
     filter: Optional[WhereFilterIntersection] = None
     metadata: Optional[SourceFileMetadata] = None
-    time_granularity: Optional[TimeGranularity] = None
+    time_granularity: Optional[str] = None
     resource_type: Literal[NodeType.Metric]
     meta: Dict[str, Any] = field(default_factory=dict, metadata=MergeBehavior.Update.meta())
     tags: List[str] = field(default_factory=list)

core/dbt/artifacts/resources/v1/semantic_layer_components.py

@@ -12,17 +12,21 @@
 class WhereFilter(dbtClassMixin):
     where_sql_template: str
 
-    @property
-    def call_parameter_sets(self) -> FilterCallParameterSets:
-        return WhereFilterParser.parse_call_parameter_sets(self.where_sql_template)
+    def call_parameter_sets(
+        self, custom_granularity_names: Sequence[str]
+    ) -> FilterCallParameterSets:
+        return WhereFilterParser.parse_call_parameter_sets(
+            self.where_sql_template, custom_granularity_names=custom_granularity_names
+        )
 
 
 @dataclass
 class WhereFilterIntersection(dbtClassMixin):
     where_filters: List[WhereFilter]
 
-    @property
-    def filter_expression_parameter_sets(self) -> Sequence[Tuple[str, FilterCallParameterSets]]:
+    def filter_expression_parameter_sets(
+        self, custom_granularity_names: Sequence[str]
+    ) -> Sequence[Tuple[str, FilterCallParameterSets]]:
         raise NotImplementedError
 
 

core/dbt/contracts/graph/unparsed.py

@@ -564,7 +564,7 @@ class UnparsedMetricInput(dbtClassMixin):
     filter: Union[str, List[str], None] = None
     alias: Optional[str] = None
     offset_window: Optional[str] = None
-    offset_to_grain: Optional[str] = None  # str is really a TimeGranularity Enum
+    offset_to_grain: Optional[str] = None
 
 
 @dataclass

core/dbt/parser/schema_yaml_readers.py

@@ -228,19 +228,11 @@ def _get_input_measures(
     def _get_period_agg(self, unparsed_period_agg: str) -> PeriodAggregation:
         return PeriodAggregation(unparsed_period_agg)
 
-    def _get_optional_grain_to_date(
-        self, unparsed_grain_to_date: Optional[str]
-    ) -> Optional[TimeGranularity]:
-        if not unparsed_grain_to_date:
-            return None
-
-        return TimeGranularity(unparsed_grain_to_date)
-
     def _get_optional_time_window(
         self, unparsed_window: Optional[str]
     ) -> Optional[MetricTimeWindow]:
         if unparsed_window is not None:
-            parts = unparsed_window.split(" ")
+            parts = unparsed_window.lower().split(" ")
             if len(parts) != 2:
                 raise YamlParseDictError(
                     self.yaml.path,
@@ -251,18 +243,6 @@ def _get_optional_time_window(
                 )
 
             granularity = parts[1]
-            # once we drop python 3.8 this could just be `granularity = parts[0].removesuffix('s')
-            if granularity.endswith("s"):
-                # months -> month
-                granularity = granularity[:-1]
-            if granularity not in [item.value for item in TimeGranularity]:
-                raise YamlParseDictError(
-                    self.yaml.path,
-                    "window",
-                    {"window": unparsed_window},
-                    f"Invalid time granularity {granularity} in cumulative/conversion metric window string: ({unparsed_window})",
-                )
-
             count = parts[0]
             if not count.isdigit():
                 raise YamlParseDictError(
@@ -274,7 +254,7 @@ def _get_optional_time_window(
 
             return MetricTimeWindow(
                 count=int(count),
-                granularity=TimeGranularity(granularity),
+                granularity=granularity,
             )
         else:
             return None
@@ -283,16 +263,12 @@ def _get_metric_input(self, unparsed: Union[UnparsedMetricInput, str]) -> Metric
         if isinstance(unparsed, str):
             return MetricInput(name=unparsed)
         else:
-            offset_to_grain: Optional[TimeGranularity] = None
-            if unparsed.offset_to_grain is not None:
-                offset_to_grain = TimeGranularity(unparsed.offset_to_grain)
-
             return MetricInput(
                 name=unparsed.name,
                 filter=parse_where_filter(unparsed.filter),
                 alias=unparsed.alias,
                 offset_window=self._get_optional_time_window(unparsed.offset_window),
-                offset_to_grain=offset_to_grain,
+                offset_to_grain=unparsed.offset_to_grain,
             )
 
     def _get_optional_metric_input(
@@ -354,9 +330,7 @@ def _get_optional_cumulative_type_params(
                 window=self._get_optional_time_window(
                     unparsed_type_params.cumulative_type_params.window
                 ),
-                grain_to_date=self._get_optional_grain_to_date(
-                    unparsed_type_params.cumulative_type_params.grain_to_date
-                ),
+                grain_to_date=unparsed_type_params.cumulative_type_params.grain_to_date,
                 period_agg=self._get_period_agg(
                     unparsed_type_params.cumulative_type_params.period_agg
                 ),
@@ -369,6 +343,10 @@ def _get_metric_type_params(self, unparsed_metric: UnparsedMetric) -> MetricType
 
         grain_to_date: Optional[TimeGranularity] = None
         if type_params.grain_to_date is not None:
+            # This should've been changed to a string (to support custom grain), but since this
+            # is a legacy field waiting to be deprecated, we will not support custom grain here
+            # in order to force customers off of using this field. The field to use should be
+            # `cumulative_type_params.grain_to_date`
             grain_to_date = TimeGranularity(type_params.grain_to_date)
 
         return MetricTypeParams(
@@ -435,9 +413,7 @@ def parse_metric(self, unparsed: UnparsedMetric, generated_from: Optional[str] =
             label=unparsed.label,
             type=MetricType(unparsed.type),
             type_params=self._get_metric_type_params(unparsed),
-            time_granularity=(
-                TimeGranularity(unparsed.time_granularity) if unparsed.time_granularity else None
-            ),
+            time_granularity=unparsed.time_granularity,
             filter=parse_where_filter(unparsed.filter),
             meta=unparsed.meta,
             tags=unparsed.tags,

core/setup.py

@@ -69,7 +69,7 @@
         # These are major-version-0 packages also maintained by dbt-labs.
         # Accept patches but avoid automatically updating past a set minor version range.
         "dbt-extractor>=0.5.0,<=0.6",
-        "dbt-semantic-interfaces>=0.7.4,<0.8",
+        "dbt-semantic-interfaces>=0.8.0,<0.9",
         # Minor versions for these are expected to be backwards-compatible
         "dbt-common>=1.11.0,<2.0",
         "dbt-adapters>=1.8.0,<2.0",