From ce99b6826eb977335ce173ef1e60fa5132bac8eb Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Thu, 2 Aug 2018 21:56:49 +0000
Subject: [PATCH 01/13] flask_site blueprint

---
 fireworks/flask_site/app.py                   | 45 ++++++++++---------
 fireworks/flask_site/templates/base.html      | 10 ++---
 fireworks/flask_site/templates/dashboard.html | 18 ++++----
 .../flask_site/templates/fw_details.html      |  4 +-
 fireworks/flask_site/templates/home.html      | 40 ++++++++---------
 fireworks/flask_site/templates/report.html    |  6 +--
 .../flask_site/templates/wf_details.html      | 18 ++++----
 7 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/fireworks/flask_site/app.py b/fireworks/flask_site/app.py
index 966a44ef5..9ab7d3ef8 100644
--- a/fireworks/flask_site/app.py
+++ b/fireworks/flask_site/app.py
@@ -15,6 +15,11 @@
 from fireworks.fw_config import WEBSERVER_PERFWARNINGS
 import fireworks.flask_site.helpers as fwapp_util
 
+from flask import Blueprint
+tmpl_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'templates')
+stat_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'static')
+main_bp = Blueprint('fw_webgui_main', __name__, template_folder=tmpl_dir, static_folder=stat_dir)
+
 app = Flask(__name__)
 app.use_reloader = True
 app.secret_key = os.environ.get(
@@ -81,7 +86,7 @@ def _addq_WF(q):
     return {
         "$and": [q, app.BASE_Q_WF, session.get('wf_filt', {}), filt_from_fw]}
 
-@app.template_filter('datetime')
+@main_bp.app_template_filter('datetime')
 def datetime(value):
     import datetime as dt
 
@@ -89,7 +94,7 @@ def datetime(value):
     return date.strftime('%m/%d/%Y')
 
 
-@app.template_filter('pluralize')
+@main_bp.app_template_filter('pluralize')
 def pluralize(number, singular='', plural='s'):
     if number == 1:
         return singular
@@ -97,7 +102,7 @@ def pluralize(number, singular='', plural='s'):
         return plural
 
 
-@app.route("/")
+@main_bp.route("/")
 @requires_auth
 def home():
     fw_querystr = request.args.get('fw_query')
@@ -148,7 +153,7 @@ def home():
     return render_template('home.html', **locals())
 
 
-@app.route('/fw/<int:fw_id>/details')
+@main_bp.route('/fw/<int:fw_id>/details')
 @requires_auth
 def get_fw_details(fw_id):
     # just fill out whatever attributse you want to see per step, then edit the handlebars template in
@@ -161,7 +166,7 @@ def get_fw_details(fw_id):
     return jsonify(fw)
 
 
-@app.route('/fw/<int:fw_id>')
+@main_bp.route('/fw/<int:fw_id>')
 @requires_auth
 def fw_details(fw_id):
     try:
@@ -174,7 +179,7 @@ def fw_details(fw_id):
     return render_template('fw_details.html', **locals())
 
 
-@app.route('/wf/<int:wf_id>/json')
+@main_bp.route('/wf/<int:wf_id>/json')
 @requires_auth
 def workflow_json(wf_id):
     try:
@@ -215,7 +220,7 @@ def workflow_json(wf_id):
     return jsonify(nodes_and_edges)
 
 
-@app.route('/wf/<int:wf_id>')
+@main_bp.route('/wf/<int:wf_id>')
 @requires_auth
 def wf_details(wf_id):
     try:
@@ -229,9 +234,9 @@ def wf_details(wf_id):
     return render_template('wf_details.html', **locals())
 
 
-@app.route('/fw/', defaults={"state": "total"})
-@app.route("/fw/<state>/", defaults={"sorting_key": "_id", "sorting_order": "DESCENDING"})
-@app.route("/fw/<state>/<sorting_key>/<sorting_order>/")
+@main_bp.route('/fw/', defaults={"state": "total"})
+@main_bp.route("/fw/<state>/", defaults={"sorting_key": "_id", "sorting_order": "DESCENDING"})
+@main_bp.route("/fw/<state>/<sorting_key>/<sorting_order>/")
 @requires_auth
 def fw_state(state, sorting_key='_id', sorting_order="DESCENDING"):
     if sorting_order == "ASCENDING":
@@ -259,9 +264,9 @@ def fw_state(state, sorting_key='_id', sorting_order="DESCENDING"):
     return render_template('fw_state.html', **locals())
 
 
-@app.route('/wf/', defaults={"state": "total"})
-@app.route("/wf/<state>/", defaults={"sorting_key": "_id", "sorting_order": "DESCENDING"})
-@app.route("/wf/<state>/<sorting_key>/<sorting_order>/")
+@main_bp.route('/wf/', defaults={"state": "total"})
+@main_bp.route("/wf/<state>/", defaults={"sorting_key": "_id", "sorting_order": "DESCENDING"})
+@main_bp.route("/wf/<state>/<sorting_key>/<sorting_order>/")
 @requires_auth
 def wf_state(state, sorting_key='_id', sorting_order="DESCENDING"):
     if sorting_order == "ASCENDING":
@@ -289,8 +294,8 @@ def wf_state(state, sorting_key='_id', sorting_order="DESCENDING"):
     return render_template('wf_state.html', **locals())
 
 
-@app.route("/wf/metadata/<key>/<value>/", defaults={"state": "total"})
-@app.route("/wf/metadata/<key>/<value>/<state>/")
+@main_bp.route("/wf/metadata/<key>/<value>/", defaults={"state": "total"})
+@main_bp.route("/wf/metadata/<key>/<value>/<state>/")
 @requires_auth
 def wf_metadata_find(key, value, state):
     db = lp.workflows
@@ -324,9 +329,9 @@ def wf_metadata_find(key, value, state):
         return render_template('wf_metadata.html', **locals())
 
 
-@app.route('/report/', defaults={"interval": "months", "num_intervals": 6})
-@app.route('/report/<interval>/', defaults={"num_intervals": 6})
-@app.route("/report/<interval>/<num_intervals>/")
+@main_bp.route('/report/', defaults={"interval": "months", "num_intervals": 6})
+@main_bp.route('/report/<interval>/', defaults={"num_intervals": 6})
+@main_bp.route("/report/<interval>/<num_intervals>/")
 @requires_auth
 def report(interval, num_intervals):
     num_intervals = int(num_intervals)
@@ -351,7 +356,7 @@ def report(interval, num_intervals):
 
     return render_template('report.html', **locals())
 
-@app.route('/dashboard/')
+@main_bp.route('/dashboard/')
 @requires_auth
 def dashboard():
     PLOTTING = False
@@ -398,7 +403,7 @@ def parse_querystr(querystr, coll):
               "to make it run faster.".format(querystr))
     return d
 
