Release Delphi Epidata 0.1.1

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.0
+current_version = 0.1.1
 commit = False
 tag = False
 

integrations/acquisition/covidcast/test_covidcast_meta_caching.py

@@ -67,14 +67,26 @@ def test_caching(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'state', 20200422, 'pa',
           123, 1, 2, 3, 456, 1, 20200422, 0, 1, False, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),
         (0, 'src', 'sig', 'day', 'state', 20200422, 'wa',
           789, 1, 2, 3, 456, 1, 20200423, 1, 1, False, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
     ''')
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (100, 'src', 'wip_sig', 'day', 'state', 20200422, 'pa',
           456, 4, 5, 6, 789, -1, 20200422, 0, 1, True, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
     ''')

integrations/client/test_delphi_epidata.py

@@ -67,7 +67,13 @@ def test_covidcast(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
           123, 1.5, 2.5, 3.5, 456, 4, 20200414, 0, 0, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),
@@ -331,7 +337,13 @@ def test_geo_value(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '11111',
           123, 10, 11, 12, 456, 13, 20200414, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),
@@ -432,7 +444,13 @@ def test_covidcast_meta(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
           123, 1.5, 2.5, 3.5, 456, 4, 20200414, 0, 0, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),
@@ -562,7 +580,13 @@ def test_covidcast_nowcast(self):
   def test_async_epidata(self):
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '11111',
           123, 10, 11, 12, 456, 13, 20200414, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),

integrations/server/test_covid_hosp.py

@@ -28,24 +28,24 @@ def setUp(self):
         cur.execute('truncate table covid_hosp_state_timeseries')
         cur.execute('truncate table covid_hosp_meta')
 
+
+  def insert_issue(self, cur, issue, value, record_type):
+    so_many_nulls = ', '.join(['null'] * 57)
+    cur.execute(f'''insert into covid_hosp_state_timeseries values (
+      0, {issue}, 'PA', 20201118, {value}, {so_many_nulls}, '{record_type}'
+    )''')
+
   def test_query_by_issue(self):
     """Query with and without specifying an issue."""
 
-    # insert dummy data
-    def insert_issue(cur, issue, value, record_type):
-      so_many_nulls = ', '.join(['null'] * 57)
-      cur.execute(f'''insert into covid_hosp_state_timeseries values (
-        0, {issue}, 'PA', 20201118, {value}, {so_many_nulls}, '{record_type}'
-      )''')
-
     with Database.connect() as db:
       with db.new_cursor() as cur:
         # inserting out of order to test server-side order by
         # also inserting two for 20201201 to test tiebreaker.
-        insert_issue(cur, 20201201, 123, 'T')
-        insert_issue(cur, 20201201, 321, 'D')
-        insert_issue(cur, 20201203, 789, 'T')
-        insert_issue(cur, 20201202, 456, 'T')
+        self.insert_issue(cur, 20201201, 123, 'T')
+        self.insert_issue(cur, 20201201, 321, 'D')
+        self.insert_issue(cur, 20201203, 789, 'T')
+        self.insert_issue(cur, 20201202, 456, 'T')
 
     # request without issue (defaulting to latest issue)
     with self.subTest(name='no issue (latest)'):
@@ -81,3 +81,20 @@ def insert_issue(cur, issue, value, record_type):
       self.assertEqual(rows[1]['critical_staffing_shortage_today_yes'], 456)
       self.assertEqual(rows[2]['issue'], 20201203)
       self.assertEqual(rows[2]['critical_staffing_shortage_today_yes'], 789)
+
+
+  def test_query_by_as_of(self):
+    with Database.connect() as db:
+      with db.new_cursor() as cur:
+        self.insert_issue(cur, 20201101, 0, 'T')
+        self.insert_issue(cur, 20201102, 1, 'D')
+        self.insert_issue(cur, 20201103, 2, 'D')
+        self.insert_issue(cur, 20201103, 3, 'T')
+        self.insert_issue(cur, 20201104, 4, 'T')
+
+    with self.subTest(name='as_of with multiple issues'):
+      response = Epidata.covid_hosp('PA', 20201118, as_of=20201103)
+      self.assertEqual(response['result'], 1)
+      self.assertEqual(len(response['epidata']), 1)
+      self.assertEqual(response['epidata'][0]['issue'], 20201103)
+      self.assertEqual(response['epidata'][0]['critical_staffing_shortage_today_yes'], 2)

