Nans: modify a few tests

Author: dshemetov

integrations/acquisition/covidcast/test_csv_uploading.py

@@ -79,15 +79,17 @@ def test_uploading(self):
       f.write('tx,NA,0.2,20\n')
       f.write('wa,3,0.3,30\n')
 
-    # invalid, missing with an inf value and missing cols
+    # invalid, missing with an inf value
     with open(source_receiving_dir + '/20200419_state_test_missing1.csv', 'w') as f:
       f.write('geo_id,val,se,sample_size,missing_val,missing_se,missing_sample_size\n')
       f.write(f'fl,inf,0.3,30,{Nans.UNKNOWN},{Nans.NOT_MISSING},{Nans.NOT_MISSING}\n')
 
+    # invalid, missing with an incorrect missing code
     with open(source_receiving_dir + '/20200419_state_test_missing2.csv', 'w') as f:
       f.write('geo_id,val,se,sample_size,missing_val,missing_se,missing_sample_size\n')
       f.write(f'tx,NA,0.2,20,{Nans.NOT_MISSING},{Nans.NOT_MISSING},{Nans.NOT_MISSING}\n')
 
+    # invalid, no missing with an incorrect missing code
     with open(source_receiving_dir + '/20200419_state_test_missing3.csv', 'w') as f:
       f.write('geo_id,val,se,sample_size,missing_val,missing_se,missing_sample_size\n')
       f.write(f'wa,3,0.3,30,{Nans.UNKNOWN},{Nans.NOT_MISSING},{Nans.NOT_MISSING}\n')

integrations/server/test_covidcast_endpoints.py

@@ -12,7 +12,7 @@
 import mysql.connector
 import requests
 import pandas as pd
-
+from delphi_utils import Nans
 
 # use the local instance of the Epidata API
 BASE_URL = "http://delphi_web_epidata/epidata/covidcast"
@@ -37,9 +37,9 @@ class CovidcastRow:
     lag: int = 0
     is_latest_issue: bool = True
     is_wip: bool = False
-    # missing_value: Optional[int] = None
-    # missing_std: Optional[int] = None
-    # missing_sample_size: Optional[int] = None
+    missing_value: int = Nans.NOT_MISSING
+    missing_stderr: int = Nans.NOT_MISSING
+    missing_sample_size: int = Nans.NOT_MISSING
 
     def __str__(self):
         return f"""(
@@ -59,7 +59,10 @@ def __str__(self):
             {self.issue},
             {self.lag},
             {self.is_latest_issue},
-            {self.is_wip}
+            {self.is_wip},
+            {self.missing_value},
+            {self.missing_stderr},
+            {self.missing_sample_size}
             )"""
 
     @staticmethod
@@ -76,6 +79,9 @@ def from_json(json: Dict[str, Any]) -> "CovidcastRow":
             value=json["value"],
             stderr=json["stderr"],
             sample_size=json["sample_size"],
+            missing_value=json["missing_value"],
+            missing_stderr=json["missing_stderr"],
+            missing_sample_size=json["missing_sample_size"]
         )
 
     @property
@@ -138,6 +144,7 @@ def test_basic(self):
 
         rows = [CovidcastRow(time_value=20200401 + i, value=i) for i in range(10)]
         first = rows[0]
+        breakpoint()
         self._insert_rows(rows)
 
         with self.subTest("validation"):
@@ -156,6 +163,7 @@ def test_trend(self):
         first = rows[0]
         last = rows[-1]
         ref = rows[num_rows // 2]
+        breakpoint()
         self._insert_rows(rows)
 
         out = self._fetch("/trend", signal=first.signal_pair, geo=first.geo_pair, date=last.time_value, window="20200401-20201212", basis=ref.time_value)