dmitry review

Author: rzats

src/server/_params.py

@@ -215,7 +215,7 @@ def parse_time_arg(key: str = "time") -> Optional[TimePair]:
         return time_pairs[0]
 
     # make sure 'day' and 'week' aren't mixed
-    time_types = set([time_pair.time_type for time_pair in time_pairs])
+    time_types = set(time_pair.time_type for time_pair in time_pairs)
     if len(time_types) >= 2:
         raise ValidationFailedException(f'{key}: {time_pairs} mixes "day" and "week" time types')
 

src/server/_query.py

@@ -171,7 +171,7 @@ def filter_pair(pair: SourceSignalPair, i) -> str:
     return f"({' OR '.join(parts)})"
 
 
-def filter_time_pairs(
+def filter_time_pair(
     type_field: str,
     time_field: str,
     pair: Optional[TimePair],
@@ -449,7 +449,7 @@ def where_source_signal_pairs(
         )
         return self
 
-    def where_time_pairs(
+    def where_time_pair(
         self,
         type_field: str,
         value_field: str,
@@ -459,7 +459,7 @@ def where_time_pairs(
         fq_type_field = self._fq_field(type_field)
         fq_value_field = self._fq_field(value_field)
         self.conditions.append(
-            filter_time_pairs(
+            filter_time_pair(
                 fq_type_field,
                 fq_value_field,
                 values,

src/server/endpoints/covidcast.py

@@ -143,7 +143,7 @@ def handle():
 
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
     q.where_geo_pairs("geo_type", "geo_value", geo_pairs)
-    q.where_time_pairs("time_type", "time_value", time_pair)
+    q.where_time_pair("time_type", "time_value", time_pair)
 
     _handle_lag_issues_as_of(q, issues, lag, as_of)
 
@@ -197,7 +197,7 @@ def handle_trend():
 
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
     q.where_geo_pairs("geo_type", "geo_value", geo_pairs)
-    q.where_time_pairs("time_type", "time_value", time_window)
+    q.where_time_pair("time_type", "time_value", time_window)
 
     # fetch most recent issue fast
     _handle_lag_issues_as_of(q, None, None, None)
@@ -248,7 +248,7 @@ def handle_trendseries():
 
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
     q.where_geo_pairs("geo_type", "geo_value", geo_pairs)
-    q.where_time_pairs("time_type", "time_value", time_window)
+    q.where_time_pair("time_type", "time_value", time_window)
 
     # fetch most recent issue fast
     _handle_lag_issues_as_of(q, None, None, None)
@@ -309,7 +309,7 @@ def handle_correlation():
         source_signal_pairs,
     )
     q.where_geo_pairs("geo_type", "geo_value", geo_pairs)
-    q.where_time_pairs("time_type", "time_value", time_window)
+    q.where_time_pair("time_type", "time_value", time_window)
 
     df = as_pandas(str(q), q.params)
     if is_day:
@@ -381,7 +381,7 @@ def handle_export():
     q.set_fields(["geo_value", "signal", "time_value", "issue", "lag", "value", "stderr", "sample_size", "geo_type", "source"], [], [])
     q.set_order("time_value", "geo_value")
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
-    q.where_time_pairs("time_type", "time_value", TimePair("day" if is_day else "week", [(start_day, end_day)]))
+    q.where_time_pair("time_type", "time_value", TimePair("day" if is_day else "week", [(start_day, end_day)]))
     q.where_geo_pairs("geo_type", "geo_value", [GeoPair(geo_type, True if geo_values == "*" else geo_values)])
 
     _handle_lag_issues_as_of(q, None, None, as_of)
@@ -462,7 +462,7 @@ def handle_backfill():
 
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
     q.where_geo_pairs("geo_type", "geo_value", [geo_pair])
-    q.where_time_pairs("time_type", "time_value", time_pair)
+    q.where_time_pair("time_type", "time_value", time_pair)
 
     # no restriction of issues or dates since we want all issues
     # _handle_lag_issues_as_of(q, issues, lag, as_of)
@@ -638,7 +638,7 @@ def handle_coverage():
     else:
         q.where(geo_type=geo_type)
     q.where_source_signal_pairs("source", "signal", source_signal_pairs)
-    q.where_time_pairs("time_type", "time_value", time_window)
+    q.where_time_pair("time_type", "time_value", time_window)
     q.group_by = "c.source, c.signal, c.time_value"
     q.set_order("source", "signal", "time_value")
 

tests/server/test_params.py

@@ -311,11 +311,11 @@ def test_parse_time_arg(self):
             with app.test_request_context("/?time=week:20121010"):
                 self.assertRaises(ValidationFailedException, parse_time_arg)
             with app.test_request_context("/?time=day:*;week:*"):
-                self.assertRaises(ValidationFailedException, parse_time_arg)
+                self.assertRaisesRegex(ValidationFailedException, "mixes \"day\" and \"week\" time types", parse_time_arg)
             with app.test_request_context("/?time=day:20201201;week:202012"):
-                self.assertRaises(ValidationFailedException, parse_time_arg)
+                self.assertRaisesRegex(ValidationFailedException, "mixes \"day\" and \"week\" time types", parse_time_arg)
             with app.test_request_context("/?time=day:*;day:20202012;week:202101-202104"):
-                self.assertRaises(ValidationFailedException, parse_time_arg)
+                self.assertRaisesRegex(ValidationFailedException, "mixes \"day\" and \"week\" time types", parse_time_arg)
 
     def test_parse_day_range_arg(self):
         with self.subTest("empty"):

tests/server/test_query.py

@@ -14,7 +14,7 @@
     filter_dates,
     filter_geo_pairs,
     filter_source_signal_pairs,
-    filter_time_pairs,
+    filter_time_pair,
 )
 from delphi.epidata.server._params import (
     GeoPair,
@@ -245,57 +245,57 @@ def test_filter_source_signal_pairs(self):
                 {"p_0t": "src1", "p_0t_0": "sig2", "p_1t": "src2", "p_1t_0": "srcx"},
             )
 
-    def test_filter_time_pairs(self):
+    def test_filter_time_pair(self):
         with self.subTest("empty"):
             params = {}
-            self.assertEqual(filter_time_pairs("t", "v", None, "p", params), "FALSE")
+            self.assertEqual(filter_time_pair("t", "v", None, "p", params), "FALSE")
             self.assertEqual(params, {})
         with self.subTest("*"):
             params = {}
             self.assertEqual(
-                filter_time_pairs("t", "v", TimePair("day", True), "p", params),
+                filter_time_pair("t", "v", TimePair("day", True), "p", params),
                 "(t = :p_0t)",
             )
             self.assertEqual(params, {"p_0t": "day"})
         with self.subTest("single"):
             params = {}
             self.assertEqual(
-                filter_time_pairs("t", "v", TimePair("day", [20201201]), "p", params),
+                filter_time_pair("t", "v", TimePair("day", [20201201]), "p", params),
                 "((t = :p_0t AND (v = :p_0t_0)))",
             )
             self.assertEqual(params, {"p_0t": "day", "p_0t_0": 20201201})
         with self.subTest("multi"):
             params = {}
             self.assertEqual(
-                filter_time_pairs("t", "v", TimePair("day", [20201201, 20201203]), "p", params),
+                filter_time_pair("t", "v", TimePair("day", [20201201, 20201203]), "p", params),
                 "((t = :p_0t AND (v = :p_0t_0 OR v = :p_0t_1)))",
             )
             self.assertEqual(params, {"p_0t": "day", "p_0t_0": 20201201, "p_0t_1": 20201203})
         with self.subTest("range"):
             params = {}
             self.assertEqual(
-                filter_time_pairs("t", "v", TimePair("day", [(20201201, 20201203)]), "p", params),
+                filter_time_pair("t", "v", TimePair("day", [(20201201, 20201203)]), "p", params),
                 "((t = :p_0t AND (v BETWEEN :p_0t_0 AND :p_0t_0_2)))",
             )
             self.assertEqual(params, {"p_0t": "day", "p_0t_0": 20201201, "p_0t_0_2": 20201203})
         with self.subTest("dedupe"):
             params = {}
             self.assertEqual(
-                filter_time_pairs("t", "v", TimePair("day", [20200101, 20200101, (20200101, 20200101), 20200101]), "p", params),
+                filter_time_pair("t", "v", TimePair("day", [20200101, 20200101, (20200101, 20200101), 20200101]), "p", params),
                 "((t = :p_0t AND (v = :p_0t_0)))",
             )
             self.assertEqual(params, {"p_0t": "day", "p_0t_0": 20200101})
         with self.subTest("merge single range"):
             params = {}
             self.assertEqual(
-                filter_time_pairs("t", "v", TimePair("day", [20200101, 20200102, (20200101, 20200104)]), "p", params),
+                filter_time_pair("t", "v", TimePair("day", [20200101, 20200102, (20200101, 20200104)]), "p", params),
                 "((t = :p_0t AND (v BETWEEN :p_0t_0 AND :p_0t_0_2)))",
             )
             self.assertEqual(params, {"p_0t": "day", "p_0t_0": 20200101, "p_0t_0_2": 20200104})
         with self.subTest("merge ranges and singles"):
             params = {}
             self.assertEqual(
-                filter_time_pairs("t", "v", TimePair("day", [20200101, 20200103, (20200105, 20200107)]), "p", params),
+                filter_time_pair("t", "v", TimePair("day", [20200101, 20200103, (20200105, 20200107)]), "p", params),
                 "((t = :p_0t AND (v = :p_0t_0 OR v = :p_0t_1 OR v BETWEEN :p_0t_2 AND :p_0t_2_2)))",
             )
             self.assertEqual(params, {"p_0t": "day", "p_0t_0": 20200101, "p_0t_1": 20200103, 'p_0t_2': 20200105, 'p_0t_2_2': 20200107})