-@app.route("/reports/<coll>/<interval>/<num_intervals>/fig.png")
+@main_bp.route("/reports/<coll>/<interval>/<num_intervals>/fig.png")
 def simple(coll, interval, num_intervals):
     from io import BytesIO
 
diff --git a/fireworks/flask_site/templates/base.html b/fireworks/flask_site/templates/base.html
index 5e078f65d..38c64841b 100644
--- a/fireworks/flask_site/templates/base.html
+++ b/fireworks/flask_site/templates/base.html
@@ -1,9 +1,9 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html lang="en">
 <head>
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/bootstrap.css') }}">
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/flat-ui.css') }}">
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/styles.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('fw_webgui_main.static', filename='css/bootstrap.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('fw_webgui_main.static', filename='css/flat-ui.css') }}">
+    <link rel="stylesheet" type="text/css" href="{{ url_for('fw_webgui_main.static', filename='css/styles.css') }}">
     {% block morehead %}{% endblock %}
     <title>{% block title %}{% endblock %}</title>
 </head>
@@ -11,8 +11,8 @@
 
 <body>
     <div class="container">
-        <a href="/" >
-            <img class="brand" src="{{ url_for('static', filename='images/fw-logo.png') }}"></img>
+        <a href="{{ url_for('fw_webgui_main.home') }}" >
+            <img class="brand" src="{{ url_for('fw_webgui_main.static', filename='images/fw-logo.png') }}"></img>
         </a>
     </div>
     <hr class="myhrline">
diff --git a/fireworks/flask_site/templates/dashboard.html b/fireworks/flask_site/templates/dashboard.html
index 9886cede3..7a93cb8cc 100644
--- a/fireworks/flask_site/templates/dashboard.html
+++ b/fireworks/flask_site/templates/dashboard.html
@@ -6,18 +6,18 @@ <h2>Fireworks</h2>
 {% if PLOTTING %}
 <div class="report_images">
     <div class="imgContainer">
-        <a href="/report/hours/24"><img src="/reports/fireworks/hours/24/fig.png" width="450px"></a>
+        <a href="{{ url_for('fw_webgui_main.home') }}report/hours/24"><img src="{{ url_for('fw_webgui_main.home') }}reports/fireworks/hours/24/fig.png" width="450px"></a>
     </div>
     <div class="imgContainer">
-        <a href="/report/days/30"><img src="/reports/fireworks/days/30/fig.png" width="450px"></a>
+        <a href="{{ url_for('fw_webgui_main.home') }}report/days/30"><img src="{{ url_for('fw_webgui_main.home') }}reports/fireworks/days/30/fig.png" width="450px"></a>
     </div>
 </div>
 <div class="report_images">
     <div class="imgContainer">
-        <a href="/report/months/12"><img src="/reports/fireworks/months/12/fig.png" width="450px"></a>
+        <a href="{{ url_for('fw_webgui_main.home') }}report/months/12"><img src="{{ url_for('fw_webgui_main.home') }}reports/fireworks/months/12/fig.png" width="450px"></a>
     </div>
     <div class="imgContainer">
-        <a href="/report/years/10"><img src="/reports/fireworks/years/10/fig.png" width="450px"></a>
+        <a href="{{ url_for('fw_webgui_main.home') }}report/years/10"><img src="{{ url_for('fw_webgui_main.home') }}reports/fireworks/years/10/fig.png" width="450px"></a>
     </div>
 </div>
 {% else %}
@@ -30,18 +30,18 @@ <h2>Workflows</h2>
 {% if PLOTTING %}
 <div class="report_images">
     <div class="imgContainer">
-        <a href="/report/hours/24"><img src="/reports/workflows/hours/24/fig.png" width="450px"></a>
+        <a href="{{ url_for('fw_webgui_main.home') }}report/hours/24"><img src="{{ url_for('fw_webgui_main.home') }}reports/workflows/hours/24/fig.png" width="450px"></a>
     </div>
     <div class="imgContainer">
-        <a href="/report/days/30"><img src="/reports/workflows/days/30/fig.png" width="450px"></a>
+        <a href="{{ url_for('fw_webgui_main.home') }}report/days/30"><img src="{{ url_for('fw_webgui_main.home') }}reports/workflows/days/30/fig.png" width="450px"></a>
     </div>
 </div>
 <div class="report_images">
     <div class="imgContainer">
-        <a href="/report/months/12"><img src="/reports/workflows/months/12/fig.png" width="450px"></a>
+        <a href="{{ url_for('fw_webgui_main.home') }}report/months/12"><img src="{{ url_for('fw_webgui_main.home') }}reports/workflows/months/12/fig.png" width="450px"></a>
     </div>
     <div class="imgContainer">
-        <a href="/report/years/10"><img src="/reports/workflows/years/10/fig.png" width="450px"></a>
+        <a href="{{ url_for('fw_webgui_main.home') }}report/years/10"><img src="{{ url_for('fw_webgui_main.home') }}reports/workflows/years/10/fig.png" width="450px"></a>
     </div>
 </div>
 {% else %}
@@ -50,4 +50,4 @@ <h2>Workflows</h2>
 </p>
 {% endif %}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/fireworks/flask_site/templates/fw_details.html b/fireworks/flask_site/templates/fw_details.html
index c98cfd0ed..b55a5116c 100644
--- a/fireworks/flask_site/templates/fw_details.html
+++ b/fireworks/flask_site/templates/fw_details.html
@@ -3,9 +3,9 @@
 {% block title %}Firework {{ fw_id }} Details{% endblock %}
 
 {% block morehead %}
-  <link rel="stylesheet" href="{{ url_for('static', filename='css/jquery.jsonview.css') }}" />
+  <link rel="stylesheet" href="{{ url_for('fw_webgui_main.static', filename='css/jquery.jsonview.css') }}" />
   <script type="text/javascript" src="http://code.jquery.com/jquery.min.js"></script>
-  <script type="text/javascript" src="{{ url_for('static', filename='js/jquery.jsonview.js') }}"></script>
+  <script type="text/javascript" src="{{ url_for('fw_webgui_main.static', filename='js/jquery.jsonview.js') }}"></script>
   <script type="text/javascript">
     var json = {{ fw | tojson }};
 
diff --git a/fireworks/flask_site/templates/home.html b/fireworks/flask_site/templates/home.html
index bff2b98de..4c43efc7e 100644
--- a/fireworks/flask_site/templates/home.html
+++ b/fireworks/flask_site/templates/home.html
@@ -17,18 +17,18 @@
 <div class="row pull-down">
     <div class="span6">
         <table class="table table-bordered">
-            <tr><th colspan="3"><a href="/wf">Newest Workflows</a></th></tr>
+            <tr><th colspan="3"><a href="{{ url_for('fw_webgui_main.home') }}wf">Newest Workflows</a></th></tr>
             {% for wf in wf_info %}
                 <tr>
                     <td>
                         <div class="row pull-down-sm">
                             <div class="span2">
-                                <a href="/wf/{{ wf.id }}"><strong>{{ wf.name }}</strong></a>
+                                <a href="{{ url_for('fw_webgui_main.home') }}wf/{{ wf.id }}"><strong>{{ wf.name }}</strong></a>
                             </div>
                             <div class="span3">
                                 <span class="label {{wf.state}}">{{wf.state}}</span>
                                 <span class="pull-right">
-                                    ID: <a href="/wf/{{ wf.id }}">{{ wf.id }}</a>
+                                    ID: <a href="{{ url_for('fw_webgui_main.home') }}wf/{{ wf.id }}">{{ wf.id }}</a>
                                 </span>
                             </div>
 
@@ -37,7 +37,7 @@
                         <div class="pull-up">
                             {% for fw  in wf.fireworks %}
                             <div>
-                                <small><a class="fw-link {{fw.state}}" href="/fw/{{ fw.fw_id }}">{{fw.name}}</a></small>
+                                <small><a class="fw-link {{fw.state}}" href="{{ url_for('fw_webgui_main.home') }}fw/{{ fw.fw_id }}">{{fw.name}}</a></small>
                             </div>
                             {% endfor %}
                         </div>
@@ -51,10 +51,10 @@
         {% if PLOTTING %}
         <div class="report_images">
             <div class="imgContainer">
-                <a href="/report/hours/12"><img src="/reports/fireworks/hours/12/fig.png" width="225px"></a>
+                <a href="{{ url_for('fw_webgui_main.home') }}report/hours/12"><img src="{{ url_for('fw_webgui_main.home') }}reports/fireworks/hours/12/fig.png" width="225px"></a>
             </div>
             <div class="imgContainer">
-                <a href="/report/days/7"><img src="/reports/fireworks/days/7/fig.png" width="225px"></a>
+                <a href="{{ url_for('fw_webgui_main.home') }}report/days/7"><img src="{{ url_for('fw_webgui_main.home') }}reports/fireworks/days/7/fig.png" width="225px"></a>
             </div>
         </div>
         {% else %}
@@ -66,8 +66,8 @@
             <tr><th colspan="3">Database snapshot</th></tr>
             <tr>
                 <th></th>
-                <th><a href="/fw">Fireworks</a></th>
-                <th><a href="/wf">Workflows</a></th>
+                <th><a href="{{ url_for('fw_webgui_main.home') }}fw">Fireworks</a></th>
+                <th><a href="{{ url_for('fw_webgui_main.home') }}wf">Workflows</a></th>
             </tr>
             {% for state, fw_num, wf_num in state_nums %}
                 <tr>
@@ -76,29 +76,29 @@
                             {{ state }}
                         </span>
                     </td>
-                    <td><center><a href="/fw/{{ state }}">{{ '{:,}'.format(fw_num) }}</a></center></td>
-                    <td><center><a href="/wf/{{ state }}">{{ '{:,}'.format(wf_num) }}</a></center></td>
+                    <td><center><a href="{{ url_for('fw_webgui_main.home') }}fw/{{ state }}">{{ '{:,}'.format(fw_num) }}</a></center></td>
+                    <td><center><a href="{{ url_for('fw_webgui_main.home') }}wf/{{ state }}">{{ '{:,}'.format(wf_num) }}</a></center></td>
                 </tr>
             {% endfor %}
             <tr>
                 <th><div align="right">TOTAL</div></th>
-                <td><center><a href="/fw">{{ '{:,}'.format(tot_fws) }}</a></center></td>
-                <td><center><a href="/wf">{{ '{:,}'.format(tot_wfs) }}</a></center></td>
+                <td><center><a href="{{ url_for('fw_webgui_main.home') }}fw">{{ '{:,}'.format(tot_fws) }}</a></center></td>
+                <td><center><a href="{{ url_for('fw_webgui_main.home') }}wf">{{ '{:,}'.format(tot_wfs) }}</a></center></td>
             </tr>
         </table>
 
         <hr />
         <h3>Summary Reports</h3>
-        <p>See a <a href="/dashboard">visual dashboard</a>.</p>
+        <p>See a <a href="{{ url_for('fw_webgui_main.home') }}dashboard">visual dashboard</a>.</p>
         <p>Get a report of all jobs for the past:</p>
         <ul>
-            <li><a href="/report/minutes/30">30 minutes</a></li>
-            <li><a href="/report/hours/24">24 hours</a></li>
-            <li><a href="/report/days/7">7 days</a></li>
-            <li><a href="/report/days/30">30 days</a></li>
-            <li><a href="/report/months/6">6 months</a></li>
-            <li><a href="/report/months/24">24 months</a></li>
-            <li><a href="/report/years/10">10 years</a></li>
+            <li><a href="{{ url_for('fw_webgui_main.home') }}report/minutes/30">30 minutes</a></li>
+            <li><a href="{{ url_for('fw_webgui_main.home') }}report/hours/24">24 hours</a></li>
+            <li><a href="{{ url_for('fw_webgui_main.home') }}report/days/7">7 days</a></li>
+            <li><a href="{{ url_for('fw_webgui_main.home') }}report/days/30">30 days</a></li>
+            <li><a href="{{ url_for('fw_webgui_main.home') }}report/months/6">6 months</a></li>
+            <li><a href="{{ url_for('fw_webgui_main.home') }}report/months/24">24 months</a></li>
+            <li><a href="{{ url_for('fw_webgui_main.home') }}report/years/10">10 years</a></li>
         </ul>
         <p>For more reporting options, use the "lpad report --help" command line tool.</p>
 
diff --git a/fireworks/flask_site/templates/report.html b/fireworks/flask_site/templates/report.html
index a3d5854d0..44e9539da 100644
--- a/fireworks/flask_site/templates/report.html
+++ b/fireworks/flask_site/templates/report.html
@@ -6,10 +6,10 @@
 {% if PLOTTING %}
 <div class="report_images">
     <div class="imgContainer">
-        <img src="/reports/fireworks/{{ interval }}/{{ num_intervals }}/fig.png" width="450px">
+        <img src="{{ url_for('fw_webgui_main.home') }}reports/fireworks/{{ interval }}/{{ num_intervals }}/fig.png" width="450px">
     </div>
     <div class="imgContainer">
-        <img src="/reports/workflows/{{ interval }}/{{ num_intervals }}/fig.png" width="450px">
+        <img src="{{ url_for('fw_webgui_main.home') }}reports/workflows/{{ interval }}/{{ num_intervals }}/fig.png" width="450px">
     </div>
 </div>
 {% else %}
@@ -31,4 +31,4 @@ <h3 class="text-center">Workflows Report</h3>
 {{ wf_report_text }}
 </pre>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/fireworks/flask_site/templates/wf_details.html b/fireworks/flask_site/templates/wf_details.html
index 7e164638f..aee69e5a6 100644
--- a/fireworks/flask_site/templates/wf_details.html
+++ b/fireworks/flask_site/templates/wf_details.html
@@ -3,16 +3,16 @@
 {% block title %}Workflow {{ wf_id }} Details{% endblock %}
 
 {% block morehead %}
-<link rel="stylesheet" href="{{ url_for('static', filename='css/jquery.jsonview.css') }}" />
-<link href="{{ url_for('static', filename='font-awesome-4.0.3/css/font-awesome.css')}}" rel="stylesheet" type="text/css" />
-<link href="{{ url_for('static', filename='css/cytoscape.js-panzoom.css')}}" rel="stylesheet" type="text/css" />
+<link rel="stylesheet" href="{{ url_for('fw_webgui_main.static', filename='css/jquery.jsonview.css') }}" />
+<link href="{{ url_for('fw_webgui_main.static', filename='font-awesome-4.0.3/css/font-awesome.css')}}" rel="stylesheet" type="text/css" />
+<link href="{{ url_for('fw_webgui_main.static', filename='css/cytoscape.js-panzoom.css')}}" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="http://code.jquery.com/jquery.min.js"></script>
-<script type="text/javascript" src="{{ url_for('static', filename='js/jquery.jsonview.js') }}"></script>
-<script type="text/javascript" src="{{ url_for('static', filename='js/cytoscape.min.js') }}"></script>
-<script type="text/javascript" src="{{ url_for('static', filename='js/dagre.js') }}"></script>
-<script type="text/javascript" src="{{ url_for('static', filename='js/handlebars-v4.0.2.js') }}"></script>
-<script type="text/javascript" src="{{ url_for('static', filename='js/cytoscape-panzoom.js') }}"></script>
-<script type="text/javascript" src="{{ url_for('static', filename='js/wf_cyto.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('fw_webgui_main.static', filename='js/jquery.jsonview.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('fw_webgui_main.static', filename='js/cytoscape.min.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('fw_webgui_main.static', filename='js/dagre.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('fw_webgui_main.static', filename='js/handlebars-v4.0.2.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('fw_webgui_main.static', filename='js/cytoscape-panzoom.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('fw_webgui_main.static', filename='js/wf_cyto.js') }}"></script>
 {% raw %}
 <script id="job-details" type="text/x-handlebars-template">
 <div class="panel panel-default">

From 77694b6572922fefba584e6d91f549043d6c0543 Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Thu, 2 Aug 2018 21:57:08 +0000
Subject: [PATCH 02/13] run flask_site in JupyterHub

---
 fireworks/scripts/lpad_run.py | 38 ++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/fireworks/scripts/lpad_run.py b/fireworks/scripts/lpad_run.py
index 60d1c12de..c4d0d1074 100644
--- a/fireworks/scripts/lpad_run.py
+++ b/fireworks/scripts/lpad_run.py
@@ -518,20 +518,30 @@ def webgui(args):
         webbrowser.open("http://{}:{}".format(args.host, args.port))
         p1.join()
     else:
-        from fireworks.flask_site.app import bootstrap_app
-        try:
-            from fireworks.flask_site.gunicorn import (
-                StandaloneApplication, number_of_workers)
-        except ImportError:
-            import sys
-            sys.exit("Gunicorn is required for server mode. "
-                     "Install using `pip install gunicorn`.")
-        nworkers = args.nworkers if args.nworkers else number_of_workers()
-        options = {
-            'bind': '%s:%s' % (args.host, args.port),
-            'workers': nworkers,
-        }
-        StandaloneApplication(bootstrap_app, options).run()
+        #from fireworks.flask_site.app import bootstrap_app
+        #try:
+        #    from fireworks.flask_site.gunicorn import (
+        #        StandaloneApplication, number_of_workers)
+        #except ImportError:
+        #    import sys
+        #    sys.exit("Gunicorn is required for server mode. "
+        #             "Install using `pip install gunicorn`.")
+        #nworkers = args.nworkers if args.nworkers else number_of_workers()
+        #options = {
+        #    'bind': '%s:%s' % (args.host, args.port),
+        #    'workers': nworkers,
+        #}
+        #StandaloneApplication(bootstrap_app, options).run()
+        from flask import Flask
+        from werkzeug.serving import run_simple
+        application = Flask(__name__)
+        application.secret_key = os.environ.get("FWAPP_SECRET_KEY", os.urandom(24))
+        from fireworks.flask_site.app import main_bp
+        JPY_USER = os.environ.get('JPY_USER')
+        PROXY_URL_PREFIX = '/fwproxy/{}'.format(JPY_USER) if JPY_USER else ''
+        application.register_blueprint(main_bp, url_prefix=PROXY_URL_PREFIX)
+        run_simple(args.host, args.port, application, use_reloader=args.debug,
+                   use_debugger=args.debug, use_evalex=args.debug, threaded=True)
 
 
 def add_scripts(args):

From 9037b3c30608829066985276105c45b27733d761 Mon Sep 17 00:00:00 2001
From: Patrick Huck <tschaume@users.noreply.github.com>
Date: Tue, 7 Aug 2018 15:37:27 -0700
Subject: [PATCH 03/13] filter benign numpy warnings

---
 fireworks/__init__.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/fireworks/__init__.py b/fireworks/__init__.py
index 4958ec1b6..eaa776f3f 100644
--- a/fireworks/__init__.py
+++ b/fireworks/__init__.py
@@ -3,6 +3,10 @@
 __version__ = '1.7.6'
 FW_INSTALL_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
+import warnings                                                                                                                     
+warnings.filterwarnings("ignore", message="numpy.dtype size changed")                                                               
+warnings.filterwarnings("ignore", message="numpy.ndarray size changed")
+
 # These imports allow a much simpler import of core Fireworks functionality.
 # E.g., you can now do "from fireworks import Firework", instead of from
 # "fireworks.core.firework import Firework".

From c2662c42936648f4f644c7124f496358b6f2b5e3 Mon Sep 17 00:00:00 2001
From: Shreyas Cholia <shreyas@gmail.com>
Date: Fri, 28 Jun 2019 09:13:24 -0700
Subject: [PATCH 04/13] set application_root

---
 fireworks/flask_site/app.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fireworks/flask_site/app.py b/fireworks/flask_site/app.py
index af3bd11fe..11aa7a2f7 100644
--- a/fireworks/flask_site/app.py
+++ b/fireworks/flask_site/app.py
@@ -22,6 +22,11 @@
     "FWAPP_SECRET_KEY",
     os.urandom(24))
 
