Merge branch 'develop' into btr-pr-template

Author: BrianThomasRoss

Dockerfile

@@ -7,6 +7,7 @@ COPY setup.py .
 COPY .streamlit .streamlit
 COPY defaults defaults
 COPY src src
+COPY st_app.py st_app.py
 RUN pip install -q .
 
 CMD ["streamlit", "run", "st_app.py"]

habitat/hooks/run

@@ -1,5 +1,7 @@
 #!/bin/sh
 export HOME="/hab/svc/chime/config"
+# export the parameters file path
+export PARAMETERS="${pkg_prefix}/defaults/webapp.cfg"
 cd "/hab/svc/chime"
 
 if [ "$(whoami)" = "root" ]; then

habitat/plan.sh

@@ -67,6 +67,7 @@ do_build() {
 
 do_install() {
   cp -pr ${PLAN_CONTEXT}/../src/* "${pkg_prefix}/"
+  cp -pr ${PLAN_CONTEXT}/../deafults/webapp.cfg "${pkg_prefix}/defaults/"
   return $?
 }
 

src/chime_dash/app/services/plotting.py

@@ -33,5 +33,8 @@ def plot_dataframe(
             }
             for col in dataframe.columns
         ],
-        "layout": {"yaxis": yaxis},
+        "layout": {
+            "yaxis": yaxis,
+            "legend": {"orientation": "h"},
+        },
     }

src/penn_chime/view/spreadsheet.py

@@ -7,8 +7,8 @@ def __init__(self, st_obj, secret):
         # use creds to create a client to interact with the Google Drive API
         self.scope = ['https://spreadsheets.google.com/feeds', 'https://www.googleapis.com/auth/drive']
         #secret = 'client_secret.json'
-        self.creds = ServiceAccountCredentials.from_json(secret)
-        #self.creds = ServiceAccountCredentials.from_json_keyfile_name(secret, self.scope)
+        #self.creds = ServiceAccountCredentials.from_json_keyfile_dict(secret)
+        self.creds = ServiceAccountCredentials.from_json_keyfile_name(secret, self.scope)
         self.client = gspread.authorize(self.creds)
 
 

src/penn_chime/view/st_display.py

@@ -444,9 +444,15 @@ def subscribe(st_obj):
     affiliation = st_obj.text_input (label="Enter Affiliation", value="", key="na_upper_2")
     if st_obj.button (label="Submit", key="ta_submit_1"):
         row = [email, name, affiliation]
-        send_subscription_to_google_sheet(st_obj, row)
+        send_subscription_to_google_sheet_secret_json(st_obj, row)
 
-def send_subscription_to_google_sheet(st_obj, row):
+def send_subscription_to_google_sheet_secret_json(st_obj, row):
+    json_secret = "/mnt/google-api-creds/client_secret.json"
+    #print(json_secret)
+    spr = spreadsheet (st_obj, json_secret)
+    spr.writeToSheet("CHIME Form Submissions", row)
+
+def send_subscription_to_google_sheet_secret_dict(st_obj, row):
     json_secret = readGoogleApiSecretsDict()
     #print(json_secret)
     spr = spreadsheet(st_obj, json_secret)

tests/chime_dash/app/utils/test_callbacks.py

@@ -0,0 +1,70 @@
+from unittest.mock import patch, MagicMock
+
+import dash_core_components as dcc
+import dash_html_components as html
+import pytest
+from dash import Dash
+from dash.dependencies import Input, Output
+
+from src.chime_dash.app.utils.callbacks import (
+    ChimeCallback,
+    register_callbacks,
+    wrap_callbacks,
+)
+
+
+@pytest.mark.parametrize(
+    "callbacks, new_callbacks, registered_callback_length",
+    [
+        ([], [], 0),
+        ([], ["ChimeCallback1", "ChimeCallback2", "ChimeCallback3"], 3),
+        (["ChimeCallback1"], ["ChimeCallback2", "ChimeCallback3"], 3),
+        (["ChimeCallback1"], [], 1),
+    ],
+)
+def test_register_callbacks(
+    callbacks, new_callbacks, registered_callback_length, monkeypatch
+):
+    registered_callbacks = callbacks
+    monkeypatch.setattr(
+        "src.chime_dash.app.utils.callbacks.__registered_callbacks",
+        registered_callbacks,
+    )
+    register_callbacks(new_callbacks)
+    assert len(registered_callbacks) == registered_callback_length
+
+
+def test_wrap_callbacks(dash_app, monkeypatch):
+    mock_chime_callback = MagicMock()
+    monkeypatch.setattr(
+        "src.chime_dash.app.utils.callbacks.__registered_callbacks",
+        [mock_chime_callback],
+    )
+    wrap_callbacks(dash_app)
+    mock_chime_callback.wrap.assert_called_once_with(dash_app)
+
+
+def test_ChimeCallback_wrap(dash_app):
+    # set up the layout
+    dash_app.layout = html.Div(
+        id="root",
+        children=[
+            dcc.Input(id="input-id", value="initial value", type="text"),
+            html.Div(id="output-id"),
+        ],
+    )
+    # create a callback for elements in this layout
+    chime_callback = ChimeCallback(
+        changed_elements={"input-id": "value"},
+        callback_fn=lambda *args, **kwargs: ["new value"],
+        dom_updates={"output-id": "children"},
+    )
+
+    # register the Chime Callback with the layout
+    chime_callback.wrap(dash_app)
+
+    assert list(dash_app.callback_map)[0] == "..output-id.children.."
+    assert dash_app.callback_map["..output-id.children.."]["inputs"] == [
+        {"id": "input-id", "property": "value"}
+    ]
+    assert dash_app.callback_map["..output-id.children.."]["callback"]

tests/conftest.py

@@ -1,5 +1,6 @@
 from datetime import datetime
 
+from dash import Dash
 import pytest
 import pandas as pd
 
@@ -32,6 +33,10 @@ def just_store_instead_of_rendering(self, inp, *args, **kwargs):
         return None
 
 
+@pytest.fixture()
+def dash_app():
+    return Dash()
+
 @pytest.fixture
 def mock_st():
     return MockStreamlit()