New monorepo deploys

.circleci/config.yml

@@ -41,33 +41,19 @@ jobs:
                   exit 0
             fi
 
+            git config --global user.email '<>' # Leave email blank
+            git config --global user.name "Circle MonoRepo Automatic Deployer"
+
             for APP in $APPS_MODIFIED
             do
-              if [ "$APP" == "$CIRCLE_BRANCH" ]
+              if [ "$APP" != "$CIRCLE_BRANCH" ]
               then
-                git config --global user.email '<>' # Leave email blank
-                git config --global user.name "Circle MonoRepo Automatic Deployer"
-                if [[ $APP =~ "dashr" ]]
-                then
-                  cp ~/dash-sample-apps/apps/"$APP"/Aptfile ~/dash-sample-apps/
-                  cp ~/dash-sample-apps/apps/"$APP"/Procfile ~/dash-sample-apps/
-                  cp ~/dash-sample-apps/apps/"$APP"/.buildpacks ~/dash-sample-apps/
-                  cp ~/dash-sample-apps/apps/"$APP"/init.R ~/dash-sample-apps/
-                  # app.json tries to call python predeploy, which is not needed for R apps:
-                  rm ~/dash-sample-apps/app.json
-                  git add . && git commit -a -m "Deployed commit: $CIRCLE_SHA1"
-                fi
-                if [ ! -d ~/dash-sample-apps/apps/"$APP"/assets/ ]
-                then
-                  echo "Deploy failed because there is no assets/ folder. Exiting..."
-                  exit 1
-                fi
-                git commit -m "Deployed commit: $CIRCLE_SHA1"
-                git push playground $CIRCLE_BRANCH:master --force
-                exit 0
-              else
                 echo "appname: $APP is not same as the branchname: $CIRCLE_BRANCH. Not deploying..."
+                continue
               fi
+
+              CREATE_APP=true ./deploy "$APP"
+              exit 0
             done
             echo "Deploy failed because of a branchname/appname mismatch. Exiting..."
             exit 1
@@ -90,20 +76,18 @@ jobs:
           name: Deploy
           command: |
             APPS_MODIFIED=$(ls apps | grep dash- | sort -u)
+            if [ -z "$APPS_MODIFIED" ]
+            then
+                  echo "No app change detected. Skipping the deploy.."
+                  exit 0
+            fi
+
+            git config --global user.email '<>' # Leave email blank
+            git config --global user.name "Circle MonoRepo Automatic Deployer"
+
             for APP in $APPS_MODIFIED
             do
-              if [[ $APP =~ "dashr" ]]
-              then
-                continue
-              fi
-              git config --global user.email '<>' # Leave email blank
-              git config --global user.name "Circle MonoRepo Automatic Deployer"
-              if [ -d ~/dash-sample-apps/apps/"$APP"/ ]
-              then
-                git commit -m "Deployed commit: $CIRCLE_SHA1"
-                git remote add $APP https://dash-playground.plotly.host/GIT/$APP
-                git push $APP master --force || echo "Deploy failed because there is no such app on Dash Gallery: $APP. Please use the web interface to create an app with this name. Continuing deployments..."
-              fi
+              ./deploy "$APP"
             done
       - run:
           name: Push to production

.deployignore

@@ -0,0 +1,7 @@
+# these apps are ignored for deployment
+dash-image-processing
+dash-mapd-demo
+dash-salesforce-crm
+dash-windstreaming
+dashr-alignment-viewer
+dashr-salesforce-crm

README.md

@@ -67,7 +67,7 @@ Contributing an app written with Dash for R is very similar to the steps outline
 3. The `Procfile` should contain 
 
 ```
-web: R -f /app/apps/"$DASH_APP_NAME"/app.R
+web: R -f /app/app.R
 ```
 
 4. Routing and request pathname prefixes should be set. One approach might be to include
@@ -88,12 +88,6 @@ at the head of your `app.R` file.
 app$run_server(host = "0.0.0.0", port = Sys.getenv('PORT', 8050))
 ``
 