+# Allow application to run under a service prefix in JupyterHub
+if os.environ.get("JUPYTERHUB_SERVICE_PREFIX"):
+    base_url = os.environ.get("JUPYTERHUB_SERVICE_PREFIX")
+    app.config["APPLICATION_ROOT"] = base_url
+
 hello = __name__
 app.BASE_Q = {}
 app.BASE_Q_WF = {}

From e499b576dcf116398702846d9505ef36f60594c5 Mon Sep 17 00:00:00 2001
From: Shreyas Cholia <shreyas@gmail.com>
Date: Fri, 28 Jun 2019 09:47:43 -0700
Subject: [PATCH 05/13] set generic app root config

---
 fireworks/flask_site/app.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fireworks/flask_site/app.py b/fireworks/flask_site/app.py
index 11aa7a2f7..142cddfa4 100644
--- a/fireworks/flask_site/app.py
+++ b/fireworks/flask_site/app.py
@@ -22,10 +22,9 @@
     "FWAPP_SECRET_KEY",
     os.urandom(24))
 
-# Allow application to run under a service prefix in JupyterHub
-if os.environ.get("JUPYTERHUB_SERVICE_PREFIX"):
-    base_url = os.environ.get("JUPYTERHUB_SERVICE_PREFIX")
-    app.config["APPLICATION_ROOT"] = base_url
+# Allow application to run under a service prefix url
+if os.environ.get("FW_APPLICATION_ROOT"):
+    app.config["APPLICATION_ROOT"] = os.environ.get("FW_APPLICATION_ROOT")
 
 hello = __name__
 app.BASE_Q = {}

