Fix for latest ophyd async 2nd attempt

pyproject.toml

@@ -51,7 +51,7 @@ dev = [
     # Commented out due to dependency version conflict with pydantic 1.x
     # "copier",
     "myst-parser",
-    "ophyd_async[sim]>=v0.14.0",
+    "ophyd_async[sim]>=v0.19.0",
     "pre-commit",
     "psutil",
     "pydata-sphinx-theme>=0.12",
@@ -131,6 +131,7 @@ filterwarnings = [
     "ignore:dep_util is Deprecated. Use functions from setuptools instead.:DeprecationWarning",
     # Ignore deprecation warning from zocalo
     "ignore:.*pkg_resources.*:DeprecationWarning",
+    "ignore:epics_signal_x is deprecated, use epics_triggerable_command instead:DeprecationWarning",
 ]
 # Doctest python code in docs, python code in src docstrings, test functions in tests
 testpaths = "docs src tests system_tests"

src/dodal/beamlines/adsim.py

@@ -1,3 +1,4 @@
+from ophyd_async.epics.adcore import ADWriterFactory
 from ophyd_async.epics.adsimdetector import SimDetector
 
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
@@ -82,7 +83,6 @@ def stage() -> XThetaStage:
 def det(path_provider) -> SimDetector:
     return SimDetector(
         f"{PREFIX.beamline_prefix}-DI-CAM-01:",
-        path_provider=path_provider,
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix=HDF5_SUFFIX),
         driver_suffix=DET_SUFFIX,
-        writer_suffix=HDF5_SUFFIX,
     )

src/dodal/beamlines/b01_1.py

@@ -3,7 +3,7 @@
 
 from ophyd_async.core import PathProvider, StaticPathProvider, UUIDFilenameProvider
 from ophyd_async.epics.adaravis import AravisDetector
-from ophyd_async.epics.adcore import NDROIStatIO
+from ophyd_async.epics.adcore import ADWriterFactory, NDROIStatIO
 from ophyd_async.epics.pmac import PmacIO
 from ophyd_async.fastcs.panda import HDFPanda
 
@@ -87,9 +87,8 @@ def spectroscopy_detector(path_provider: PathProvider) -> AravisDetector:
     pv_prefix = f"{PREFIX.beamline_prefix}-DI-DCAM-02:"
     return AravisDetector(
         pv_prefix,
-        path_provider=path_provider,
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix=HDF5_SUFFIX),
         driver_suffix=CAM_SUFFIX,
-        writer_suffix=HDF5_SUFFIX,
         plugins={
             "roistat": NDROIStatIO(f"{pv_prefix}ROISTAT:", num_channels=3),
         },
