Merge pull request #312 from spc-group/guarneri

Things fixed to work with Guarneri

Also, removed the ``devices`` module and related code.

environment.yml

@@ -48,6 +48,7 @@ dependencies:
     - pytest-mongodb
     - StrEnum
     - ophyd-registry >= 1.3.3
+    - guarneri >= 0.2.0
     - xraydb >=4.5.0
     - pytest-timeout  # Get rid of this if tests are not hanging
     - git+https://github.com/pcdshub/pcdsdevices

pyproject.toml

@@ -19,7 +19,7 @@ keywords = ["synchrotron", "xray", "bluesky"]
 dependencies = ["aioca", "aiokafka", "bluesky", "ophyd", "ophyd-async>=0.8.0a5", "databroker", "apsbss", "xraydb",
 	        "mergedeep", "xrayutilities", "bluesky-queueserver-api", "tomlkit",
 		"apstools", "databroker", "ophyd-registry", "caproto", "pcdsdevices",
-		"strenum", "bluesky-adaptive", "tiled[client]"]
+		"strenum", "bluesky-adaptive", "tiled[client]", "guarneri"]
 
 [project.optional-dependencies]
 

src/conftest.py

@@ -15,7 +15,6 @@
 from tiled.server.app import build_app
 
 import haven
-from haven._iconfig import beamline_connected as _beamline_connected
 from haven.catalog import Catalog
 from haven.devices.aps import ApsMachine
 from haven.devices.area_detector import AravisDetector
@@ -44,16 +43,10 @@
 )
 
 
-@pytest.fixture()
-def beamline_connected():
-    with _beamline_connected(True):
-        yield
-
-
 @pytest.fixture()
 def sim_registry(monkeypatch):
     # Save the registry so we can restore it later
-    registry = haven.beamline.registry
+    registry = haven.beamline.devices
     objects_by_name = registry._objects_by_name
     objects_by_label = registry._objects_by_label
     registry.clear()

src/firefly/area_detector_viewer.py

@@ -25,7 +25,7 @@ class AreaDetectorViewerDisplay(display.FireflyDisplay):
 
     def customize_device(self):
         device_name = name = self.macros()["AD"]
-        device = beamline.registry.find(device_name)
+        device = beamline.devices[device_name]
         self.device = device
         img_pv = device.pva.pv_name.get(as_string=True)
         addr = f"pva://{img_pv}"

src/firefly/bss.py

@@ -51,7 +51,7 @@ def customize_ui(self):
         self.ui.refresh_models_button.setIcon(qta.icon("fa5s.sync"))
 
     def customize_device(self):
-        self._device = beamline.registry.find("beamline_manager")
+        self._device = beamline.devices["beamline_manager"]
 
     def proposals(self):
         config = load_config()
@@ -143,7 +143,7 @@ def select_proposal(self, current, previous):
     def update_proposal(self):
         new_id = self._proposal_id
         # Change the proposal in the EPICS record
-        bss = beamline.registry.find("beamline_manager.bss")
+        bss = beamline.devices["beamline_manager.bss"]
         bss.proposal.proposal_id.set(new_id).wait()
         # Notify any interested parties that the proposal has been changed
         self.proposal_changed.emit()
@@ -160,7 +160,7 @@ def select_esaf(self, current, previous):
     def update_esaf(self):
         new_id = self._esaf_id
         # Change the esaf in the EPICS record
-        bss = beamline.registry.find("beamline_manager.bss")
+        bss = beamline.devices["beamline_manager.bss"]
         bss.wait_for_connection()
         bss.esaf.esaf_id.set(new_id).wait(timeout=5)
         # Notify any interested parties that the esaf has been changed

src/firefly/controller.py

@@ -16,8 +16,8 @@
 from qtpy.QtWidgets import QAction, QErrorMessage
 
 from haven import beamline, load_config
-from haven.device import titelize
 from haven.exceptions import ComponentNotFound, InvalidConfiguration
+from haven.utils import titleize
 
 from .action import Action, ActionsRegistry, WindowAction
 from .kafka_client import KafkaClient
@@ -77,7 +77,7 @@ def __init__(self, parent=None, display="status", use_main_window=False):
         self.actions = ActionsRegistry()
         self.windows = OrderedDict()
         self.queue_re_state_changed.connect(self.enable_queue_controls)
-        self.registry = beamline.registry
+        self.registry = beamline.devices
         # An error message dialog for later use
         self.error_message = QErrorMessage()
 
