more ux for calibrations

Author: CamDavidsonPilon

core/pioreactor/calibrations/protocols/od_fusion_standards.py

@@ -463,8 +463,8 @@ def advance(self, ctx: SessionContext) -> SessionStep | None:
             sigma_floor=fit.sigma_floor,
         )
 
-        ctx.store_estimator(estimator, pt.OD_FUSED_DEVICE)
-        ctx.complete({"title": "Fusion estimator saved."})
+        result = ctx.store_estimator(estimator, pt.OD_FUSED_DEVICE)
+        ctx.complete({"title": "Fusion estimator saved.", **result})
         return CalibrationComplete()
 
 

core/pioreactor/web/api.py

@@ -1436,6 +1436,15 @@ def get_all_active_estimators(pioreactor_unit: str) -> DelayedResponseReturnValu
     return create_task_response(task)
 
 
+@api_bp.route("/workers/<pioreactor_unit>/estimators", methods=["GET"])
+def get_all_estimators(pioreactor_unit: str) -> DelayedResponseReturnValue:
+    if pioreactor_unit == UNIVERSAL_IDENTIFIER:
+        task = broadcast_get_across_workers("/unit_api/estimators")
+    else:
+        task = tasks.multicast_get("/unit_api/estimators", [pioreactor_unit])
+    return create_task_response(task)
+
+
 @api_bp.route("/workers/<pioreactor_unit>/zipped_calibrations", methods=["GET"])
 def get_all_calibrations_as_yamls(pioreactor_unit: str) -> ResponseReturnValue:
     if pioreactor_unit == UNIVERSAL_IDENTIFIER:
@@ -1603,6 +1612,24 @@ def get_calibration(pioreactor_unit: str, device: str, cal_name: str) -> Delayed
     return create_task_response(task)
 
 
+@api_bp.route("/workers/<pioreactor_unit>/estimators/<device>", methods=["GET"])
+def get_estimators_by_device(pioreactor_unit: str, device: str) -> DelayedResponseReturnValue:
+    if pioreactor_unit == UNIVERSAL_IDENTIFIER:
+        task = broadcast_get_across_workers(f"/unit_api/estimators/{device}")
+    else:
+        task = tasks.multicast_get(f"/unit_api/estimators/{device}", [pioreactor_unit])
+    return create_task_response(task)
+
+
+@api_bp.route("/workers/<pioreactor_unit>/estimators/<device>/<estimator_name>", methods=["GET"])
+def get_estimator(pioreactor_unit: str, device: str, estimator_name: str) -> DelayedResponseReturnValue:
+    if pioreactor_unit == UNIVERSAL_IDENTIFIER:
+        task = broadcast_get_across_workers(f"/unit_api/estimators/{device}/{estimator_name}")
+    else:
+        task = tasks.multicast_get(f"/unit_api/estimators/{device}/{estimator_name}", [pioreactor_unit])
+    return create_task_response(task)
+
+
 @api_bp.route("/workers/<pioreactor_unit>/calibrations/<device>", methods=["POST"])
 def create_calibration(pioreactor_unit: str, device: str) -> DelayedResponseReturnValue:
     yaml_data = request.get_json()["calibration_data"]
@@ -1769,6 +1796,15 @@ def set_active_calibration(pioreactor_unit, device, cal_name) -> DelayedResponse
     return create_task_response(task)
 
 
+@api_bp.route("/workers/<pioreactor_unit>/active_estimators/<device>/<estimator_name>", methods=["PATCH"])
+def set_active_estimator(pioreactor_unit, device, estimator_name) -> DelayedResponseReturnValue:
+    if pioreactor_unit == UNIVERSAL_IDENTIFIER:
+        task = broadcast_patch_across_workers(f"/unit_api/active_estimators/{device}/{estimator_name}")
+    else:
+        task = tasks.multicast_patch(f"/unit_api/active_estimators/{device}/{estimator_name}", [pioreactor_unit])
+    return create_task_response(task)
+
+
 @api_bp.route("/workers/<pioreactor_unit>/active_calibrations/<device>", methods=["DELETE"])
 def remove_active_status_calibration(pioreactor_unit, device) -> DelayedResponseReturnValue:
     if pioreactor_unit == UNIVERSAL_IDENTIFIER:
@@ -1778,6 +1814,15 @@ def remove_active_status_calibration(pioreactor_unit, device) -> DelayedResponse
     return create_task_response(task)
 
 
+@api_bp.route("/workers/<pioreactor_unit>/active_estimators/<device>", methods=["DELETE"])
+def remove_active_status_estimator(pioreactor_unit, device) -> DelayedResponseReturnValue:
+    if pioreactor_unit == UNIVERSAL_IDENTIFIER:
+        task = broadcast_delete_across_workers(f"/unit_api/active_estimators/{device}")
+    else:
+        task = tasks.multicast_delete(f"/unit_api/active_estimators/{device}", [pioreactor_unit])
+    return create_task_response(task)
+
+
 @api_bp.route("/workers/<pioreactor_unit>/calibrations/<device>/<cal_name>", methods=["DELETE"])
 def delete_calibration(pioreactor_unit, device, cal_name) -> DelayedResponseReturnValue:
     if pioreactor_unit == UNIVERSAL_IDENTIFIER:
@@ -1787,6 +1832,15 @@ def delete_calibration(pioreactor_unit, device, cal_name) -> DelayedResponseRetu
     return create_task_response(task)
 
 
+@api_bp.route("/workers/<pioreactor_unit>/estimators/<device>/<estimator_name>", methods=["DELETE"])
+def delete_estimator(pioreactor_unit, device, estimator_name) -> DelayedResponseReturnValue:
+    if pioreactor_unit == UNIVERSAL_IDENTIFIER:
+        task = broadcast_delete_across_workers(f"/unit_api/estimators/{device}/{estimator_name}")
+    else:
+        task = tasks.multicast_delete(f"/unit_api/estimators/{device}/{estimator_name}", [pioreactor_unit])
+    return create_task_response(task)
+
+
 ## PLUGINS
 
 

core/pioreactor/web/static/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/static/css/main.9c7a48b7.css",
-    "main.js": "/static/static/js/main.52ca6c09.js",
+    "main.js": "/static/static/js/main.1e4ef9e0.js",
     "static/media/pioreactor_cloud.webp": "/static/static/media/pioreactor_cloud.b15b29e435797dc69d76.webp",
     "static/media/roboto-all-500-normal.woff": "/static/static/media/roboto-all-500-normal.0ab669b7a0d19b178f57.woff",
     "static/media/roboto-all-700-normal.woff": "/static/static/media/roboto-all-700-normal.a457fde362a540fcadff.woff",
@@ -30,10 +30,10 @@
     "static/media/roboto-greek-ext-700-normal.woff2": "/static/static/media/roboto-greek-ext-700-normal.bd9854c751441ccc1a70.woff2",
     "index.html": "/static/index.html",
     "main.9c7a48b7.css.map": "/static/static/css/main.9c7a48b7.css.map",
-    "main.52ca6c09.js.map": "/static/static/js/main.52ca6c09.js.map"
+    "main.1e4ef9e0.js.map": "/static/static/js/main.1e4ef9e0.js.map"
   },
   "entrypoints": [
     "static/css/main.9c7a48b7.css",
-    "static/js/main.52ca6c09.js"
+    "static/js/main.1e4ef9e0.js"
   ]
 }

core/pioreactor/web/static/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/static/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="/static/logo192.png"/><link rel="manifest" href="/static/manifest.json"/><script defer="defer" src="/static/static/js/main.52ca6c09.js"></script><link href="/static/static/css/main.9c7a48b7.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/static/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="/static/logo192.png"/><link rel="manifest" href="/static/manifest.json"/><script defer="defer" src="/static/static/js/main.1e4ef9e0.js"></script><link href="/static/static/css/main.9c7a48b7.css" rel="stylesheet"></head><body><div id="root"></div></body></html>