@@ -107,9 +106,8 @@ def imaging_detector(path_provider: PathProvider) -> AravisDetector:
     """
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
-        path_provider=path_provider,
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix=HDF5_SUFFIX),
         driver_suffix=CAM_SUFFIX,
-        writer_suffix=HDF5_SUFFIX,
     )
 
 

src/dodal/beamlines/i11.py

@@ -2,6 +2,7 @@
 from pathlib import Path
 
 from ophyd_async.core import PathProvider, StaticPathProvider, UUIDFilenameProvider
+from ophyd_async.epics.adcore import ADWriterFactory
 
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import DET_SUFFIX
@@ -49,9 +50,10 @@ def mythen3(path_provider: PathProvider) -> Mythen3:
     """Mythen3 Detector from PSI."""
     return Mythen3(
         prefix=f"{PREFIX.beamline_prefix}-EA-DET-07:",
-        path_provider=path_provider,
+        writer_factory=ADWriterFactory.hdf(
+            path_provider=path_provider, writer_suffix="HDF:"
+        ),
         drv_suffix=DET_SUFFIX,
-        writer_suffix="HDF:",
     )
 
 

src/dodal/beamlines/i13_1.py

@@ -3,6 +3,7 @@
 
 from ophyd_async.core import PathProvider
 from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.epics.adcore import ADWriterFactory
 from ophyd_async.epics.admerlin import MerlinDetector
 
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
@@ -44,18 +45,16 @@ def sample_xyz_lab_fa_stage() -> XYZStage:
 @devices.factory()
 def side_camera(path_provider: PathProvider) -> AravisDetector:
     return AravisDetector(
-        prefix=f"{PREFIX}-OP-FLOAT-03:",
+        f"{PREFIX}-OP-FLOAT-03:",
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix="HDF5:"),
         driver_suffix="CAM:",
-        writer_suffix="HDF5:",
-        path_provider=path_provider,
     )
 
 
 @devices.factory()
 def merlin(path_provider: PathProvider) -> MerlinDetector:
     return MerlinDetector(
-        prefix=f"{PREFIX}-EA-DET-04:",
+        f"{PREFIX}-EA-DET-04:",
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix="HDF5:"),
         driver_suffix="CAM:",
-        writer_suffix="HDF5:",
-        path_provider=path_provider,
     )

src/dodal/beamlines/i15_1.py

@@ -3,7 +3,7 @@
 
 from daq_config_server import ConfigClient
 from ophyd_async.core import PathProvider, StaticPathProvider, UUIDFilenameProvider
-from ophyd_async.epics.adcore import ADWriterType, ContAcqDetector, NDPluginBaseIO
+from ophyd_async.epics.adcore import ADWriterFactory, ContAcqDetector, NDPluginBaseIO
 from ophyd_async.epics.motor import Motor
 from ophyd_async.fastcs.eiger import EigerDetector
 
@@ -318,57 +318,47 @@ def zebra() -> Zebra:
 def webcam_1(path_provider: PathProvider) -> ContAcqDetector:
     return ContAcqDetector(
         f"{PREFIX.beamline_prefix}-DI-WEB-01:",
-        path_provider=path_provider,
+        ADWriterFactory.jpeg(path_provider=path_provider, writer_suffix="JPEG:"),
         driver_suffix=CAM_SUFFIX,
         cb_suffix="CIRC:",
-        writer_type=ADWriterType.JPEG,
-        writer_suffix="JPEG:",
     )
 
 
 @devices.factory()
 def webcam_2(path_provider: PathProvider) -> ContAcqDetector:
     return ContAcqDetector(
         f"{PREFIX.beamline_prefix}-DI-WEB-02:",
-        path_provider=path_provider,
+        ADWriterFactory.jpeg(path_provider=path_provider, writer_suffix="JPEG:"),
         driver_suffix=CAM_SUFFIX,
         cb_suffix="CIRC:",
-        writer_type=ADWriterType.JPEG,
-        writer_suffix="JPEG:",
     )
 
 
 @devices.factory()
 def cam_1(path_provider: PathProvider) -> ContAcqDetector:
     return ContAcqDetector(
         f"{PREFIX.beamline_prefix}-DI-CAM-01:",
-        path_provider=path_provider,
+        ADWriterFactory.jpeg(path_provider=path_provider, writer_suffix="JPEG:"),
         driver_suffix=CAM_SUFFIX,
         cb_suffix="CIRC:",
-        writer_type=ADWriterType.JPEG,
-        writer_suffix="JPEG:",
     )
 
 
 @devices.factory()
 def cam_2(path_provider: PathProvider) -> ContAcqDetector:
     return ContAcqDetector(
         f"{PREFIX.beamline_prefix}-DI-CAM-02:",
-        path_provider=path_provider,
+        ADWriterFactory.jpeg(path_provider=path_provider, writer_suffix="JPEG:"),
         driver_suffix=CAM_SUFFIX,
         cb_suffix="CIRC:",
-        writer_type=ADWriterType.JPEG,
-        writer_suffix="JPEG:",
     )
 
 
 @devices.factory()
 def cam_3(path_provider: PathProvider) -> ContAcqDetector:
     return ContAcqDetector(
         f"{PREFIX.beamline_prefix}-DI-CAM-03:",
-        path_provider=path_provider,
+        ADWriterFactory.jpeg(path_provider=path_provider, writer_suffix="JPEG:"),
         driver_suffix=CAM_SUFFIX,
         cb_suffix="CIRC:",
-        writer_type=ADWriterType.JPEG,
-        writer_suffix="JPEG:",
     )

src/dodal/beamlines/i23.py

@@ -3,6 +3,7 @@
 
 from daq_config_server import ConfigClient
 from ophyd_async.core import InOut, PathProvider, StrictEnum
+from ophyd_async.epics.adcore import ADWriterFactory
 from ophyd_async.epics.adpilatus import PilatusDetector
 
 from dodal.beamlines.aithre import DISPLAY_CONFIG, ZOOM_PARAMS_FILE
@@ -103,10 +104,9 @@ def zebra() -> Zebra:
 @devices.factory()
 def pilatus(path_provider: PathProvider) -> PilatusDetector:
     return PilatusDetector(
-        prefix=f"{PREFIX.beamline_prefix}-EA-PILAT-01:",
-        path_provider=path_provider,
+        f"{PREFIX.beamline_prefix}-EA-PILAT-01:",
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix=HDF5_SUFFIX),
         driver_suffix="cam1:",
-        writer_suffix=HDF5_SUFFIX,
     )
 
 

src/dodal/beamlines/p38.py

@@ -4,6 +4,7 @@
 from daq_config_server import ConfigClient
 from ophyd_async.core import PathProvider
 from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.epics.adcore import ADWriterFactory
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import (
@@ -60,9 +61,11 @@ def path_provider() -> PathProvider:
 def d3(path_provider: PathProvider) -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
+        ADWriterFactory.hdf(
+            path_provider=path_provider,
+            writer_suffix=HDF5_SUFFIX,
+        ),
         driver_suffix="DET:",
-        writer_suffix=HDF5_SUFFIX,
-        path_provider=path_provider,
     )
 
 
@@ -71,19 +74,17 @@ def d3(path_provider: PathProvider) -> AravisDetector:
 def d11(path_provider: PathProvider) -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-03:",
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix=HDF5_SUFFIX),
         driver_suffix="DET:",
-        writer_suffix=HDF5_SUFFIX,
-        path_provider=path_provider,
     )
 
 
 @devices.factory()
 def d12(path_provider: PathProvider) -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-DI-DCAM-04:",
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix=HDF5_SUFFIX),
         driver_suffix="DET:",
-        writer_suffix=HDF5_SUFFIX,
-        path_provider=path_provider,
     )
 
 

src/dodal/beamlines/p45.py

@@ -3,6 +3,7 @@
 
 from ophyd_async.core import PathProvider
 from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.epics.adcore import ADWriterFactory
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
@@ -46,9 +47,8 @@ def choppers() -> XYStage:
 def det(path_provider: PathProvider) -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-EA-MAP-01:",
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix=HDF5_SUFFIX),
         driver_suffix=DET_SUFFIX,
-        writer_suffix=HDF5_SUFFIX,
-        path_provider=path_provider,
     )
 
 
@@ -57,9 +57,8 @@ def det(path_provider: PathProvider) -> AravisDetector:
 def diff(path_provider: PathProvider) -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-EA-DIFF-01:",
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix=HDF5_SUFFIX),
         driver_suffix=DET_SUFFIX,
-        writer_suffix=HDF5_SUFFIX,
-        path_provider=path_provider,
     )
 
 

src/dodal/beamlines/p99.py

@@ -3,6 +3,7 @@
 
 from ophyd_async.core import PathProvider
 from ophyd_async.epics.adandor import AndorDetector
+from ophyd_async.epics.adcore import ADWriterFactory
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import set_beamline
@@ -63,10 +64,9 @@ def lab_stage() -> XYZStage:
 def andor2_det(path_provider: PathProvider) -> AndorDetector:
     """Andor model:DU897_BV."""
     return AndorDetector(
-        prefix=f"{PREFIX.beamline_prefix}-EA-DET-03:",
+        f"{PREFIX.beamline_prefix}-EA-DET-03:",
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix=HDF5_SUFFIX),
         driver_suffix=CAM_SUFFIX,
-        writer_suffix=HDF5_SUFFIX,
-        path_provider=path_provider,
     )
 
 

src/dodal/beamlines/training_rig.py

@@ -3,6 +3,7 @@
 
 from ophyd_async.core import PathProvider, StaticPathProvider, UUIDFilenameProvider
 from ophyd_async.epics.adaravis import AravisDetector
+from ophyd_async.epics.adcore import ADWriterFactory
 from ophyd_async.fastcs.panda import HDFPanda
 
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
@@ -46,9 +47,8 @@ def sample_stage() -> XThetaStage:
 def det(path_provider: PathProvider) -> AravisDetector:
     return AravisDetector(
         f"{PREFIX.beamline_prefix}-EA-DET-01:",
-        path_provider=path_provider,
+        ADWriterFactory.hdf(path_provider=path_provider, writer_suffix=HDF5_SUFFIX),
         driver_suffix=DET_SUFFIX,
-        writer_suffix=HDF5_SUFFIX,
     )
 
 

src/dodal/devices/beamlines/b16/detector.py

@@ -4,7 +4,7 @@
 from ophyd_async.epics.adcore import (
     ADAcquireLogic,
     ADBaseIO,
-    ADWriterType,
+    ADWriterFactory,
     AreaDetector,
     prepare_exposures,
 )
@@ -37,11 +37,9 @@ def software_triggered_tiff_area_detector(
     """
     driver = ADBaseIO(prefix + CAM_SUFFIX)
     return AreaDetector(
-        prefix=prefix,
-        driver=driver,
+        driver,
+        prefix,
+        ADWriterFactory.tiff(path_provider=path_provider, writer_suffix=TIFF_SUFFIX),
         acquire_logic=ADAcquireLogic(driver),
         trigger_logic=TiffTriggerLogic(driver, deadtime),
-        path_provider=path_provider,
-        writer_type=ADWriterType.TIFF,
-        writer_suffix=TIFF_SUFFIX,
     )

