Updates for dash

Author: jlubken

src/chime_dash/__init__.py

@@ -8,7 +8,7 @@
 from typing import TypeVar
 
 from dash import Dash
-from penn_chime.parameters import Parameters
+from penn_chime.model.parameters import Parameters
 
 from chime_dash.app.config import from_object
 from chime_dash.app.pages.root import Root

src/chime_dash/app/components/base.py

@@ -11,7 +11,7 @@
 from dash.development.base_component import ComponentMeta
 from dash_html_components import Div
 
-from penn_chime.parameters import Parameters
+from penn_chime.model.parameters import Parameters
 
 from chime_dash.app.utils.templates import read_localization_yml, read_localization_markdown
 

src/chime_dash/app/components/navbar.py

@@ -10,7 +10,7 @@
 from chime_dash.app.components.base import Component
 from chime_dash.app.components.menu import Menu
 
-from penn_chime.parameters import Parameters
+from penn_chime.model.parameters import Parameters
 
 
 class Navbar(Component):

src/chime_dash/app/services/callbacks.py

@@ -12,8 +12,8 @@
     prepare_visualization_group
 )
 
-from penn_chime.models import SimSirModel
-from penn_chime.parameters import Parameters, Disposition
+from penn_chime.model.sir import Sir
+from penn_chime.model.parameters import Parameters, Disposition
 
 
 class ComponentCallbacks:
@@ -37,7 +37,7 @@ def handle_model_change(i, sidebar_data):
         viz_kwargs = {}
         if sidebar_data:
             pars = parameters_deserializer(sidebar_data["parameters"])
-            model = SimSirModel(pars)
+            model = Sir(pars)
             vis = i.components.get("visualizations", None) if i else None
             vis_content = vis.content if vis else None
 

src/chime_dash/app/utils/__init__.py

@@ -7,8 +7,6 @@
 -------
 templates       utilities for localization templates
 """
-from . import callbacks
-from . import templates
 
 from itertools import repeat
 from json import dumps, loads
@@ -23,9 +21,9 @@
 from chime_dash.app.services.plotting import plot_dataframe
 from chime_dash.app.utils.templates import df_to_html_table
 
-from penn_chime.parameters import Parameters, Disposition
+from penn_chime.model.parameters import Parameters, Disposition
 from penn_chime.constants import DATE_FORMAT
-from penn_chime.charts import build_table
+from penn_chime.view.charts import build_table
 
 
 class ReadOnlyDict(Mapping):

src/chime_dash/app/utils/templates.py

@@ -15,7 +15,7 @@
 from dash_core_components import DatePickerSingle
 from dash_bootstrap_components import FormGroup, Label, Input, Checklist
 
-from penn_chime.parameters import Parameters
+from penn_chime.model.parameters import Parameters
 
 # Consider moving this to a config file eventually
 TEMPLATE_DIR = path.join(