integrations/server/test_covidcast.py

@@ -45,7 +45,13 @@ def test_round_trip(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
           123, 1.5, 2.5, 3.5, 456, 4, 20200414, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
@@ -92,7 +98,13 @@ def test_round_trip(self):
 
   #   # insert dummy data
   #   self.cur.execute(f'''
-  #     insert into covidcast values
+  #    INSERT INTO
+  #      `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+  #      `time_value`, `geo_value`, `value_updated_timestamp`, 
+  #      `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+  #      `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+  #      `missing_stderr`,`missing_sample_size`) 
+  #    VALUES
   #       (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
   #         123, 1.5, 2.5, 3.5, 456, 4, 20200414, 0, 1, False,
   #         {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
@@ -129,7 +141,13 @@ def test_csv_format(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
           123, 1.5, 2.5, 3.5, 456, 4, 20200414, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
@@ -163,7 +181,13 @@ def test_raw_json_format(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
           123, 1.5, 2.5, 3.5, 456, 4, 20200414, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
@@ -205,7 +229,13 @@ def test_fields(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
           123, 1.5, 2.5, 3.5, 456, 4, 20200414, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
@@ -326,7 +356,13 @@ def test_location_wildcard(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '11111',
           123, 10, 11, 12, 456, 13, 20200414, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),
@@ -414,7 +450,13 @@ def test_geo_value(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '11111',
           123, 10, 11, 12, 456, 13, 20200414, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),
@@ -530,7 +572,13 @@ def test_location_timeline(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200411, '01234',
           123, 10, 11, 12, 456, 13, 20200413, 2, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),
@@ -618,7 +666,13 @@ def test_unique_key_constraint(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
           0, 0, 0, 0, 0, 0, 20200414, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
@@ -628,15 +682,27 @@ def test_unique_key_constraint(self):
     # fail to insert different dummy data under the same key
     with self.assertRaises(mysql.connector.errors.IntegrityError):
       self.cur.execute(f'''
-        insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
           (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
             1, 1, 1, 1, 1, 1, 20200414, 0, 1, False,
             {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
       ''')
 
     # succeed to insert different dummy data under a different issue
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
           1, 1, 1, 1, 1, 1, 20200415, 1, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING})
@@ -647,7 +713,13 @@ def test_nullable_columns(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'day', 'county', 20200414, '01234',
           123, 0.123, NULL, NULL, 456, NULL, 20200414, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.OTHER}, {Nans.OTHER})
@@ -693,7 +765,13 @@ def test_temporal_partitioning(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
         (0, 'src', 'sig', 'hour', 'state', 2020041714, 'vi',
           123, 10, 11, 12, 456, 13, 2020041714, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),
@@ -750,7 +828,13 @@ def test_date_formats(self):
 
     # insert dummy data
     self.cur.execute(f'''
-      insert into covidcast values
+      INSERT INTO
+        `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	      `time_value`, `geo_value`, `value_updated_timestamp`, 
+        `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+        `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+        `missing_stderr`,`missing_sample_size`) 
+      VALUES
       (0, 'src', 'sig', 'day', 'county', 20200411, '01234',
           123, 10, 11, 12, 456, 13, 20200413, 0, 1, False,
           {Nans.NOT_MISSING}, {Nans.NOT_MISSING}, {Nans.NOT_MISSING}),

integrations/server/test_covidcast_endpoints.py

@@ -127,7 +127,13 @@ def _insert_rows(self, rows: Iterable[CovidcastRow]):
         sql = ",\n".join((str(r) for r in rows))
         self.cur.execute(
             f"""
-            insert into covidcast values
+            INSERT INTO
+                `covidcast` (`id`, `source`, `signal`, `time_type`, `geo_type`, 
+	            `time_value`, `geo_value`, `value_updated_timestamp`, 
+                `value`, `stderr`, `sample_size`, `direction_updated_timestamp`, 
+                `direction`, `issue`, `lag`, `is_latest_issue`, `is_wip`,`missing_value`,
+                `missing_stderr`,`missing_sample_size`) 
+            VALUES
             {sql}
             """
         )