import automations

Pioreactor · Jul 15, 2024 · 0228823 · 0228823
1 parent e3c4ee6
commit 0228823
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/pioreactor/background_jobs/dosing_automation.py b/pioreactor/background_jobs/dosing_automation.py
@@ -27,6 +27,7 @@
 from pioreactor.utils import whoami
 from pioreactor.utils.timing import current_utc_datetime
 from pioreactor.utils.timing import RepeatedTimer
+from pioreactor.automations.dosing import *
 
 
 def close(x: float, y: float) -> bool:
@@ -685,7 +686,12 @@ def start_dosing_automation(
 ) -> DosingAutomationJob:
     unit = unit or whoami.get_unit_name()
     experiment = experiment or whoami.get_assigned_experiment_name(unit)
-    klass = available_dosing_automations[automation_name]
+    try:
+        klass = available_dosing_automations[automation_name]
+    except:
+        raise KeyError(
+            f"Unable to find {automation_name}. Available automations are {list( available_dosing_automations.keys())}"
+        )
 
     return klass(
         unit=unit,

diff --git a/pioreactor/background_jobs/led_automation.py b/pioreactor/background_jobs/led_automation.py
@@ -22,6 +22,7 @@
 from pioreactor.utils import whoami
 from pioreactor.utils.timing import current_utc_datetime
 from pioreactor.utils.timing import RepeatedTimer
+from pioreactor.automations.led import *
 
 
 def brief_pause() -> float:
@@ -61,7 +62,7 @@ class LEDAutomationJob(AutomationJob):
 
     def __init_subclass__(cls, **kwargs):
         super().__init_subclass__(**kwargs)
-        # this registers all subclasses of LEDAutomation
+        # this registers all subclasses of LEDAutomationJob
         if hasattr(cls, "automation_name") and getattr(cls, "automation_name") != "led_automation_base":
             available_led_automations[cls.automation_name] = cls
 

diff --git a/pioreactor/background_jobs/temperature_automation.py b/pioreactor/background_jobs/temperature_automation.py
@@ -29,6 +29,7 @@
 from pioreactor.utils.timing import RepeatedTimer
 from pioreactor.utils.timing import to_datetime
 from pioreactor.version import rpi_version_info
+from pioreactor.automations.temperature import *
 
 
 class TemperatureAutomationJob(AutomationJob):

diff --git a/update_scripts/upcoming/update.sh b/update_scripts/upcoming/update.sh
@@ -14,10 +14,9 @@ HOSTNAME=$(hostname)
 LEADER_HOSTNAME=$(crudini --get $PIO_DIR/config.ini cluster.topology leader_hostname)
 
 if [ "$HOSTNAME" = "$LEADER_HOSTNAME" ]; then
-    sudo rm /var/www/pioreactorui/contrib/jobs/03_temperature_control.yaml
-    sudo rm /var/www/pioreactorui/contrib/jobs/04_dosing_control.yaml
-    sudo rm /var/www/pioreactorui/contrib/jobs/05_led_control.yaml
-
-    sudo rm /var/www/pioreactorui/contrib/charts/06_temperature.yaml
+    sudo rm /var/www/pioreactorui/contrib/jobs/03_temperature_control.yaml || :
+    sudo rm /var/www/pioreactorui/contrib/jobs/04_dosing_control.yaml || :
+    sudo rm /var/www/pioreactorui/contrib/jobs/06_led_control.yaml || :
 
+    sudo rm /var/www/pioreactorui/contrib/charts/06_temperature.yaml || :
 fi