Add missing parameters

Author: jlubken

src/chime_dash/app/services/callbacks.py

@@ -115,20 +115,26 @@ def update_parameters(i, *input_values) -> List[dict]:
         dt = inputs_dict["doubling_time"] if inputs_dict["doubling_time"] else None
         dfh = inputs_dict["date_first_hospitalized"] if not dt else None
         pars = Parameters(
-            population=inputs_dict["population"],
             current_hospitalized=inputs_dict["current_hospitalized"],
             date_first_hospitalized=dfh,
             doubling_time=dt,
-            hospitalized=Disposition(
-                inputs_dict["hospitalized_rate"] / 100, inputs_dict["hospitalized_los"]
+            hospitalized=Disposition.create(
+                days=inputs_dict["hospitalized_los"],
+                rate=inputs_dict["hospitalized_rate"] / 100,
+            ),
+            icu=Disposition(
+                days=inputs_dict["icu_los"],
+                rate=inputs_dict["icu_rate"] / 100,
             ),
-            icu=Disposition(inputs_dict["icu_rate"] / 100, inputs_dict["icu_los"]),
             infectious_days=inputs_dict["infectious_days"],
             market_share=inputs_dict["market_share"] / 100,
             n_days=inputs_dict["n_days"],
+            population=inputs_dict["population"],
+            recovered=0,  #FIXME input or pass through from defaults is required!
             relative_contact_rate=inputs_dict["relative_contact_rate"] / 100,
-            ventilated=Disposition(
-                inputs_dict["ventilated_rate"] / 100, inputs_dict["ventilated_los"]
+            ventilated=Disposition.create(
+                days=inputs_dict["ventilated_los"],
+                rate=inputs_dict["ventilated_rate"] / 100,
             ),
             max_y_axis=inputs_dict.get("max_y_axis_value", None),
         )

src/chime_dash/app/utils/__init__.py

@@ -60,38 +60,55 @@ def parameters_serializer(p: Parameters):
 
 def parameters_deserializer(p_json: str):
     values = loads(p_json)
-    dfh = (
-        parse_date(values["date_first_hospitalized"])
-        if values["date_first_hospitalized"]
-        else None
-    )
+
+    dates = {
+        key: parse_date(values[key]) if values[key] else None
+        for key in (
+            "current_date",
+            "date_first_hospitalized",
+            "mitigation_date",
+        )
+    }
     result = Parameters(
+        current_date=dates["current_date"],
         current_hospitalized=values["current_hospitalized"],
-        hospitalized=Disposition(*values["hospitalized"]),
-        icu=Disposition(*values["icu"]),
-        relative_contact_rate=values["relative_contact_rate"],
-        ventilated=Disposition(*values["ventilated"]),
-        current_date=parse_date(values["current_date"]),
-        date_first_hospitalized=dfh,
-        doubling_time=values["doubling_time"],
+        hospitalized=Disposition.create(
+            days=values["hospitalized"][0],
+            rate=values["hospitalized"][1],
+        ),
+        icu=Disposition.create(
+            days=values["icu"][0],
+            rate=values["icu"][1],
+        ),
         infectious_days=values["infectious_days"],
+        date_first_hospitalized=dates["date_first_hospitalized"],
+        doubling_time=values["doubling_time"],
         market_share=values["market_share"],
         max_y_axis=values["max_y_axis"],
+        mitigation_date=values["mitigation_date"],
         n_days=values["n_days"],
         population=values["population"],
         recovered=values["recovered"],
         region=values["region"],
+        relative_contact_rate=values["relative_contact_rate"],
+        ventilated=Disposition.create(
+            days=values["ventilated"][0],
+            rate=values["ventilated"][1],
+        ),
     )
 
+    # FIXME: parameters should be immutable
+    #  Working around validators in __init__
     for key, value in values.items():
 
         if result.__dict__[key] != value and key not in (
+            "current_date",
+            "date_first_hospitalized",
             "dispositions",
             "hospitalized",
             "icu",
+            "mitigation_date",
             "ventilated",
-            "current_date",
-            "date_first_hospitalized",
         ):
             result.__dict__[key] = value