src/dodal/devices/beamlines/i11/mythen.py

@@ -3,15 +3,14 @@
 
 from ophyd_async.core import (
     DetectorTriggerLogic,
-    PathProvider,
     SignalRW,
     StrictEnum,
 )
 from ophyd_async.epics.adcore import (
     ADAcquireLogic,
     ADBaseIO,
     ADImageMode,
-    ADWriterType,
+    ADWriterFactory,
     AreaDetector,
 )
 from ophyd_async.epics.core import PvSuffix
@@ -132,21 +131,17 @@ class Mythen3(AreaDetector[Mythen3Driver]):
     def __init__(
         self,
         prefix: str,
-        path_provider: PathProvider,
+        writer_factory: ADWriterFactory,
         drv_suffix: str = DET_SUFFIX,
-        writer_type: ADWriterType = ADWriterType.HDF,
-        writer_suffix: str | None = "HDF:",
         name: str = "",
     ):
         self.driver = Mythen3Driver(prefix + drv_suffix)
 
         super().__init__(
-            prefix=prefix,
-            driver=self.driver,
+            self.driver,
+            prefix,
+            writer_factory,
             acquire_logic=ADAcquireLogic(self.driver),
             trigger_logic=Mythen3TriggerLogic(self.driver),
-            path_provider=path_provider,
-            writer_type=writer_type,
-            writer_suffix=writer_suffix,
             name=name,
         )