lint and cleanup

Author: aysim319

google_symptoms/delphi_google_symptoms/date_utils.py

@@ -2,7 +2,7 @@
 
 from datetime import date, datetime, timedelta
 from itertools import product
-from typing import Dict, List, Tuple
+from typing import Dict, List, Union
 
 import covidcast
 from delphi_utils.validator.utils import lag_converter
@@ -11,7 +11,7 @@
 from .constants import COMBINED_METRIC, FULL_BKFILL_START_DATE, PAD_DAYS, SMOOTHERS
 
 
-def generate_patch_dates(params: Dict) -> Dict[date, Tuple[date]]:
+def generate_patch_dates(params: Dict) -> Dict[date, Dict[str, Union[date, int]]]:
     """
     Generate date range for chunking backfilled dates.
 
@@ -43,11 +43,13 @@ def generate_patch_dates(params: Dict) -> Dict[date, Tuple[date]]:
 
     return patch_dates
 
+
 def get_max_lag(params: Dict) -> int:
-    """Determine reporting lag for data source"""
+    """Determine reporting lag for data source."""
     max_expected_lag = lag_converter(params["validation"]["common"].get("max_expected_lag", {"all": 4}))
     return max(list(max_expected_lag.values()))
 
+
 def generate_num_export_days(params: Dict, logger) -> [int]:
     """
     Generate dates for exporting based on current available data.
@@ -128,4 +130,3 @@ def generate_query_dates(
     retrieve_dates = [start_date - timedelta(days=PAD_DAYS - 1), export_end_date]
 
     return retrieve_dates
-

google_symptoms/delphi_google_symptoms/run.py

@@ -60,7 +60,13 @@ def run_module(params, logger=None):
     )
 
     # Pull GS data
-    dfs = pull_gs_data(params["indicator"]["bigquery_credentials"], export_start_date, export_end_date, num_export_days, custom_run_flag)
+    dfs = pull_gs_data(
+        params["indicator"]["bigquery_credentials"],
+        export_start_date,
+        export_end_date,
+        num_export_days,
+        custom_run_flag,
+    )
     for geo_res in GEO_RESOLUTIONS:
         if geo_res == "state":
             df_pull = dfs["state"]

google_symptoms/tests/test_pull.py

@@ -8,15 +8,16 @@
 from delphi_google_symptoms.pull import (
     pull_gs_data, preprocess, format_dates_for_query, pull_gs_data_one_geolevel)
 from delphi_google_symptoms.constants import METRICS, COMBINED_METRIC
+from conftest import TEST_DIR
 
 good_input = {
-    "state": "test_data/small_states_daily.csv",
-    "county": "test_data/small_counties_daily.csv"
+    "state": f"{TEST_DIR}/test_data/small_states_daily.csv",
+    "county": f"{TEST_DIR}/test_data/small_counties_daily.csv"
 }
 
 bad_input = {
-    "missing_cols": "test_data/bad_state_missing_cols.csv",
-    "invalid_fips": "test_data/bad_county_invalid_fips.csv"
+    "missing_cols": f"{TEST_DIR}/test_data/bad_state_missing_cols.csv",
+    "invalid_fips": f"{TEST_DIR}/test_data/bad_county_invalid_fips.csv"
 }
 
 symptom_names = ["symptom_" +