Merge branch 'develop' into issue-#421

Author: jlubken

Dockerfile.dash

@@ -2,8 +2,11 @@ FROM python:3.7.7-slim-buster
 
 WORKDIR /code 
 
+ARG PORT
+ENV PORT $PORT
+
 COPY requirements.txt requirements.txt
-RUN pip install -q -r requirements.txt
+RUN pip install -r requirements.txt
 
 COPY src src 
 

docker-compose-dash.yml

@@ -0,0 +1,12 @@
+version: '3.1'
+
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile.dash
+      args:
+        - PORT=${PORT}
+    restart: always
+    ports:
+      - "${PORT}:8000"

k8s/app.yaml

@@ -25,7 +25,7 @@ spec:
         app: chime
     spec:
       containers:
-      - image: docker.pkg.github.com/codeforphilly/chime/penn-chime:1.1.1
+      - image: docker.pkg.github.com/codeforphilly/chime/penn-chime:1.1.2
         name: chime
         ports:
         - containerPort: 8000

script/server-dash

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+# script/server: Launch the application and any extra required processes
+#                locally.
+
+set -e
+cd "$(dirname "$0")/.."
+
+
+script/bootstrap
+
+if [ ! -f ".env" ]; then
+    echo
+    echo "==> Initializing .env…"
+    cp .env.example .env
+fi
+
+echo
+echo "==> Loading .env…"
+set -o allexport; source .env; set +o allexport
+
+echo
+echo "==> Starting containers with docker-compose…"
+docker-compose -f docker-compose-dash.yml up -d --build
+
+echo
+echo "==> App is now ready to go!"
+echo "    *Open http://localhost:${PORT}"
+echo

setup.py

@@ -1,6 +1,6 @@
 """Setup file for chime
 """
-__version__ = "1.1.1"
+__version__ = "1.1.2"
 __author__ = "Predictive Healthcare @ Penn Medicine"
 
 from os import path
@@ -30,7 +30,8 @@
         "dash",
         "dash_bootstrap_components",
         "pyyaml",
-        "gunicorn"
+        "gunicorn", 
+        "selenium"
     ],
     classifiers=[
         "Programming Language :: Python :: 3",
@@ -44,3 +45,4 @@
     keywords=[],
     include_package_data=True,
 )
+

src/__init__.py

@@ -2,7 +2,7 @@
 
 This directory provides the interface for the dash app.
 
-![Current interface](docs/assets/interface.png)
+![Current interface](docs/interface.png)
 
 ## Tree
 Structure of the app

src/assets/favicon.ico

@@ -1 +1,50 @@
-x = 1
+"""
+chime_dash/app
+
+dash instance defined here
+"""
+
+from dash import Dash
+from typing import TypeVar
+from chime_dash.app.config import from_object
+from penn_chime.settings import get_defaults
+from chime_dash.app.components import Body
+from chime_dash.app.utils.callbacks import wrap_callbacks
+
+DashAppInstance = TypeVar('DashAppInstance')
+DEFAULTS = get_defaults()
+
+def create_app(context:str='prod')-> DashAppInstance:
+    """
+    create_app initializes the app instance
+    
+    Args:
+        context (str, optional): One of either 'prod', 'dev', 'testing.
+        Defaults to 'prod' where dash.Dash.run_server(debug=False).
+        Change to 'dev' or 'test' to set debug to true.
+    
+    Returns:
+        Env: Config variables based on context argument received
+        DashAppInstance: Dash instance with appropriate configuration settings
+    """
+
+    Env = from_object(context)
+    
+    LANGUAGE = Env.LANG
+    body = Body(LANGUAGE, DEFAULTS)
+    
+    
+    App = Dash(
+        __name__,
+        external_stylesheets=body.external_stylesheets,
+        external_scripts=body.external_scripts,
+    )
+
+    App.title = Env.CHIME_TITLE
+    App.layout = body.html
+    wrap_callbacks(App)
+
+    
+
+    return Env, App
+

src/chime_dash/README.md

@@ -0,0 +1,3 @@
+"""/app
+where the magic happens
+"""