feat: bundle clients into the package

Author: sgratzl

.dockerignore

@@ -2,4 +2,5 @@
 /.mypy_cache
 /.github
 /docs
-__pycache__
+__pycache__
+/node_modules

.gitignore

@@ -3,4 +3,6 @@ __pycache__/
 /.vscode
 /delphi-epidata
 /.env
-*.db
+*.db
+/build
+/node_modules

build.js

@@ -0,0 +1,6 @@
+const { process, minimizeJs, rename } = require('delphi-cmu-buildtools');
+
+Promise.all([
+    process('*.+(coffee|js|py|R)', [], { srcDir: './src/client', dstDir: './build/lib' }),
+    process('*.js', [minimizeJs(), rename((f) => f.replace('.js', '.min.js'))], { srcDir: './src/client', dstDir: './build/lib' }),
+]).then((r) => console.log(r.flat()));

dev/docker/database/epidata/Dockerfile

@@ -9,7 +9,7 @@ ENV MYSQL_USER user
 ENV MYSQL_PASSWORD pass
 
 # provide DDL which will create empty tables at container startup
-COPY repos/delphi/delphi-epidata/src/ddl/*.sql /docker-entrypoint-initdb.d/
+COPY ./src/ddl/*.sql /docker-entrypoint-initdb.d/
 
 # grant access to SQL scripts
 RUN chmod o+r /docker-entrypoint-initdb.d/*.sql

devops/Dockerfile

@@ -1,3 +1,8 @@
+FROM node:lts-buster AS builder
+WORKDIR /src
+COPY . /src
+RUN npm ci && npm run build
+
 FROM tiangolo/meinheld-gunicorn:python3.7
 LABEL org.opencontainers.image.source=https://github.com/cmu-delphi/delphi-epidata
 # use delphi's timezome
@@ -8,4 +13,5 @@ RUN pip install --no-cache-dir -r requirements.txt
 
 COPY ./devops/gunicorn_conf.py /app
 COPY ./src/server/ /app/app/
+COPY --from=builder ./src/build/lib/ /app/app/lib/
 RUN rm -rf /app/app/__pycache__ /app/app/*.php && chmod -R o+r /app/app

package-lock.json

@@ -0,0 +1,12 @@
+{
+    "name": "delphi-epidata",
+    "private": true,
+    "dependencies": {},
+    "devDependencies": {
+        "delphi-cmu-buildtools": "github:sgratzl/delphi-cmu-buildtools"
+    },
+    "scripts": {
+        "build": "node build.js",
+        "image": "docker build -t delphi-epidata:latest --file ./devops/Dockerfile ."
+    }
+}

package.json

@@ -1,14 +1,14 @@
 from typing import cast
 
-from flask import Flask, g
+from flask import Flask, g, request
 from sqlalchemy.engine import Connection
 from werkzeug.local import LocalProxy
 
 from ._config import SECRET
 from ._db import engine
 from ._exceptions import DatabaseErrorException
 
-app = Flask("EpiData")
+app = Flask("EpiData", static_url_path="")
 app.config["SECRET"] = SECRET
 
 
@@ -27,6 +27,8 @@ def _get_db() -> Connection:
 
 @app.before_request
 def connect_db():
+    if request.path.startswith('/lib'):
+        return
     # try to get the db
     try:
         _get_db()

src/server/_common.py

@@ -2,7 +2,7 @@
 import logging
 from typing import Dict, Callable
 
-from flask import request, send_file, Response
+from flask import request, send_file, Response, send_from_directory
 
 from ._config import URL_PREFIX
 from ._common import app
@@ -37,6 +37,11 @@ def handle_generic():
 def send_index_file():
     return send_file(pathlib.Path(__file__).parent / "index.html")
 
+@app.route(f"{URL_PREFIX}/lib/<path:path>")
+def send_lib_file(path: str):
+    print(path, flush=True)
+    return send_from_directory(pathlib.Path(__file__).parent / "lib", path)
+
 
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=5000)