Expand use of IntRange

Author: rzats

src/server/_query.py

@@ -20,7 +20,7 @@
 from ._exceptions import DatabaseErrorException
 from ._validate import extract_strings
 from ._params import GeoPair, SourceSignalPair, TimePair
-from .utils import time_values_to_ranges, TimeValues
+from .utils import time_values_to_ranges, IntRange, TimeValues
 
 
 def date_string(value: int) -> str:
@@ -75,7 +75,7 @@ def filter_strings(
 
 def filter_integers(
     field: str,
-    values: Optional[Sequence[Union[Tuple[int, int], int]]],
+    values: Optional[Sequence[IntRange]],
     param_key: str,
     params: Dict[str, Any],
 ):
@@ -399,7 +399,7 @@ def _fq_field(self, field: str) -> str:
     def where_integers(
         self,
         field: str,
-        values: Optional[Sequence[Union[Tuple[int, int], int]]],
+        values: Optional[Sequence[IntRange]],
         param_key: Optional[str] = None,
     ) -> "QueryBuilder":
         fq_field = self._fq_field(field)

src/server/_validate.py

@@ -3,7 +3,7 @@
 from flask import request
 
 from ._exceptions import UnAuthenticatedException, ValidationFailedException
-from .utils import TimeValues
+from .utils import IntRange, TimeValues
 
 
 def resolve_auth_token() -> Optional[str]:
@@ -84,9 +84,6 @@ def extract_strings(key: Union[str, Sequence[str]]) -> Optional[List[str]]:
     return [v for vs in s for v in vs.split(",")]
 
 
-IntRange = Union[Tuple[int, int], int]
-
-
 def extract_integer(key: Union[str, Sequence[str]]) -> Optional[int]:
     s = _extract_value(key)
     if not s:

src/server/utils/__init__.py

@@ -1 +1 @@
-from .dates import shift_day_value, day_to_time_value, time_value_to_iso, time_value_to_day, days_in_range, weeks_in_range, shift_week_value, week_to_time_value, time_value_to_week, guess_time_value_is_day, guess_time_value_is_week, time_values_to_ranges, days_to_ranges, weeks_to_ranges, TimeValues
+from .dates import shift_day_value, day_to_time_value, time_value_to_iso, time_value_to_day, days_in_range, weeks_in_range, shift_week_value, week_to_time_value, time_value_to_week, guess_time_value_is_day, guess_time_value_is_week, time_values_to_ranges, days_to_ranges, weeks_to_ranges, IntRange, TimeValues

src/server/utils/dates.py

@@ -13,7 +13,8 @@
 from .logger import get_structured_logger
 
 # Alias for a sequence of date ranges (int, int) or date integers
-TimeValues: TypeAlias = Sequence[Union[Tuple[int, int], int]]
+IntRange: TypeAlias = Union[Tuple[int, int], int]
+TimeValues: TypeAlias = Sequence[IntRange]
 
 def time_value_to_day(value: int) -> date:
     year, month, day = value // 10000, (value % 10000) // 100, value % 100