JIT: minor code clean

Author: dshemetov

src/server/_validate.py

@@ -189,3 +189,13 @@ def push_range(first: str, last: str):
         values.append(parse_date(part))
     # success, return the list
     return values
+
+def extract_bool(key: Union[str, Sequence[str]]) -> Optional[bool]:
+    s = _extract_value(key)
+    if not s:
+        return None
+    if s.lower() == "true":
+        return True
+    if s.lower() == "false":
+        return False
+    raise ValidationFailedException(f"{key}: not a boolean: {s}")

src/server/endpoints/covidcast.py

@@ -30,6 +30,7 @@
 from .._query import QueryBuilder, execute_query, run_query, parse_row, filter_fields
 from .._printer import create_printer, CSVPrinter
 from .._validate import (
+    extract_bool,
     extract_date,
     extract_dates,
     extract_integer,
@@ -122,14 +123,23 @@ def _handle_lag_issues_as_of(q: QueryBuilder, issues: Optional[List[Union[Tuple[
         pass
 
 
-# TODO: Write an actual smoother arg parser.
 def parse_transform_args():
     # The length of the window to smooth over.
-    smoother_window_length = request.values.get("smoother_window_length", 7)
+    smoother_window_length = extract_integer("smoother_window_length")
+    if smoother_window_length is None:
+        smoother_window_length = 7
+
+    # TODO: Add support for floats inputs here.
     # The value to fill for missing date values.
-    pad_fill_value = request.values.get("pad_fill_value", nan)
+    pad_fill_value = extract_integer("pad_fill_value")
+    if pad_fill_value is None:
+        pad_fill_value = nan
+
     # The value to fill for None or nan values.
-    nan_fill_value = request.values.get("nans_fill_value", nan)
+    nan_fill_value = extract_integer("nans_fill_value")
+    if nan_fill_value is None:
+        nan_fill_value = nan
+
     smoother_args = {
         "smoother_kernel": SmootherKernelValue.average,
         "smoother_window_length": smoother_window_length if isinstance(smoother_window_length, Number) and smoother_window_length <= MAX_SMOOTHER_WINDOW else MAX_SMOOTHER_WINDOW,
@@ -140,8 +150,11 @@ def parse_transform_args():
 
 
 def parse_jit_bypass():
-    jit_bypass = request.values.get("jit_bypass")
-    return bool(jit_bypass) if jit_bypass else False
+    jit_bypass = extract_bool("jit_bypass")
+    if jit_bypass is None:
+        return False
+    else:
+        return jit_bypass
 
 
 @bp.route("/", methods=("GET", "POST"))

src/server/endpoints/covidcast_utils/model.py

@@ -1,5 +1,4 @@
 from dataclasses import asdict, dataclass, field
-from datetime import timedelta
 from enum import Enum
 from functools import partial
 from itertools import groupby, repeat, tee
@@ -15,7 +14,7 @@
 from delphi_utils.nancodes import Nans
 from ..._params import SourceSignalPair, TimePair
 from .smooth_diff import generate_smoothed_rows, generate_diffed_rows
-from ...utils import date_to_time_value, shift_time_value, time_value_to_date, time_value_range
+from ...utils import shift_time_value, iterate_over_ints_and_ranges
 
 
 IDENTITY: Callable = lambda rows, **kwargs: rows
@@ -491,35 +490,6 @@ def pad_time_window(time_window: Tuple[int, int], pad_length: int) -> Tuple[int,
     return (shift_time_value(min_time, -1 * pad_length), max_time)
 
 
-def _iterate_over_ints_and_ranges(lst: Iterator[Union[int, Tuple[int, int]]], use_dates: bool = True) -> Iterator[int]:
-    """A generator that iterates over the unique values in a list of integers and ranges in ascending order.
-
-    The tuples are assumed to be left- and right-inclusive. If use_dates is True, then the integers are interpreted as
-    YYYYMMDD dates.
-
-    Examples:
-        iterate_over_ints_and_ranges([(5, 8), 0]) would iterate over [0, 5, 6, 7, 8].
-        iterate_over_ints_and_ranges([(5, 8), (4, 6), (3, 5)]) would iterate over [3, 4, 5, 6, 7, 8].
-        iterate_over_ints_and_ranges([(7, 8), (5, 7), (3, 8), 8]) would iterate over [3, 4, 5, 6, 7, 8].
-    """
-    lst = sorted((x, x) if isinstance(x, int) else x for x in lst)
-    if not lst:
-        return
-
-    if use_dates:
-        increment = lambda x, y: date_to_time_value(time_value_to_date(x) + timedelta(days=y))
-        range_handler = time_value_range
-    else:
-        increment = lambda x, y: x + y
-        range_handler = range
-
-    biggest_seen = increment(lst[0][0], -1)
-    for a, b in lst:
-        for y in range_handler(max(a, increment(biggest_seen, 1)), increment(b, 1)):
-            yield y
-        biggest_seen = max(biggest_seen, b)
-
-
 def get_day_range(time_pairs: List[TimePair]) -> Iterator[int]:
     """Iterate over a list of TimePair time_values, including the values contained in the ranges.
 
@@ -540,7 +510,7 @@ def get_day_range(time_pairs: List[TimePair]) -> Iterator[int]:
         else:
             raise ValueError("get_day_range only supports int or list time_values.")
 
-    return _iterate_over_ints_and_ranges(time_values_flattened)
+    return iterate_over_ints_and_ranges(time_values_flattened)
 
 
 def _generate_transformed_rows(

src/server/utils/__init__.py

@@ -1 +1,17 @@
-from .dates import shift_time_value, date_to_time_value, time_value_to_iso, time_value_to_date, days_in_range, weeks_in_range, shift_week_value, week_to_time_value, week_value_to_week, guess_time_value_is_day, time_values_to_ranges, days_to_ranges, weeks_to_ranges, time_value_range
+from .dates import (
+    shift_time_value,
+    date_to_time_value,
+    time_value_to_iso,
+    time_value_to_date,
+    days_in_range,
+    weeks_in_range,
+    shift_week_value,
+    week_to_time_value,
+    week_value_to_week,
+    guess_time_value_is_day,
+    time_values_to_ranges,
+    days_to_ranges,
+    weeks_to_ranges,
+    iterate_over_range,
+    iterate_over_ints_and_ranges,
+)

src/server/utils/dates.py

@@ -140,7 +140,7 @@ def _to_ranges(values: Sequence[Union[Tuple[int, int], int]], value_to_date: Cal
         logging.info('bad input to date ranges', input=values, exception=e)
         return values
 
-def time_value_range(start: int, end: int) -> Iterator[int]:
+def iterate_over_range(start: int, end: int) -> Iterator[int]:
     """Iterate over ints corresponding to dates in a time range.
     
     Left inclusive, right exclusive to mimic behavior of Python's built-in range.
@@ -152,3 +152,31 @@ def time_value_range(start: int, end: int) -> Iterator[int]:
     while current_date < final_date:
         yield date_to_time_value(current_date)
         current_date = current_date + timedelta(days=1)
+
+def iterate_over_ints_and_ranges(lst: Iterator[Union[int, Tuple[int, int]]], use_dates: bool = True) -> Iterator[int]:
+    """A generator that iterates over the unique values in a list of integers and ranges in ascending order.
+
+    The tuples are assumed to be left- and right-inclusive. If use_dates is True, then the integers are interpreted as
+    YYYYMMDD dates.
+
+    Examples:
+        iterate_over_ints_and_ranges([(5, 8), 0]) would iterate over [0, 5, 6, 7, 8].
+        iterate_over_ints_and_ranges([(5, 8), (4, 6), (3, 5)]) would iterate over [3, 4, 5, 6, 7, 8].
+        iterate_over_ints_and_ranges([(7, 8), (5, 7), (3, 8), 8]) would iterate over [3, 4, 5, 6, 7, 8].
+    """
+    lst = sorted((x, x) if isinstance(x, int) else x for x in lst)
+    if not lst:
+        return
+
+    if use_dates:
+        increment = lambda x, y: date_to_time_value(time_value_to_date(x) + timedelta(days=y))
+        range_handler = iterate_over_range
+    else:
+        increment = lambda x, y: x + y
+        range_handler = range
+
+    biggest_seen = increment(lst[0][0], -1)
+    for a, b in lst:
+        for y in range_handler(max(a, increment(biggest_seen, 1)), increment(b, 1)):
+            yield y
+        biggest_seen = max(biggest_seen, b)

tests/server/utils/test_dates.py

@@ -2,7 +2,7 @@
 from datetime import date
 from epiweeks import Week
 
-from delphi.epidata.server.utils.dates import time_value_to_date, date_to_time_value, shift_time_value, time_value_to_iso, days_in_range, weeks_in_range, week_to_time_value, week_value_to_week, time_values_to_ranges, time_value_range
+from delphi.epidata.server.utils.dates import time_value_to_date, date_to_time_value, shift_time_value, time_value_to_iso, days_in_range, weeks_in_range, week_to_time_value, week_value_to_week, time_values_to_ranges, iterate_over_range
 
 
 class UnitTests(unittest.TestCase):
@@ -60,7 +60,7 @@ def test_time_values_to_ranges(self):
         # individual weeks become a range (2020 is a rare year with 53 weeks)
         self.assertEqual(time_values_to_ranges([202051, 202052, 202053, 202101, 202102]), [(202051, 202102)])
 
-    def test_time_value_range(self):
-        self.assertEqual(list(time_value_range(20210801, 20210805)), [20210801, 20210802, 20210803, 20210804])
-        self.assertEqual(list(time_value_range(20210801, 20210801)), [])
-        self.assertEqual(list(time_value_range(20210801, 20210701)), [])
+    def test_iterate_over_range(self):
+        self.assertEqual(list(iterate_over_range(20210801, 20210805)), [20210801, 20210802, 20210803, 20210804])
+        self.assertEqual(list(iterate_over_range(20210801, 20210801)), [])
+        self.assertEqual(list(iterate_over_range(20210801, 20210701)), [])