From 250da92375d5e23db95bcf65cc0591697fc2abbe Mon Sep 17 00:00:00 2001
From: Will Deng <william.deng14@gmail.com>
Date: Wed, 4 Dec 2024 12:05:06 -0500
Subject: [PATCH] Update snapshots

---
 ...e_metric_with_non_default_grain__dfp_0.xml |   2 +-
 ...t_cumulative_metric_with_window__dfp_0.xml |   2 +-
 ...e_metric_with_non_default_grain__dfp_0.xml |   2 +-
 ...st_derived_metric_offset_window__dfp_0.xml |  16 +--
 ..._metric_offset_with_granularity__dfp_0.xml |  16 +--
 ...erived_offset_cumulative_metric__dfp_0.xml |  18 +--
 ...in_to_time_spine_derived_metric__dfp_0.xml |  16 +--
 ...erived_metric_with_outer_offset__dfp_0.xml |  28 ++---
 ...ry_have_different_granularities__dfp_0.xml |  96 ++++++++--------
 ...e_spine_node_with_offset_window__plan0.xml |   2 +-
 ...rsion_metric_predicate_pushdown__dfp_0.xml |   2 +-
 ...sion_metric_predicate_pushdown__dfpo_0.xml |   2 +-
 ...ative_metric_predicate_pushdown__dfp_0.xml |   2 +-
 ...tive_metric_predicate_pushdown__dfpo_0.xml |   2 +-
 ...spine_metric_predicate_pushdown__dfp_0.xml | 102 ++++++++---------
 ...pine_metric_predicate_pushdown__dfpo_0.xml | 102 ++++++++---------
 ...ost_agg_join_predicate_pushdown__dfp_0.xml | 103 +++++++++---------
 ...st_agg_join_predicate_pushdown__dfpo_0.xml | 103 +++++++++---------
 ...ffset_metric_predicate_pushdown__dfp_0.xml | 102 ++++++++---------
 ...fset_metric_predicate_pushdown__dfpo_0.xml | 102 ++++++++---------
 20 files changed, 411 insertions(+), 409 deletions(-)

diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_non_default_grain__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_non_default_grain__dfp_0.xml
index 6d769b8a9..50efd3287 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_non_default_grain__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_non_default_grain__dfp_0.xml
@@ -62,7 +62,7 @@ docstring:
                             <!--       time_granularity=ExpandedTimeGranularity(name='day', base_granularity=DAY),   -->
                             <!--     ),                                                                              -->
                             <!--   )                                                                                 -->
-                            <!-- window = PydanticMetricTimeWindow(count=2, granularity=MONTH) -->
+                            <!-- window = PydanticMetricTimeWindow(count=2, granularity='month') -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
                                 <!-- node_id = NodeId(id_str='sma_28015') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
index 4e666acbf..ca0d20bf0 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_cumulative_metric_with_window__dfp_0.xml
@@ -35,7 +35,7 @@ docstring:
                         <!--       time_granularity=ExpandedTimeGranularity(name='day', base_granularity=DAY), -->
                         <!--     ),                                                                            -->
                         <!--   )                                                                               -->
-                        <!-- window = PydanticMetricTimeWindow(count=2, granularity=MONTH) -->
+                        <!-- window = PydanticMetricTimeWindow(count=2, granularity='month') -->
                         <MetricTimeDimensionTransformNode>
                             <!-- description = "Metric Time Dimension 'ds'" -->
                             <!-- node_id = NodeId(id_str='sma_28015') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_cumulative_metric_with_non_default_grain__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_cumulative_metric_with_non_default_grain__dfp_0.xml
index e7226c195..7bc8eb72d 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_cumulative_metric_with_non_default_grain__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_cumulative_metric_with_non_default_grain__dfp_0.xml
@@ -75,7 +75,7 @@ docstring:
                                 <!--       time_granularity=ExpandedTimeGranularity(name='day', base_granularity=DAY),     -->
                                 <!--     ),                                                                                -->
                                 <!--   )                                                                                   -->
-                                <!-- window = PydanticMetricTimeWindow(count=2, granularity=MONTH) -->
+                                <!-- window = PydanticMetricTimeWindow(count=2, granularity='month') -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
                                     <!-- node_id = NodeId(id_str='sma_28015') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
index 89893e30b..e5ac09297 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_window__dfp_0.xml
@@ -14,13 +14,13 @@ docstring:
             <ComputeMetricsNode>
                 <!-- description = 'Compute Metrics via Expressions' -->
                 <!-- node_id = NodeId(id_str='cm_0') -->
-                <!-- metric_spec =                                                         -->
-                <!--   MetricSpec(                                                         -->
-                <!--     element_name='bookings',                                          -->
-                <!--     filter_spec_set=WhereFilterSpecSet(),                             -->
-                <!--     alias='bookings_5_days_ago',                                      -->
-                <!--     offset_window=PydanticMetricTimeWindow(count=5, granularity=DAY), -->
-                <!--   )                                                                   -->
+                <!-- metric_spec =                                                           -->
+                <!--   MetricSpec(                                                           -->
+                <!--     element_name='bookings',                                            -->
+                <!--     filter_spec_set=WhereFilterSpecSet(),                               -->
+                <!--     alias='bookings_5_days_ago',                                        -->
+                <!--     offset_window=PydanticMetricTimeWindow(count=5, granularity='day'), -->
+                <!--   )                                                                     -->
                 <AggregateMeasuresNode>
                     <!-- description = 'Aggregate Measures' -->
                     <!-- node_id = NodeId(id_str='am_0') -->
@@ -46,7 +46,7 @@ docstring:
                             <!--   )                                                                               -->
                             <!-- use_custom_agg_time_dimension = False -->
                             <!-- join_type = INNER -->
-                            <!-- offset_window = PydanticMetricTimeWindow(count=5, granularity=DAY) -->
+                            <!-- offset_window = PydanticMetricTimeWindow(count=5, granularity='day') -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
                                 <!-- node_id = NodeId(id_str='sma_28009') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
index e359957f5..08b9f9c68 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_metric_offset_with_granularity__dfp_0.xml
@@ -12,13 +12,13 @@ test_filename: test_dataflow_plan_builder.py
             <ComputeMetricsNode>
                 <!-- description = 'Compute Metrics via Expressions' -->
                 <!-- node_id = NodeId(id_str='cm_0') -->