-6. For convenience, it is probably easiest to set the working directory in `app.R` as well:
-
-``
-setwd(sprintf("/app/apps/%s", appName))
-``
-
 ### Making changes to an existing app
 
 Switch to the branch that has the same name as the DDS app (the "app
@@ -117,7 +111,7 @@ branch. Once you have passed your code review, you can merge your PR.
 
 - **`Procfile`** gets run at root level for deployment
     - Make sure python working directory is at the app level
-    - Ex. `web: gunicorn --pythonpath apps/{DASH_APP_NAME} app:server`
+    - Ex. `web: gunicorn app:server`
 - **`requirements.txt`**
     - Install project dependecies in a virtual environment
 - **`runtime.txt`**
@@ -139,7 +133,7 @@ branch. Once you have passed your code review, you can merge your PR.
 
 #### Handle relative path
 
-Since deployment happens at the root level `/` and not at the app level (`/apps/{DASH_APP_NAME}`), we need to make sure our application is able to run at both levels for flexibility.
+Assets should never use a relative path, as this will fail when deployed to Dash Enterprise due to use of subdirectories for serving apps.
 
 Reading from assets and data folder
 ```Python

apps/dash-brain-viewer/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-brain-viewer app:server
+web: gunicorn app:server

apps/dash-clinical-analytics/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-clinical-analytics app:server
+web: gunicorn app:server

apps/dash-cytoscape-phylogeny/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-cytoscape-phylogeny app:server
+web: gunicorn app:server

apps/dash-cytoscape/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-cytoscape app:server
+web: gunicorn app:server

apps/dash-daq-iv-tracer/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-daq-iv-tracer demo:server
+web: gunicorn demo:server

apps/dash-daq-satellite-dashboard/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-daq-satellite-dashboard app:server
+web: gunicorn app:server

apps/dash-datashader/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-datashader app:server
+web: gunicorn app:server

apps/dash-drug-discovery/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-drug-discovery app:server
+web: gunicorn app:server

apps/dash-financial-report/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-financial-report app:server
+web: gunicorn app:server

apps/dash-image-processing/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-image-processing app:server
+web: gunicorn app:server

apps/dash-image-processing/app.py

@@ -6,7 +6,6 @@
 import csv
 import sys
 import pathlib
-import importlib
 
 import boto3
 import dash
@@ -16,8 +15,8 @@
 from dash.dependencies import Input, Output, State
 from flask_caching import Cache
 
-drc = importlib.import_module("apps.dash-image-processing.dash_reusable_components")
-utils = importlib.import_module("apps.dash-image-processing.utils")
+import dash_reusable_components as drc
+import utils
 
 DEBUG = True
 LOCAL = False

apps/dash-image-processing/utils.py

@@ -8,8 +8,6 @@
 
 from PIL import Image, ImageFilter, ImageDraw, ImageEnhance
 
-# drc = importlib.import_module("apps.dash-iamge-processing.dash_reusable_components")
-
 #
 APP_PATH = str(pathlib.Path(__file__).parent.resolve())
 

apps/dash-lastodash/Procfile

@@ -1 +1 @@
-web:gunicorn --pythonpath apps/dash-lastodash lastodash:server
+web: gunicorn lastodash:server

apps/dash-live-model-training/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-live-model-training app:server
+web: gunicorn app:server

apps/dash-manufacture-spc-dashboard/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-manufacture-spc-dashboard app:server
+web: gunicorn app:server

apps/dash-mapd-demo/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-mapd-demo app:server
+web: gunicorn app:server

apps/dash-medical-provider-charges/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-medical-provider-charges app:server
+web: gunicorn app:server

apps/dash-medical-provider-charges/app.py

@@ -86,8 +86,6 @@
 for state in state_list:
     p = os.getcwd().split(os.path.sep)
     csv_path = "data/processed/df_{}_lat_lon.csv".format(state)
-    if p[-1] != "dash-medical-provider-charges":
-        csv_path = "apps/dash-medical-provider-charges/" + csv_path
     state_data = pd.read_csv(csv_path)
     data_dict[state] = state_data
 

apps/dash-multipage-report/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-multipage-report app:server
+web: gunicorn app:server

apps/dash-nlp/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-nlp app:server
+web: gunicorn app:server

apps/dash-object-detection/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-object-detection app:server
+web: gunicorn app:server

apps/dash-oil-and-gas/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-oil-and-gas app:server
+web: gunicorn app:server

apps/dash-oil-gas-ternary/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-oil-gas-ternary app:server
+web: gunicorn app:server

apps/dash-oil-gas-ternary/app.py

@@ -1,4 +1,3 @@
-import importlib
 import pathlib
 import os
 
@@ -11,7 +10,6 @@
 import plotly.graph_objs as go
 from dash.dependencies import Input, Output, State
 
-# constants = importlib.import_module("apps.dash-oil-gas-ternary.constants")
 import constants
 
 # app initialize

apps/dash-opioid-epidemic/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-opioid-epidemic app:server
+web: gunicorn app:server

apps/dash-pk-calc/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-pk-calc app:server
+web: gunicorn app:server

apps/dash-salesforce-crm/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-salesforce-crm index:server
+web: gunicorn index:server

apps/dash-stitching/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-stitching app:server
+web: gunicorn app:server

apps/dash-study-browser/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-study-browser app:server
+web: gunicorn app:server

apps/dash-svm/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-svm app:server
+web: gunicorn app:server

apps/dash-svm/app.py

@@ -11,8 +11,8 @@
 from sklearn import datasets
 from sklearn.svm import SVC
 
-drc = importlib.import_module("apps.dash-svm.utils.dash_reusable_components")
-figs = importlib.import_module("apps.dash-svm.utils.figures")
+import utils.dash_reusable_components as drc
+import utils.figures as figs
 
 app = dash.Dash(
     __name__,

apps/dash-tsne/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-tsne app:server
+web: gunicorn app:server

apps/dash-uber-rides-demo/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-uber-rides-demo app:server
+web: gunicorn app:server

apps/dash-web-trader/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-web-trader app:server
+web: gunicorn app:server

apps/dash-wind-streaming/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-wind-streaming app:server
+web: gunicorn app:server

apps/dash-yield-curve/Procfile

@@ -1 +1 @@
-web: gunicorn --pythonpath apps/dash-yield-curve app:server
+web: gunicorn app:server

apps/dashr-alignment-viewer/.buildpacks

@@ -1 +1 @@
-https://github.com/virtualstaticvoid/heroku-buildpack-r#heroku-16
+https://github.com/plotly/heroku-buildpack-r#heroku-18

apps/dashr-alignment-viewer/Procfile

@@ -1 +1 @@
-web: R -f /app/apps/"$DASH_APP_NAME"/app.R
+web: R -f /app/app.R

apps/dashr-alignment-viewer/app.R

@@ -4,7 +4,6 @@ if (appName != "") {
   pathPrefix <- sprintf("/%s/", appName)
   Sys.setenv(DASH_ROUTES_PATHNAME_PREFIX = pathPrefix,
              DASH_REQUESTS_PATHNAME_PREFIX = pathPrefix)
-  setwd(sprintf("/app/apps/%s", appName))
 }
 
 library(dashBio)

apps/dashr-brain-viewer/.buildpacks

@@ -1 +1 @@
-https://github.com/virtualstaticvoid/heroku-buildpack-r#heroku-16
+https://github.com/plotly/heroku-buildpack-r#heroku-18

apps/dashr-brain-viewer/Procfile

@@ -1 +1 @@
-web: R -f /app/apps/"$DASH_APP_NAME"/app.R
+web: R -f /app/app.R

apps/dashr-brain-viewer/app.R

@@ -13,8 +13,6 @@ if (appName != ""){
 
   Sys.setenv(DASH_ROUTES_PATHNAME_PREFIX = pathPrefix,
              DASH_REQUESTS_PATHNAME_PREFIX = pathPrefix)
-
-  setwd(sprintf("/app/apps/%s", appName))
 }
 
 read_mniobj <- function(file){

apps/dashr-clustergram/Procfile

@@ -1 +1 @@
-web: R -f /app/apps/"$DASH_APP_NAME"/app.R
+web: R -f /app/app.R

apps/dashr-clustergram/app.R

@@ -12,8 +12,6 @@ if (appName != ""){
 
   Sys.setenv(DASH_ROUTES_PATHNAME_PREFIX = pathPrefix,
              DASH_REQUESTS_PATHNAME_PREFIX = pathPrefix)
-
-  setwd(sprintf("/app/apps/%s", appName))
 }
 
 source("utils/dash_bio_utils.R")

apps/dashr-daq-iv-tracer/.buildpacks

@@ -0,0 +1 @@
+https://github.com/plotly/heroku-buildpack-r#heroku-18

apps/dashr-daq-iv-tracer/Procfile

@@ -1 +1 @@
-web: R -f /app/apps/"$DASH_APP_NAME"/app.R
+web: R -f /app/app.R

apps/dashr-daq-iv-tracer/app.R

@@ -10,8 +10,6 @@ if (!appName == "") {
 
   Sys.setenv(DASH_ROUTES_PATHNAME_PREFIX = pathPrefix,
              DASH_REQUESTS_PATHNAME_PREFIX = pathPrefix)
-
-  setwd(sprintf("/app/apps/%s", appName))
 }
 
 source("utils/helperfuns.R")

apps/dashr-drug-discovery/.buildpacks

@@ -0,0 +1 @@
+https://github.com/plotly/heroku-buildpack-r#heroku-18

apps/dashr-drug-discovery/Procfile

@@ -1 +1 @@
-web: R -f /app/apps/"$DASH_APP_NAME"/app.R
+web: R -f /app/app.R

apps/dashr-drug-discovery/app.R

@@ -9,14 +9,10 @@ if (appName != ""){
 
   Sys.setenv(DASH_ROUTES_PATHNAME_PREFIX = pathPrefix,
              DASH_REQUESTS_PATHNAME_PREFIX = pathPrefix)
-
-  setwd(sprintf("./app/apps/%s", appName))
 }
 
 app <- Dash$new()
 
-setwd(sprintf("./app/apps/%s", appName))
-
 df <- read.csv('./data/small_molecule_drugbank.csv', header = TRUE, sep = ",")
 
 

apps/dashr-financial-report/.buildpacks

@@ -1 +1 @@
-https://github.com/virtualstaticvoid/heroku-buildpack-r#heroku-16
+https://github.com/plotly/heroku-buildpack-r#heroku-18

apps/dashr-financial-report/Procfile

@@ -1 +1 @@
-web: R -f /app/apps/"$DASH_APP_NAME"/app.R
+web: R -f /app/app.R

apps/dashr-financial-report/app.R

@@ -1,19 +1,10 @@
 appName <- Sys.getenv("DASH_APP_NAME")
 
 if (appName != ""){
-
   pathPrefix <- sprintf("/%s/", appName)
 
-
-
   Sys.setenv(DASH_ROUTES_PATHNAME_PREFIX = pathPrefix,
-
              DASH_REQUESTS_PATHNAME_PREFIX = pathPrefix)
-
-
-
-  setwd(sprintf("/app/apps/%s", appName))
-
 }
 
 

apps/dashr-ideogram/.buildpacks

@@ -1 +1 @@
-https://github.com/virtualstaticvoid/heroku-buildpack-r#heroku-16
+https://github.com/plotly/heroku-buildpack-r#heroku-18

apps/dashr-ideogram/Procfile

@@ -1 +1 @@
-web: R -f /app/apps/"$DASH_APP_NAME"/app.R
+web: R -f /app/app.R