From f5c6d05f4c17aa1c2bccd82e759ae4d434c3ccb3 Mon Sep 17 00:00:00 2001
From: Shreyas Cholia <shreyas@gmail.com>
Date: Wed, 10 Jul 2019 15:14:09 -0700
Subject: [PATCH 06/13] fix url prefix

---
 fireworks/flask_site/app.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/fireworks/flask_site/app.py b/fireworks/flask_site/app.py
index 5c0a987d9..e0c79a1f8 100644
--- a/fireworks/flask_site/app.py
+++ b/fireworks/flask_site/app.py
@@ -21,16 +21,21 @@
 stat_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'static')
 main_bp = Blueprint('fw_webgui_main', __name__, template_folder=tmpl_dir, static_folder=stat_dir)
 
+
 app = Flask(__name__)
-app.use_reloader = True
-app.secret_key = os.environ.get(
-    "FWAPP_SECRET_KEY",
-    os.urandom(24))
+
 
 # Allow application to run under a service prefix url
 if os.environ.get("FW_APPLICATION_ROOT"):
     app.config["APPLICATION_ROOT"] = os.environ.get("FW_APPLICATION_ROOT")
 
+app.register_blueprint(main_bp, url_prefix=app.config["APPLICATION_ROOT"])
+
+app.use_reloader = True
+app.secret_key = os.environ.get(
+    "FWAPP_SECRET_KEY",
+    os.urandom(24))
+
 hello = __name__
 app.BASE_Q = {}
 app.BASE_Q_WF = {}