-                <!-- metric_spec =                                                         -->
-                <!--   MetricSpec(                                                         -->
-                <!--     element_name='bookings',                                          -->
-                <!--     filter_spec_set=WhereFilterSpecSet(),                             -->
-                <!--     alias='bookings_5_days_ago',                                      -->
-                <!--     offset_window=PydanticMetricTimeWindow(count=5, granularity=DAY), -->
-                <!--   )                                                                   -->
+                <!-- metric_spec =                                                           -->
+                <!--   MetricSpec(                                                           -->
+                <!--     element_name='bookings',                                            -->
+                <!--     filter_spec_set=WhereFilterSpecSet(),                               -->
+                <!--     alias='bookings_5_days_ago',                                        -->
+                <!--     offset_window=PydanticMetricTimeWindow(count=5, granularity='day'), -->
+                <!--   )                                                                     -->
                 <AggregateMeasuresNode>
                     <!-- description = 'Aggregate Measures' -->
                     <!-- node_id = NodeId(id_str='am_0') -->
@@ -44,7 +44,7 @@ test_filename: test_dataflow_plan_builder.py
                             <!--   )                                                                                   -->
                             <!-- use_custom_agg_time_dimension = False -->
                             <!-- join_type = INNER -->
-                            <!-- offset_window = PydanticMetricTimeWindow(count=5, granularity=DAY) -->
+                            <!-- offset_window = PydanticMetricTimeWindow(count=5, granularity='day') -->
                             <MetricTimeDimensionTransformNode>
                                 <!-- description = "Metric Time Dimension 'ds'" -->
                                 <!-- node_id = NodeId(id_str='sma_28009') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
index a24de25d6..35a0046a3 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_derived_offset_cumulative_metric__dfp_0.xml
@@ -13,13 +13,13 @@ test_filename: test_dataflow_plan_builder.py
             <ComputeMetricsNode>
                 <!-- description = 'Compute Metrics via Expressions' -->
                 <!-- node_id = NodeId(id_str='cm_0') -->
-                <!-- metric_spec =                                                         -->
-                <!--   MetricSpec(                                                         -->
-                <!--     element_name='every_two_days_bookers',                            -->
-                <!--     filter_spec_set=WhereFilterSpecSet(),                             -->
-                <!--     alias='every_2_days_bookers_2_days_ago',                          -->
-                <!--     offset_window=PydanticMetricTimeWindow(count=2, granularity=DAY), -->
-                <!--   )                                                                   -->
+                <!-- metric_spec =                                                           -->
+                <!--   MetricSpec(                                                           -->
+                <!--     element_name='every_two_days_bookers',                              -->
+                <!--     filter_spec_set=WhereFilterSpecSet(),                               -->
+                <!--     alias='every_2_days_bookers_2_days_ago',                            -->
+                <!--     offset_window=PydanticMetricTimeWindow(count=2, granularity='day'), -->
+                <!--   )                                                                     -->
                 <AggregateMeasuresNode>
                     <!-- description = 'Aggregate Measures' -->
                     <!-- node_id = NodeId(id_str='am_0') -->
@@ -45,7 +45,7 @@ test_filename: test_dataflow_plan_builder.py
                             <!--   )                                                                               -->
                             <!-- use_custom_agg_time_dimension = False -->
                             <!-- join_type = INNER -->
-                            <!-- offset_window = PydanticMetricTimeWindow(count=2, granularity=DAY) -->
+                            <!-- offset_window = PydanticMetricTimeWindow(count=2, granularity='day') -->
                             <JoinOverTimeRangeNode>
                                 <!-- description = 'Join Self Over Time Range' -->
                                 <!-- node_id = NodeId(id_str='jotr_0') -->
@@ -56,7 +56,7 @@ test_filename: test_dataflow_plan_builder.py
                                 <!--       time_granularity=ExpandedTimeGranularity(name='day', base_granularity=DAY), -->
                                 <!--     ),                                                                            -->
                                 <!--   )                                                                               -->
-                                <!-- window = PydanticMetricTimeWindow(count=2, granularity=DAY) -->
+                                <!-- window = PydanticMetricTimeWindow(count=2, granularity='day') -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
                                     <!-- node_id = NodeId(id_str='sma_28009') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml
index 4acddea8c..560dfd276 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_join_to_time_spine_derived_metric__dfp_0.xml
@@ -63,13 +63,13 @@ test_filename: test_dataflow_plan_builder.py
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_1') -->
-                    <!-- metric_spec =                                                          -->
-                    <!--   MetricSpec(                                                          -->
-                    <!--     element_name='bookings_fill_nulls_with_0',                         -->
-                    <!--     filter_spec_set=WhereFilterSpecSet(),                              -->
-                    <!--     alias='bookings_2_weeks_ago',                                      -->
-                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity=DAY), -->
-                    <!--   )                                                                    -->
+                    <!-- metric_spec =                                                            -->
+                    <!--   MetricSpec(                                                            -->
+                    <!--     element_name='bookings_fill_nulls_with_0',                           -->
+                    <!--     filter_spec_set=WhereFilterSpecSet(),                                -->
+                    <!--     alias='bookings_2_weeks_ago',                                        -->
+                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity='day'), -->
+                    <!--   )                                                                      -->
                     <JoinToTimeSpineNode>
                         <!-- description = 'Join to Time Spine Dataset' -->
                         <!-- node_id = NodeId(id_str='jts_2') -->
@@ -107,7 +107,7 @@ test_filename: test_dataflow_plan_builder.py
                                     <!--   )                                                                               -->
                                     <!-- use_custom_agg_time_dimension = False -->
                                     <!-- join_type = INNER -->
-                                    <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity=DAY) -->
+                                    <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity='day') -->
                                     <MetricTimeDimensionTransformNode>
                                         <!-- description = "Metric Time Dimension 'ds'" -->
                                         <!-- node_id = NodeId(id_str='sma_28009') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml
