changes in compliance with #205

Author: vishakha1812

cdc_covidnet/delphi_cdc_covidnet/constants.py

@@ -0,0 +1,5 @@
+"""
+CONTAINS SIGNAL REGISTRY
+"""
+COVIDNET = "covidnet"
+SIGNALS = [COVIDNET]

cdc_covidnet/delphi_cdc_covidnet/update_sensor.py

@@ -13,14 +13,11 @@
 import pandas as pd
 
 from delphi_utils import read_params
-from delphi_epidata import Epidata
-
+import covidcast
 from .api_config import APIConfig
 from .covidnet import CovidNet
 from .geo_maps import GeoMaps
-
-
-SIGNALS = ["covidnet"]
+from .constants import SIGNALS
 
 
 def write_to_csv(data: pd.DataFrame, out_name: str, output_path: str):
@@ -114,48 +111,46 @@ def add_prefix(signal_names, wip_signal, prefix: str):
     prefix : 'wip_'
         prefix for new/non public signals
     wip_signal : List[str] or bool
-        Either takes a list of wip signals: [], OR
-        incorporated all signals in the registry: True OR
-        no signals: False
+        a list of wip signals: [], OR
+        all signals in the registry: True OR
+        only signals that have never been published: False
     Returns
     -------
     List of signal names
         wip/non wip signals for further computation
     """
 
-    if wip_signal in ("", False):
-        return signal_names
-    elif wip_signal and isinstance(wip_signal, bool):
+    if wip_signal is True:
+        return [prefix + signal for signal in signal_names]
+    if isinstance(wip_signal, list):
+        make_wip = set(wip_signal)
+        return [
+            (prefix if signal in make_wip else "") + signal
+            for signal in signal_names
+        ]
+    if wip_signal in {False, ""}:
         return [
-            (prefix + signal) if public_signal(signal)
-            else signal
+            signal if public_signal(signal)
+            else prefix + signal
             for signal in signal_names
         ]
-    elif isinstance(wip_signal, list):
-        for signal in wip_signal:
-            if public_signal(signal):
-                signal_names.append(prefix + signal)
-                signal_names.remove(signal)
-        return signal_names
-    else:
-        raise ValueError("Supply True | False or '' or [] | list()")
+    raise ValueError("Supply True | False or '' or [] | list()")
 
 
 def public_signal(signal_):
-    """Checks if the signal name is already public using Epidata
+    """Checks if the signal name is already public using COVIDcast
     Parameters
     ----------
     signal_ : str
         Name of the signal
     Returns
     -------
     bool
-        True if the signal is not present
-        False if the signal is present
+        True if the signal is present
+        False if the signal is not present
     """
-    epidata_df = Epidata.covidcast_meta()
-    for index in range(len(epidata_df['epidata'])):
-        if 'signal' in epidata_df['epidata'][index]:
-            if epidata_df['epidata'][index]['signal'] == signal_:
-                return False
-    return True
+    epidata_df = covidcast.metadata()
+    for index in range(len(epidata_df)):
+        if epidata_df['signal'][index] == signal_:
+            return True
+    return False

cdc_covidnet/params.json.template

@@ -5,5 +5,5 @@
   "start_date": "2020-03-07",
   "end_date": "",
   "parallel": false,
-   "wip_signal": ""
+   "wip_signal": []
 }

cdc_covidnet/setup.py

@@ -8,7 +8,8 @@
     "pytest-cov",
     "pylint",
     "delphi-utils",
-    "requests"
+    "requests",
+    "covidcast"
 ]
 
 setup(

cdc_covidnet/tests/params.json.template

@@ -5,4 +5,5 @@
   "start_date": "2020-03-07",
   "end_date": "",
   "parallel": true
+  "wip_signal": []
 }