From d6de64b069002944bdca12f4ad632b256906153b Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Wed, 10 Jul 2019 15:46:45 -0700
Subject: [PATCH 07/13] webgui: add APPLICATION_ROOT

---
 fireworks/scripts/lpad_run.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fireworks/scripts/lpad_run.py b/fireworks/scripts/lpad_run.py
index 9187357d9..b13738aa7 100644
--- a/fireworks/scripts/lpad_run.py
+++ b/fireworks/scripts/lpad_run.py
@@ -569,6 +569,7 @@ def webgui(args):
         application.secret_key = os.environ.get("FWAPP_SECRET_KEY", os.urandom(24))
         from fireworks.flask_site.app import main_bp
         PROXY_URL_PREFIX = '/fireworks'
+        application.config["APPLICATION_ROOT"] = os.environ.get("JUPYTERHUB_SERVICE_PREFIX")
         application.register_blueprint(main_bp, url_prefix=PROXY_URL_PREFIX)
         run_simple(args.host, args.port, application, use_reloader=args.debug,
                    use_debugger=args.debug, use_evalex=args.debug, threaded=True)

From b8a4bf0dde5ea917cad8b0a4b961349a7328cdae Mon Sep 17 00:00:00 2001
From: Shreyas Cholia <shreyas@gmail.com>
Date: Wed, 10 Jul 2019 15:50:35 -0700
Subject: [PATCH 08/13] fix BP registration

---
 fireworks/flask_site/app.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fireworks/flask_site/app.py b/fireworks/flask_site/app.py
index e0c79a1f8..0782ceba2 100644
--- a/fireworks/flask_site/app.py
+++ b/fireworks/flask_site/app.py
@@ -29,7 +29,6 @@
 if os.environ.get("FW_APPLICATION_ROOT"):
     app.config["APPLICATION_ROOT"] = os.environ.get("FW_APPLICATION_ROOT")
 
