diff --git a/CHANGELOG.md b/CHANGELOG.md index de832db7..74fd4323 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -33,39 +33,39 @@ #### Web API changes - New API to retrieve and set clocks on Pioreactors - - GET `/api/units//system/utc_clock` - - GET `/unit_api/system/utc_clock` - - POST `/api/system/utc_clock` - - POST `/unit_api/system/utc_clock` + - GET `/api/units//system/utc_clock` + - GET `/unit_api/system/utc_clock` + - POST `/api/system/utc_clock` + - POST `/unit_api/system/utc_clock` - New log APIs - - GET `/api/experiments//recent_logs` - - GET `/api/experiments//logs` - - GET `/api/logs` - - GET `/api/workers//experiments//recent_logs` - - GET `/api/workers//experiments//logs` - - GET `/api/units//logs` - - POST `/workers//experiments//logs` + - GET `/api/experiments//recent_logs` + - GET `/api/experiments//logs` + - GET `/api/logs` + - GET `/api/workers//experiments//recent_logs` + - GET `/api/workers//experiments//logs` + - GET `/api/units//logs` + - POST `/workers//experiments//logs` - New calibrations APIs - - GET `/api/workers//calibrations` - - GET `/unit_api/calibrations` - - GET `/unit_api/active_calibrations` - - GET `/api/workers//calibrations/` - - GET `/unit_api/calibrations/` - - PATCH `/api/workers//active_calibrations//` - - PATCH `/unit_api/active_calibrations//` - - DELETE `/api/workers//active_calibrations//` - - DELETE `/api/workers//calibrations//` - - DELETE `/unit_api/active_calibrations//` - - DELETE `/unit_api/calibrations//` + - GET `/api/workers//calibrations` + - GET `/unit_api/calibrations` + - GET `/unit_api/active_calibrations` + - GET `/api/workers//calibrations/` + - GET `/unit_api/calibrations/` + - PATCH `/api/workers//active_calibrations//` + - PATCH `/unit_api/active_calibrations//` + - DELETE `/api/workers//active_calibrations//` + - DELETE `/api/workers//calibrations//` + - DELETE `/unit_api/active_calibrations//` + - DELETE `/unit_api/calibrations//` - New API for plugins - - GET `/api/units//plugins/installed` - - PATCH `/api/units//plugins/install` - - PATCH `/api/units//plugins/uninstall` + - GET `/api/units//plugins/installed` + - PATCH `/api/units//plugins/install` + - PATCH `/api/units//plugins/uninstall` - Changed the `settings` API (see docs). - New `/api/units` that returns a list of units (this is workers & leader). If leader is also a worker, then it's identical to `/api/workers` - New `/api/experiments//historical_worker_assignments` that stores historical assignments to experiments - New Path API for getting the dir structure of `~/.pioreactor`: - - `/unit_api/system/path/` + - `/unit_api/system/path/` ### Enhancements - new SQL table for `historical_experiment_assignments` that stores historical assignments to experiments. @@ -101,7 +101,6 @@ - fixed Stirring not updating to best DC % when using a calibration after changing target RPM - ### 24.12.10 - Hotfix for UI settings bug diff --git a/update_scripts/upcoming/cal_convert.py b/update_scripts/upcoming/cal_convert.py index 7fb7d6b8..411ccd06 100644 --- a/update_scripts/upcoming/cal_convert.py +++ b/update_scripts/upcoming/cal_convert.py @@ -20,8 +20,6 @@ def convert_old_to_new_pump(old_cal: dict) -> tuple[SimplePeristalticPumpCalibra created_at=old_cal["created_at"], curve_data_=[old_cal["duration_"], old_cal["bias_"]], curve_type="poly", - x="Duration", - y="Volume", recorded_data={"x": old_cal["durations"], "y": old_cal["volumes"]}, hz=old_cal["hz"], dc=old_cal["dc"], @@ -38,9 +36,7 @@ def convert_old_to_new_od(old_cal: dict) -> tuple[ODCalibration, str]: created_at=old_cal["created_at"], curve_data_=old_cal["curve_data_"], curve_type="poly", - x="Voltage", - y="OD600", - recorded_data={"x": old_cal["voltages"], "y": old_cal["od600s"]}, + recorded_data={"y": old_cal["voltages"], "x": old_cal["od600s"]}, angle=old_cal["type"].split("_")[1], pd_channel=old_cal["pd_channel"], ir_led_intensity=old_cal["ir_led_intensity"], diff --git a/update_scripts/upcoming/update.sh b/update_scripts/upcoming/update.sh index 627264a1..543720d3 100644 --- a/update_scripts/upcoming/update.sh +++ b/update_scripts/upcoming/update.sh @@ -13,14 +13,16 @@ STORAGE_DIR=/home/$USERNAME/.pioreactor/storage # 1. create persistant db in all pioreactors DB=$STORAGE_DIR/local_persistent_pioreactor_metadata.sqlite -touch $DB -touch $DB-shm -touch $DB-wal +if [ ! -f "$DB" ]; then + touch $DB + touch $DB-shm + touch $DB-wal +fi chown -R $USERNAME:www-data $DB* # 2. make a calibration dir in all pioreactors -sudo -u $USERNAME mkdir "$STORAGE_DIR"/calibrations +sudo -u $USERNAME mkdir -p "$STORAGE_DIR"/calibrations # 3. install pyyaml (only leader has it, but workers need it now) sudo pip3 install "$SCRIPT_DIR"/PyYAML-6.0.2-cp311-cp311-linux_armv7l.whl