…or/web/static/static/js/main.52ca6c09.js …or/web/static/static/js/main.1e4ef9e0.jscore/pioreactor/web/static/static/js/main.52ca6c09.js renamed to core/pioreactor/web/static/static/js/main.1e4ef9e0.js core/pioreactor/web/static/static/js/main.52ca6c09.js renamed to core/pioreactor/web/static/static/js/main.1e4ef9e0.js

@@ -867,6 +867,33 @@ def get_all_active_estimators() -> ResponseReturnValue:
     return attach_cache_control(jsonify(all_estimators), max_age=10)
 
 
+@unit_api_bp.route("/estimators", methods=["GET"])
+def get_all_estimators() -> ResponseReturnValue:
+    estimator_dir = ESTIMATOR_PATH
+
+    if not estimator_dir.exists():
+        return attach_cache_control(jsonify({}), max_age=10)
+
+    all_estimators: dict[str, list] = {}
+
+    with local_persistent_storage("active_estimators") as cache:
+        for file in sorted(estimator_dir.glob("*/*.yaml")):
+            try:
+                device = file.parent.name
+                estimator = to_builtins(yaml_decode(file.read_bytes(), type=AllEstimators))
+                estimator["is_active"] = cache.get(device) == estimator.get("estimator_name")
+                estimator["pioreactor_unit"] = HOSTNAME
+                estimator["device"] = device
+                if device in all_estimators:
+                    all_estimators[device].append(estimator)
+                else:
+                    all_estimators[device] = [estimator]
+            except Exception as e:
+                publish_to_error_log(f"Error reading {file.stem}: {e}", "get_all_estimators")
+
+    return attach_cache_control(jsonify(all_estimators), max_age=10)
+
+
 @unit_api_bp.route("/zipped_calibrations", methods=["GET"])
 def get_all_calibrations_as_zipped_yaml() -> ResponseReturnValue:
     calibration_dir = CALIBRATION_PATH
@@ -1092,6 +1119,7 @@ def get_estimators_by_device(device: str) -> ResponseReturnValue:
                 estimator = to_builtins(yaml_decode(file.read_bytes(), type=AllEstimators))
                 estimator["is_active"] = c.get(device) == estimator.get("estimator_name")
                 estimator["pioreactor_unit"] = HOSTNAME
+                estimator["device"] = device
                 estimators.append(estimator)
             except Exception as e:
                 publish_to_error_log(f"Error reading {file.stem}: {e}", "get_estimators_by_device")
@@ -1111,6 +1139,7 @@ def get_estimator(device: str, estimator_name: str) -> ResponseReturnValue:
             estimator = to_builtins(yaml_decode(estimator_path.read_bytes(), type=AllEstimators))
             estimator["is_active"] = c.get(device) == estimator.get("estimator_name")
             estimator["pioreactor_unit"] = HOSTNAME
+            estimator["device"] = device
             return attach_cache_control(jsonify(estimator), max_age=10)
         except Exception as e:
             publish_to_error_log(f"Error reading {estimator_path.stem}: {e}", "get_estimator")
@@ -1132,3 +1161,42 @@ def remove_active_status_calibration(device: str) -> ResponseReturnValue:
             c.pop(device)
 
     return {"status": "success"}, 200
