dls-dodal 1.65.0__py3-none-any.whl → 1.67.0__py3-none-any.whl

dodal/beamlines/training_rig.py

@@ -1,19 +1,12 @@
-from pathlib import Path
-
 from ophyd_async.epics.adaravis import AravisDetector
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
     get_path_provider,
-    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import DET_SUFFIX, HDF5_SUFFIX
-from dodal.common.visit import (
-    LocalDirectoryServiceClient,
-    StaticVisitPathProvider,
-)
 from dodal.devices.motors import XThetaStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix, get_beamline_name
@@ -35,15 +28,6 @@ set_log_beamline(BL)
 set_utils_beamline(BL)
 
 
-set_path_provider(
-    StaticVisitPathProvider(
-        BL,
-        Path("/exports/mybeamline/data/2025"),
-        client=LocalDirectoryServiceClient(),
-    )
-)
-
-
 @device_factory()
 def sample_stage() -> XThetaStage:
     return XThetaStage(f"{PREFIX.beamline_prefix}-MO-MAP-01:STAGE:")

dodal/cli.py

@@ -1,3 +1,4 @@
+import importlib
 import os
 from collections.abc import Mapping
 from pathlib import Path
@@ -9,6 +10,7 @@ from ophyd_async.plan_stubs import ensure_connected
 
 from dodal.beamlines import all_beamline_names, module_name_for_beamline
 from dodal.common.beamlines.beamline_utils import set_path_provider
+from dodal.device_manager import DeviceManager
 from dodal.utils import AnyDevice, filter_ophyd_devices, make_all_devices
 
 from . import __version__
@@ -43,7 +45,8 @@ def main(ctx: click.Context) -> None:
     "attempt any I/O. Useful as a a dry-run.",
     default=False,
 )
-def connect(beamline: str, all: bool, sim_backend: bool) -> None:
+@click.option("-n", "--name", "device_manager", default="devices")
+def connect(beamline: str, all: bool, sim_backend: bool, device_manager: str) -> None:
     """Initialises a beamline module, connects to all devices, reports
     any connection issues."""
 
@@ -51,7 +54,6 @@ def connect(beamline: str, all: bool, sim_backend: bool) -> None:
 
     # We need to make a fake path provider for any detectors that need one,
     # it is not used in dodal connect
-    _spoof_path_provider()
 
     module_name = module_name_for_beamline(beamline)
     full_module_path = f"dodal.beamlines.{module_name}"
@@ -62,16 +64,28 @@ def connect(beamline: str, all: bool, sim_backend: bool) -> None:
 
     print(f"Attempting connection to {beamline} (using {full_module_path})")
 
-    # Force all devices to be lazy (don't connect to PVs on instantiation) and do
-    # connection as an extra step, because the alternatives is handling the fact
-    # that only some devices may be lazy.
-    devices, instance_exceptions = make_all_devices(
-        full_module_path,
-        include_skipped=all,
-        fake_with_ophyd_sim=sim_backend,
-        wait_for_connection=False,
-    )
-    devices, connect_exceptions = _connect_devices(run_engine, devices, sim_backend)
+    mod = importlib.import_module(full_module_path)
+
+    # Don't connect devices as they're built and do connection as an extra step,
+    # because the alternatives is handling the fact that only some devices may
+    # be lazy.
+
+    if (manager := getattr(mod, device_manager, None)) and isinstance(
+        manager, DeviceManager
+    ):
+        devices, instance_exceptions, connect_exceptions = manager.build_and_connect(
+            mock=sim_backend,
+        )
+    else:
+        print(f"No device manager named '{device_manager}' found in {mod}")
+        _spoof_path_provider()
+        devices, instance_exceptions = make_all_devices(
+            full_module_path,
+            include_skipped=all,
+            fake_with_ophyd_sim=sim_backend,
+            wait_for_connection=False,
+        )
+        devices, connect_exceptions = _connect_devices(run_engine, devices, sim_backend)
 
     # Inform user of successful connections
     _report_successful_devices(devices, sim_backend)

dodal/common/coordination.py

@@ -17,7 +17,7 @@ def group_uuid(name: str) -> Group:
     return f"{name}-{str(uuid.uuid4())[:6]}"
 
 
-def inject(name: str) -> Any:  # type: ignore
+def inject(name: str = "") -> Any:  # type: ignore
     """
     Function to mark a defaulted argument of a plan as a reference to a device stored
     in another context and not available to be referenced directly.
@@ -30,7 +30,8 @@ def inject(name: str) -> Any:  # type: ignore
     def scan(x: Movable = inject("stage_x"), start: float = 0.0 ...)
 
     Args:
-        name (str): Name of a Device to be fetched from an external context
+        name (str): Name of a Device to be fetched from an external context. This can be
+        left blank when injecting device composites (the default)
 
     Returns:
         Any: name but without typing checking, valid as any default type