Split model from view for PPE

Author: jlubken

Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.7.7-slim-buster
 ENV PARAMETERS=./defaults/webapp.cfg
-ENV PPE_FOLDER=./defaults/assets/
+ENV ASSETS=./defaults/assets/
 ENV PORT=8000
 WORKDIR /app
 COPY README.md .

Procfile

@@ -1 +1 @@
-web: PARAMETERS=./defaults/webapp.cfg PPE_EXCEL=./defaults/PPE_Usage_Draft_CC_modifications_v2.xlsx STREAMLIT_SERVER_PORT=$PORT streamlit run st_app.py
+web: PARAMETERS=./defaults/webapp.cfg ASSETS=./defaults/assets STREAMLIT_SERVER_PORT=$PORT streamlit run st_app.py

src/penn_chime/model/ppe.py

@@ -0,0 +1,14 @@
+"""Personal Protective Equipment."""
+
+import os
+from typing import Dict
+
+
+class PPE:
+
+    def __init__(self, env: Dict[str, str]):
+        """__init__."""
+        self.assets = assets = env['ASSETS']
+        self.filename = filename = "PPE_Calculator_for_COVID-19.xlsx"
+        self.src = os.path.join(assets, filename)
+        self.screenshot = os.path.join(assets, 'PPE_Screenshot.jpg')

src/penn_chime/ppe/ppe.py

@@ -2,9 +2,9 @@
 
 import os
 
-import altair as alt  # type: ignore
-import streamlit as st  # type: ignore
-import i18n  # type: ignore
+import altair as alt
+import streamlit as st
+import i18n
 
 i18n.set('filename_format', '{locale}.{format}')
 i18n.set('locale', 'en')
@@ -13,14 +13,15 @@
 
 from ..model.parameters import Parameters
 from ..model.sir import Sir
+from ..model.ppe import PPE
 from .charts import (
     build_admits_chart,
     build_census_chart,
     build_sim_sir_w_date_chart,
 )
-from ..ppe.ppe import PPE
 from .st_display import (
     display_download_link,
+    display_excel_download_link,
     display_footer,
     display_header,
     display_sidebar,
@@ -37,6 +38,7 @@ def main():
 
     d = Parameters.create(os.environ, [])
     ppe = PPE(os.environ)
+
     p = display_sidebar(st, d)
     m = Sir(p)
 
@@ -65,7 +67,7 @@ def main():
     )
 
     st.subheader(i18n.t("app-PPE-title"))
-    ppe.display_ppe_download_link(st)
+    display_excel_download_link(st, ppe.filename, ppe.src)
     display_download_link(
         st,
         p,
@@ -74,14 +76,18 @@ def main():
     )
 
     if st.checkbox("Show a screenshot of the tool"):
-        st.image(image=ppe.ppe_folder+'PPE_Screenshot.jpg',
-                 width=600,
-                 format='JPEG')
+        st.image(
+            image=ppe.screenshot,
+            width=600,
+            format='JPEG',
+        )
     st.markdown("""
-                    Refer to our <a href="{link_to_docs}">user documentation for instructions on how to use the tool</a>.
-                """.format(link_to_docs="https://code-for-philly.gitbook.io/chime/ppe-calculator"),
-                unsafe_allow_html=True
-                )
+        Refer to our <a href="{link_to_docs}">user documentation for instructions on how to use the tool</a>.
+    """.format(
+            link_to_docs="https://code-for-philly.gitbook.io/chime/ppe-calculator",
+        ),
+        unsafe_allow_html=True
+    )
 
     st.subheader(i18n.t("app-SIR-title"))
     st.markdown(i18n.t("app-SIR-text"))

src/penn_chime/view/st_app.py

@@ -3,8 +3,10 @@
 import os
 import json
 
+from logging import INFO, basicConfig, getLogger
 import pandas as pd
 import i18n
+from sys import stdout
 
 from ..constants import (
     CHANGE_DATE,
@@ -15,9 +17,21 @@
     VERSION,
 )
 from ..model.parameters import Parameters, Disposition
-from ..utils import dataframe_to_base64
+from ..utils import (
+    dataframe_to_base64,
+    excel_to_base64,
+)
 from .spreadsheet import spreadsheet
 
+
+basicConfig(
+    level=INFO,
+    format="%(asctime)s - %(name)s - %(levelname)s - %(message)s",
+    stream=stdout,
+)
+logger = getLogger(__name__)
+
+
 hide_menu_style = """
         <style>
         #MainMenu {visibility: hidden;}
@@ -448,7 +462,6 @@ def display_footer(st):
     )
     st.markdown(i18n.t("presentation-copyright"))
 
-
 def display_download_link(st, p, filename: str, df: pd.DataFrame):
     csv = dataframe_to_base64(df.rename(p.labels, axis=1))
     st.markdown(
@@ -457,3 +470,13 @@ def display_download_link(st, p, filename: str, df: pd.DataFrame):
         ),
         unsafe_allow_html=True,
     )
+
+def display_excel_download_link(st, filename: str, src: str):
+    excel = excel_to_base64(src)
+    st.markdown("""
+        Download the PPE Calculator here: <a download="{filename}" href="data:file/xlsx;base64,{excel}">{filename}</a>.
+    """.format(
+            excel=excel, filename=filename
+        ),
+        unsafe_allow_html=True,
+    )