-app.register_blueprint(main_bp, url_prefix=app.config["APPLICATION_ROOT"])
 
 app.use_reloader = True
 app.secret_key = os.environ.get(
@@ -416,6 +415,8 @@ def simple(coll, interval, num_intervals):
     response.headers['Content-Type'] = 'image/png'
     return response
 
+app.register_blueprint(main_bp, url_prefix=app.config["APPLICATION_ROOT"])
+
 
 if __name__ == "__main__":
     app.run(debug=True, port=8080)

From 4973c3bf7b70a2bfa52f10f37c57e60603cd0738 Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Wed, 10 Jul 2019 16:26:50 -0700
Subject: [PATCH 09/13] go back to gunicorn

---
 fireworks/scripts/lpad_run.py | 46 +++++++++++++++++------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/fireworks/scripts/lpad_run.py b/fireworks/scripts/lpad_run.py
index b13738aa7..dee72a972 100644
--- a/fireworks/scripts/lpad_run.py
+++ b/fireworks/scripts/lpad_run.py
@@ -550,29 +550,29 @@ def webgui(args):
         webbrowser.open("http://{}:{}".format(args.host, args.port))
         p1.join()
     else:
-        #try:
-        #    from fireworks.flask_site.gunicorn import (
-        #        StandaloneApplication, number_of_workers)
-        #except ImportError:
-        #    import sys
-        #    sys.exit("Gunicorn is required for server mode. "
-        #             "Install using `pip install gunicorn`.")
-        #nworkers = args.nworkers if args.nworkers else number_of_workers()
-        #options = {
-        #    'bind': '%s:%s' % (args.host, args.port),
-        #    'workers': nworkers,
-        #}
-        #StandaloneApplication(app, options).run()
-        from flask import Flask
-        from werkzeug.serving import run_simple
-        application = Flask(__name__)
-        application.secret_key = os.environ.get("FWAPP_SECRET_KEY", os.urandom(24))
-        from fireworks.flask_site.app import main_bp
-        PROXY_URL_PREFIX = '/fireworks'
-        application.config["APPLICATION_ROOT"] = os.environ.get("JUPYTERHUB_SERVICE_PREFIX")
-        application.register_blueprint(main_bp, url_prefix=PROXY_URL_PREFIX)
-        run_simple(args.host, args.port, application, use_reloader=args.debug,
-                   use_debugger=args.debug, use_evalex=args.debug, threaded=True)
+        try:
+            from fireworks.flask_site.gunicorn import (
+                StandaloneApplication, number_of_workers)
+        except ImportError:
+            import sys
+            sys.exit("Gunicorn is required for server mode. "
+                     "Install using `pip install gunicorn`.")
+        nworkers = args.nworkers if args.nworkers else number_of_workers()
+        options = {
+            'bind': '%s:%s' % (args.host, args.port),
+            'workers': nworkers,
+        }
+        StandaloneApplication(app, options).run()
+        #from flask import Flask
+        #from werkzeug.serving import run_simple
+        #application = Flask(__name__)
+        #application.secret_key = os.environ.get("FWAPP_SECRET_KEY", os.urandom(24))
+        #from fireworks.flask_site.app import main_bp
+        #PROXY_URL_PREFIX = '/fireworks'
+        #application.config["APPLICATION_ROOT"] = os.environ.get("JUPYTERHUB_SERVICE_PREFIX")
+        #application.register_blueprint(main_bp, url_prefix=PROXY_URL_PREFIX)
+        #run_simple(args.host, args.port, application, use_reloader=args.debug,
+        #           use_debugger=args.debug, use_evalex=args.debug, threaded=True)
 
 
 def add_scripts(args):

From 5215d950892a2548eb53dbbf5757f5543c3f7b15 Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Tue, 16 Jul 2019 16:16:19 -0700
Subject: [PATCH 10/13] fix blueprint urls

---
 fireworks/flask_site/static/js/wf_cyto.js     | 137 +++++++++---------
 .../flask_site/templates/fw_details.html      |   2 +-
 fireworks/flask_site/templates/fw_state.html  |  16 +-
 .../flask_site/templates/wf_details.html      |   2 +-
 .../flask_site/templates/wf_metadata.html     |   4 +-
 fireworks/flask_site/templates/wf_state.html  |  14 +-
 6 files changed, 87 insertions(+), 88 deletions(-)

diff --git a/fireworks/flask_site/static/js/wf_cyto.js b/fireworks/flask_site/static/js/wf_cyto.js
index 3354dd3dc..e750b5bd0 100644
--- a/fireworks/flask_site/static/js/wf_cyto.js
+++ b/fireworks/flask_site/static/js/wf_cyto.js
@@ -1,81 +1,80 @@
 $(document).ready(function() {
     var options = {
-         name: 'dagre',
+        name: 'dagre',
 
-          // dagre algo options, uses default value on undefined
-         nodeSep: undefined, // the separation between adjacent nodes in the same rank
-         edgeSep: undefined, // the separation between adjacent edges in the same rank
-         rankSep: undefined, // the separation between adjacent nodes in the same rank
-         rankDir: 'TB', // 'TB' for top to bottom flow, 'LR' for left to right
-         minLen: function( edge ){ return 1; }, // number of ranks to keep between the source and target of the edge
-         edgeWeight: function( edge ){ return 1; }, // higher weight edges are generally made shorter and straighter than lower weight edges
+        // dagre algo options, uses default value on undefined
+        nodeSep: undefined, // the separation between adjacent nodes in the same rank
+        edgeSep: undefined, // the separation between adjacent edges in the same rank
+        rankSep: undefined, // the separation between adjacent nodes in the same rank
+        rankDir: 'TB', // 'TB' for top to bottom flow, 'LR' for left to right
+        minLen: function( edge ){ return 1; }, // number of ranks to keep between the source and target of the edge
+        edgeWeight: function( edge ){ return 1; }, // higher weight edges are generally made shorter and straighter than lower weight edges
 
-         // general layout options
-         fit: true, // whether to fit to viewport
-         padding: 30, // fit padding
-         animate: false, // whether to transition the node positions
-         animationDuration: 500, // duration of animation in ms if enabled
-         boundingBox: undefined, // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h }
-         ready: function(){}, // on layoutready
-         stop: function(){} // on layoutstop
-};
-       $.getJSON("/wf/"+ $("#wf_id").html()+ "/json", function(result){
+        // general layout options
+        fit: true, // whether to fit to viewport
+        padding: 30, // fit padding
+        animate: false, // whether to transition the node positions
+        animationDuration: 500, // duration of animation in ms if enabled
+        boundingBox: undefined, // constrain layout bounds; { x1, y1, x2, y2 } or { x1, y1, w, h }
+        ready: function(){}, // on layoutready
+        stop: function(){} // on layoutstop
+    };
+    var wf_json = window.location.pathname + "/json";
+    $.getJSON(wf_json, function(result){
         var cy = cytoscape({
-container: document.getElementById('cy'),
-style: cytoscape.stylesheet()
-    .selector('node')
-    .css({
-    'content': 'data(name)',
-    'text-valign': 'center',
-    'width':'data(width)',
-    'shape':'rectangle',
-    'color': 'white',
-    'background-color' : 'data(state)',
-    'text-outline-width': 1,
-    'font-family': "Open Sans, sans-serif",
-    'font-size': 14,
-    'text-outline-color': '#888'
-    })
-    .selector('edge')
-    .css({
-    'target-arrow-shape': 'triangle'
-    })
-    .selector(':selected')
-    .css({
-    'background-color': 'black',
-    'line-color': 'black',
-    'target-arrow-color': 'black',
-                       'source-arrow-color': 'black'
-                                   })
-    .selector('.faded')
-    .css({
-    'opacity': 0.25,
-    'text-opacity': 0
-           }),
-    elements: {
-    nodes:result.nodes,
-    edges:result.edges,
-      },
-    ready: function() {
-               window.cy = this;
-               cy.layout(options);
-               cy.panzoom();
-           }
-});
- $('#json').JSONView('collapse')
-var source = $("#job-details").html();
-var template = Handlebars.compile(source);
-cy.on("click", 'node', function(evt) {
-        $.getJSON("/fw/" + this.data('id') + "/details", function(result) {
+            container: document.getElementById('cy'),
+            style: cytoscape.stylesheet()
+            .selector('node')
+            .css({
+                'content': 'data(name)',
+                'text-valign': 'center',
+                'width':'data(width)',
+                'shape':'rectangle',
+                'color': 'white',
+                'background-color' : 'data(state)',
+                'text-outline-width': 1,
+                'font-family': "Open Sans, sans-serif",
+                'font-size': 14,
+                'text-outline-color': '#888'
+            })
+            .selector('edge')
+            .css({
+                'target-arrow-shape': 'triangle'
+            })
+            .selector(':selected')
+            .css({
+                'background-color': 'black',
+                'line-color': 'black',
+                'target-arrow-color': 'black',
+                'source-arrow-color': 'black'
+            })
+            .selector('.faded')
+            .css({
+                'opacity': 0.25,
+                'text-opacity': 0
+            }),
+            elements: {
+                nodes:result.nodes,
+                edges:result.edges,
+            },
+            ready: function() {
+                window.cy = this;
+                cy.layout(options);
+                cy.panzoom();
+            }
+        });
+        $('#json').JSONView('collapse')
+        var source = $("#job-details").html();
+        var template = Handlebars.compile(source);
+        cy.on("click", 'node', function(evt) {
+            var path = window.location.pathname.split('/');
+            var root = path.splice(0, path.length-2).join('/');
+            $.getJSON(root + "/fw/" + this.data('id') + "/details", function(result) {
                 $("#job-details-target").html(template(result));
             });
         });
 
-});
-
-
-
-
+    });
 });
 
 
diff --git a/fireworks/flask_site/templates/fw_details.html b/fireworks/flask_site/templates/fw_details.html
index b55a5116c..90d2fd55d 100644
--- a/fireworks/flask_site/templates/fw_details.html
+++ b/fireworks/flask_site/templates/fw_details.html
@@ -4,7 +4,7 @@
 
 {% block morehead %}
   <link rel="stylesheet" href="{{ url_for('fw_webgui_main.static', filename='css/jquery.jsonview.css') }}" />
-  <script type="text/javascript" src="http://code.jquery.com/jquery.min.js"></script>
+  <script type="text/javascript" src="//code.jquery.com/jquery.min.js"></script>
   <script type="text/javascript" src="{{ url_for('fw_webgui_main.static', filename='js/jquery.jsonview.js') }}"></script>
   <script type="text/javascript">
     var json = {{ fw | tojson }};
diff --git a/fireworks/flask_site/templates/fw_state.html b/fireworks/flask_site/templates/fw_state.html
index 057ec2e37..42e943637 100644
--- a/fireworks/flask_site/templates/fw_state.html
+++ b/fireworks/flask_site/templates/fw_state.html
@@ -13,23 +13,23 @@ <h3 class="text-center">{{ '{:,}'.format(fw_count) }} {{ state|lower }} Firework
         <th>ID</th>
         <th>Name</th>
         {% if current_sorting_key == "created_on" and current_sorting_order == "ASCENDING" %}
-        <th><a href="/fw/{{state}}/created_on/DESCENDING">Created On &#x25B2;</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}fw/{{state}}/created_on/DESCENDING">Created On &#x25B2;</a></th>
         {% elif current_sorting_key == "created_on" and current_sorting_order == "DESCENDING" %}
-        <th><a href="/fw/{{state}}/created_on/ASCENDING">Created On &#x25BC;</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}fw/{{state}}/created_on/ASCENDING">Created On &#x25BC;</a></th>
         {% else %}
-        <th><a href="/fw/{{state}}/created_on/DESCENDING">Created On</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}fw/{{state}}/created_on/DESCENDING">Created On</a></th>
         {% endif %}
         {% if current_sorting_key == "updated_on" and current_sorting_order == "ASCENDING" %}
-        <th><a href="/fw/{{state}}/updated_on/DESCENDING">Updated On &#x25B2;</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}fw/{{state}}/updated_on/DESCENDING">Updated On &#x25B2;</a></th>
         {% elif current_sorting_key == "updated_on" and current_sorting_order == "DESCENDING" %}
-        <th><a href="/fw/{{state}}/updated_on/ASCENDING">Updated On &#x25BC;</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}fw/{{state}}/updated_on/ASCENDING">Updated On &#x25BC;</a></th>
         {% else %}
-        <th><a href="/fw/{{state}}/updated_on/DESCENDING">Updated On</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}fw/{{state}}/updated_on/DESCENDING">Updated On</a></th>
         {% endif %}
     </tr>
     {% for row in rows %}
         <tr>
