refactor: from superset.utils.core break down date_parser (#12408)

apache · Jan 13, 2021 · 35c15b8 · 35c15b8
1 parent 90915db
commit 35c15b8
Show file tree

Hide file tree

Showing 11 changed files with 753 additions and 704 deletions.
diff --git a/superset/common/query_object.py b/superset/common/query_object.py
@@ -28,12 +28,8 @@
 from superset.exceptions import QueryObjectValidationError
 from superset.typing import Metric
 from superset.utils import pandas_postprocessing
-from superset.utils.core import (
-    DTTM_ALIAS,
-    get_since_until,
-    json_int_dttm_ser,
-    parse_human_timedelta,
-)
+from superset.utils.core import DTTM_ALIAS, json_int_dttm_ser
+from superset.utils.date_parser import get_since_until, parse_human_timedelta
 from superset.views.utils import get_time_range_endpoints
 
 config = app.config

diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
@@ -57,6 +57,7 @@
 from superset.models.helpers import AuditMixinNullable, ImportExportMixin, QueryResult
 from superset.typing import FilterValues, Granularity, Metric, QueryObjectDict
 from superset.utils import core as utils
+from superset.utils.date_parser import parse_human_datetime, parse_human_timedelta
 
 try:
     import requests
@@ -777,7 +778,7 @@ def granularity(
             granularity["timeZone"] = timezone
 
         if origin:
-            dttm = utils.parse_human_datetime(origin)
+            dttm = parse_human_datetime(origin)
             assert dttm
             granularity["origin"] = dttm.isoformat()
 
@@ -795,7 +796,7 @@ def granularity(
         else:
             granularity["type"] = "duration"
             granularity["duration"] = (
-                utils.parse_human_timedelta(period_name).total_seconds()  # type: ignore
+                parse_human_timedelta(period_name).total_seconds()  # type: ignore
                 * 1000
             )
         return granularity
@@ -938,7 +939,7 @@ def values_for_column(self, column_name: str, limit: int = 10000) -> List[Any]:
         )
         # TODO: Use Lexicographic TopNMetricSpec once supported by PyDruid
         if self.fetch_values_from:
-            from_dttm = utils.parse_human_datetime(self.fetch_values_from)
+            from_dttm = parse_human_datetime(self.fetch_values_from)
             assert from_dttm
         else:
             from_dttm = datetime(1970, 1, 1)
@@ -1426,7 +1427,7 @@ def query(self, query_obj: QueryObjectDict) -> QueryResult:
         time_offset = DruidDatasource.time_offset(query_obj["granularity"])
 
         def increment_timestamp(ts: str) -> datetime:
-            dt = utils.parse_human_datetime(ts).replace(tzinfo=DRUID_TZ)
+            dt = parse_human_datetime(ts).replace(tzinfo=DRUID_TZ)
             return dt + timedelta(milliseconds=time_offset)
 
         if DTTM_ALIAS in df.columns and time_offset:

diff --git a/superset/migrations/versions/3dda56f1c4c6_migrate_num_period_compare_and_period_.py b/superset/migrations/versions/3dda56f1c4c6_migrate_num_period_compare_and_period_.py
@@ -33,7 +33,7 @@
 from sqlalchemy.ext.declarative import declarative_base
 
 from superset import db
-from superset.utils.core import parse_human_timedelta
+from superset.utils.date_parser import parse_human_timedelta
 
 revision = "3dda56f1c4c6"
 down_revision = "bddc498dd179"

diff --git a/superset/tasks/cache.py b/superset/tasks/cache.py
@@ -31,7 +31,7 @@
 from superset.models.dashboard import Dashboard
 from superset.models.slice import Slice
 from superset.models.tags import Tag, TaggedObject
-from superset.utils.core import parse_human_datetime
+from superset.utils.date_parser import parse_human_datetime
 from superset.views.utils import build_extra_filters
 
 logger = get_task_logger(__name__)