Rebuild UI on reconnect and allow startup without server (#33)

Not perfect, in particular would like it better if at least the active plan stayed loaded, if not all of the various plans

Closes #32

Closes #31

Author: ksunden

bluesky_cmds/somatic/plan_ui.py

@@ -5,16 +5,13 @@
 import toolz
 from qtpy import QtWidgets
 from .comms import RM
+from .signals import plans_allowed_updated, devices_allowed_updated
 from bluesky_hwproxy import zmq_single_request as hwproxy_request
 
 import WrightTools as wt
 from bluesky_cmds.project import widgets as pw
 from bluesky_cmds.project import classes as pc
 
-# TODO: rebuild uis on change to devices_allowed
-devices_all_json = RM.devices_allowed()["devices_allowed"]
-devices_all = {}
-
 
 def get_all_components(k, v):
     out = {k: v}
@@ -28,17 +25,30 @@ def get_units(device):
         key_name = device.replace(".", "_")
     else:
         base_name = key_name = device
-    return hwproxy_request("describe", {"device": base_name})[0]["return"].get(key_name, {}).get(
+    return hwproxy_request("describe", {"device": base_name})[0].get("return", {}).get(key_name, {}).get(
         "units", None
     )
 
-for k, v in devices_all_json.items():
-    devices_all.update(get_all_components(k, v))
 
+devices_all = {}
+devices_all_json = {}
+devices_movable = []
+devices_not_movable = []
+devices_with_deps = []
+
+def update_devices():
+    global devices_all, devices_all_json, devices_movable, devices_not_movable, devices_with_deps
+    devices_all_json = RM.devices_allowed()["devices_allowed"]
+    devices_all = {}
+
+    for k, v in devices_all_json.items():
+        devices_all.update(get_all_components(k, v))
+
+    devices_movable = list(filter(lambda x: devices_all[x]["is_movable"], devices_all))
+    devices_not_movable = list(filter(lambda x: not devices_all[x]["is_movable"], devices_all))
+    devices_with_deps = list(filter(lambda x: "components" in devices_all[x], devices_all))
+    update_plan_ui()
 
-devices_movable = list(filter(lambda x: devices_all[x]["is_movable"], devices_all))
-devices_not_movable = list(filter(lambda x: not devices_all[x]["is_movable"], devices_all))
-devices_with_deps = list(filter(lambda x: "components" in devices_all[x], devices_all))
 
 
 class PlanUI:
@@ -831,145 +841,151 @@ def on_method_selected(self):
 
 
 plan_ui_lookup = defaultdict(PlanUI)
-plan_ui_lookup["sleep"] = PlanUI(
-    [
-        FloatWidget("time", "time", 1.0),
-    ]
-)
-plan_ui_lookup["mv"] = PlanUI(
-    [
-        MvArgsWidget(),
-    ]
-)
-plan_ui_lookup["grid_scan_wp"] = PlanUI(
-    [
-        MetadataWidget(),
-        DeviceListWidget(),
-        GridscanArgsWidget(),
-        ConstantWidget(),
-    ]
-)
-plan_ui_lookup["rel_grid_scan_wp"] = PlanUI(
-    [
-        MetadataWidget(),
-        DeviceListWidget(),
-        GridscanArgsWidget(),
-        ConstantWidget(),
-    ]
-)
-plan_ui_lookup["scan_wp"] = PlanUI(
-    [
-        MetadataWidget(),
-        DeviceListWidget(),
-        ScanArgsWidget(),
-        IntWidget("Npts", "num", 11),
-        ConstantWidget(),
-    ]
-)
-plan_ui_lookup["rel_scan_wp"] = PlanUI(
-    [
-        MetadataWidget(),
-        DeviceListWidget(),
-        ScanArgsWidget(),
-        IntWidget("Npts", "num", 11),
-        ConstantWidget(),
-    ]
-)
-plan_ui_lookup["list_scan_wp"] = PlanUI(
-    [
-        MetadataWidget(),
-        DeviceListWidget(),
-        ListscanArgsWidget(),
-        ConstantWidget(),
-    ]
-)
-plan_ui_lookup["rel_list_scan_wp"] = PlanUI(
-    [
-        MetadataWidget(),
-        DeviceListWidget(),
-        ListscanArgsWidget(),
-        ConstantWidget(),
-    ]
-)
-plan_ui_lookup["list_grid_scan_wp"] = PlanUI(
-    [
-        MetadataWidget(),
-        DeviceListWidget(),
-        ListscanArgsWidget(),
-        ConstantWidget(),
-    ]
-)
-plan_ui_lookup["rel_list_grid_scan_wp"] = PlanUI(
-    [
-        MetadataWidget(),
-        DeviceListWidget(),
-        ListscanArgsWidget(),
-        ConstantWidget(),
-    ]
-)
-plan_ui_lookup["count"] = PlanUI(
-    [
-        MetadataWidget(),
-        DeviceListWidget(),
-        IntWidget("Npts", "num", 1),
-        FloatWidget("Delay", "delay", 0),
-    ]
-)
-
-if devices_with_deps:
-    plan_ui_lookup["run_tune_test"] = PlanUI(
+
+def update_plan_ui():
+    plan_ui_lookup["sleep"] = PlanUI(
+        [
+            FloatWidget("time", "time", 1.0),
+        ]
+    )
+    plan_ui_lookup["mv"] = PlanUI(
+        [
+            MvArgsWidget(),
+        ]
+    )
+    plan_ui_lookup["grid_scan_wp"] = PlanUI(
+        [
+            MetadataWidget(),
+            DeviceListWidget(),
+            GridscanArgsWidget(),
+            ConstantWidget(),
+        ]
+    )
+    plan_ui_lookup["rel_grid_scan_wp"] = PlanUI(
+        [
+            MetadataWidget(),
+            DeviceListWidget(),
+            GridscanArgsWidget(),
+            ConstantWidget(),
+        ]
+    )
+    plan_ui_lookup["scan_wp"] = PlanUI(
+        [
+            MetadataWidget(),
+            DeviceListWidget(),
+            ScanArgsWidget(),
+            IntWidget("Npts", "num", 11),
+            ConstantWidget(),
+        ]
+    )
+    plan_ui_lookup["rel_scan_wp"] = PlanUI(
         [
             MetadataWidget(),
             DeviceListWidget(),
-            OpaSelectorWidget(),
-            SpectrometerWidget(include_center=False),
+            ScanArgsWidget(),
+            IntWidget("Npts", "num", 11),
+            ConstantWidget(),
         ]
     )
-    opa=OpaSelectorWidget()
-    plan_ui_lookup["run_setpoint"] = PlanUI(
+    plan_ui_lookup["list_scan_wp"] = PlanUI(
         [
             MetadataWidget(),
             DeviceListWidget(),
-            opa,
-            OpaMotorSelectorWidget(opa_selector=opa),
-            FloatWidget("Width", "width", 1),
-            IntWidget("Npts", "npts", 11),
-            SpectrometerWidget(include_center=False),
+            ListscanArgsWidget(),
+            ConstantWidget(),
         ]
     )
-    opa=OpaSelectorWidget()
-    plan_ui_lookup["run_intensity"] = PlanUI(
+    plan_ui_lookup["rel_list_scan_wp"] = PlanUI(
         [
             MetadataWidget(),
             DeviceListWidget(),
-            opa,
-            OpaMotorSelectorWidget(opa_selector=opa),
-            FloatWidget("Width", "width", 1),
-            IntWidget("Npts", "npts", 11),
-            SpectrometerWidget(include_center=False),
+            ListscanArgsWidget(),
+            ConstantWidget(),
         ]
     )
-    opa=OpaSelectorWidget()
-    plan_ui_lookup["run_holistic"] = PlanUI(
+    plan_ui_lookup["list_grid_scan_wp"] = PlanUI(
         [
             MetadataWidget(),
             DeviceListWidget(),
-            opa,
-            OpaMotorSelectorWidget(opa_selector=opa),
-            OpaMotorSelectorWidget(opa_selector=opa),
-            FloatWidget("Width", "width", 1),
-            IntWidget("Npts", "npts", 11),
-            SpectrometerWidget(include_center=False),
+            ListscanArgsWidget(),
+            ConstantWidget(),
         ]
     )
-    opa=OpaSelectorWidget()
-    plan_ui_lookup["motortune"] = PlanUI(
+    plan_ui_lookup["rel_list_grid_scan_wp"] = PlanUI(
         [
             MetadataWidget(),
             DeviceListWidget(),
-            opa,
-            BoolWidget("Use Tune Points", "use_tune_points"),
-            OpaMotorFullWidget(opa_selector=opa),
-            SpectrometerWidget(),
+            ListscanArgsWidget(),
+            ConstantWidget(),
         ]
     )
+    plan_ui_lookup["count"] = PlanUI(
+        [
+            MetadataWidget(),
+            DeviceListWidget(),
+            IntWidget("Npts", "num", 1),
+            FloatWidget("Delay", "delay", 0),
+        ]
+    )
+
+    if devices_with_deps:
+        plan_ui_lookup["run_tune_test"] = PlanUI(
+            [
+                MetadataWidget(),
+                DeviceListWidget(),
+                OpaSelectorWidget(),
+                SpectrometerWidget(include_center=False),
+            ]
+        )
+        opa=OpaSelectorWidget()
+        plan_ui_lookup["run_setpoint"] = PlanUI(
+            [
+                MetadataWidget(),
+                DeviceListWidget(),
+                opa,
+                OpaMotorSelectorWidget(opa_selector=opa),
+                FloatWidget("Width", "width", 1),
+                IntWidget("Npts", "npts", 11),
+                SpectrometerWidget(include_center=False),
+            ]
+        )
+        opa=OpaSelectorWidget()
+        plan_ui_lookup["run_intensity"] = PlanUI(
+            [
+                MetadataWidget(),
+                DeviceListWidget(),
+                opa,
+                OpaMotorSelectorWidget(opa_selector=opa),
+                FloatWidget("Width", "width", 1),
+                IntWidget("Npts", "npts", 11),
+                SpectrometerWidget(include_center=False),
+            ]
+        )
+        opa=OpaSelectorWidget()
+        plan_ui_lookup["run_holistic"] = PlanUI(
+            [
+                MetadataWidget(),
+                DeviceListWidget(),
+                opa,
+                OpaMotorSelectorWidget(opa_selector=opa),
+                OpaMotorSelectorWidget(opa_selector=opa),
+                FloatWidget("Width", "width", 1),
+                IntWidget("Npts", "npts", 11),
+                SpectrometerWidget(include_center=False),
+            ]
+        )
+        opa=OpaSelectorWidget()
+        plan_ui_lookup["motortune"] = PlanUI(
+            [
+                MetadataWidget(),
+                DeviceListWidget(),
+                opa,
+                BoolWidget("Use Tune Points", "use_tune_points"),
+                OpaMotorFullWidget(opa_selector=opa),
+                SpectrometerWidget(),
+            ]
+        )
+
+    # TODO: Reload current UI state
+plans_allowed_updated.connect(update_plan_ui)
+devices_allowed_updated.connect(update_devices)

bluesky_cmds/somatic/queue.py

@@ -46,6 +46,8 @@ def __init__(self, parent_widget, message_widget):
         self.update_ui()
         somatic.signals.queue_updated.connect(self.update_queue)
         somatic.signals.history_updated.connect(self.update_history)
+        somatic.signals.plans_allowed_updated.connect(self.rebuild_plan_ui)
+        somatic.signals.devices_allowed_updated.connect(self.rebuild_plan_ui)
 
     def add_button_to_table(self, i, j, text, color):
         button = pw.SetButton(text, color=color)
@@ -217,14 +219,16 @@ def show_preset_dialog(self, item):
         self.update_presets()
 
 
-
     def create_plan_frame(self):
         frame = QtWidgets.QWidget()
         frame.setLayout(QtWidgets.QVBoxLayout())
         layout = frame.layout()
         layout.setContentsMargins(0, 0, 0, 0)
         input_table = pw.InputTable()
-        allowed_plans = RM.plans_allowed()
+        try:
+            allowed_plans = RM.plans_allowed()
+        except:
+            allowed_plans = {"plans_allowed": {"count": None}}
         allowed_values = allowed_plans["plans_allowed"].keys()
         self.plan_combo = pc.Combo(allowed_values=allowed_values)
         self.plan_combo.updated.connect(self.on_plan_selected)
@@ -239,13 +243,29 @@ def create_plan_frame(self):
         layout.addWidget(append_button)
         return frame
 
-    def on_append_to_queue(self):
+    def rebuild_plan_ui(self):
+        for frame in self.type_frames.values():
+            self.settings_layout.removeWidget(frame)
+            frame.hide()
+            frame.close()
+        self.type_frames["plan"] = self.create_plan_frame()
+        for frame in self.type_frames.values():
+            self.settings_layout.insertWidget(8, frame)
+            frame.hide()
+        self.on_load_item(self.get_plan().to_dict())
+        self.update_type()
+
+    def get_plan(self):
         plan_name = self.plan_combo.read()
         widget = self.plan_widgets[plan_name]
         kwargs = widget.kwargs
         meta = kwargs.pop("md", {})
         plan = BPlan(plan_name, *widget.args, **kwargs)
         plan.meta = meta
+        return plan
+
+    def on_append_to_queue(self):
+        plan = self.get_plan()
         RM.item_add(plan)
 
     def on_queue_start_clicked(self):