Merge branch 'deploy-jhu' into main

Author: krivard

google_health/delphi_google_health/run.py

@@ -34,6 +34,11 @@ def run_module():
     cache_dir = params["cache_dir"]
     wip_signal = params["wip_signal"]
 
+    # if missing start_date, set to today (GMT) minus 5 days
+    if start_date == "":
+        now = datetime.datetime.now(datetime.timezone.utc)
+        start_date = (now - datetime.timedelta(days=4)).strftime("%Y-%m-%d")
+
     # if missing start_date, set to today (GMT) minus 5 days
     if start_date == "":
         now = datetime.datetime.now(datetime.timezone.utc)

jhu/delphi_jhu/run.py

@@ -47,6 +47,13 @@
     "incidence":            ("incidence_prop", False),
     "cumulative_prop":      ("cumulative_prop", False),
 }
+# Temporarily added for wip_ signals
+# WIP_SENSOR_NAME_MAP = {
+#     "new_counts":           ("incid_num", False),
+#     "cumulative_counts":    ("cumul_num", False),
+#     "incidence":            ("incid_prop", False),
+#     "cumulative_prop":      ("cumul_prop", False),
+# }
 SMOOTHERS_MAP = {
     "unsmoothed":           (identity, ''),
     "seven_day_average":    (seven_day_moving_average, '7dav_'),
@@ -92,8 +99,9 @@ def run_module():
         # Drop early entries where data insufficient for smoothing
         df = df.loc[~df["val"].isnull(), :]
         sensor_name = SENSOR_NAME_MAP[sensor][0]
-        if SENSOR_NAME_MAP[sensor][1]:
-            metric = f"wip_{metric}"
+        # if (SENSOR_NAME_MAP[sensor][1] or SMOOTHERS_MAP[smoother][2]):
+        #     metric = f"wip_{metric}"
+        #     sensor_name = WIP_SENSOR_NAME_MAP[sensor][0]
         sensor_name = SMOOTHERS_MAP[smoother][1] + sensor_name
         create_export_csv(
             df,