Merge branch 'develop' into ahil-elastic

Author: jlubken

.github/workflows/pythonapp.yml

@@ -43,7 +43,7 @@ jobs:
         python -m pytest
     - name: Run App
       run: |
-        PARAMETERS=./defaults/cypress.cfg streamlit run st_app.py &
+        PARAMETERS=./defaults/cypress.cfg ASSETS=./defaults/assets streamlit run st_app.py &
     - name: Cypress
       uses: cypress-io/github-action@v1
       with:

Dockerfile

@@ -1,5 +1,7 @@
 FROM python:3.7.7-slim-buster
+ENV ASSETS=./defaults/assets/
 ENV PARAMETERS=./defaults/webapp.cfg
+ENV PORT=8000
 WORKDIR /app
 COPY README.md .
 COPY setup.cfg .
@@ -11,5 +13,4 @@ COPY src src
 COPY st_app.py st_app.py
 RUN pip install -q .
 
-CMD ["streamlit", "run", "st_app.py"]
-
+CMD STREAMLIT_SERVER_PORT=$PORT streamlit run st_app.py

Procfile

@@ -1 +1 @@
-web: PARAMETERS=defaults/webapp.cfg 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

defaults/assets/PPE_Calculator_for_COVID-19.xlsx

@@ -46,12 +46,14 @@ pip install streamlit
 ## Run the Streamlit Web App
 
 ```bash
+ASSETS=./defaults/assets \
 PARAMETERS=-./defaults/webapp.cfg streamlit run st_app.py
 ```
 
 ## Run the Command Line Interface
 
 ```bash
+ASSETS=./defaults/assets \
 PARAMETERS=./defaults/cli.cfg penn_chime
 ```
 
@@ -66,6 +68,7 @@ penn_chime --help
 If you want a different set of default parameters, you may use your own configuration file.
 
 ```bash
+ASSETS=./defaults/assets \
 PARAMETERS=./defaults/yours.cfg streamlit run st_app.py
 ```
 
@@ -77,7 +80,19 @@ Be sure to include `--mitigation-date` in the file if social distancing was impl
 If you need to run the application on a different port than the default (8000), you can set an environment variable.
 
 ```bash
-STREAMLIT_SERVER_PORT=1234 PARAMETERS=./defaults/webapp.cfg streamlit run st_app.py
+ASSETS=./defaults/assets \
+STREAMLIT_SERVER_PORT=1234 \
+PARAMETERS=./defaults/webapp.cfg streamlit run st_app.py
+```
+
+### Choosing a Different Language
+
+If you want to run the application in another language, do the following. You can select Japanese as the language other than English.
+
+```bash
+ASSETS=./defaults/assets \
+LANG=ja \
+PARAMETERS=./defaults/webapp.cfg streamlit run st_app.py
 ```
 
 ## Project Layout

defaults/assets/PPE_Screenshot.jpg

@@ -1,3 +1,4 @@
 # Contributing: Operations Support
 
-*Coming soon*
+- This repo is associated with Penn Medicine's Chime1.0 model, which uses a Streamlit app that is built on an SIR model
+- Contributors are encouraged to consider supporting Penn Medicine's Chime2.0 model, which still uses a Streamlit app, but leverages an enhanced Bayesian SEIR model.

defaults/assets/PPE_Screenshot_Interface_v0.png

@@ -1,5 +1,5 @@
 build:
   docker:
-    web: Dockerfile.dash
+    web: Dockerfile
   config: 
-    PORT: ${PORT}
+    PORT: ${PORT}