398 Add conditionals to sidebar

* First take on conditionals in sidebar

* Fix toggles to make them predictable
Add feature to change modes for date of first hospitalized and start of distancing measures

* Delete unused class

* Updated import 

Updated to reflect current structure of the base branch

Co-authored-by: Brian Ross <ML@BrianThomasRoss.com>

Author: Zedmor

setup.py

@@ -26,6 +26,7 @@
         "gspread",
         "gunicorn",
         "dash",
+        "dash_daq",
         "dash_bootstrap_components",
         "numpy",
         "pandas",

src/chime_dash/app/pages/sidebar.py

@@ -3,15 +3,16 @@
 
 #! _SIDEBAR_ELEMENTS should be considered for moving else where
 """
-from typing import List
 from collections import OrderedDict
 from datetime import date, datetime
+from typing import List
 
 from dash.development.base_component import ComponentMeta
-from dash_html_components import Nav, Div
 from dash_core_components import Store
+from dash_html_components import Nav, Div
 
 from chime_dash.app.components.base import Page
+from chime_dash.app.services.callbacks import SidebarCallbacks
 from chime_dash.app.utils import ReadOnlyDict
 from chime_dash.app.utils.templates import (
     create_switch_input,
@@ -20,7 +21,6 @@
     create_header,
     create_line_break,
 )
-from chime_dash.app.services.callbacks import SidebarCallbacks
 
 FLOAT_INPUT_MIN = 0.001
 FLOAT_INPUT_STEP = "any"
@@ -40,12 +40,19 @@
     ###
     line_break_1={"type": "linebreak"},
     spread_parameters={"type": "header", "size": "h4"},
+    spread_parameters_checkbox={"type": "switch", "on": False},
     date_first_hospitalized={
         "type": "date",
         "min_date_allowed": datetime(2019, 10, 1),
-        "max_date_allowed": datetime(2021, 12, 31),
+        "max_date_allowed": datetime(2021, 12, 31)
     },
     doubling_time={"type": "number", "min": FLOAT_INPUT_MIN, "step": FLOAT_INPUT_STEP},
+    social_distancing_checkbox={"type": "switch", "on": False},
+    social_distancing_start_date={
+        "type": "date",
+        "min_date_allowed": datetime(2019, 10, 1),
+        "max_date_allowed": datetime(2021, 12, 31),
+    },
     relative_contact_rate={
         "type": "number",
         "min": 0.0,
@@ -93,7 +100,7 @@
         "date": date.today(),
     },
     max_y_axis_value={"type": "number", "min": 10, "step": 10, "value": None},
-    show_tables={"type": "switch", "value": False},
+    show_tables={"type": "switch", "on": False},
 ))
 
 
@@ -113,11 +120,22 @@ class Sidebar(Page):
         for key, value in _SIDEBAR_ELEMENTS.items()
         if value["type"] not in ("header", "linebreak")
     ))
+
     input_value_map = ReadOnlyDict(OrderedDict(
-        (key, {"number": "value", "date": "date"}.get(value, "value"))
+        (key, {"number": "value", "date": "date", "switch": "on"}.get(value, "value"))
         for key, value in input_type_map.items()
     ))
 
+    input_state_map = ReadOnlyDict(OrderedDict(
+        [
+            ('group_date_first_hospitalized', 'style'),
+            ('group_doubling_time', 'style'),
+            ('group_social_distancing_start_date', 'style'),
+            ('group_relative_contact_rate', 'style'),
+        ]
+    ))
+
+
     def get_html(self) -> List[ComponentMeta]:
         """Initializes the view
         """

src/chime_dash/app/services/callbacks.py

@@ -1,17 +1,17 @@
+from collections import OrderedDict, defaultdict
+from datetime import datetime, date
 from typing import List
-from datetime import datetime
-from collections import OrderedDict
 from urllib.parse import parse_qsl, urlencode
+
 from dash.exceptions import PreventUpdate
 
-from chime_dash.app.utils.callbacks import ChimeCallback, register_callbacks
 from chime_dash.app.utils import (
     get_n_switch_values,
     parameters_deserializer,
     parameters_serializer,
     prepare_visualization_group
 )
-
+from chime_dash.app.utils.callbacks import ChimeCallback, register_callbacks
 from penn_chime.model.sir import Sir
 from penn_chime.model.parameters import Parameters, Disposition
 
@@ -27,7 +27,7 @@ class IndexCallbacks(ComponentCallbacks):
 
     @staticmethod
     def toggle_tables(switch_value):
-        return get_n_switch_values(switch_value, 3)
+        return get_n_switch_values(not switch_value, 3)
 
     @staticmethod
     def handle_model_change(i, sidebar_data):
@@ -63,7 +63,7 @@ def handle_model_change_helper(sidebar_mod, sidebar_data):
             component_instance=component_instance,
             callbacks=[
                 ChimeCallback(  # If user toggles show_tables, show/hide tables
-                    changed_elements={"show_tables": "value"},
+                    changed_elements={"show_tables": "on"},
                     dom_updates={
                         "SIR_table_container": "hidden",
                         "new_admissions_table_container": "hidden",
@@ -98,10 +98,7 @@ class SidebarCallbacks(ComponentCallbacks):
     def get_formated_values(i, input_values):
         result = dict(zip(i.input_value_map.keys(), input_values))
         for key, input_type in i.input_type_map.items():
-            # todo remove this hack needed because of how Checklist type (used for switch input) returns values
-            if input_type == "switch":
-                result[key] = False if result[key] == [True] else True
-            elif input_type == "date":
+            if input_type == "date":
                 value = result[key]
                 try:
                     result[key] = datetime.strptime(value, "%Y-%m-%d").date() if value else value
@@ -194,6 +191,12 @@ def parse_hash(hash_str, sidebar_input_types):
             value_type = sidebar_input_types[key]
             if value_type == "number":
                 parsed_value = RootCallbacks.try_parsing_number(value)
+            elif value == 'None':
+                parsed_value = None
+            elif value == 'True':
+                parsed_value = True
+            elif value == 'False':
+                parsed_value = False
             else:
                 parsed_value = value
             hash_dict[key] = parsed_value
@@ -203,6 +206,7 @@ def parse_hash(hash_str, sidebar_input_types):
     def hash_changed(sidebar_input_types, hash_str=None, root_data=None):
         if hash_str:
             hash_dict = RootCallbacks.parse_hash(hash_str, sidebar_input_types)
+            # Fix that empty values encodes to 'None' string in url
             result = RootCallbacks.get_inputs(hash_dict, sidebar_input_types.keys())
             # Don't update the data store if it already contains the same data
             if result == root_data:
@@ -224,7 +228,42 @@ def stores_changed(inputs_keys, root_mod, sidebar_mod, root_data, sidebar_data):
             new_val = RootCallbacks.get_inputs(root_data, inputs_keys)
         else:
             raise PreventUpdate
-        return ["#{}".format(urlencode(new_val))] + list(new_val.values())
+
+        # Spread parameters toggle handling
+        if sidebar_data.get('inputs_dict', {}).get('spread_parameters_checkbox'):
+            styles = {
+                'date_first_hospitalized': None,
+                'doubling_time': {'display': 'none'}
+            }
+            new_val['doubling_time'] = None
+            new_val['date_first_hospitalized'] = date(year=2020, month=4, day=1)
+        else:
+            styles = {
+                'date_first_hospitalized': {'display': 'none'},
+                'doubling_time': None
+            }
+            new_val['date_first_hospitalized'] = None
+            if new_val['doubling_time'] is None:
+                new_val['doubling_time'] = 1
+
+        # Social distancing handler
+        if sidebar_data.get('inputs_dict', {}).get('social_distancing_checkbox'):
+            styles.update({
+                'social_distancing_start_date': None,
+                'relative_contact_rate': None
+            })
+            if not new_val['social_distancing_start_date']:
+                new_val['social_distancing_start_date'] = new_val['current_date']
+        else:
+            styles.update({
+                'social_distancing_start_date': {'display': 'none'},
+                'relative_contact_rate': {'display': 'none'}
+            })
+            new_val['relative_contact_rate'] = 0
+
+        if not styles['date_first_hospitalized']:
+            print(sidebar_data.get('inputs_dict', {}).get('spread_parameters_checkbox'))
+        return ["#{}".format(urlencode(new_val))] + list(new_val.values()) + list(styles.values())
 
     def __init__(self, component_instance):
         sidebar = component_instance.components["sidebar"]
@@ -235,7 +274,12 @@ def hash_changed_helper(hash_str=None, root_data=None):
             return RootCallbacks.hash_changed(sidebar_input_types, hash_str, root_data)
 
         def stores_changed_helper(root_mod, sidebar_mod, root_data, sidebar_data):
-            return RootCallbacks.stores_changed(sidebar_inputs.keys(), root_mod, sidebar_mod, root_data, sidebar_data)
+            return RootCallbacks.stores_changed(sidebar_inputs.keys(),
+                                                root_mod,
+                                                sidebar_mod,
+                                                root_data,
+                                                sidebar_data)
+
         super().__init__(
             component_instance=component_instance,
             callbacks=[
@@ -248,6 +292,7 @@ def stores_changed_helper(root_mod, sidebar_mod, root_data, sidebar_data):
                 ChimeCallback(
                     changed_elements={"root-store": "modified_timestamp", "sidebar-store": "modified_timestamp"},
                     dom_updates={"location": "hash", **sidebar_inputs},
+                    dom_states=sidebar.input_state_map,
                     callback_fn=stores_changed_helper,
                     stores=["root-store", "sidebar-store"],
                 ),

src/chime_dash/app/templates/en/sidebar.yml

@@ -3,10 +3,13 @@ population: Regional population
 market_share: Hospital market share (%)
 current_hospitalized: Currently hospitalized COVID-19 patients
 
+spread_parameters_checkbox: I know the date of the first hospitalized case.
 spread_parameters: Spread and Contact Parameters
 date_first_hospitalized: Date of first hospitalized case (enter this date to have CHIME estimate the initial doubling time)
 doubling_time: Doubling time in days (up to today. This overwrites date of first hospitalized estimation)
 relative_contact_rate: Social distancing (% reduction in social contact going forward)
+social_distancing_checkbox: Social distancing measures have been implemented
+social_distancing_start_date: Date of social distancing measures effect (may be delayed from implementation)
 
 severity_parameters: Severity Parameters
 hospitalized_rate: Hospitalization rate (% of total infections)

src/chime_dash/app/utils/__init__.py

@@ -104,12 +104,8 @@ def build_csv_download(df):
 
 def get_n_switch_values(input_value, elements_to_update) -> List[bool]:
     result = []
-    boolean_input_value = False
-    if input_value == [True]:
-        boolean_input_value = True
     for _ in repeat(None, elements_to_update):
-        # todo Fix once switch values make sense. Currently reported as "None" for off and "[False]" for on
-        result.append(not boolean_input_value)
+        result.append(input_value)
     return result
 
 

src/chime_dash/app/utils/callbacks.py

@@ -10,6 +10,7 @@ def __init__(self,
                  changed_elements: Mapping,
                  callback_fn: Callable,
                  dom_updates: Mapping = None,
+                 dom_states: Mapping = None,
                  stores: Iterable = None,
                  memoize: bool = True
                  ):
@@ -26,13 +27,20 @@ def __init__(self,
                 Output(component_id=component_id, component_property=component_property)
                 for component_id, component_property in dom_updates.items()
             )
+        if dom_states:
+            self.outputs.extend(
+                Output(component_id=component_id, component_property=component_property)
+                for component_id, component_property in dom_states.items()
+            )
+
         if stores:
             self.stores.extend(
                 State(component_id=component_id, component_property="data")
                 for component_id in stores
             )
 
     def wrap(self, app: Dash):
+        print(f'Registering callback: \nOutputs: \n{self.outputs}, \nInputs:\n{self.inputs}, \nStore: \n{self.stores} \nUsing: {self.callback_fn}\n\n')
         if self.memoize:
             @lru_cache(maxsize=32)
             @app.callback(self.outputs, self.inputs, self.stores)

src/chime_dash/app/utils/templates.py

@@ -2,6 +2,8 @@
 Utility functions for localization templates
 templates themselves can be found in app/templates/en
 """
