ui details

Author: CamDavidsonPilon

core/pioreactor/calibrations/protocols/od_reference_standard.py

@@ -167,7 +167,7 @@ def reference_standard_flow(ctx: SessionContext) -> CalibrationStep:
 
             od_readings = _record_reference_standard_for_session(ctx, ir_led_intensity)
             recorded_ods = [0.0, 1000 * STANDARD_OD]
-            timestamp = current_utc_datetime().strftime("%Y-%m-%d")
+            timestamp = current_utc_datetime().strftime("%Y-%m-%d_%H-%M-%S")
 
             calibration_links: list[dict[str, str | None]] = []
             if isinstance(od_readings, dict):

core/pioreactor/calibrations/protocols/pump_duration_based.py

@@ -283,7 +283,7 @@ def pump_duration_flow(ctx: SessionContext) -> CalibrationStep:
             ctx.step = "tracer_volume"
         return steps.action(
             "Tracer run",
-            f"Running the pump for {tracer_duration:.2f} seconds, then measure the volume expelled.",
+            f"Running the pump for {tracer_duration:.2f} seconds. Please measure the volume expelled.",
         )
 
     if ctx.step == "tracer_volume":
@@ -327,8 +327,8 @@ def pump_duration_flow(ctx: SessionContext) -> CalibrationStep:
             ctx.step = "test_volume"
         duration = float(durations[test_index])
         step = steps.action(
-            "Test run",
-            f"Running the pump for {duration:.2f} seconds, then measure the volume expelled.",
+            "Dispense run",
+            f"Running the pump for {duration:.2f} seconds. Please measure the volume expelled.",
         )
         if results:
             step.metadata = {
@@ -394,7 +394,7 @@ def pump_duration_flow(ctx: SessionContext) -> CalibrationStep:
                         "Too much uncertainty in slope - you probably want to rerun this calibration..."
                     )
         step = steps.form(
-            "Record test volume",
+            "Record dispensed volume",
             "Enter the amount of water expelled (mL or g).",
             [fields.float("volume_ml", label="Volume expelled", minimum=0.0001)],
         )

core/pioreactor/calibrations/session_flow.py

@@ -331,8 +331,8 @@ def result(self, result: dict[str, Any]) -> CalibrationStep:
         return CalibrationStep(
             step_id="complete",
             step_type="result",
-            title="Calibration complete",
-            body="Calibration results are ready.",
+            title="Calibration complete!",
+            body="Calibration(s) is set to Active and ready to be used.",
             metadata={"result": result},
         )
 

core/pioreactor/web/api.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import configparser
+import json
 import os
 import re
 import sqlite3
@@ -82,6 +83,27 @@ def format_utc_timestamp_for_lookback_hours(lookback_hours: float) -> str:
     return cutoff.strftime("%Y-%m-%dT%H:%M:%S.%fZ")
 
 
