fix tests

dbt-labs · Nov 12, 2024 · 6983d64 · 6983d64
1 parent 9f2a8ed
commit 6983d64
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 14 deletions.
diff --git a/core/dbt/artifacts/resources/v1/metric.py b/core/dbt/artifacts/resources/v1/metric.py
@@ -48,6 +48,14 @@ class MetricTimeWindow(dbtClassMixin):
     count: int
     granularity: str
 
+    @property
+    def window_string(self) -> str:  # noqa: D
+        return f"{self.count} {self.granularity}"
+
+    @property
+    def is_standard_granularity(self) -> bool:  # noqa: D
+        return self.granularity.casefold() in {item.value.casefold() for item in TimeGranularity}
+
 
 @dataclass
 class MetricInput(dbtClassMixin):

diff --git a/core/dbt/artifacts/resources/v1/semantic_model.py b/core/dbt/artifacts/resources/v1/semantic_model.py
@@ -31,6 +31,14 @@
 """
 
 
+@dataclass
+class SemanticLayerElementConfig(dbtClassMixin):
+    meta: Dict[str, Any] = field(
+        default_factory=dict,
+        metadata=MergeBehavior.Update.meta(),
+    )
+
+
 @dataclass
 class Defaults(dbtClassMixin):
     agg_time_dimension: Optional[str] = None
@@ -72,6 +80,7 @@ class Dimension(dbtClassMixin):
     type_params: Optional[DimensionTypeParams] = None
     expr: Optional[str] = None
     metadata: Optional[SourceFileMetadata] = None
+    config: Optional[SemanticLayerElementConfig] = None
 
     @property
     def reference(self) -> DimensionReference:
@@ -106,6 +115,7 @@ class Entity(dbtClassMixin):
     label: Optional[str] = None
     role: Optional[str] = None
     expr: Optional[str] = None
+    config: Optional[SemanticLayerElementConfig] = None
 
     @property
     def reference(self) -> EntityReference:
@@ -147,6 +157,7 @@ class Measure(dbtClassMixin):
     agg_params: Optional[MeasureAggregationParameters] = None
     non_additive_dimension: Optional[NonAdditiveDimension] = None
     agg_time_dimension: Optional[str] = None
+    config: Optional[SemanticLayerElementConfig] = None
 
     @property
     def reference(self) -> MeasureReference:

diff --git a/tests/functional/metrics/test_metrics.py b/tests/functional/metrics/test_metrics.py
@@ -85,7 +85,7 @@ def test_simple_metric(
         )
         assert (
             manifest.metrics["metric.test.number_of_people"].time_granularity
-            == TimeGranularity.MONTH
+            == TimeGranularity.MONTH.value
         )
         assert manifest.metrics["metric.test.collective_tenure"].time_granularity is None
 
@@ -436,25 +436,25 @@ def test_cumulative_metric(self, project):
         metric_ids = set(manifest.metrics.keys())
         expected_metric_ids_to_cumulative_type_params = {
             "metric.test.weekly_visits": CumulativeTypeParams(
-                window=MetricTimeWindow(count=7, granularity=TimeGranularity.DAY),
+                window=MetricTimeWindow(count=7, granularity=TimeGranularity.DAY.value),
                 period_agg=PeriodAggregation.AVERAGE,
             ),
             "metric.test.cumulative_orders": CumulativeTypeParams(
                 period_agg=PeriodAggregation.LAST
             ),
             "metric.test.orders_ytd": CumulativeTypeParams(
-                grain_to_date=TimeGranularity.YEAR, period_agg=PeriodAggregation.FIRST
+                grain_to_date=TimeGranularity.YEAR.value, period_agg=PeriodAggregation.FIRST
             ),
             "metric.test.monthly_orders": CumulativeTypeParams(
-                window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH),
+                window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH.value),
                 period_agg=PeriodAggregation.AVERAGE,
             ),
             "metric.test.yearly_orders": CumulativeTypeParams(
-                window=MetricTimeWindow(count=1, granularity=TimeGranularity.YEAR),
+                window=MetricTimeWindow(count=1, granularity=TimeGranularity.YEAR.value),
                 period_agg=PeriodAggregation.FIRST,
             ),
             "metric.test.visits_mtd": CumulativeTypeParams(
-                grain_to_date=TimeGranularity.MONTH, period_agg=PeriodAggregation.FIRST
+                grain_to_date=TimeGranularity.MONTH.value, period_agg=PeriodAggregation.FIRST
             ),
             "metric.test.cumulative_visits": CumulativeTypeParams(
                 period_agg=PeriodAggregation.FIRST

diff --git a/tests/unit/contracts/graph/test_semantic_manifest.py b/tests/unit/contracts/graph/test_semantic_manifest.py
@@ -66,7 +66,7 @@ def test_require_yaml_configuration_for_mf_time_spines(
             ),
             (
                 MetricTypeParams(
-                    window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH)
+                    window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH.value)
                 ),
                 1,
                 False,
@@ -75,7 +75,7 @@ def test_require_yaml_configuration_for_mf_time_spines(
             (
                 MetricTypeParams(
                     cumulative_type_params=CumulativeTypeParams(
-                        grain_to_date=TimeGranularity.MONTH,
+                        grain_to_date=TimeGranularity.MONTH.value,
                     )
                 ),
                 0,
@@ -85,7 +85,7 @@ def test_require_yaml_configuration_for_mf_time_spines(
             (
                 MetricTypeParams(
                     cumulative_type_params=CumulativeTypeParams(
-                        window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH),
+                        window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH.value),
                     )
                 ),
                 0,
@@ -100,7 +100,7 @@ def test_require_yaml_configuration_for_mf_time_spines(
             ),
             (
                 MetricTypeParams(
-                    window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH)
+                    window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH.value)
                 ),
                 0,
                 True,
@@ -109,7 +109,7 @@ def test_require_yaml_configuration_for_mf_time_spines(
             (
                 MetricTypeParams(
                     cumulative_type_params=CumulativeTypeParams(
-                        grain_to_date=TimeGranularity.MONTH,
+                        grain_to_date=TimeGranularity.MONTH.value,
                     )
                 ),
                 0,
@@ -119,7 +119,7 @@ def test_require_yaml_configuration_for_mf_time_spines(
             (
                 MetricTypeParams(
                     cumulative_type_params=CumulativeTypeParams(
-                        window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH),
+                        window=MetricTimeWindow(count=1, granularity=TimeGranularity.MONTH.value),
                     )
                 ),
                 0,

diff --git a/tests/unit/test_semantic_layer_nodes_satisfy_protocols.py b/tests/unit/test_semantic_layer_nodes_satisfy_protocols.py
@@ -196,7 +196,7 @@ def where_filter() -> WhereFilter:
 
 @pytest.fixture(scope="session")
 def metric_time_window() -> MetricTimeWindow:
-    return MetricTimeWindow(count=1, granularity=TimeGranularity.DAY)
+    return MetricTimeWindow(count=1, granularity=TimeGranularity.DAY.value)
 
 
 @pytest.fixture(scope="session")
@@ -211,7 +211,7 @@ def complex_metric_input(metric_time_window, where_filter) -> MetricInput:
         filter=where_filter,
         alias="aliased_metric_input",
         offset_window=metric_time_window,
-        offset_to_grain=TimeGranularity.DAY,
+        offset_to_grain=TimeGranularity.DAY.value,
     )