bump version

CamDavidsonPilon · CamDavidsonPilon · commit 1abaaa936486 · 2023-01-05T10:54:32.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### Upcoming
+ - add `/api/get_ui_version`
+
 ### 22.12.0
  - First changelog entry.
  - Fix caching bug that was preventing the UI from displaying newly added Pioreactors.
diff --git a/app.py b/app.py
@@ -15,8 +15,10 @@
 from flask import Flask
 from flask import g
 
+from version import __version__
+
 NAME = "pioreactorui"
-VERSION = "22.12.0"
+VERSION = __version__
 HOSTNAME = socket.gethostname()
 LOG_TOPIC = f"pioreactor/{HOSTNAME}/$experiment/logs/ui"
 
diff --git a/asset-manifest.json b/asset-manifest.json
@@ -1,15 +1,15 @@
 {
   "files": {
     "main.css": "/static/css/main.a57f1396.chunk.css",
-    "main.js": "/static/js/main.de1540cf.chunk.js",
-    "main.js.map": "/static/js/main.de1540cf.chunk.js.map",
+    "main.js": "/static/js/main.2c6c8e79.chunk.js",
+    "main.js.map": "/static/js/main.2c6c8e79.chunk.js.map",
     "runtime-main.js": "/static/js/runtime-main.b43b082e.js",
     "runtime-main.js.map": "/static/js/runtime-main.b43b082e.js.map",
     "static/css/2.15aaca28.chunk.css": "/static/css/2.15aaca28.chunk.css",
     "static/js/2.85251dbd.chunk.js": "/static/js/2.85251dbd.chunk.js",
     "static/js/2.85251dbd.chunk.js.map": "/static/js/2.85251dbd.chunk.js.map",
     "index.html": "/index.html",
-    "precache-manifest.f68ef17db7d29e0e5138496bd751e38c.js": "/precache-manifest.f68ef17db7d29e0e5138496bd751e38c.js",
+    "precache-manifest.5e709619ad77e80c03050885ff48e5c2.js": "/precache-manifest.5e709619ad77e80c03050885ff48e5c2.js",
     "service-worker.js": "/service-worker.js",
     "static/css/2.15aaca28.chunk.css.map": "/static/css/2.15aaca28.chunk.css.map",
     "static/css/main.a57f1396.chunk.css.map": "/static/css/main.a57f1396.chunk.css.map",
@@ -24,6 +24,6 @@
     "static/css/2.15aaca28.chunk.css",
     "static/js/2.85251dbd.chunk.js",
     "static/css/main.a57f1396.chunk.css",
-    "static/js/main.de1540cf.chunk.js"
+    "static/js/main.2c6c8e79.chunk.js"
   ]
 }
