Fix mypy checks

Author: jlubken

src/penn_chime/parameters.py

@@ -12,7 +12,7 @@
 )
 from collections import namedtuple
 from datetime import date, datetime
-from typing import Dict
+from typing import Dict, List
 
 from .constants import (
     CHANGE_DATE,
@@ -48,17 +48,17 @@
 # Be sure to multiply by 100 when using the parameter as a default to a percent widget!
 
 
-Disposition = namedtuple("Disposition", ("days", "rate"))
+_Disposition = namedtuple("_Disposition", ("days", "rate"))
 
 
-def _create_disposition(*, days: int, rate: float):
-    """Mandate key word arguments."""
-    Positive(key='days', value=days)
-    Rate(key='rate', value=rate)
-    return Disposition(days, rate)
+class Disposition(_Disposition):
 
-
-Disposition.create = _create_disposition
+    @classmethod
+    def create(cls, *, days: int, rate: float):
+        """Mandate key word arguments."""
+        Positive(key='days', value=days)
+        Rate(key='rate', value=rate)
+        return cls(days, rate)
 
 
 class Regions:
@@ -230,23 +230,29 @@ def create(
 
     def __init__(self, **kwargs):
         today = date.today()
-        passed_and_default_parameters = {}
-        for key, value in kwargs.items():
-            if key not in ACCEPTED_PARAMETERS:
-                raise ValueError(f"Unexpected parameter {key}")
-            passed_and_default_parameters[key] = value
 
         self.current_date = None
+        self.current_hospitalized = None
+        self.date_first_hospitalized = None
+        self.doubling_time = None
         self.hospitalized = None
         self.icu = None
+        self.infectious_days = None
+        self.market_share = None
         self.max_y_axis = None
         self.mitigation_date = None
+        self.n_days = None
         self.population = None
         self.region = None
+        self.relative_contact_rate = None
+        self.recovered = None
         self.ventilated = None
 
-        for key in ACCEPTED_PARAMETERS:
-            setattr(self, key, None)
+        passed_and_default_parameters = {}
+        for key, value in kwargs.items():
+            if key not in ACCEPTED_PARAMETERS:
+                raise ValueError(f"Unexpected parameter {key}")
+            passed_and_default_parameters[key] = value
 
         for key, value in passed_and_default_parameters.items():
             validator = ACCEPTED_PARAMETERS[key][0]

src/penn_chime/validators/__init__.py

@@ -1,14 +1,23 @@
 """the callable validator design pattern"""
 
-from .validators import EPSILON, OptionalValue, Bounded, OptionalBounded, Rate, Date, OptionalDate, ValDisposition
+from ..constants import EPSILON
+from .validators import (
+    OptionalValue as ValOptionalValue,
+    Bounded as ValBounded,
+    OptionalBounded as ValOptionalBounded,
+    Rate as ValRate,
+    Date as ValDate,
+    OptionalDate as ValOptionalDate,
+    ValDisposition as ValValDisposition,
+)
 
-OptionalValue = OptionalValue()
-OptionalStrictlyPositive = OptionalBounded(lower_bound=EPSILON)
-StrictlyPositive = Bounded(lower_bound=EPSILON)
-Positive = Bounded(lower_bound=-EPSILON)
-Rate = Rate()  # type: ignore
-Date = Date()  # type: ignore
-OptionalDate = OptionalDate()  # type: ignore
-ValDisposition = ValDisposition()
+OptionalValue = ValOptionalValue()
+OptionalStrictlyPositive = ValOptionalBounded(lower_bound=EPSILON)
+StrictlyPositive = ValBounded(lower_bound=EPSILON)
+Positive = ValBounded(lower_bound=-EPSILON)
+Rate = ValRate()
+Date = ValDate()
+OptionalDate = ValOptionalDate()
+ValDisposition = ValValDisposition()
 # # rolling a custom validator for doubling time in case DS wants to add upper bound
 # DoublingTime = OptionalBounded(lower_bound=0-EPSILON, upper_bound=None)