Update: add new field type to support mixed time types.

Author: jaydu1

delphi_epidata/_covidcast.py

@@ -70,7 +70,7 @@ def define_covidcast_fields() -> List[EpidataFieldInfo]:
         ),
         EpidataFieldInfo("geo_value", EpidataFieldType.text),
         EpidataFieldInfo("time_type", EpidataFieldType.categorical, categories=list(get_args(TimeType))),
-        EpidataFieldInfo("time_value", EpidataFieldType.date),
+        EpidataFieldInfo("time_value", EpidataFieldType.date_or_epiweek),
         EpidataFieldInfo("issue", EpidataFieldType.date),
         EpidataFieldInfo("lag", EpidataFieldType.int),
         EpidataFieldInfo("value", EpidataFieldType.float),

delphi_epidata/_endpoints.py

@@ -355,8 +355,8 @@ def covidcast_meta(self) -> CALL_TYPE:
                 EpidataFieldInfo("data_source", EpidataFieldType.text),
                 EpidataFieldInfo("signal", EpidataFieldType.text),
                 EpidataFieldInfo("time_type", EpidataFieldType.categorical, categories=["week", "day"]),
-                EpidataFieldInfo("min_time", EpidataFieldType.date),
-                EpidataFieldInfo("max_time", EpidataFieldType.date),
+                EpidataFieldInfo("min_time", EpidataFieldType.date_or_epiweek),
+                EpidataFieldInfo("max_time", EpidataFieldType.date_or_epiweek),
                 EpidataFieldInfo("num_locations", EpidataFieldType.int),
                 EpidataFieldInfo("min_value", EpidataFieldType.float),
                 EpidataFieldInfo("max_value", EpidataFieldType.float),

delphi_epidata/_model.py

@@ -21,7 +21,7 @@
 from epiweeks import Week
 from pandas import DataFrame, CategoricalDtype
 
-from ._parse import parse_api_date, parse_api_week, fields_to_predicate
+from ._parse import parse_api_date, parse_api_week, parse_api_date_or_week, fields_to_predicate
 
 EpiDateLike = Union[int, str, date, Week]
 EpiRangeDict = TypedDict("EpiRangeDict", {"from": EpiDateLike, "to": EpiDateLike})
@@ -124,6 +124,7 @@ class EpidataFieldType(Enum):
     epiweek = 4
     categorical = 5
     bool = 6
+    date_or_epiweek = 7
 
 
 @dataclass
@@ -235,6 +236,8 @@ def _parse_value(
         meta = self.meta_by_name.get(key)
         if not meta or value is None:
             return value
+        if meta.type == EpidataFieldType.date_or_epiweek and not disable_date_parsing:
+            return parse_api_date_or_week(value)
         if meta.type == EpidataFieldType.date and not disable_date_parsing:
             return parse_api_date(value)
         if meta.type == EpidataFieldType.epiweek and not disable_date_parsing:
@@ -270,7 +273,7 @@ def _as_df(
                 data_types[info.name] = CategoricalDtype(categories=info.categories or None, ordered=True)
             elif info.type == EpidataFieldType.int:
                 data_types[info.name] = int
-            elif info.type in (EpidataFieldType.date, EpidataFieldType.epiweek):
+            elif info.type in (EpidataFieldType.date, EpidataFieldType.epiweek, EpidataFieldType.date_or_epiweek):
                 data_types[info.name] = int if disable_date_parsing else "datetime64"
             elif info.type == EpidataFieldType.float:
                 data_types[info.name] = float

delphi_epidata/_parse.py

@@ -18,6 +18,16 @@ def parse_api_week(value: Union[str, int, float, None]) -> Optional[date]:
     return cast(date, Week.fromstring(str(value)).startdate())
 
 
+def parse_api_date_or_week(value: Union[str, int, float, None]) -> Optional[date]:
+    if value is None:
+        return None
+    v = str(value)
+    if len(v) == 6:
+        return cast(date, Week.fromstring(v).startdate())
+    if len(v) == 8:
+        return datetime.strptime(v, "%Y%m%d").date()
+
+
 def fields_to_predicate(fields: Optional[Iterable[str]] = None) -> Callable[[str], bool]:
     if not fields:
         return lambda _: True