-            <td><center><a href="/fw/{{ row.fw_id }}">{{ row.fw_id }}</a></center></td>
+            <td><center><a href="{{ url_for('fw_webgui_main.home') }}fw/{{ row.fw_id }}">{{ row.fw_id }}</a></center></td>
             <td>{{ row.name }}</td>
             <td>{{ row.created_on }}</td>
             <td>{{ row.updated_on }}</td>
@@ -39,4 +39,4 @@ <h3 class="text-center">{{ '{:,}'.format(fw_count) }} {{ state|lower }} Firework
 
 {{ pagination.links|safe }}
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/fireworks/flask_site/templates/wf_details.html b/fireworks/flask_site/templates/wf_details.html
index 968b158f2..46f3ee093 100644
--- a/fireworks/flask_site/templates/wf_details.html
+++ b/fireworks/flask_site/templates/wf_details.html
@@ -77,7 +77,7 @@ <h4 class="text-center">Workflow {{ wf_id }} </h4>
     <ul class="inline">
         {% for s in all_states %}
         <li>
-            <a href="/fw/{{s}}">
+            <a href="{{ url_for('fw_webgui_main.home') }}fw/{{s}}">
                 <span class="label {{ s }}">
                     {{ s }}
                 </span>
diff --git a/fireworks/flask_site/templates/wf_metadata.html b/fireworks/flask_site/templates/wf_metadata.html
index 316681132..2d46b9a84 100644
--- a/fireworks/flask_site/templates/wf_metadata.html
+++ b/fireworks/flask_site/templates/wf_metadata.html
@@ -10,7 +10,7 @@ <h3 class="text-center">{{ '{:,}'.format(wf_count) }} {{ state|lower }} Workflow
   <ul class="inline">
     {% for s in all_states %}
     <li>