@@ -112,15 +112,16 @@ async def setup_instrument(self, load_instrument=True):
 
         """
         if load_instrument:
+            beamline.load()
             try:
-                await beamline.load()
+                await beamline.connect()
             except NotConnected as exc:
                 log.exception(exc)
                 msg = (
                     "One or more devices failed to load. See console logs for details."
                 )
                 self.error_message.showMessage(msg)
-            self.registry_changed.emit(beamline.registry)
+            self.registry_changed.emit(beamline.devices)
         # Make actions for launching other windows
         self.setup_window_actions()
         # Actions for controlling the bluesky run engine
@@ -501,7 +502,7 @@ def device_actions(
         actions = {
             device.name: WindowAction(
                 name=f"show_{device.name}_action",
-                text=titelize(device.name),
+                text=titleize(device.name),
                 display_file=display_file,
                 icon=icon,
                 WindowClass=WindowClass,

src/firefly/display.py

@@ -100,7 +100,7 @@ def customize_device(self):
         # Retrieve the device
         device = self.macros().get("DEVICE")
         if device is not None:
-            device = beamline.registry.find(device)
+            device = beamline.devices[device]
         self.device = device
         return device
 

src/firefly/energy.py

@@ -61,7 +61,7 @@ def __init__(self, args=None, macros={}, **kwargs):
 
     def customize_device(self):
         try:
-            self.energy_positioner = beamline.registry.find("energy")
+            self.energy_positioner = beamline.devices["energy"]
         except ComponentNotFound:
             warnings.warn("Could not find energy positioner.")
             log.warning("Could not find energy positioner.")

src/firefly/filters.py

@@ -14,7 +14,7 @@ def ui_filename(self):
         return "filters.ui"
 
     def customize_device(self):
-        filters = beamline.registry.findall(label="filters", allow_none=True)
+        filters = beamline.devices.findall(label="filters", allow_none=True)
         self.filters = sorted(
             filters, key=lambda dev: (dev.material.get(), dev.thickness.get())
         )

src/firefly/iocs.py

@@ -16,7 +16,7 @@ def customize_ui(self):
             self.iocs_layout.takeAt(idx).widget().deleteLater()
         # Add embedded displays for all the ion chambers
         self._ioc_displays = []
-        manager = beamline.registry["beamline_manager"]
+        manager = beamline.devices["beamline_manager"]
 
         for idx, cpt_name in enumerate(manager.iocs.component_names):
             cpt = getattr(manager.iocs, cpt_name)

src/firefly/ion_chamber.py

@@ -8,7 +8,7 @@ class IonChamberDisplay(display.FireflyDisplay):
     """A GUI window for changing settings in an ion chamber."""
 
     def customize_device(self):
-        self._device = beamline.registry.find(self.macros()["IC"])
+        self._device = beamline.devices[self.macros()["IC"]]
 
     def customize_ui(self):
         # Use qtawesome icons instead of unicode arrows

src/firefly/pydm_plugin.py

@@ -42,7 +42,7 @@ def find_signal(self, address: str):
         Signal
           The Ophyd signal corresponding to the address.
         """
-        return beamline.registry[address]
+        return beamline.devices[address]
 
 
 class HavenConnection(RegistryConnection, SignalConnection):
@@ -161,7 +161,7 @@ class HavenPlugin(SignalPlugin):
     def connection_class(channel, address, protocol):
         # Check if we need the synchronous or asynchronous version
         try:
-            sig = beamline.registry[address]
+            sig = beamline.devices[address]
         except KeyError:
             sig = None
         is_ophyd_async = inspect.iscoroutinefunction(getattr(sig, "connect", None))

src/firefly/status.py

@@ -31,7 +31,7 @@ def add_shutter_widgets(self):
         form.removeRow(self.ui.shutter_A_layout)
         form.removeRow(self.ui.shutter_CD_layout)
         # Add widgets for shutters
-        shutters = beamline.registry.findall("shutters", allow_none=True)
+        shutters = beamline.devices.findall("shutters", allow_none=True)
         row_idx = 4
         on_color = self.ui.shutter_permit_indicator.onColor
         off_color = self.ui.shutter_permit_indicator.offColor

src/firefly/table.py

@@ -82,7 +82,7 @@ def ui_file(self):
 
 class TableDisplay(display.FireflyDisplay):
     def customize_device(self):
-        self.device = beamline.registry.find(self.macros()["DEVICE"])
+        self.device = beamline.devices[self.macros()["DEVICE"]]
         # Determine which flavor of caQtDM parameters we need
         if self.num_legs == 2:
             self.caqtdm = TwoLegCaQtDM(table=self.device)

src/firefly/xrf_detector.py

@@ -505,7 +505,7 @@ def handle_new_spectrum(self, new_spectrum, mca_num):
     def customize_device(self):
         # Load the device from the registry
         device_name = self.macros()["DEV"]
-        self.device = device = beamline.registry.find(device_name)
+        self.device = device = beamline.devices[device_name]
         # Set up data channels
         self._spectrum_channels = []
         for mca_num in range(self.device.num_elements):

src/haven/_iconfig.py

@@ -12,8 +12,6 @@
 import argparse
 import logging
 import os
-from contextlib import contextmanager
-from copy import deepcopy
 from pathlib import Path
 from pprint import pprint
 from typing import Optional, Sequence
@@ -99,21 +97,6 @@ def print_config_value(args: Sequence[str] = None):
         print(value)
 
 
-@contextmanager
-def beamline_connected(is_connected=True):
-    global _local_overrides
-    # Save old value
-    old_dict = deepcopy(_local_overrides)
-    # Set temporary value
-    if "beamline" not in _local_overrides.keys():
-        _local_overrides["beamline"] = {}
-    _local_overrides["beamline"]["hardware_is_present"] = is_connected
-    # Return to enclosing code
-    yield
-    # Restore old value
-    _local_overrides = old_dict
-
-
 # -----------------------------------------------------------------------------
 # :author:    Mark Wolfman
 # :email:     [email protected]