diff --git a/index.html b/index.html
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link href="/static/css/2.15aaca28.chunk.css" rel="stylesheet"><link href="/static/css/main.a57f1396.chunk.css" rel="stylesheet"></head><body><div id="root"></div><script>!function(e){function r(r){for(var n,i,l=r[0],f=r[1],a=r[2],c=0,s=[];c<l.length;c++)i=l[c],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var f=t[l];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/";var l=this.webpackJsonpui=this.webpackJsonpui||[],f=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=f;t()}([])</script><script src="/static/js/2.85251dbd.chunk.js"></script><script src="/static/js/main.de1540cf.chunk.js"></script></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link href="/static/css/2.15aaca28.chunk.css" rel="stylesheet"><link href="/static/css/main.a57f1396.chunk.css" rel="stylesheet"></head><body><div id="root"></div><script>!function(e){function r(r){for(var n,i,l=r[0],f=r[1],a=r[2],c=0,s=[];c<l.length;c++)i=l[c],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var f=t[l];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/";var l=this.webpackJsonpui=this.webpackJsonpui||[],f=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=f;t()}([])</script><script src="/static/js/2.85251dbd.chunk.js"></script><script src="/static/js/main.2c6c8e79.chunk.js"></script></body></html>
diff --git a/main.py b/main.py
@@ -1,7 +1,10 @@
+# -*- coding: utf-8 -*-
+from __future__ import annotations
+
+import tasks  # noqa: F401,F403 # Import tasks so they are registered with Huey instance.
+import views  # noqa: F401,F403 # Import views so they are registered with Flask app.
 from app import app
-import tasks  # Import tasks so they are registered with Huey instance.
-import views  # Import views so they are registered with Flask app.
 
 
-if __name__ == '__main__':
-    app.run()
+if __name__ == "__main__":
+    app.run()
diff --git a/precache-manifest.5e709619ad77e80c03050885ff48e5c2.js b/precache-manifest.5e709619ad77e80c03050885ff48e5c2.js
@@ -1,14 +1,14 @@
 self.__precacheManifest = (self.__precacheManifest || []).concat([
   {
-    "revision": "a12eff4251eb6548c2ed91d30922e062",
+    "revision": "440e136e2cca318e59a4d76308c835d3",
     "url": "/index.html"
   },
   {
     "revision": "81defbce1e1e51b2c5a4",
     "url": "/static/css/2.15aaca28.chunk.css"
   },
   {
-    "revision": "dda75fe9e4eeafa5d673",
+    "revision": "ee15efc0a9463559cb75",
     "url": "/static/css/main.a57f1396.chunk.css"
   },
   {
@@ -20,8 +20,8 @@ self.__precacheManifest = (self.__precacheManifest || []).concat([
     "url": "/static/js/2.85251dbd.chunk.js.LICENSE.txt"
   },
   {
-    "revision": "dda75fe9e4eeafa5d673",
-    "url": "/static/js/main.de1540cf.chunk.js"
+    "revision": "ee15efc0a9463559cb75",
+    "url": "/static/js/main.2c6c8e79.chunk.js"
   },
   {
     "revision": "717be7891cc3d466bc4e",
diff --git a/service-worker.js b/service-worker.js
@@ -14,7 +14,7 @@
 importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");
 
 importScripts(
-  "/precache-manifest.f68ef17db7d29e0e5138496bd751e38c.js"
+  "/precache-manifest.5e709619ad77e80c03050885ff48e5c2.js"
 );
 
 self.addEventListener('message', (event) => {
diff --git a/static/js/main.2c6c8e79.chunk.js b/static/js/main.2c6c8e79.chunk.js
diff --git a/static/js/main.2c6c8e79.chunk.js.map b/static/js/main.2c6c8e79.chunk.js.map
diff --git a/static/js/main.de1540cf.chunk.js b/static/js/main.de1540cf.chunk.js
diff --git a/static/js/main.de1540cf.chunk.js.map b/static/js/main.de1540cf.chunk.js.map
diff --git a/tasks.py b/tasks.py
@@ -8,8 +8,8 @@
 from dotenv import dotenv_values
 from huey import SqliteHuey
 
-huey = SqliteHuey(filename="huey.db")
 env = dotenv_values(".env")
+huey = SqliteHuey(filename="huey.db")
 
 logger = logging.getLogger("huey.consumer")
 logger.setLevel(logging.INFO)
@@ -41,15 +41,15 @@ def add_new_pioreactor(new_pioreactor_name: str) -> tuple[bool, str]:
 @huey.task()
 def update_app() -> bool:
     logger.info("Updating app on leader")
-    update_app_on_leader = ["pio", "update", "--app"]
+    update_app_on_leader = ["pio", "update", "app"]
     subprocess.run(update_app_on_leader)
 
     logger.info("Updating app on workers")
-    update_app_across_all_workers = ["pios", "update"]
+    update_app_across_all_workers = ["pios", "update", "-y"]
     subprocess.run(update_app_across_all_workers)
 
     logger.info("Updating UI on leader")
-    update_ui_on_leader = ["pio", "update", "--ui"]
+    update_ui_on_leader = ["pio", "update", "ui"]
     subprocess.run(update_ui_on_leader)
 
     return True
diff --git a/version.py b/version.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+from __future__ import annotations
+
+
+__version__ = "23.1.0"
diff --git a/views.py b/views.py
@@ -14,17 +14,23 @@
 from flask import request
 from flask import Response
 from huey.exceptions import HueyException
-from yaml import CLoader as Loader  # type: ignore
-from yaml import load as yaml_load  # type: ignore
 
+try:
+    from yaml import CLoader as Loader  # type: ignore
+except ImportError:
+    from yaml import Loader  # type: ignore
+
+from yaml import load as yaml_load  # type: ignore
 import tasks as background_tasks
 from app import app
 from app import cache
 from app import client
 from app import env
 from app import insert_into_db
 from app import publish_to_error_log
+from app import publish_to_log
 from app import query_db
+from app import VERSION
 
 
 def current_utc_datetime() -> datetime:
@@ -324,18 +330,18 @@ def list_installed_plugins():
 @app.route("/api/install_plugin", methods=["POST"])
 def install_plugin():
     cache.evict("plugins")
+    cache.evict("config")
     body = request.get_json()
     background_tasks.pios("install-plugin", body["plugin_name"])
-    cache.evict("plugins")
     return Response(status=204)
 
 
 @app.route("/api/uninstall_plugin", methods=["POST"])
 def uninstall_plugin():
     cache.evict("plugins")
+    cache.evict("config")
     body = request.get_json()
     background_tasks.pios("uninstall-plugin", body["plugin_name"])
-    cache.evict("plugins")
     return Response(status=204)
 
 
@@ -402,6 +408,11 @@ def get_app_version():
     return result.stdout.strip()
 
 
+@app.route("/api/get_ui_version", methods=["GET"])
+def get_ui_version():
+    return VERSION
+
+
 @app.route("/api/export_datasets", methods=["POST"])
 def export_datasets():
     body = request.get_json()
@@ -575,18 +586,9 @@ def create_experiment():
                 body.get("organismUsed"),
             ),
         )
-
-        # we want to make sure that this is published to MQTT
-        msg = client.publish(
-            "pioreactor/latest_experiment/experiment", body["experiment"], qos=2, retain=True
-        )
-        while msg.wait_for_publish(timeout=60):
-            pass
-        assert msg.is_published()
-        client.publish(
-            "pioreactor/latest_experiment/created_at", body["created_at"], qos=2, retain=True
+        publish_to_log(
+            f"New experiment created: {body['experiment']}", "create_experiment", level="INFO"
         )
-
         return Response(status=200)
 
     except sqlite3.IntegrityError as e:
@@ -678,6 +680,7 @@ def delete_config():
     config_path = Path(env["DOT_PIOREACTOR"]) / filename
 
     background_tasks.rm(config_path)
+    publish_to_log(f"Deleted config {body['filename']}.", "delete_config")
     return Response(status=204)
 
 
@@ -723,19 +726,19 @@ def save_new_config():
             assert config.get("cluster.topology", "leader_hostname")
             assert config.get("cluster.topology", "leader_address")
     except configparser.DuplicateSectionError as e:
-        msg = f"Duplicate section [{e.section}] was found."
+        msg = f"Duplicate section [{e.section}] was found. Please fix and try again."
         publish_to_error_log(msg, "save_new_config")
         return {"msg": msg}, 400
     except configparser.DuplicateOptionError as e:
-        msg = f"Duplicate option {[e.option]} was found in section {[e.section]}."
+        msg = f"Duplicate option, `{e.option}`, was found in section [{e.section}]. Please fix and try again."
         publish_to_error_log(msg, "save_new_config")
         return {"msg": msg}, 400
     except configparser.ParsingError:
-        msg = "Incorrect syntax."
+        msg = "Incorrect syntax. Please fix and try again."
         publish_to_error_log(msg, "save_new_config")
         return {"msg": msg}, 400
     except (AssertionError, configparser.NoSectionError, KeyError, TypeError):
-        msg = "Missing required fields in [cluster.topology]: `leader_hostname` and/or `leader_address` ."
+        msg = "Missing required field(s) in [cluster.topology]: `leader_hostname` and/or `leader_address`. Please fix and try again."
         publish_to_error_log(msg, "save_new_config")
         return {"msg": msg}, 400
     except Exception as e:

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link href="/static/css/2.15aaca28.chunk.css" rel="stylesheet"><link href="/static/css/main.a57f1396.chunk.css" rel="stylesheet"></head><body><div id="root"></div><script>!function(e){function r(r){for(var n,i,l=r[0],f=r[1],a=r[2],c=0,s=[];c<l.length;c++)i=l[c],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a\|\|[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var f=t[l];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)\|\|Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/";var l=this.webpackJsonpui=this.webpackJsonpui\|\|[],f=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=f;t()}([])</script><script src="/static/js/2.85251dbd.chunk.js"></script><script src="/static/js/main.de1540cf.chunk.js"></script></body></html>
	`1`	+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Pioreactor"/><link rel="apple-touch-icon" href="/logo192.png"/><link rel="manifest" href="/manifest.json"/><link href="/static/css/2.15aaca28.chunk.css" rel="stylesheet"><link href="/static/css/main.a57f1396.chunk.css" rel="stylesheet"></head><body><div id="root"></div><script>!function(e){function r(r){for(var n,i,l=r[0],f=r[1],a=r[2],c=0,s=[];c<l.length;c++)i=l[c],Object.prototype.hasOwnProperty.call(o,i)&&o[i]&&s.push(o[i][0]),o[i]=0;for(n in f)Object.prototype.hasOwnProperty.call(f,n)&&(e[n]=f[n]);for(p&&p(r);s.length;)s.shift()();return u.push.apply(u,a\|\|[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var f=t[l];0!==o[f]&&(n=!1)}n&&(u.splice(r--,1),e=i(i.s=t[0]))}return e}var n={},o={1:0},u=[];function i(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,i),t.l=!0,t.exports}i.m=e,i.c=n,i.d=function(e,r,t){i.o(e,r)\|\|Object.defineProperty(e,r,{enumerable:!0,get:t})},i.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.t=function(e,r){if(1&r&&(e=i(e)),8&r)return e;if(4&r&&"object"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(i.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:e}),2&r&&"string"!=typeof e)for(var n in e)i.d(t,n,function(r){return e[r]}.bind(null,n));return t},i.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return i.d(r,"a",r),r},i.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},i.p="/";var l=this.webpackJsonpui=this.webpackJsonpui\|\|[],f=l.push.bind(l);l.push=r,l=l.slice();for(var a=0;a<l.length;a++)r(l[a]);var p=f;t()}([])</script><script src="/static/js/2.85251dbd.chunk.js"></script><script src="/static/js/main.2c6c8e79.chunk.js"></script></body></html>
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`	`self.__precacheManifest = (self.__precacheManifest \|\| []).concat([`
`2`	`2`	`{`
`3`		`- "revision": "a12eff4251eb6548c2ed91d30922e062",`
	`3`	`+ "revision": "440e136e2cca318e59a4d76308c835d3",`
`4`	`4`	`"url": "/index.html"`
`5`	`5`	`},`
`6`	`6`	`{`
`7`	`7`	`"revision": "81defbce1e1e51b2c5a4",`
`8`	`8`	`"url": "/static/css/2.15aaca28.chunk.css"`
`9`	`9`	`},`
`10`	`10`	`{`
`11`		`- "revision": "dda75fe9e4eeafa5d673",`
	`11`	`+ "revision": "ee15efc0a9463559cb75",`
`12`	`12`	`"url": "/static/css/main.a57f1396.chunk.css"`
`13`	`13`	`},`
`14`	`14`	`{`
`@@ -20,8 +20,8 @@ self.__precacheManifest = (self.__precacheManifest \|\| []).concat([`
`20`	`20`	`"url": "/static/js/2.85251dbd.chunk.js.LICENSE.txt"`
`21`	`21`	`},`
`22`	`22`	`{`
`23`		`- "revision": "dda75fe9e4eeafa5d673",`
`24`		`- "url": "/static/js/main.de1540cf.chunk.js"`
	`23`	`+ "revision": "ee15efc0a9463559cb75",`
	`24`	`+ "url": "/static/js/main.2c6c8e79.chunk.js"`
`25`	`25`	`},`
`26`	`26`	`{`
`27`	`27`	`"revision": "717be7891cc3d466bc4e",`