some re-organizing of code for readability

Author: minhkhul

_delphi_utils_python/delphi_utils/validator/datafetcher.py

@@ -16,10 +16,6 @@
 FILENAME_REGEX = re.compile(
     r'^(?P<date>\d{8})_(?P<geo_type>\w+?)_(?P<signal>\w+)\.csv$')
 
-params = read_params()
-assert "validation" in params
-API_KEY = ("epidata", params["validation"]["common"]["api_credentials"])
-
 def make_date_filter(start_date, end_date):
     """
     Create a function to filter dates in the specified date range (inclusive).
@@ -113,9 +109,14 @@ def get_geo_signal_combos(data_source):
 
     Cross references based on combinations reported available by COVIDcast metadata.
     """
+
+    params = read_params()
+    assert "validation" in params
+    api_key = ("epidata", params["validation"]["common"]["api_credentials"])
+
     # Maps data_source name with what's in the API, lists used in case of multiple names
     meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta",
-                                 auth=API_KEY)
+                                 auth=api_key)
     meta_response.raise_for_status()
     source_signal_mappings = {i['source']:i['db_source'] for i in
         meta_response.json()}
@@ -143,7 +144,7 @@ def get_geo_signal_combos(data_source):
             elif geo_status == "unknown":
                 epidata_signal = requests.get(
                     "https://api.covidcast.cmu.edu/epidata/covidcast/meta",
-                    params={'signal': f"{src}:{sig}"}, auth=API_KEY)
+                    params={'signal': f"{src}:{sig}"}, auth=api_key)
                 epidata_signal.raise_for_status()
                 # Not an active signal
                 active_status = [val['active'] for i in epidata_signal.json()