update

Author: CamDavidsonPilon

pioreactorui/__init__.py

@@ -55,7 +55,7 @@
 logger.debug(f"Starting {NAME}={VERSION} on {HOSTNAME}...")
 logger.debug(f".env={dict(env)}")
 
-client = mqtt.Client(callback_api_version=CallbackAPIVersion.VERSION2)
+client = mqtt.Client(client_id="pioreactor_ui", callback_api_version=CallbackAPIVersion.VERSION2)
 client.username_pw_set(
     pioreactor_config.get("mqtt", "username", fallback="pioreactor"),
     pioreactor_config.get("mqtt", "password", fallback="raspberry"),
@@ -192,12 +192,11 @@ def _get_temp_local_metadata_db_connection():
     db = getattr(g, "_local_metadata_database", None)
     if db is None:
         db = g._local_metadata_database = sqlite3.connect(
-            pioreactor_config.get("storage", "temporary_cache")
+            f'file:{pioreactor_config.get("storage", "temporary_cache")}?mode=ro', uri=True
         )
         db.row_factory = _make_dicts
         db.executescript(
             """
-            PRAGMA synchronous = 1; -- aka NORMAL, recommended when using WAL
             PRAGMA temp_store = 2;  -- stop writing small files to disk, use mem
             PRAGMA busy_timeout = 15000;
             PRAGMA foreign_keys = ON;

pioreactorui/api.py

@@ -518,10 +518,12 @@ def get_logs_for_unit(pioreactor_unit: str) -> ResponseReturnValue:
 
 
 @api.route("/workers/<pioreactor_unit>/experiments/<experiment>/logs", methods=["POST"])
+@api.route("/units/<pioreactor_unit>/experiments/<experiment>/logs", methods=["POST"])
 def publish_new_log(pioreactor_unit: str, experiment: str) -> ResponseReturnValue:
     body = request.get_json()
+    source_ = body.get("source_", "ui")
 
-    topic = f"pioreactor/{pioreactor_unit}/{experiment}/logs/ui/{body['level'].lower()}"
+    topic = f"pioreactor/{pioreactor_unit}/{experiment}/logs/{source_}/{body['level'].lower()}"
     client.publish(
         topic,
         msg_to_JSON(
@@ -1275,14 +1277,14 @@ def export_datasets() -> ResponseReturnValue:
         "--output", filename_with_path.as_posix(), *cmd_tables, *experiment_options, *other_options
     )
     try:
-        status = result(blocking=True, timeout=5 * 60)
+        status, msg = result(blocking=True, timeout=5 * 60)
     except (HueyException, TaskException):
         status = False
         return {"result": status, "filename": None, "msg": "Timed out"}, 500
 
     if not status:
-        publish_to_error_log("Failed.", "export_datasets")
-        return {"result": status, "filename": None, "msg": "Failed."}, 500
+        publish_to_error_log(msg, "export_datasets")
+        return {"result": status, "filename": None, "msg": msg}, 500
 
     return {"result": status, "filename": filename, "msg": "Finished"}, 200
 

pioreactorui/tasks.py

@@ -204,13 +204,13 @@ def pio_plugins_list(*args: str, env: dict[str, str] = {}) -> tuple[bool, str]:
 
 @huey.task()
 @huey.lock_task("export-data-lock")
-def pio_run_export_experiment_data(*args: str, env: dict[str, str] = {}) -> bool:
+def pio_run_export_experiment_data(*args: str, env: dict[str, str] = {}) -> tuple[bool, bytes]:
     logger.info(f'Executing `{join(("pio", "run", "export_experiment_data") + args)}`, {env=}')
     result = run(
         (PIO_EXECUTABLE, "run", "export_experiment_data") + args,
         env=dict(os.environ) | env,
     )
-    return result.returncode == 0
+    return result.returncode == 0, result.stdout.strip()
 
 
 @huey.task(priority=100)
@@ -391,7 +391,7 @@ def multicast_post_across_cluster(
 
 @huey.task(priority=10)
 def get_from_worker(
-    worker: str, endpoint: str, json: dict | None = None, timeout=1.0, return_raw=False
+    worker: str, endpoint: str, json: dict | None = None, timeout=5.0, return_raw=False
 ) -> tuple[str, Any]:
     try:
         address = resolve_to_address(worker)
@@ -419,7 +419,7 @@ def multicast_get_across_cluster(
     endpoint: str,
     workers: list[str],
     json: dict | list[dict | None] | None = None,
-    timeout: float = 1.0,
+    timeout: float = 5.0,
     return_raw=False,
 ) -> dict[str, Any]:
     # this function "consumes" one huey thread waiting fyi

pioreactorui/unit_api.py

@@ -720,7 +720,7 @@ def get_all_calibrations_as_zipped_yaml() -> ResponseReturnValue:
     buffer = BytesIO()
 
     with zipfile.ZipFile(buffer, "w", zipfile.ZIP_DEFLATED) as zip_file:
-        for file_path in sorted(calibration_dir.rglob("*")):
+        for file_path in sorted(calibration_dir.rglob("*.yaml")):
             if file_path.is_file():
                 arc_name = file_path.relative_to(calibration_dir)
                 zip_file.write(str(file_path), arcname=str(arc_name))