Fix typings

Author: rzats

requirements.txt

@@ -11,4 +11,4 @@ scipy==1.6.2
 tenacity==7.0.0
 newrelic
 epiweeks==2.1.2
-typing-extensions==4.4.0
+typing-extensions

src/server/_query.py

@@ -20,7 +20,7 @@
 from ._db import metadata
 from ._printer import create_printer, APrinter
 from ._exceptions import DatabaseErrorException
-from ._validate import DateRange, extract_strings
+from ._validate import extract_strings
 from ._params import GeoPair, SourceSignalPair, TimePair
 from .utils import time_values_to_ranges, days_to_ranges, weeks_to_ranges, TimeValues
 
@@ -188,7 +188,7 @@ def filter_pair(pair: TimePair, i) -> str:
         if isinstance(pair.time_values, bool) and pair.time_values:
             return f"{type_field} = :{type_param}"
         ranges = weeks_to_ranges(pair.time_values) if pair.is_week else days_to_ranges(pair.time_values)
-        return f"({type_field} = :{type_param} AND {filter_integers(time_field, cast(Sequence[Union[int, Tuple[int,int]]], ranges), type_param, params)})"
+        return f"({type_field} = :{type_param} AND {filter_integers(time_field, ranges, type_param, params)})"
 
     parts = [filter_pair(p, i) for i, p in enumerate(values)]
 

src/server/_validate.py

@@ -3,6 +3,7 @@
 from flask import request
 
 from ._exceptions import UnAuthenticatedException, ValidationFailedException
+from .utils import TimeValues
 
 
 def resolve_auth_token() -> Optional[str]:
@@ -141,14 +142,11 @@ def extract_date(key: Union[str, Sequence[str]]) -> Optional[int]:
     return parse_date(s)
 
 
-DateRange = Union[Tuple[int, int], int]
-
-
-def extract_dates(key: Union[str, Sequence[str]]) -> Optional[List[DateRange]]:
+def extract_dates(key: Union[str, Sequence[str]]) -> Optional[TimeValues]:
     parts = extract_strings(key)
     if not parts:
         return None
-    values: List[Union[Tuple[int, int], int]] = []
+    values: TimeValues = []
 
     def push_range(first: str, last: str):
         first_d = parse_date(first)

src/server/endpoints/covidcast.py

@@ -35,7 +35,7 @@
 )
 from .._pandas import as_pandas, print_pandas
 from .covidcast_utils import compute_trend, compute_trends, compute_correlations, compute_trend_value, CovidcastMetaEntry
-from ..utils import shift_day_value, day_to_time_value, time_value_to_iso, time_value_to_day, shift_week_value, time_value_to_week, guess_time_value_is_day, week_to_time_value
+from ..utils import shift_day_value, day_to_time_value, time_value_to_iso, time_value_to_day, shift_week_value, time_value_to_week, guess_time_value_is_day, week_to_time_value, TimeValues
 from .covidcast_utils.model import TimeType, count_signal_time_types, data_sources, create_source_signal_alias_mapper
 
 # first argument is the endpoint name
@@ -89,7 +89,7 @@ def parse_time_pairs() -> List[TimePair]:
     return parse_time_arg()
 
 
-def _handle_lag_issues_as_of(q: QueryBuilder, issues: Optional[List[Union[Tuple[int, int], int]]] = None, lag: Optional[int] = None, as_of: Optional[int] = None):
+def _handle_lag_issues_as_of(q: QueryBuilder, issues: Optional[TimeValues] = None, lag: Optional[int] = None, as_of: Optional[int] = None):
     if issues:
         q.retable(history_table)
         q.where_integers("issue", issues)