+def _extract_unit_api_error(response: Response | None) -> str | None:
+    if response is None:
+        return None
+    body = response.content
+    if not body:
+        return None
+    content_type = response.headers.get("Content-Type", "")
+    if "application/json" not in content_type:
+        return None
+    try:
+        payload = json.loads(body)
+    except Exception:
+        return None
+    if isinstance(payload, dict):
+        for key in ("error", "message", "description"):
+            value = payload.get(key)
+            if isinstance(value, str) and value.strip():
+                return value.strip()
+    return None
+
+
 def broadcast_get_across_cluster(endpoint: str, timeout: float = 5.0, return_raw=False) -> Result:
     assert endpoint.startswith("/unit_api")
     return tasks.multicast_get(
@@ -1526,6 +1548,7 @@ def start_calibration_session(pioreactor_unit: str) -> ResponseReturnValue:
     if body is None:
         abort_with(400, description="Missing JSON payload.")
 
+    response: Response | None = None
     try:
         response = post_into(
             resolve_to_address(pioreactor_unit),
@@ -1535,8 +1558,17 @@ def start_calibration_session(pioreactor_unit: str) -> ResponseReturnValue:
         )
         response.raise_for_status()
     except (HTTPErrorStatus, HTTPException) as exc:
+        detail = _extract_unit_api_error(response)
+        if detail:
+            publish_to_error_log(f"{exc}: {detail}", "start_calibration_session")
+            abort_with(502, f"Starting calibration session failed on {pioreactor_unit}: {detail}")
+        if response is not None:
+            abort_with(
+                502,
+                f"Starting calibration session failed on {pioreactor_unit} (HTTP {response.status_code}).",
+            )
         publish_to_error_log(str(exc), "start_calibration_session")
-        abort_with(502, f"Starting calibration session failed on {pioreactor_unit}. See system logs.")
+        abort_with(502, f"Starting calibration session failed on {pioreactor_unit}.")
 
     return Response(
         response.content,
@@ -1550,6 +1582,7 @@ def get_calibration_session(pioreactor_unit: str, session_id: str) -> ResponseRe
     if pioreactor_unit == UNIVERSAL_IDENTIFIER:
         abort_with(400, "Cannot fetch sessions with $broadcast; choose a specific Pioreactor.")
 
+    response: Response | None = None
     try:
         response = get_from(
             resolve_to_address(pioreactor_unit),
@@ -1558,8 +1591,17 @@ def get_calibration_session(pioreactor_unit: str, session_id: str) -> ResponseRe
         )
         response.raise_for_status()
     except (HTTPErrorStatus, HTTPException) as exc:
+        detail = _extract_unit_api_error(response)
+        if detail:
+            publish_to_error_log(f"{exc}: {detail}", "get_calibration_session")
+            abort_with(502, f"Fetching calibration session failed on {pioreactor_unit}: {detail}")
+        if response is not None:
+            abort_with(
+                502,
+                f"Fetching calibration session failed on {pioreactor_unit} (HTTP {response.status_code}).",
+            )
         publish_to_error_log(str(exc), "get_calibration_session")
-        abort_with(502, f"Fetching calibration session failed on {pioreactor_unit}. See system logs.")
+        abort_with(502, f"Fetching calibration session failed on {pioreactor_unit}.")
 
     return Response(
         response.content,
@@ -1577,6 +1619,7 @@ def advance_calibration_session(pioreactor_unit: str, session_id: str) -> Respon
     if body is None:
         abort_with(400, description="Missing JSON payload.")
 
+    response: Response | None = None
     try:
         response = post_into(
             resolve_to_address(pioreactor_unit),
@@ -1586,8 +1629,17 @@ def advance_calibration_session(pioreactor_unit: str, session_id: str) -> Respon
         )
         response.raise_for_status()
     except (HTTPErrorStatus, HTTPException) as exc:
+        detail = _extract_unit_api_error(response)
+        if detail:
+            publish_to_error_log(f"{exc}: {detail}", "advance_calibration_session")
+            abort_with(502, detail)
+        if response is not None:
+            abort_with(
+                502,
+                f"Updating calibration session failed on {pioreactor_unit} (HTTP {response.status_code}).",
+            )
         publish_to_error_log(str(exc), "advance_calibration_session")
-        abort_with(502, f"Updating calibration session failed on {pioreactor_unit}. See system logs.")
+        abort_with(502, f"Updating calibration session failed on {pioreactor_unit}.")
 
     return Response(
         response.content,
@@ -1601,6 +1653,7 @@ def abort_calibration_session(pioreactor_unit: str, session_id: str) -> Response
     if pioreactor_unit == UNIVERSAL_IDENTIFIER:
         abort_with(400, "Cannot abort sessions with $broadcast; choose a specific Pioreactor.")
 
+    response: Response | None = None
     try:
         response = post_into(
             resolve_to_address(pioreactor_unit),
@@ -1609,8 +1662,17 @@ def abort_calibration_session(pioreactor_unit: str, session_id: str) -> Response
         )
         response.raise_for_status()
     except (HTTPErrorStatus, HTTPException) as exc:
+        detail = _extract_unit_api_error(response)
+        if detail:
+            publish_to_error_log(f"{exc}: {detail}", "abort_calibration_session")
+            abort_with(502, f"Aborting calibration session failed on {pioreactor_unit}: {detail}")
+        if response is not None:
+            abort_with(
+                502,
+                f"Aborting calibration session failed on {pioreactor_unit} (HTTP {response.status_code}).",
+            )
         publish_to_error_log(str(exc), "abort_calibration_session")
-        abort_with(502, f"Aborting calibration session failed on {pioreactor_unit}. See system logs.")
+        abort_with(502, f"Aborting calibration session failed on {pioreactor_unit}.")
 
     return Response(
         response.content,

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.9a56352a.js",
+    "main.js": "/static/static/js/main.19c0ffc4.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.9a56352a.js.map": "/static/static/js/main.9a56352a.js.map"
+    "main.19c0ffc4.js.map": "/static/static/js/main.19c0ffc4.js.map"
   },
   "entrypoints": [
     "static/css/main.9c7a48b7.css",
-    "static/js/main.9a56352a.js"
+    "static/js/main.19c0ffc4.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.9a56352a.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.19c0ffc4.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.9a56352a.js …or/web/static/static/js/main.19c0ffc4.jscore/pioreactor/web/static/static/js/main.9a56352a.js renamed to core/pioreactor/web/static/static/js/main.19c0ffc4.js core/pioreactor/web/static/static/js/main.9a56352a.js renamed to core/pioreactor/web/static/static/js/main.19c0ffc4.js

@@ -8,6 +8,7 @@
 from pathlib import Path
 from tempfile import NamedTemporaryFile
 from time import sleep
+from typing import Any
 
 from flask import after_this_request
 from flask import Blueprint
@@ -67,63 +68,17 @@
 unit_api_bp = Blueprint("unit_api", __name__, url_prefix="/unit_api")
 
 
-def _float_from_payload(payload: dict[str, object], key: str) -> float:
-    value = payload.get(key)
-    if isinstance(value, (int, float)):
-        return float(value)
-    if isinstance(value, str):
-        return float(value)
-    raise ValueError(f"Missing or invalid '{key}'.")
-
-
-def _optional_float_from_payload(payload: dict[str, object], key: str) -> float | None:
-    value = payload.get(key)
-    if value is None:
-        return None
-    if isinstance(value, (int, float)):
-        return float(value)
-    if isinstance(value, str):
-        return float(value)
-    raise ValueError(f"Invalid '{key}'.")
-
-
-def _string_from_payload(payload: dict[str, object], key: str) -> str:
-    value = payload.get(key)
-    if isinstance(value, str):
-        return value
-    raise ValueError(f"Missing or invalid '{key}'.")
-
-
-def _string_dict_from_payload(payload: dict[str, object], key: str) -> dict[str, str]:
-    value = payload.get(key)
-    if not isinstance(value, dict):
-        raise ValueError(f"Missing or invalid '{key}'.")
-    typed: dict[str, str] = {}
-    for item_key, item_value in value.items():
-        if not isinstance(item_key, str) or not isinstance(item_value, str):
-            raise ValueError(f"Invalid '{key}'.")
-        typed[item_key] = item_value
-    return typed
-
-
-def _object_dict_from_payload(payload: dict[str, object], key: str) -> dict[str, object]:
-    value = payload.get(key)
-    if not isinstance(value, dict):
-        raise ValueError(f"Missing or invalid '{key}'.")
-    return value
-
-
-def _execute_calibration_action(action: str, payload: dict[str, object]) -> dict[str, object]:
-    def _raise_if_task_failed(result: object, message: str) -> None:
+def _execute_calibration_action(action: str, payload: dict[str, Any]) -> dict[str, Any]:
+    def _raise_if_task_failed(result, message: str) -> None:
         if isinstance(result, Exception):
             raise ValueError(message)
 
     if action == "pump":
         task = tasks.calibration_execute_pump(
-            _string_from_payload(payload, "pump_device"),
-            _float_from_payload(payload, "duration_s"),
-            _float_from_payload(payload, "hz"),
-            _float_from_payload(payload, "dc"),
+            payload["pump_device"],
+            float(payload["duration_s"]),
+            float(payload["hz"]),
+            float(payload["dc"]),
         )
         try:
             success = task(blocking=True, timeout=30)
@@ -136,8 +91,8 @@ def _raise_if_task_failed(result: object, message: str) -> None:
 
     if action == "od_standards_measure":
         task = tasks.calibration_measure_standard(
-            _float_from_payload(payload, "rpm"),
-            _string_dict_from_payload(payload, "channel_angle_map"),
+            float(payload["rpm"]),
+            payload["channel_angle_map"],
         )
         try:
             voltages = task(blocking=True, timeout=30)
@@ -147,7 +102,7 @@ def _raise_if_task_failed(result: object, message: str) -> None:
         return {"voltages": voltages}
 
     if action == "od_reference_standard_read":
-        task = tasks.calibration_reference_standard_read(_float_from_payload(payload, "ir_led_intensity"))
+        task = tasks.calibration_reference_standard_read(float(payload["ir_led_intensity"]))
         try:
             readings = task(blocking=True, timeout=300)
         except HueyException as exc:
@@ -157,8 +112,8 @@ def _raise_if_task_failed(result: object, message: str) -> None:
 
     if action == "stirring_calibration":
         task = tasks.calibration_run_stirring(
-            _optional_float_from_payload(payload, "min_dc"),
-            _optional_float_from_payload(payload, "max_dc"),
+            float(payload["min_dc"]) if "min_dc" in payload else None,
+            float(payload["max_dc"]) if "max_dc" in payload else None,
         )
         try:
             calibration_payload = task(blocking=True, timeout=300)
@@ -178,8 +133,8 @@ def _raise_if_task_failed(result: object, message: str) -> None:
 
     if action == "save_calibration":
         task = tasks.calibration_save_calibration(
-            _string_from_payload(payload, "device"),
-            _object_dict_from_payload(payload, "calibration"),
+            payload["device"],
+            payload["calibration"],
         )
         try:
             result = task(blocking=True, timeout=30)
@@ -1226,9 +1181,3 @@ def remove_active_status_calibration(device: str) -> ResponseReturnValue:
             c.pop(device)
 
     return {"status": "success"}, 200
-
-
-@unit_api_bp.errorhandler(404)
-def not_found(e):
-    # Return JSON for API requests, using the error description
-    return jsonify({"error": e.description}), 404