Upgrade DSI

metricflow-semantics/metricflow_semantics/time/dateutil_adjuster.py

@@ -22,7 +22,20 @@ class DateutilTimePeriodAdjuster(TimePeriodAdjuster):
 
     def _relative_delta_for_window(self, time_granularity: TimeGranularity, count: int) -> relativedelta:
         """Relative-delta to cover time windows specified at different grains."""
-        if time_granularity is TimeGranularity.DAY:
+        if time_granularity is TimeGranularity.NANOSECOND:
+            # TODO: figure out a workaround when enabling time constraints
+            raise ValueError("`relativedelta` does not support nanoseconds.")
+        elif time_granularity is TimeGranularity.MICROSECOND:
+            return relativedelta(microseconds=count)
+        elif time_granularity is TimeGranularity.MILLISECOND:
+            return relativedelta(microseconds=count * 1000)
+        elif time_granularity is TimeGranularity.SECOND:
+            return relativedelta(seconds=count)
+        elif time_granularity is TimeGranularity.MINUTE:
+            return relativedelta(minutes=count)
+        elif time_granularity is TimeGranularity.HOUR:
+            return relativedelta(hours=count)
+        elif time_granularity is TimeGranularity.DAY:
             return relativedelta(days=count)
         elif time_granularity is TimeGranularity.WEEK:
             return relativedelta(weeks=count)
@@ -53,8 +66,18 @@ def expand_time_constraint_to_fill_granularity(
     def adjust_to_start_of_period(
         self, time_granularity: TimeGranularity, date_to_adjust: datetime.datetime
     ) -> datetime.datetime:
-        if time_granularity is TimeGranularity.DAY:
+        # TODO: update these options once time constraints support a full timestamp
+        if (
+            time_granularity is TimeGranularity.NANOSECOND
+            or time_granularity is TimeGranularity.MICROSECOND
+            or time_granularity is TimeGranularity.MILLISECOND
+            or time_granularity is TimeGranularity.SECOND
+            or time_granularity is TimeGranularity.MINUTE
+            or time_granularity is TimeGranularity.HOUR
+            or time_granularity is TimeGranularity.DAY
+        ):
             return date_to_adjust
+
         elif time_granularity is TimeGranularity.WEEK:
             return date_to_adjust + relativedelta(weekday=dateutil.relativedelta.MO(-1))
         elif time_granularity is TimeGranularity.MONTH:
@@ -77,8 +100,18 @@ def adjust_to_start_of_period(
     def adjust_to_end_of_period(
         self, time_granularity: TimeGranularity, date_to_adjust: datetime.datetime
     ) -> datetime.datetime:
-        if time_granularity is TimeGranularity.DAY:
+        # TODO: update these options once time constraints support a full timestamp
+        if (
+            time_granularity is TimeGranularity.NANOSECOND
+            or time_granularity is TimeGranularity.MICROSECOND
+            or time_granularity is TimeGranularity.MILLISECOND
+            or time_granularity is TimeGranularity.SECOND
+            or time_granularity is TimeGranularity.MINUTE
+            or time_granularity is TimeGranularity.HOUR
+            or time_granularity is TimeGranularity.DAY
+        ):
             return date_to_adjust
+
         elif time_granularity is TimeGranularity.WEEK:
             return date_to_adjust + relativedelta(weekday=dateutil.relativedelta.SU(1))
         elif time_granularity is TimeGranularity.MONTH:

metricflow-semantics/metricflow_semantics/time/time_constants.py

@@ -1,15 +1,5 @@
 from __future__ import annotations
 
-from dbt_semantic_interfaces.type_enums.time_granularity import TimeGranularity
-
 # Python formatting string to use for converting datetime to ISO8601
 ISO8601_PYTHON_FORMAT = "%Y-%m-%d"
 ISO8601_PYTHON_TS_FORMAT = "%Y-%m-%d %H:%M:%S"
-
-SUPPORTED_GRANULARITIES = [
-    TimeGranularity.DAY,
-    TimeGranularity.WEEK,
-    TimeGranularity.MONTH,
-    TimeGranularity.QUARTER,
-    TimeGranularity.YEAR,
-]