-      <a href="/wf/metadata/{{key}}/{{value}}/{{s}}">
+      <a href="{{ url_for('fw_webgui_main.home') }}wf/metadata/{{key}}/{{value}}/{{s}}">
         <span class="label {{s}}">
           {{ s }}
         </span>
@@ -30,7 +30,7 @@ <h3 class="text-center">{{ '{:,}'.format(wf_count) }} {{ state|lower }} Workflow
   </tr>
   {% for row in rows %}
   <tr>
-    <td><center><a href="/wf/{{ row.fw_id }}">{{ row.fw_id }}</a></center></td>
+    <td><center><a href="{{ url_for('fw_webgui_main.home') }}wf/{{ row.fw_id }}">{{ row.fw_id }}</a></center></td>
     <td>{{ row.name }}</td>
     <td>{{ row.created_on }}</td>
   </tr>
diff --git a/fireworks/flask_site/templates/wf_state.html b/fireworks/flask_site/templates/wf_state.html
index a54e517f3..4d04b2c26 100644
--- a/fireworks/flask_site/templates/wf_state.html
+++ b/fireworks/flask_site/templates/wf_state.html
@@ -12,23 +12,23 @@ <h3 class="text-center">{{ '{:,}'.format(wf_count) }} {{ state|lower }} Workflow
         <th>ID</th>
         <th>Name</th>
         {% if current_sorting_key == "created_on" and current_sorting_order == "ASCENDING" %}
-        <th><a href="/wf/{{state}}/created_on/DESCENDING">Created On &#x25B2;</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}wf/{{state}}/created_on/DESCENDING">Created On &#x25B2;</a></th>
         {% elif current_sorting_key == "created_on" and current_sorting_order == "DESCENDING" %}
-        <th><a href="/wf/{{state}}/created_on/ASCENDING">Created On &#x25BC;</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}wf/{{state}}/created_on/ASCENDING">Created On &#x25BC;</a></th>
         {% else %}
-        <th><a href="/wf/{{state}}/created_on/DESCENDING">Created On</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}wf/{{state}}/created_on/DESCENDING">Created On</a></th>
         {% endif %}
         {% if current_sorting_key == "updated_on" and current_sorting_order == "ASCENDING" %}
-        <th><a href="/wf/{{state}}/updated_on/DESCENDING">Updated On &#x25B2;</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}wf/{{state}}/updated_on/DESCENDING">Updated On &#x25B2;</a></th>
         {% elif current_sorting_key == "updated_on" and current_sorting_order == "DESCENDING" %}
-        <th><a href="/wf/{{state}}/updated_on/ASCENDING">Updated On &#x25BC;</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}wf/{{state}}/updated_on/ASCENDING">Updated On &#x25BC;</a></th>
         {% else %}
-        <th><a href="/wf/{{state}}/updated_on/DESCENDING">Updated On</a></th>
+        <th><a href="{{ url_for('fw_webgui_main.home') }}wf/{{state}}/updated_on/DESCENDING">Updated On</a></th>
         {% endif %}
     </tr>
     {% for row in rows %}
         <tr>
-            <td><center><a href="/wf/{{ row.fw_id }}">{{ row.fw_id }}</a></center></td>
+            <td><center><a href="{{ url_for('fw_webgui_main.home') }}wf/{{ row.fw_id }}">{{ row.fw_id }}</a></center></td>
             <td>{{ row.name }}</td>
             <td>{{ row.created_on }}</td>
             <td>{{ row.updated_on }}</td>

From 7a18c78e49542a231a2432f9facf78ec1ba73448 Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Fri, 26 Jul 2019 17:33:04 -0700
Subject: [PATCH 11/13] args check, fixes #331

---
 fireworks/scripts/lpad_run.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fireworks/scripts/lpad_run.py b/fireworks/scripts/lpad_run.py
index 2b67e816d..e4d722a08 100644
--- a/fireworks/scripts/lpad_run.py
+++ b/fireworks/scripts/lpad_run.py
@@ -358,7 +358,7 @@ def get_children(links, start, max_depth):
 def detect_lostruns(args):
     lp = get_lp(args)
     query = ast.literal_eval(args.query) if args.query else None
-    launch_query = ast.literal_eval(args.launch_query) if args.host else None
+    launch_query = ast.literal_eval(args.launch_query) if args.launch_query else None
     fl, ff, fi = lp.detect_lostruns(expiration_secs=args.time, fizzle=args.fizzle, rerun=args.rerun,
                                     max_runtime=args.max_runtime, min_runtime=args.min_runtime,
                                     refresh=args.refresh, query=query, launch_query=launch_query)

From 621e0f0a2ce6bf4d14c9cf0a421a17b3470f4d37 Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Mon, 29 Jul 2019 14:28:24 -0700
Subject: [PATCH 12/13] use simplejson

---
 fireworks/flask_site/util.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fireworks/flask_site/util.py b/fireworks/flask_site/util.py
index aec86b759..7af320dac 100644
--- a/fireworks/flask_site/util.py
+++ b/fireworks/flask_site/util.py
@@ -1,5 +1,5 @@
 import datetime
-import json
+import simplejson as json
 
 from bson.objectid import ObjectId
 from flask.globals import current_app

From 0701e22f979472e5eb1b40db1d21a798462858dc Mon Sep 17 00:00:00 2001
From: Patrick Huck <phuck@lbl.gov>
Date: Wed, 5 Jan 2022 15:14:57 -0800
Subject: [PATCH 13/13] whitespace fixes

---
 fireworks/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fireworks/__init__.py b/fireworks/__init__.py
index 68e0fc600..3eb0f3900 100644
--- a/fireworks/__init__.py
+++ b/fireworks/__init__.py
@@ -3,8 +3,8 @@
 __version__ = "1.9.8"
 FW_INSTALL_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-import warnings                                                                                                                     
-warnings.filterwarnings("ignore", message="numpy.dtype size changed")                                                               
+import warnings
+warnings.filterwarnings("ignore", message="numpy.dtype size changed")
 warnings.filterwarnings("ignore", message="numpy.ndarray size changed")
 
 # These imports allow a much simpler import of core Fireworks functionality.