index f82e0ccbd..edb57d973 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_nested_derived_metric_with_outer_offset__dfp_0.xml
@@ -21,25 +21,25 @@ test_filename: test_dataflow_plan_builder.py
                 <!--   )                                                                               -->
                 <!-- use_custom_agg_time_dimension = False -->
                 <!-- join_type = INNER -->
-                <!-- offset_window = PydanticMetricTimeWindow(count=2, granularity=DAY) -->
+                <!-- offset_window = PydanticMetricTimeWindow(count=2, granularity='day') -->
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_1') -->
-                    <!-- metric_spec =                                                         -->
-                    <!--   MetricSpec(                                                         -->
-                    <!--     element_name='bookings_offset_once',                              -->
-                    <!--     filter_spec_set=WhereFilterSpecSet(),                             -->
-                    <!--     offset_window=PydanticMetricTimeWindow(count=2, granularity=DAY), -->
-                    <!--   )                                                                   -->
+                    <!-- metric_spec =                                                           -->
+                    <!--   MetricSpec(                                                           -->
+                    <!--     element_name='bookings_offset_once',                                -->
+                    <!--     filter_spec_set=WhereFilterSpecSet(),                               -->
+                    <!--     offset_window=PydanticMetricTimeWindow(count=2, granularity='day'), -->
+                    <!--   )                                                                     -->
                     <ComputeMetricsNode>
                         <!-- description = 'Compute Metrics via Expressions' -->
                         <!-- node_id = NodeId(id_str='cm_0') -->
-                        <!-- metric_spec =                                                         -->
-                        <!--   MetricSpec(                                                         -->
-                        <!--     element_name='bookings',                                          -->
-                        <!--     filter_spec_set=WhereFilterSpecSet(),                             -->
-                        <!--     offset_window=PydanticMetricTimeWindow(count=5, granularity=DAY), -->
-                        <!--   )                                                                   -->
+                        <!-- metric_spec =                                                           -->
+                        <!--   MetricSpec(                                                           -->
+                        <!--     element_name='bookings',                                            -->
+                        <!--     filter_spec_set=WhereFilterSpecSet(),                               -->
+                        <!--     offset_window=PydanticMetricTimeWindow(count=5, granularity='day'), -->
+                        <!--   )                                                                     -->
                         <AggregateMeasuresNode>
                             <!-- description = 'Aggregate Measures' -->
                             <!-- node_id = NodeId(id_str='am_0') -->
@@ -65,7 +65,7 @@ test_filename: test_dataflow_plan_builder.py
                                     <!--   )                                                                               -->
                                     <!-- use_custom_agg_time_dimension = False -->
                                     <!-- join_type = INNER -->
-                                    <!-- offset_window = PydanticMetricTimeWindow(count=5, granularity=DAY) -->
+                                    <!-- offset_window = PydanticMetricTimeWindow(count=5, granularity='day') -->
                                     <MetricTimeDimensionTransformNode>
                                         <!-- description = "Metric Time Dimension 'ds'" -->
                                         <!-- node_id = NodeId(id_str='sma_28009') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml
index 37a544add..7f01f2402 100644
--- a/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_plan_builder.py/DataflowPlan/test_offset_window_metric_filter_and_query_have_different_granularities__dfp_0.xml
@@ -62,53 +62,53 @@ docstring:
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_0') -->
-                    <!-- metric_spec =                                                           -->
-                    <!--   MetricSpec(                                                           -->
-                    <!--     element_name='booking_value',                                       -->
-                    <!--     filter_spec_set=WhereFilterSpecSet(                                 -->
-                    <!--       query_level_filter_specs=(                                        -->
-                    <!--         WhereFilterSpec(                                                -->
-                    <!--           where_sql="metric_time__day = '2020-01-01'",                  -->
-                    <!--           bind_parameters=SqlBindParameterSet(),                        -->
-                    <!--           linkable_element_unions=(                                     -->
-                    <!--             LinkableElementUnion(                                       -->
-                    <!--               linkable_dimension=LinkableDimension(                     -->
-                    <!--                 properties=(                                            -->
-                    <!--                   METRIC_TIME,                                          -->
-                    <!--                 ),                                                      -->
-                    <!--                 defined_in_semantic_model=SemanticModelReference(       -->
-                    <!--                   semantic_model_name='bookings_source',                -->
-                    <!--                 ),                                                      -->
-                    <!--                 element_name='metric_time',                             -->
-                    <!--                 dimension_type=TIME,                                    -->
-                    <!--                 join_path=SemanticModelJoinPath(                        -->
-                    <!--                   left_semantic_model_reference=SemanticModelReference( -->
-                    <!--                     semantic_model_name='bookings_source',              -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--                 time_granularity=ExpandedTimeGranularity(               -->
-                    <!--                   name='day',                                           -->
-                    <!--                   base_granularity=DAY,                                 -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--           linkable_spec_set=LinkableSpecSet(                            -->
-                    <!--             time_dimension_specs=(                                      -->
-                    <!--               TimeDimensionSpec(                                        -->
-                    <!--                 element_name='metric_time',                             -->
-                    <!--                 time_granularity=ExpandedTimeGranularity(               -->
-                    <!--                   name='day',                                           -->
-                    <!--                   base_granularity=DAY,                                 -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--         ),                                                              -->
-                    <!--       ),                                                                -->
-                    <!--     ),                                                                  -->
-                    <!--     offset_window=PydanticMetricTimeWindow(count=1, granularity=WEEK),  -->
-                    <!--   )                                                                     -->
+                    <!-- metric_spec =                                                            -->
+                    <!--   MetricSpec(                                                            -->
+                    <!--     element_name='booking_value',                                        -->
+                    <!--     filter_spec_set=WhereFilterSpecSet(                                  -->
+                    <!--       query_level_filter_specs=(                                         -->
+                    <!--         WhereFilterSpec(                                                 -->
+                    <!--           where_sql="metric_time__day = '2020-01-01'",                   -->
+                    <!--           bind_parameters=SqlBindParameterSet(),                         -->
+                    <!--           linkable_element_unions=(                                      -->
+                    <!--             LinkableElementUnion(                                        -->
+                    <!--               linkable_dimension=LinkableDimension(                      -->
+                    <!--                 properties=(                                             -->
+                    <!--                   METRIC_TIME,                                           -->
+                    <!--                 ),                                                       -->
+                    <!--                 defined_in_semantic_model=SemanticModelReference(        -->
+                    <!--                   semantic_model_name='bookings_source',                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 element_name='metric_time',                              -->
+                    <!--                 dimension_type=TIME,                                     -->
+                    <!--                 join_path=SemanticModelJoinPath(                         -->
+                    <!--                   left_semantic_model_reference=SemanticModelReference(  -->
+                    <!--                     semantic_model_name='bookings_source',               -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--                 time_granularity=ExpandedTimeGranularity(                -->
+                    <!--                   name='day',                                            -->
+                    <!--                   base_granularity=DAY,                                  -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--           linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--             time_dimension_specs=(                                       -->
+                    <!--               TimeDimensionSpec(                                         -->
+                    <!--                 element_name='metric_time',                              -->
+                    <!--                 time_granularity=ExpandedTimeGranularity(                -->
+                    <!--                   name='day',                                            -->
+                    <!--                   base_granularity=DAY,                                  -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--         ),                                                               -->
+                    <!--       ),                                                                 -->
+                    <!--     ),                                                                   -->
+                    <!--     offset_window=PydanticMetricTimeWindow(count=1, granularity='week'), -->
+                    <!--   )                                                                      -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
                         <!-- node_id = NodeId(id_str='am_0') -->
@@ -177,7 +177,7 @@ docstring:
                                     <!--   )                                             -->
                                     <!-- use_custom_agg_time_dimension = False -->
                                     <!-- join_type = INNER -->
-                                    <!-- offset_window = PydanticMetricTimeWindow(count=1, granularity=WEEK) -->
+                                    <!-- offset_window = PydanticMetricTimeWindow(count=1, granularity='week') -->
                                     <MetricTimeDimensionTransformNode>
                                         <!-- description = "Metric Time Dimension 'ds'" -->
                                         <!-- node_id = NodeId(id_str='sma_28009') -->
diff --git a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
index 2fb63b6c0..1d0b73048 100644
--- a/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
+++ b/tests_metricflow/snapshots/test_dataflow_to_sql_plan.py/DataflowPlan/test_join_to_time_spine_node_with_offset_window__plan0.xml
@@ -19,7 +19,7 @@ docstring:
             <!--   )                                                                               -->
             <!-- use_custom_agg_time_dimension = False -->
             <!-- join_type = INNER -->
-            <!-- offset_window = PydanticMetricTimeWindow(count=10, granularity=DAY) -->
+            <!-- offset_window = PydanticMetricTimeWindow(count=10, granularity='day') -->
             <!-- time_range_constraint =                             -->
             <!--   TimeRangeConstraint(                              -->
             <!--     start_time=datetime.datetime(2020, 1, 1, 0, 0), -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfp_0.xml
index ee060eb70..31bc27dd3 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfp_0.xml
@@ -191,7 +191,7 @@ docstring:
                             <!--     time_granularity=ExpandedTimeGranularity(name='day', base_granularity=DAY), -->
                             <!--   )                                                                             -->
                             <!-- entity_spec = EntitySpec(element_name='user') -->
-                            <!-- window = PydanticMetricTimeWindow(count=7, granularity=DAY) -->
+                            <!-- window = PydanticMetricTimeWindow(count=7, granularity='day') -->
                             <!-- unique_key_specs = MetadataSpec(element_name='mf_internal_uuid') -->
                             <FilterElementsNode>
                                 <!-- description =                                                                         -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfpo_0.xml
index 3c8171e44..da4aa72c4 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_conversion_metric_predicate_pushdown__dfpo_0.xml
@@ -191,7 +191,7 @@ docstring:
                             <!--     time_granularity=ExpandedTimeGranularity(name='day', base_granularity=DAY), -->
                             <!--   )                                                                             -->
                             <!-- entity_spec = EntitySpec(element_name='user') -->
-                            <!-- window = PydanticMetricTimeWindow(count=7, granularity=DAY) -->
+                            <!-- window = PydanticMetricTimeWindow(count=7, granularity='day') -->
                             <!-- unique_key_specs = MetadataSpec(element_name='mf_internal_uuid') -->
                             <FilterElementsNode>
                                 <!-- description =                                                                         -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfp_0.xml
index 1715b47e8..d89dc80c3 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfp_0.xml
@@ -145,7 +145,7 @@ docstring:
                                 <!--       time_granularity=ExpandedTimeGranularity(name='day', base_granularity=DAY), -->
                                 <!--     ),                                                                            -->
                                 <!--   )                                                                               -->
-                                <!-- window = PydanticMetricTimeWindow(count=2, granularity=DAY) -->
+                                <!-- window = PydanticMetricTimeWindow(count=2, granularity='day') -->
                                 <MetricTimeDimensionTransformNode>
                                     <!-- description = "Metric Time Dimension 'ds'" -->
                                     <!-- node_id = NodeId(id_str='sma_28009') -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfpo_0.xml
index 7f88f3111..76c242657 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_cumulative_metric_predicate_pushdown__dfpo_0.xml
@@ -103,7 +103,7 @@ docstring:
                             <!--       time_granularity=ExpandedTimeGranularity(name='day', base_granularity=DAY), -->
                             <!--     ),                                                                            -->
                             <!--   )                                                                               -->
-                            <!-- window = PydanticMetricTimeWindow(count=2, granularity=DAY) -->
+                            <!-- window = PydanticMetricTimeWindow(count=2, granularity='day') -->
                             <WhereConstraintNode>
                                 <!-- description = 'Constrain Output with WHERE' -->
                                 <!-- node_id = NodeId(id_str='wcc_1') -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml
index a6b9017bc..3d4c66c74 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfp_0.xml
@@ -237,56 +237,56 @@ docstring:
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_1') -->
-                    <!-- metric_spec =                                                           -->
-                    <!--   MetricSpec(                                                           -->
-                    <!--     element_name='bookings_fill_nulls_with_0',                          -->
-                    <!--     filter_spec_set=WhereFilterSpecSet(                                 -->
-                    <!--       query_level_filter_specs=(                                        -->
-                    <!--         WhereFilterSpec(                                                -->
-                    <!--           where_sql='booking__is_instant',                              -->
-                    <!--           bind_parameters=SqlBindParameterSet(),                        -->
-                    <!--           linkable_element_unions=(                                     -->
-                    <!--             LinkableElementUnion(                                       -->
-                    <!--               linkable_dimension=LinkableDimension(                     -->
-                    <!--                 properties=(                                            -->
-                    <!--                   LOCAL,                                                -->
-                    <!--                 ),                                                      -->
-                    <!--                 defined_in_semantic_model=SemanticModelReference(       -->
-                    <!--                   semantic_model_name='bookings_source',                -->
-                    <!--                 ),                                                      -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 dimension_type=CATEGORICAL,                             -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--                 join_path=SemanticModelJoinPath(                        -->
-                    <!--                   left_semantic_model_reference=SemanticModelReference( -->
-                    <!--                     semantic_model_name='bookings_source',              -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--           linkable_spec_set=LinkableSpecSet(                            -->
-                    <!--             dimension_specs=(                                           -->
-                    <!--               DimensionSpec(                                            -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--         ),                                                              -->
-                    <!--       ),                                                                -->
-                    <!--     ),                                                                  -->
-                    <!--     alias='bookings_2_weeks_ago',                                       -->
-                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity=DAY),  -->
-                    <!--   )                                                                     -->
+                    <!-- metric_spec =                                                            -->
+                    <!--   MetricSpec(                                                            -->
+                    <!--     element_name='bookings_fill_nulls_with_0',                           -->
+                    <!--     filter_spec_set=WhereFilterSpecSet(                                  -->
+                    <!--       query_level_filter_specs=(                                         -->
+                    <!--         WhereFilterSpec(                                                 -->
+                    <!--           where_sql='booking__is_instant',                               -->
+                    <!--           bind_parameters=SqlBindParameterSet(),                         -->
+                    <!--           linkable_element_unions=(                                      -->
+                    <!--             LinkableElementUnion(                                        -->
+                    <!--               linkable_dimension=LinkableDimension(                      -->
+                    <!--                 properties=(                                             -->
+                    <!--                   LOCAL,                                                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 defined_in_semantic_model=SemanticModelReference(        -->
+                    <!--                   semantic_model_name='bookings_source',                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 dimension_type=CATEGORICAL,                              -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--                 join_path=SemanticModelJoinPath(                         -->
+                    <!--                   left_semantic_model_reference=SemanticModelReference(  -->
+                    <!--                     semantic_model_name='bookings_source',               -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--           linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--             dimension_specs=(                                            -->
+                    <!--               DimensionSpec(                                             -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--         ),                                                               -->
+                    <!--       ),                                                                 -->
+                    <!--     ),                                                                   -->
+                    <!--     alias='bookings_2_weeks_ago',                                        -->
+                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity='day'), -->
+                    <!--   )                                                                      -->
                     <JoinToTimeSpineNode>
                         <!-- description = 'Join to Time Spine Dataset' -->
                         <!-- node_id = NodeId(id_str='jts_2') -->
@@ -384,7 +384,7 @@ docstring:
                                             <!--   )                                             -->
                                             <!-- use_custom_agg_time_dimension = False -->
                                             <!-- join_type = INNER -->
-                                            <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity=DAY) -->
+                                            <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity='day') -->
                                             <MetricTimeDimensionTransformNode>
                                                 <!-- description = "Metric Time Dimension 'ds'" -->
                                                 <!-- node_id = NodeId(id_str='sma_28009') -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml
index 1a7bf440d..3c6a02528 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_predicate_pushdown__dfpo_0.xml
@@ -236,56 +236,56 @@ docstring:
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_4') -->
-                    <!-- metric_spec =                                                           -->
-                    <!--   MetricSpec(                                                           -->
-                    <!--     element_name='bookings_fill_nulls_with_0',                          -->
-                    <!--     filter_spec_set=WhereFilterSpecSet(                                 -->
-                    <!--       query_level_filter_specs=(                                        -->
-                    <!--         WhereFilterSpec(                                                -->
-                    <!--           where_sql='booking__is_instant',                              -->
-                    <!--           bind_parameters=SqlBindParameterSet(),                        -->
-                    <!--           linkable_element_unions=(                                     -->
-                    <!--             LinkableElementUnion(                                       -->
-                    <!--               linkable_dimension=LinkableDimension(                     -->
-                    <!--                 properties=(                                            -->
-                    <!--                   LOCAL,                                                -->
-                    <!--                 ),                                                      -->
-                    <!--                 defined_in_semantic_model=SemanticModelReference(       -->
-                    <!--                   semantic_model_name='bookings_source',                -->
-                    <!--                 ),                                                      -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 dimension_type=CATEGORICAL,                             -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--                 join_path=SemanticModelJoinPath(                        -->
-                    <!--                   left_semantic_model_reference=SemanticModelReference( -->
-                    <!--                     semantic_model_name='bookings_source',              -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--           linkable_spec_set=LinkableSpecSet(                            -->
-                    <!--             dimension_specs=(                                           -->
-                    <!--               DimensionSpec(                                            -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--         ),                                                              -->
-                    <!--       ),                                                                -->
-                    <!--     ),                                                                  -->
-                    <!--     alias='bookings_2_weeks_ago',                                       -->
-                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity=DAY),  -->
-                    <!--   )                                                                     -->
+                    <!-- metric_spec =                                                            -->
+                    <!--   MetricSpec(                                                            -->
+                    <!--     element_name='bookings_fill_nulls_with_0',                           -->
+                    <!--     filter_spec_set=WhereFilterSpecSet(                                  -->
+                    <!--       query_level_filter_specs=(                                         -->
+                    <!--         WhereFilterSpec(                                                 -->
+                    <!--           where_sql='booking__is_instant',                               -->
+                    <!--           bind_parameters=SqlBindParameterSet(),                         -->
+                    <!--           linkable_element_unions=(                                      -->
+                    <!--             LinkableElementUnion(                                        -->
+                    <!--               linkable_dimension=LinkableDimension(                      -->
+                    <!--                 properties=(                                             -->
+                    <!--                   LOCAL,                                                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 defined_in_semantic_model=SemanticModelReference(        -->
+                    <!--                   semantic_model_name='bookings_source',                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 dimension_type=CATEGORICAL,                              -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--                 join_path=SemanticModelJoinPath(                         -->
+                    <!--                   left_semantic_model_reference=SemanticModelReference(  -->
+                    <!--                     semantic_model_name='bookings_source',               -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--           linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--             dimension_specs=(                                            -->
+                    <!--               DimensionSpec(                                             -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--         ),                                                               -->
+                    <!--       ),                                                                 -->
+                    <!--     ),                                                                   -->
+                    <!--     alias='bookings_2_weeks_ago',                                        -->
+                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity='day'), -->
+                    <!--   )                                                                      -->
                     <JoinToTimeSpineNode>
                         <!-- description = 'Join to Time Spine Dataset' -->
                         <!-- node_id = NodeId(id_str='jts_5') -->
@@ -383,7 +383,7 @@ docstring:
                                             <!--   )                                             -->
                                             <!-- use_custom_agg_time_dimension = False -->
                                             <!-- join_type = INNER -->
-                                            <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity=DAY) -->
+                                            <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity='day') -->
                                             <MetricTimeDimensionTransformNode>
                                                 <!-- description = "Metric Time Dimension 'ds'" -->
                                                 <!-- node_id = NodeId(id_str='sma_2') -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml
index 349319f1f..621702efe 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfp_0.xml
@@ -294,56 +294,56 @@ docstring:
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_1') -->
-                    <!-- metric_spec =                                                           -->
-                    <!--   MetricSpec(                                                           -->
-                    <!--     element_name='bookings_fill_nulls_with_0',                          -->
-                    <!--     filter_spec_set=WhereFilterSpecSet(                                 -->
-                    <!--       query_level_filter_specs=(                                        -->
-                    <!--         WhereFilterSpec(                                                -->
-                    <!--           where_sql='booking__is_instant',                              -->
-                    <!--           bind_parameters=SqlBindParameterSet(),                        -->
-                    <!--           linkable_element_unions=(                                     -->
-                    <!--             LinkableElementUnion(                                       -->
-                    <!--               linkable_dimension=LinkableDimension(                     -->
-                    <!--                 properties=(                                            -->
-                    <!--                   LOCAL,                                                -->
-                    <!--                 ),                                                      -->
-                    <!--                 defined_in_semantic_model=SemanticModelReference(       -->
-                    <!--                   semantic_model_name='bookings_source',                -->
-                    <!--                 ),                                                      -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 dimension_type=CATEGORICAL,                             -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--                 join_path=SemanticModelJoinPath(                        -->
-                    <!--                   left_semantic_model_reference=SemanticModelReference( -->
-                    <!--                     semantic_model_name='bookings_source',              -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--           linkable_spec_set=LinkableSpecSet(                            -->
-                    <!--             dimension_specs=(                                           -->
-                    <!--               DimensionSpec(                                            -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--         ),                                                              -->
-                    <!--       ),                                                                -->
-                    <!--     ),                                                                  -->
-                    <!--     alias='bookings_2_weeks_ago',                                       -->
-                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity=DAY),  -->
-                    <!--   )                                                                     -->
+                    <!-- metric_spec =                                                            -->
+                    <!--   MetricSpec(                                                            -->
+                    <!--     element_name='bookings_fill_nulls_with_0',                           -->
+                    <!--     filter_spec_set=WhereFilterSpecSet(                                  -->
+                    <!--       query_level_filter_specs=(                                         -->
+                    <!--         WhereFilterSpec(                                                 -->
+                    <!--           where_sql='booking__is_instant',                               -->
+                    <!--           bind_parameters=SqlBindParameterSet(),                         -->
+                    <!--           linkable_element_unions=(                                      -->
+                    <!--             LinkableElementUnion(                                        -->
+                    <!--               linkable_dimension=LinkableDimension(                      -->
+                    <!--                 properties=(                                             -->
+                    <!--                   LOCAL,                                                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 defined_in_semantic_model=SemanticModelReference(        -->
+                    <!--                   semantic_model_name='bookings_source',                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 dimension_type=CATEGORICAL,                              -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--                 join_path=SemanticModelJoinPath(                         -->
+                    <!--                   left_semantic_model_reference=SemanticModelReference(  -->
+                    <!--                     semantic_model_name='bookings_source',               -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--           linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--             dimension_specs=(                                            -->
+                    <!--               DimensionSpec(                                             -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--         ),                                                               -->
+                    <!--       ),                                                                 -->
+                    <!--     ),                                                                   -->
+                    <!--     alias='bookings_2_weeks_ago',                                        -->
+                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity='day'), -->
+                    <!--   )                                                                      -->
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_3') -->
@@ -490,7 +490,8 @@ docstring:
                                                 <!--   )                                             -->
                                                 <!-- use_custom_agg_time_dimension = False -->
                                                 <!-- join_type = INNER -->
-                                                <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity=DAY) -->
+                                                <!-- offset_window =                                         -->
+                                                <!--   PydanticMetricTimeWindow(count=14, granularity='day') -->
                                                 <MetricTimeDimensionTransformNode>
                                                     <!-- description = "Metric Time Dimension 'ds'" -->
                                                     <!-- node_id = NodeId(id_str='sma_28009') -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml
index 594a2144f..9bcca021f 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_fill_nulls_time_spine_metric_with_post_agg_join_predicate_pushdown__dfpo_0.xml
@@ -294,56 +294,56 @@ docstring:
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_4') -->
-                    <!-- metric_spec =                                                           -->
-                    <!--   MetricSpec(                                                           -->
-                    <!--     element_name='bookings_fill_nulls_with_0',                          -->
-                    <!--     filter_spec_set=WhereFilterSpecSet(                                 -->
-                    <!--       query_level_filter_specs=(                                        -->
-                    <!--         WhereFilterSpec(                                                -->
-                    <!--           where_sql='booking__is_instant',                              -->
-                    <!--           bind_parameters=SqlBindParameterSet(),                        -->
-                    <!--           linkable_element_unions=(                                     -->
-                    <!--             LinkableElementUnion(                                       -->
-                    <!--               linkable_dimension=LinkableDimension(                     -->
-                    <!--                 properties=(                                            -->
-                    <!--                   LOCAL,                                                -->
-                    <!--                 ),                                                      -->
-                    <!--                 defined_in_semantic_model=SemanticModelReference(       -->
-                    <!--                   semantic_model_name='bookings_source',                -->
-                    <!--                 ),                                                      -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 dimension_type=CATEGORICAL,                             -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--                 join_path=SemanticModelJoinPath(                        -->
-                    <!--                   left_semantic_model_reference=SemanticModelReference( -->
-                    <!--                     semantic_model_name='bookings_source',              -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--           linkable_spec_set=LinkableSpecSet(                            -->
-                    <!--             dimension_specs=(                                           -->
-                    <!--               DimensionSpec(                                            -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--         ),                                                              -->
-                    <!--       ),                                                                -->
-                    <!--     ),                                                                  -->
-                    <!--     alias='bookings_2_weeks_ago',                                       -->
-                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity=DAY),  -->
-                    <!--   )                                                                     -->
+                    <!-- metric_spec =                                                            -->
+                    <!--   MetricSpec(                                                            -->
+                    <!--     element_name='bookings_fill_nulls_with_0',                           -->
+                    <!--     filter_spec_set=WhereFilterSpecSet(                                  -->
+                    <!--       query_level_filter_specs=(                                         -->
+                    <!--         WhereFilterSpec(                                                 -->
+                    <!--           where_sql='booking__is_instant',                               -->
+                    <!--           bind_parameters=SqlBindParameterSet(),                         -->
+                    <!--           linkable_element_unions=(                                      -->
+                    <!--             LinkableElementUnion(                                        -->
+                    <!--               linkable_dimension=LinkableDimension(                      -->
+                    <!--                 properties=(                                             -->
+                    <!--                   LOCAL,                                                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 defined_in_semantic_model=SemanticModelReference(        -->
+                    <!--                   semantic_model_name='bookings_source',                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 dimension_type=CATEGORICAL,                              -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--                 join_path=SemanticModelJoinPath(                         -->
+                    <!--                   left_semantic_model_reference=SemanticModelReference(  -->
+                    <!--                     semantic_model_name='bookings_source',               -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--           linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--             dimension_specs=(                                            -->
+                    <!--               DimensionSpec(                                             -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--         ),                                                               -->
+                    <!--       ),                                                                 -->
+                    <!--     ),                                                                   -->
+                    <!--     alias='bookings_2_weeks_ago',                                        -->
+                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity='day'), -->
+                    <!--   )                                                                      -->
                     <WhereConstraintNode>
                         <!-- description = 'Constrain Output with WHERE' -->
                         <!-- node_id = NodeId(id_str='wcc_7') -->
@@ -490,7 +490,8 @@ docstring:
                                                 <!--   )                                             -->
                                                 <!-- use_custom_agg_time_dimension = False -->
                                                 <!-- join_type = INNER -->
-                                                <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity=DAY) -->
+                                                <!-- offset_window =                                         -->
+                                                <!--   PydanticMetricTimeWindow(count=14, granularity='day') -->
                                                 <MetricTimeDimensionTransformNode>
                                                     <!-- description = "Metric Time Dimension 'ds'" -->
                                                     <!-- node_id = NodeId(id_str='sma_2') -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml
index 08bfdf746..54e00f296 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfp_0.xml
@@ -224,56 +224,56 @@ docstring:
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_1') -->
-                    <!-- metric_spec =                                                           -->
-                    <!--   MetricSpec(                                                           -->
-                    <!--     element_name='bookings',                                            -->
-                    <!--     filter_spec_set=WhereFilterSpecSet(                                 -->
-                    <!--       query_level_filter_specs=(                                        -->
-                    <!--         WhereFilterSpec(                                                -->
-                    <!--           where_sql='booking__is_instant',                              -->
-                    <!--           bind_parameters=SqlBindParameterSet(),                        -->
-                    <!--           linkable_element_unions=(                                     -->
-                    <!--             LinkableElementUnion(                                       -->
-                    <!--               linkable_dimension=LinkableDimension(                     -->
-                    <!--                 properties=(                                            -->
-                    <!--                   LOCAL,                                                -->
-                    <!--                 ),                                                      -->
-                    <!--                 defined_in_semantic_model=SemanticModelReference(       -->
-                    <!--                   semantic_model_name='bookings_source',                -->
-                    <!--                 ),                                                      -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 dimension_type=CATEGORICAL,                             -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--                 join_path=SemanticModelJoinPath(                        -->
-                    <!--                   left_semantic_model_reference=SemanticModelReference( -->
-                    <!--                     semantic_model_name='bookings_source',              -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--           linkable_spec_set=LinkableSpecSet(                            -->
-                    <!--             dimension_specs=(                                           -->
-                    <!--               DimensionSpec(                                            -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--         ),                                                              -->
-                    <!--       ),                                                                -->
-                    <!--     ),                                                                  -->
-                    <!--     alias='bookings_2_weeks_ago',                                       -->
-                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity=DAY),  -->
-                    <!--   )                                                                     -->
+                    <!-- metric_spec =                                                            -->
+                    <!--   MetricSpec(                                                            -->
+                    <!--     element_name='bookings',                                             -->
+                    <!--     filter_spec_set=WhereFilterSpecSet(                                  -->
+                    <!--       query_level_filter_specs=(                                         -->
+                    <!--         WhereFilterSpec(                                                 -->
+                    <!--           where_sql='booking__is_instant',                               -->
+                    <!--           bind_parameters=SqlBindParameterSet(),                         -->
+                    <!--           linkable_element_unions=(                                      -->
+                    <!--             LinkableElementUnion(                                        -->
+                    <!--               linkable_dimension=LinkableDimension(                      -->
+                    <!--                 properties=(                                             -->
+                    <!--                   LOCAL,                                                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 defined_in_semantic_model=SemanticModelReference(        -->
+                    <!--                   semantic_model_name='bookings_source',                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 dimension_type=CATEGORICAL,                              -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--                 join_path=SemanticModelJoinPath(                         -->
+                    <!--                   left_semantic_model_reference=SemanticModelReference(  -->
+                    <!--                     semantic_model_name='bookings_source',               -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--           linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--             dimension_specs=(                                            -->
+                    <!--               DimensionSpec(                                             -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--         ),                                                               -->
+                    <!--       ),                                                                 -->
+                    <!--     ),                                                                   -->
+                    <!--     alias='bookings_2_weeks_ago',                                        -->
+                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity='day'), -->
+                    <!--   )                                                                      -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
                         <!-- node_id = NodeId(id_str='am_1') -->
@@ -359,7 +359,7 @@ docstring:
                                         <!--   )                                             -->
                                         <!-- use_custom_agg_time_dimension = False -->
                                         <!-- join_type = INNER -->
-                                        <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity=DAY) -->
+                                        <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity='day') -->
                                         <MetricTimeDimensionTransformNode>
                                             <!-- description = "Metric Time Dimension 'ds'" -->
                                             <!-- node_id = NodeId(id_str='sma_28009') -->
diff --git a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml
index 8a861b78d..dab9f369f 100644
--- a/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml
+++ b/tests_metricflow/snapshots/test_predicate_pushdown_optimizer.py/DataflowPlan/test_offset_metric_predicate_pushdown__dfpo_0.xml
@@ -224,56 +224,56 @@ docstring:
                 <ComputeMetricsNode>
                     <!-- description = 'Compute Metrics via Expressions' -->
                     <!-- node_id = NodeId(id_str='cm_4') -->
-                    <!-- metric_spec =                                                           -->
-                    <!--   MetricSpec(                                                           -->
-                    <!--     element_name='bookings',                                            -->
-                    <!--     filter_spec_set=WhereFilterSpecSet(                                 -->
-                    <!--       query_level_filter_specs=(                                        -->
-                    <!--         WhereFilterSpec(                                                -->
-                    <!--           where_sql='booking__is_instant',                              -->
-                    <!--           bind_parameters=SqlBindParameterSet(),                        -->
-                    <!--           linkable_element_unions=(                                     -->
-                    <!--             LinkableElementUnion(                                       -->
-                    <!--               linkable_dimension=LinkableDimension(                     -->
-                    <!--                 properties=(                                            -->
-                    <!--                   LOCAL,                                                -->
-                    <!--                 ),                                                      -->
-                    <!--                 defined_in_semantic_model=SemanticModelReference(       -->
-                    <!--                   semantic_model_name='bookings_source',                -->
-                    <!--                 ),                                                      -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 dimension_type=CATEGORICAL,                             -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--                 join_path=SemanticModelJoinPath(                        -->
-                    <!--                   left_semantic_model_reference=SemanticModelReference( -->
-                    <!--                     semantic_model_name='bookings_source',              -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--           linkable_spec_set=LinkableSpecSet(                            -->
-                    <!--             dimension_specs=(                                           -->
-                    <!--               DimensionSpec(                                            -->
-                    <!--                 element_name='is_instant',                              -->
-                    <!--                 entity_links=(                                          -->
-                    <!--                   EntityReference(                                      -->
-                    <!--                     element_name='booking',                             -->
-                    <!--                   ),                                                    -->
-                    <!--                 ),                                                      -->
-                    <!--               ),                                                        -->
-                    <!--             ),                                                          -->
-                    <!--           ),                                                            -->
-                    <!--         ),                                                              -->
-                    <!--       ),                                                                -->
-                    <!--     ),                                                                  -->
-                    <!--     alias='bookings_2_weeks_ago',                                       -->
-                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity=DAY),  -->
-                    <!--   )                                                                     -->
+                    <!-- metric_spec =                                                            -->
+                    <!--   MetricSpec(                                                            -->
+                    <!--     element_name='bookings',                                             -->
+                    <!--     filter_spec_set=WhereFilterSpecSet(                                  -->
+                    <!--       query_level_filter_specs=(                                         -->
+                    <!--         WhereFilterSpec(                                                 -->
+                    <!--           where_sql='booking__is_instant',                               -->
+                    <!--           bind_parameters=SqlBindParameterSet(),                         -->
+                    <!--           linkable_element_unions=(                                      -->
+                    <!--             LinkableElementUnion(                                        -->
+                    <!--               linkable_dimension=LinkableDimension(                      -->
+                    <!--                 properties=(                                             -->
+                    <!--                   LOCAL,                                                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 defined_in_semantic_model=SemanticModelReference(        -->
+                    <!--                   semantic_model_name='bookings_source',                 -->
+                    <!--                 ),                                                       -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 dimension_type=CATEGORICAL,                              -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--                 join_path=SemanticModelJoinPath(                         -->
+                    <!--                   left_semantic_model_reference=SemanticModelReference(  -->
+                    <!--                     semantic_model_name='bookings_source',               -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--           linkable_spec_set=LinkableSpecSet(                             -->
+                    <!--             dimension_specs=(                                            -->
+                    <!--               DimensionSpec(                                             -->
+                    <!--                 element_name='is_instant',                               -->
+                    <!--                 entity_links=(                                           -->
+                    <!--                   EntityReference(                                       -->
+                    <!--                     element_name='booking',                              -->
+                    <!--                   ),                                                     -->
+                    <!--                 ),                                                       -->
+                    <!--               ),                                                         -->
+                    <!--             ),                                                           -->
+                    <!--           ),                                                             -->
+                    <!--         ),                                                               -->
+                    <!--       ),                                                                 -->
+                    <!--     ),                                                                   -->
+                    <!--     alias='bookings_2_weeks_ago',                                        -->
+                    <!--     offset_window=PydanticMetricTimeWindow(count=14, granularity='day'), -->
+                    <!--   )                                                                      -->
                     <AggregateMeasuresNode>
                         <!-- description = 'Aggregate Measures' -->
                         <!-- node_id = NodeId(id_str='am_3') -->
@@ -359,7 +359,7 @@ docstring:
                                         <!--   )                                             -->
                                         <!-- use_custom_agg_time_dimension = False -->
                                         <!-- join_type = INNER -->
-                                        <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity=DAY) -->
+                                        <!-- offset_window = PydanticMetricTimeWindow(count=14, granularity='day') -->
                                         <MetricTimeDimensionTransformNode>
                                             <!-- description = "Metric Time Dimension 'ds'" -->
                                             <!-- node_id = NodeId(id_str='sma_2') -->