+
+
+@unit_api_bp.route("/active_estimators/<device>/<estimator_name>", methods=["PATCH"])
+def set_active_estimator(device: str, estimator_name: str) -> ResponseReturnValue:
+    with local_persistent_storage("active_estimators") as c:
+        c[device] = estimator_name
+
+    return {"status": "success"}, 200
+
+
+@unit_api_bp.route("/active_estimators/<device>", methods=["DELETE"])
+def remove_active_status_estimator(device: str) -> ResponseReturnValue:
+    with local_persistent_storage("active_estimators") as c:
+        if device in c:
+            c.pop(device)
+
+    return {"status": "success"}, 200
+
+
+@unit_api_bp.route("/estimators/<device>/<estimator_name>", methods=["DELETE"])
+def delete_estimator(device: str, estimator_name: str) -> ResponseReturnValue:
+    estimator_path = ESTIMATOR_PATH / device / f"{estimator_name}.yaml"
+
+    if not estimator_path.exists():
+        abort_with(404, description=f"Estimator '{estimator_name}' not found for device '{device}'.")
+
+    try:
+        estimator_path.unlink()
+        with local_persistent_storage("active_estimators") as cache:
+            if cache.get(device) == estimator_name:
+                cache.pop(device)
+
+        return (
+            jsonify({"msg": f"Estimator '{estimator_name}' for device '{device}' deleted successfully."}),
+            200,
+        )
+    except Exception as e:
+        publish_to_error_log(f"Error deleting estimator: {e}", "delete_estimator")
+        abort_with(500, description="Failed to delete estimator.")

…c/static/js/main.52ca6c09.js.LICENSE.txt …c/static/js/main.1e4ef9e0.js.LICENSE.txtcore/pioreactor/web/static/static/js/main.52ca6c09.js.LICENSE.txt renamed to core/pioreactor/web/static/static/js/main.1e4ef9e0.js.LICENSE.txt core/pioreactor/web/static/static/js/main.52ca6c09.js.LICENSE.txt renamed to core/pioreactor/web/static/static/js/main.1e4ef9e0.js.LICENSE.txt

@@ -13,6 +13,7 @@ import Pioreactors from "./Pioreactors";
 import Pioreactor from "./Pioreactor";
 import StartNewExperiment from "./StartNewExperiment";
 import SingleCalibrationPage from "./SingleCalibrationPage";
+import SingleEstimatorPage from "./SingleEstimatorPage";
 import CreateExperimentProfile from "./CreateExperimentProfile";
 import EditExperimentProfile from "./EditExperimentProfile";
 import EditConfig from "./EditConfig";
@@ -26,6 +27,7 @@ import SystemLogs from "./SystemLogs";
 //import Analysis from "./Analysis";
 import Experiments from "./Experiments";
 import Calibrations from "./Calibrations";
+import Estimators from "./Estimators";
 import Protocols from "./Protocols";
 import SideNavAndHeader from "./components/SideNavAndHeader";
 import MissingWorkerModelModal from "./components/MissingWorkerModelModal";
@@ -137,6 +139,10 @@ function MainSite() {
                   <Route path="/calibrations/:pioreactorUnit/" element={<Calibrations title="Pioreactor ~ Calibrations"/>}/>
                   <Route path="/calibrations/:pioreactorUnit/:device" element={<Calibrations title="Pioreactor ~ Calibrations"/>}/>
                   <Route path="/calibrations/:pioreactorUnit/:device/:calibrationName" element={<SingleCalibrationPage title="Pioreactor ~ Calibration"/>}/>
+                  <Route path="/estimators" element={<Estimators title="Pioreactor ~ Estimators"/>}/>
+                  <Route path="/estimators/:pioreactorUnit/" element={<Estimators title="Pioreactor ~ Estimators"/>}/>
+                  <Route path="/estimators/:pioreactorUnit/:device" element={<Estimators title="Pioreactor ~ Estimators"/>}/>
+                  <Route path="/estimators/:pioreactorUnit/:device/:estimatorName" element={<SingleEstimatorPage title="Pioreactor ~ Estimator"/>}/>
                   <Route path="/protocols" element={<Protocols title="Pioreactor ~ Protocols"/>}/>
                   <Route path="/protocols/:pioreactorUnit" element={<Protocols title="Pioreactor ~ Protocols"/>}/>
                   <Route path="/protocols/:pioreactorUnit/:device" element={<Protocols title="Pioreactor ~ Protocols"/>}/>