+import dash_daq as daq
+
 from typing import Dict, Any, Optional
 
 from os import path
@@ -146,6 +148,7 @@ def create_number_input(
             idx, defaults, min_val=data.get("min", None), max_val=data.get("max", None)
         )
     return FormGroup(
+        id=f'group_{idx}',
         children=[
             Label(html_for=idx, children=content[idx], style=LABEL_STYLE),
             Input(id=idx, debounce=debounce, **input_kwargs),
@@ -182,7 +185,14 @@ def create_date_input(
             "initial_visible_month"
         ] = _get_default_values(idx, defaults)
 
+    if 'style' in input_kwargs:
+        style = {'style': input_kwargs.pop('style')}
+    else:
+        style = {}
+
     return FormGroup(
+        id=f'group_{idx}',
+        **style,
         children=[
             Label(html_for=idx, children=content[idx], style=LABEL_STYLE),
             DatePickerSingle(
@@ -205,8 +215,8 @@ def create_switch_input(idx: str, data: Dict[str, Any], content: Dict[str, str])
         content: Localization text
         defaults: Parameters to infer defaults
     """
-    return Checklist(
-        id=idx, switch=True, options=[{"label": content[idx], "value": True}],
+    return daq.BooleanSwitch(
+        id=idx, on=False, label=content[idx]
     )