18
18
from .handle_wip_signal import add_prefix
19
19
20
20
21
- def check_not_none (data_frame , label , date_range ):
22
- """Exit gracefully if a data frame we attempted to retrieve is empty """
21
+ def check_none_data_frame (data_frame , label , date_range ):
22
+ """Log and return True when a data frame is None. """
23
23
if data_frame is None :
24
- print (f"{ label } not available in range { date_range } " )
25
- return False
26
- return True
24
+ print (f"{ label } completely unavailable in range { date_range } " )
25
+ return True
26
+ return False
27
27
28
28
def maybe_append (df1 , df2 ):
29
29
"""
@@ -50,9 +50,9 @@ def combine_usafacts_and_jhu(signal, geo, date_range, fetcher=covidcast.signal):
50
50
print ("Fetching jhu-csse..." )
51
51
jhu_df = fetcher ("jhu-csse" , signal , date_range [0 ], date_range [1 ], geo )
52
52
53
- if ( not check_not_none ( usafacts_df , "USA-FACTS" , date_range ) ) and \
53
+ if check_none_data_frame ( usafacts_df , "USA-FACTS" , date_range ) and \
54
54
(geo not in ('state' , 'county' ) or \
55
- ( not check_not_none ( jhu_df , "JHU" , date_range ) )):
55
+ check_none_data_frame ( jhu_df , "JHU" , date_range )):
56
56
return pd .DataFrame ({}, columns = COLUMN_MAPPING .values ())
57
57
58
58
# State level
@@ -161,8 +161,6 @@ def run_module():
161
161
params = configure (variants )
162
162
for metric , geo_res , sensor_name , signal in variants :
163
163
df = combine_usafacts_and_jhu (signal , geo_res , extend_raw_date_range (params , sensor_name )) # pylint: disable=invalid-name
164
-
165
- df = df .copy () # pylint: disable=invalid-name
166
164
df ["timestamp" ] = pd .to_datetime (df ["timestamp" ])
167
165
start_date = pd .to_datetime (params ['export_start_date' ])
168
166
export_dir = params ["export_dir" ]
0 commit comments