Skip to content

Propagate fix for #242 to main #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Sep 3, 2020
Merged

Propagate fix for #242 to main #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b566d4c
try until pull the new data successfully
Aug 24, 2020
8db2799
used tenacity
Aug 26, 2020
40091b7
Minor changes
vishakha1812 Aug 26, 2020
db54eb8
removed wildcard import error
vishakha1812 Aug 27, 2020
2a9a68f
update params.json.template
vishakha1812 Aug 27, 2020
319f038
Add wip_signal key in ansible
vishakha1812 Aug 27, 2020
17fb5ae
Add missing receiving directory
vishakha1812 Aug 27, 2020
8a40c1c
Merge pull request #239 from cmu-delphi/main
krivard Aug 27, 2020
dd4085b
Merge branch 'deploy-google_health' into fix_ght_pulling
vishakha1812 Aug 27, 2020
65490cc
Add requirement tenacity
Aug 28, 2020
d4b6f69
fixed invalid character
Aug 28, 2020
3553e00
Merge pull request #247 from cmu-delphi/fix_ght_pulling
krivard Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions google_health/delphi_google_health/pull_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import pandas as pd
import googleapiclient
import googleapiclient.discovery
from tenacity import retry, wait_fixed, stop_after_attempt

DISCOVERY_URL = "https://www.googleapis.com/discovery/v1/apis/trends/v1beta/rest"
TERMS_IDS = "anosmia_ms"
Expand Down Expand Up @@ -80,7 +81,7 @@ def query(self, start_date: str, end_date: str, geo_id, dma=False) -> dict:

return data


@retry(wait=wait_fixed(60), stop = stop_after_attempt(5))
def get_counts_states(
ght: GoogleHealthTrends,
start_date: str,
Expand Down Expand Up @@ -127,7 +128,7 @@ def get_counts_states(

return state_df


@retry(wait=wait_fixed(60), stop = stop_after_attempt(5))
def get_counts_dma(
ght: GoogleHealthTrends,
start_date: str,
Expand Down Expand Up @@ -211,23 +212,22 @@ def _get_counts_geoid(
output_dates = set(pd.date_range(start_date, end_date).to_native_types())
cache_dates = set(dt["timestamp"].values)
req_dates = list(output_dates - cache_dates)

try:
if req_dates:
sdate = min(req_dates)
edate = max(req_dates)
new_data = _api_data_to_df(
ght.query(start_date=sdate, end_date=edate, geo_id=geo_id, dma=dma),
geo_id=geo_id,
)
ght.query(start_date=sdate, end_date=edate, geo_id=geo_id, dma=dma),
geo_id=geo_id,
)
new_data = new_data[new_data["timestamp"].isin(req_dates)]
dt = dt.append(new_data).sort_values("timestamp")
dt = dt.drop_duplicates(subset="timestamp")
_write_cached_file(dt, geo_id, data_dir)
dt = _load_cached_file(geo_id, data_dir)
except googleapiclient.errors.HttpError:
#  This is thrown in there is no data yet for the given days. Need to
#  investigate this further.
# This is thrown in there is no data yet for the given days. Need to
# investigate this further.
pass

dt = dt[dt["timestamp"].isin(output_dates)]
Expand Down
2 changes: 1 addition & 1 deletion google_health/delphi_google_health/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def run_module():
print(f"Failed to archive '{exported_file}'")


def add_prefix(signal_names, wip_signal, prefix="wip_"):
def add_prefix(signal_names, wip_signal, prefix):
"""Adds prefix to signal if there is a WIP signal
Parameters
----------
Expand Down
3 changes: 2 additions & 1 deletion google_health/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
"delphi-utils",
"covidcast",
"boto3",
"moto"
"moto",
"tenacity"
]

setup(
Expand Down