Skip to content

Commit d9e1f74

Browse files
committed
remove source data from local after patch run
1 parent 14b4e6f commit d9e1f74

File tree

4 files changed

+24
-13
lines changed

4 files changed

+24
-13
lines changed

nssp/delphi_nssp/patch.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
import sys
4343
from datetime import datetime, timedelta
44-
from os import listdir, makedirs, path, getcwd
44+
from os import listdir, makedirs, path
4545
from shutil import rmtree
4646

4747
from delphi_utils import get_structured_logger, read_params
@@ -105,7 +105,7 @@ def patch():
105105

106106
source_dir = params["patch"]["source_dir"]
107107
download_source = False
108-
if not path.isdir(source_dir) or not listdir(source_dir): #no source dir or empty source dir
108+
if not path.isdir(source_dir) or not listdir(source_dir): # no source dir or empty source dir
109109
download_source = True
110110
get_source_data(params, logger)
111111
else:
@@ -145,8 +145,8 @@ def patch():
145145
run_module(params, logger)
146146
current_issue += timedelta(days=1)
147147

148-
# if download_source:
149-
# rmtree(source_dir)
148+
if download_source:
149+
rmtree(source_dir)
150150

151151

152152
if __name__ == "__main__":

nssp/delphi_nssp/pull.py

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# -*- coding: utf-8 -*-
22
"""Functions for pulling NSSP ER data."""
33

4-
import logging
54
import functools
5+
import logging
66
import sys
77
import textwrap
8-
from typing import Optional
98
from os import makedirs, path
9+
from typing import Optional
1010

1111
import pandas as pd
1212
import paramiko
@@ -136,7 +136,13 @@ def pull_with_socrata_api(socrata_token: str, dataset_id: str):
136136
return results
137137

138138

139-
def pull_nssp_data(socrata_token: str, backup_dir: str, custom_run: bool, issue_date: Optional[str] = None, logger: Optional[logging.Logger] = None):
139+
def pull_nssp_data(
140+
socrata_token: str,
141+
backup_dir: str,
142+
custom_run: bool,
143+
issue_date: Optional[str] = None,
144+
logger: Optional[logging.Logger] = None,
145+
):
140146
"""Pull the NSSP ER visits primary dataset.
141147
142148
https://data.cdc.gov/Public-Health-Surveillance/NSSP-Emergency-Department-Visit-Trajectories-by-St/rdmq-nq56/data_preview
@@ -166,7 +172,7 @@ def pull_nssp_data(socrata_token: str, backup_dir: str, custom_run: bool, issue_
166172
num_records=len(df_ervisits),
167173
source=source_filename,
168174
)
169-
175+
170176
df_ervisits = df_ervisits.rename(columns={"week_end": "timestamp"})
171177
df_ervisits = df_ervisits.rename(columns=SIGNALS_MAP)
172178

@@ -183,7 +189,11 @@ def pull_nssp_data(socrata_token: str, backup_dir: str, custom_run: bool, issue_
183189

184190

185191
def secondary_pull_nssp_data(
186-
socrata_token: str, backup_dir: str, custom_run: bool, issue_date: Optional[str] = None, logger: Optional[logging.Logger] = None
192+
socrata_token: str,
193+
backup_dir: str,
194+
custom_run: bool,
195+
issue_date: Optional[str] = None,
196+
logger: Optional[logging.Logger] = None,
187197
):
188198
"""Pull the latest NSSP ER visits secondary dataset.
189199
@@ -207,9 +217,7 @@ def secondary_pull_nssp_data(
207217
socrata_results = pull_with_socrata_api(socrata_token, "7mra-9cq9")
208218
df_ervisits = pd.DataFrame.from_records(socrata_results)
209219
create_backup_csv(df_ervisits, backup_dir, custom_run, sensor="secondary", logger=logger)
210-
logger.info("Number of records grabbed",
211-
num_records=len(df_ervisits),
212-
source="secondary Socrata API")
220+
logger.info("Number of records grabbed", num_records=len(df_ervisits), source="secondary Socrata API")
213221

214222
elif custom_run and logger.name == "delphi_nssp.patch":
215223
if issue_date is None:

nssp/delphi_nssp/run.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,9 @@ def run_module(params, logger=None):
152152
run_stats.append((max(dates), len(dates)))
153153

154154
logger.info("Generating secondary signals")
155-
secondary_df_pull = secondary_pull_nssp_data(socrata_token, backup_dir, custom_run=custom_run, issue_date=issue_date, logger=logger)
155+
secondary_df_pull = secondary_pull_nssp_data(
156+
socrata_token, backup_dir, custom_run=custom_run, issue_date=issue_date, logger=logger
157+
)
156158
for signal in SECONDARY_SIGNALS:
157159
secondary_df_pull_signal = secondary_df_pull[secondary_df_pull["signal"] == signal]
158160
if secondary_df_pull_signal.empty:

nssp/setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"freezegun",
1515
"us",
1616
"paramiko",
17+
"darker",
1718
]
1819

1920
setup(

0 commit comments

Comments
 (0)