ophyd-async 0.9.0a1__py3-none-any.whl → 0.9.0a2__py3-none-any.whl

ophyd_async/epics/adcore/_core_writer.py

@@ -0,0 +1,219 @@
+import asyncio
+from collections.abc import AsyncGenerator, AsyncIterator
+from pathlib import Path
+from typing import Generic, TypeVar, get_args
+from urllib.parse import urlunparse
+
+from bluesky.protocols import Hints, StreamAsset
+from event_model import (
+    ComposeStreamResource,
+    DataKey,
+    StreamRange,
+)
+
+from ophyd_async.core._detector import DetectorWriter
+from ophyd_async.core._providers import DatasetDescriber, NameProvider, PathProvider
+from ophyd_async.core._signal import (
+    observe_value,
+    set_and_wait_for_value,
+    wait_for_value,
+)
+from ophyd_async.core._status import AsyncStatus
+from ophyd_async.core._utils import DEFAULT_TIMEOUT
+
+# from ophyd_async.epics.adcore._core_logic import ADBaseDatasetDescriber
+from ._core_io import (
+    ADBaseDatasetDescriber,
+    Callback,
+    NDArrayBaseIO,
+    NDFileIO,
+    NDPluginBaseIO,
+)
+from ._utils import FileWriteMode
+
+NDFileIOT = TypeVar("NDFileIOT", bound=NDFileIO)
+ADWriterT = TypeVar("ADWriterT", bound="ADWriter")
+
+
+class ADWriter(DetectorWriter, Generic[NDFileIOT]):
+    default_suffix: str = "FILE1:"
+
+    def __init__(
+        self,
+        fileio: NDFileIOT,
+        path_provider: PathProvider,
+        name_provider: NameProvider,
+        dataset_describer: DatasetDescriber,
+        file_extension: str = "",
+        mimetype: str = "",
+        plugins: dict[str, NDPluginBaseIO] | None = None,
+    ) -> None:
+        self._plugins = plugins or {}
+        self.fileio = fileio
+        self._path_provider = path_provider
+        self._name_provider = name_provider
+        self._dataset_describer = dataset_describer
+        self._file_extension = file_extension
+        self._mimetype = mimetype
+        self._last_emitted = 0
+        self._emitted_resource = None
+
+        self._capture_status: AsyncStatus | None = None
+        self._multiplier = 1
+        self._filename_template = "%s%s_%6.6d"
+
+    @classmethod
+    def with_io(
+        cls: type[ADWriterT],
+        prefix: str,
+        path_provider: PathProvider,
+        dataset_source: NDArrayBaseIO | None = None,
+        fileio_suffix: str | None = None,
+        plugins: dict[str, NDPluginBaseIO] | None = None,
+    ) -> ADWriterT:
+        try:
+            fileio_cls = get_args(cls.__orig_bases__[0])[0]  # type: ignore
+        except IndexError as err:
+            raise RuntimeError("File IO class for writer not specified!") from err
+
+        fileio = fileio_cls(prefix + (fileio_suffix or cls.default_suffix))
+        dataset_describer = ADBaseDatasetDescriber(dataset_source or fileio)
+
+        def name_provider() -> str:
+            if fileio.parent == "Not attached to a detector":
+                raise RuntimeError("Initializing writer without parent detector!")
+            return fileio.parent.name
+
+        writer = cls(
+            fileio, path_provider, name_provider, dataset_describer, plugins=plugins
+        )
+        return writer
+
+    async def begin_capture(self) -> None:
+        info = self._path_provider(device_name=self._name_provider())
+
+        await self.fileio.enable_callbacks.set(Callback.ENABLE)
+
+        # Set the directory creation depth first, since dir creation callback happens
+        # when directory path PV is processed.
+        await self.fileio.create_directory.set(info.create_dir_depth)
+
+        await asyncio.gather(
+            # See https://github.com/bluesky/ophyd-async/issues/122
+            self.fileio.file_path.set(str(info.directory_path)),
+            self.fileio.file_name.set(info.filename),
+            self.fileio.file_write_mode.set(FileWriteMode.STREAM),
+            # For non-HDF file writers, use AD file templating mechanism
+            # for generating multi-image datasets
+            self.fileio.file_template.set(
+                self._filename_template + self._file_extension
+            ),
+            self.fileio.auto_increment.set(True),
+            self.fileio.file_number.set(0),
+        )
+
+        if not await self.fileio.file_path_exists.get_value():
+            msg = f"File path {info.directory_path} for file plugin does not exist"
+            raise FileNotFoundError(msg)
+
+        # Overwrite num_capture to go forever
+        await self.fileio.num_capture.set(0)
+        # Wait for it to start, stashing the status that tells us when it finishes
+        self._capture_status = await set_and_wait_for_value(
+            self.fileio.capture, True, wait_for_set_completion=False
+        )
+
+    async def open(self, multiplier: int = 1) -> dict[str, DataKey]:
+        self._emitted_resource = None
+        self._last_emitted = 0
+        self._multiplier = multiplier
+        frame_shape = await self._dataset_describer.shape()
+        dtype_numpy = await self._dataset_describer.np_datatype()
+
+        await self.begin_capture()
+
+        describe = {
+            self._name_provider(): DataKey(
+                source=self._name_provider(),
+                shape=list(frame_shape),
+                dtype="array",
+                dtype_numpy=dtype_numpy,
+                external="STREAM:",
+            )  # type: ignore
+        }
+        return describe
+
+    async def observe_indices_written(
+        self, timeout=DEFAULT_TIMEOUT
+    ) -> AsyncGenerator[int, None]:
+        """Wait until a specific index is ready to be collected"""
+        async for num_captured in observe_value(self.fileio.num_captured, timeout):
+            yield num_captured // self._multiplier
+
+    async def get_indices_written(self) -> int:
+        num_captured = await self.fileio.num_captured.get_value()
+        return num_captured // self._multiplier
+
+    async def collect_stream_docs(
+        self, indices_written: int
+    ) -> AsyncIterator[StreamAsset]:
+        if indices_written:
+            if not self._emitted_resource:
+                file_path = Path(await self.fileio.file_path.get_value())
+                file_name = await self.fileio.file_name.get_value()
+                file_template = file_name + "_{:06d}" + self._file_extension
+
+                frame_shape = await self._dataset_describer.shape()
+
+                uri = urlunparse(
+                    (
+                        "file",
+                        "localhost",
+                        str(file_path.absolute()) + "/",
+                        "",
+                        "",
+                        None,
+                    )
+                )
+
+                bundler_composer = ComposeStreamResource()
+
+                self._emitted_resource = bundler_composer(
+                    mimetype=self._mimetype,
+                    uri=uri,
+                    data_key=self._name_provider(),
+                    parameters={
+                        # Assume that we always write 1 frame per file/chunk
+                        "chunk_shape": (1, *frame_shape),
+                        # Include file template for reconstruction in consolidator
+                        "template": file_template,
+                    },
+                    uid=None,
+                    validate=True,
+                )
+
+                yield "stream_resource", self._emitted_resource.stream_resource_doc
+
+            # Indices are relative to resource
+            if indices_written > self._last_emitted:
+                indices: StreamRange = {
+                    "start": self._last_emitted,
+                    "stop": indices_written,
+                }
+                self._last_emitted = indices_written
+                yield (
+                    "stream_datum",
+                    self._emitted_resource.compose_stream_datum(indices),
+                )
+
+    async def close(self):
+        # Already done a caput callback in _capture_status, so can't do one here
+        await self.fileio.capture.set(False, wait=False)
+        await wait_for_value(self.fileio.capture, False, DEFAULT_TIMEOUT)
+        if self._capture_status:
+            # We kicked off an open, so wait for it to return
+            await self._capture_status
+
+    @property
+    def hints(self) -> Hints:
+        return {"fields": [self._name_provider()]}

ophyd_async/epics/adcore/_hdf_writer.py

@@ -1,5 +1,5 @@
 import asyncio
-from collections.abc import AsyncGenerator, AsyncIterator
+from collections.abc import AsyncIterator
 from pathlib import Path
 from xml.etree import ElementTree as ET
 
@@ -8,82 +8,69 @@ from event_model import DataKey
 
 from ophyd_async.core import (
     DEFAULT_TIMEOUT,
-    AsyncStatus,
     DatasetDescriber,
-    DetectorWriter,
     HDFDataset,
     HDFFile,
     NameProvider,
     PathProvider,
-    observe_value,
-    set_and_wait_for_value,
     wait_for_value,
 )
 
-from ._core_io import Callback, NDArrayBaseIO, NDFileHDFIO
+from ._core_io import NDFileHDFIO, NDPluginBaseIO
+from ._core_writer import ADWriter
 from ._utils import (
-    FileWriteMode,
     convert_param_dtype_to_np,
     convert_pv_dtype_to_np,
 )
 
 
-class ADHDFWriter(DetectorWriter):
+class ADHDFWriter(ADWriter[NDFileHDFIO]):
+    default_suffix: str = "HDF1:"
+
     def __init__(
         self,
-        hdf: NDFileHDFIO,
+        fileio: NDFileHDFIO,
         path_provider: PathProvider,
         name_provider: NameProvider,
         dataset_describer: DatasetDescriber,
-        *plugins: NDArrayBaseIO,
+        plugins: dict[str, NDPluginBaseIO] | None = None,
     ) -> None:
-        self.hdf = hdf
-        self._path_provider = path_provider
-        self._name_provider = name_provider
-        self._dataset_describer = dataset_describer
-
-        self._plugins = plugins
-        self._capture_status: AsyncStatus | None = None
+        super().__init__(
+            fileio,
+            path_provider,
+            name_provider,
+            dataset_describer,
+            plugins=plugins,
+            file_extension=".h5",
+            mimetype="application/x-hdf5",
+        )
         self._datasets: list[HDFDataset] = []
         self._file: HDFFile | None = None
-        self._multiplier = 1
+        self._include_file_number = False
 
     async def open(self, multiplier: int = 1) -> dict[str, DataKey]:
         self._file = None
-        info = self._path_provider(device_name=self._name_provider())
 
-        # Set the directory creation depth first, since dir creation callback happens
-        # when directory path PV is processed.
-        await self.hdf.create_directory.set(info.create_dir_depth)
+        # Setting HDF writer specific signals
 
         # Make sure we are using chunk auto-sizing
-        await asyncio.gather(self.hdf.chunk_size_auto.set(True))
+        await asyncio.gather(self.fileio.chunk_size_auto.set(True))
 
         await asyncio.gather(
-            self.hdf.num_extra_dims.set(0),
-            self.hdf.lazy_open.set(True),
-            self.hdf.swmr_mode.set(True),
-            # See https://github.com/bluesky/ophyd-async/issues/122
-            self.hdf.file_path.set(str(info.directory_path)),
-            self.hdf.file_name.set(info.filename),
-            self.hdf.file_template.set("%s/%s.h5"),
-            self.hdf.file_write_mode.set(FileWriteMode.STREAM),
-            # Never use custom xml layout file but use the one defined
-            # in the source code file NDFileHDF5LayoutXML.cpp
-            self.hdf.xml_file_name.set(""),
-            self.hdf.enable_callbacks.set(Callback.ENABLE),
+            self.fileio.num_extra_dims.set(0),
+            self.fileio.lazy_open.set(True),
+            self.fileio.swmr_mode.set(True),
+            self.fileio.xml_file_name.set(""),
         )
 
-        assert (
-            await self.hdf.file_path_exists.get_value()
-        ), f"File path {info.directory_path} for hdf plugin does not exist"
+        # By default, don't add file number to filename
+        self._filename_template = "%s%s"
+        if self._include_file_number:
+            self._filename_template += "_%6.6d"
+
+        # Set common AD file plugin params, begin capturing
+        await self.begin_capture()
 
-        # Overwrite num_capture to go forever
-        await self.hdf.num_capture.set(0)
-        # Wait for it to start, stashing the status that tells us when it finishes
-        self._capture_status = await set_and_wait_for_value(
-            self.hdf.capture, True, wait_for_set_completion=False
-        )
         name = self._name_provider()
         detector_shape = await self._dataset_describer.shape()
         np_dtype = await self._dataset_describer.np_datatype()
@@ -91,7 +78,7 @@ class ADHDFWriter(DetectorWriter):
         outer_shape = (multiplier,) if multiplier > 1 else ()
 
         # Determine number of frames that will be saved per HDF chunk
-        frames_per_chunk = await self.hdf.num_frames_chunks.get_value()
+        frames_per_chunk = await self.fileio.num_frames_chunks.get_value()
 
         # Add the main data
         self._datasets = [
@@ -105,7 +92,7 @@ class ADHDFWriter(DetectorWriter):
             )
         ]
         # And all the scalar datasets
-        for plugin in self._plugins:
+        for plugin in self._plugins.values():
             maybe_xml = await plugin.nd_attributes_file.get_value()
             # This is the check that ADCore does to see if it is an XML string
             # rather than a filename to parse
@@ -136,7 +123,7 @@ class ADHDFWriter(DetectorWriter):
 
         describe = {
             ds.data_key: DataKey(
-                source=self.hdf.full_file_name.source,
+                source=self.fileio.full_file_name.source,
                 shape=list(outer_shape + tuple(ds.shape)),
                 dtype="array" if ds.shape else "number",
                 dtype_numpy=ds.dtype_numpy,
@@ -146,25 +133,14 @@ class ADHDFWriter(DetectorWriter):
         }
         return describe
 
-    async def observe_indices_written(
-        self, timeout=DEFAULT_TIMEOUT
-    ) -> AsyncGenerator[int, None]:
-        """Wait until a specific index is ready to be collected"""
-        async for num_captured in observe_value(self.hdf.num_captured, timeout):
-            yield num_captured // self._multiplier
-
-    async def get_indices_written(self) -> int:
-        num_captured = await self.hdf.num_captured.get_value()
-        return num_captured // self._multiplier
-
     async def collect_stream_docs(
         self, indices_written: int
     ) -> AsyncIterator[StreamAsset]:
         # TODO: fail if we get dropped frames
-        await self.hdf.flush_now.set(True)
+        await self.fileio.flush_now.set(True)
         if indices_written:
             if not self._file:
-                path = Path(await self.hdf.full_file_name.get_value())
+                path = Path(await self.fileio.full_file_name.get_value())
                 self._file = HDFFile(
                     # See https://github.com/bluesky/ophyd-async/issues/122
                     path,
@@ -181,8 +157,8 @@ class ADHDFWriter(DetectorWriter):
 
     async def close(self):
         # Already done a caput callback in _capture_status, so can't do one here
-        await self.hdf.capture.set(False, wait=False)
-        await wait_for_value(self.hdf.capture, False, DEFAULT_TIMEOUT)
+        await self.fileio.capture.set(False, wait=False)
+        await wait_for_value(self.fileio.capture, False, DEFAULT_TIMEOUT)
         if self._capture_status:
             # We kicked off an open, so wait for it to return
             await self._capture_status

ophyd_async/epics/adcore/_jpeg_writer.py

@@ -0,0 +1,26 @@
+from ophyd_async.core import DatasetDescriber, NameProvider, PathProvider
+
+from ._core_io import NDFileIO, NDPluginBaseIO
+from ._core_writer import ADWriter
+
+
+class ADJPEGWriter(ADWriter[NDFileIO]):
+    default_suffix: str = "JPEG1:"
+
+    def __init__(
+        self,
+        fileio: NDFileIO,
+        path_provider: PathProvider,
+        name_provider: NameProvider,
+        dataset_describer: DatasetDescriber,
+        plugins: dict[str, NDPluginBaseIO] | None = None,
+    ) -> None:
+        super().__init__(
+            fileio,
+            path_provider,
+            name_provider,
+            dataset_describer,
+            plugins=plugins,
+            file_extension=".jpg",
+            mimetype="multipart/related;type=image/jpeg",
+        )

ophyd_async/epics/adcore/_single_trigger.py

@@ -16,11 +16,12 @@ class SingleTriggerDetector(StandardReadable, Triggerable):
         drv: ADBaseIO,
         read_uncached: Sequence[SignalR] = (),
         name="",
-        **plugins: NDPluginBaseIO,
+        plugins: dict[str, NDPluginBaseIO] | None = None,
     ) -> None:
         self.drv = drv
-        for k, v in plugins.items():
-            setattr(self, k, v)
+        if plugins is not None:
+            for k, v in plugins.items():
+                setattr(self, k, v)
 
         self.add_readables(
             [self.drv.array_counter, *read_uncached],

ophyd_async/epics/adcore/_tiff_writer.py

@@ -0,0 +1,26 @@
+from ophyd_async.core import DatasetDescriber, NameProvider, PathProvider
+
+from ._core_io import NDFileIO, NDPluginBaseIO
+from ._core_writer import ADWriter
+
+
+class ADTIFFWriter(ADWriter[NDFileIO]):
+    default_suffix: str = "TIFF1:"
+
+    def __init__(
+        self,
+        fileio: NDFileIO,
+        path_provider: PathProvider,
+        name_provider: NameProvider,
+        dataset_describer: DatasetDescriber,
+        plugins: dict[str, NDPluginBaseIO] | None = None,
+    ) -> None:
+        super().__init__(
+            fileio,
+            path_provider,
+            name_provider,
+            dataset_describer,
+            plugins=plugins,
+            file_extension=".tiff",
+            mimetype="multipart/related;type=image/tiff",
+        )

ophyd_async/epics/adcore/_utils.py

@@ -6,6 +6,7 @@ from ophyd_async.core import (
     SignalR,
     SignalRW,
     StrictEnum,
+    SubsetEnum,
     wait_for_value,
 )
 
@@ -84,7 +85,7 @@ class FileWriteMode(StrictEnum):
     STREAM = "Stream"
 
 
-class ImageMode(StrictEnum):
+class ImageMode(SubsetEnum):
     SINGLE = "Single"
     MULTIPLE = "Multiple"
     CONTINUOUS = "Continuous"

ophyd_async/epics/adkinetix/_kinetix.py

@@ -1,44 +1,49 @@
-from bluesky.protocols import HasHints, Hints
+from collections.abc import Sequence
 
-from ophyd_async.core import PathProvider, StandardDetector
-from ophyd_async.epics import adcore
+from ophyd_async.core import PathProvider, SignalR
+from ophyd_async.epics.adcore import (
+    ADHDFWriter,
+    ADWriter,
+    AreaDetector,
+    NDPluginBaseIO,
+)
 
 from ._kinetix_controller import KinetixController
 from ._kinetix_io import KinetixDriverIO
 
 
-class KinetixDetector(StandardDetector, HasHints):
+class KinetixDetector(AreaDetector[KinetixController]):
     """
     Ophyd-async implementation of an ADKinetix Detector.
     https://github.com/NSLS-II/ADKinetix
     """
 
-    _controller: KinetixController
-    _writer: adcore.ADHDFWriter
-
     def __init__(
         self,
         prefix: str,
         path_provider: PathProvider,
-        drv_suffix="cam1:",
-        hdf_suffix="HDF1:",
-        name="",
+        drv_suffix: str = "cam1:",
+        writer_cls: type[ADWriter] = ADHDFWriter,
+        fileio_suffix: str | None = None,
+        name: str = "",
+        plugins: dict[str, NDPluginBaseIO] | None = None,
+        config_sigs: Sequence[SignalR] = (),
     ):
-        self.drv = KinetixDriverIO(prefix + drv_suffix)
-        self.hdf = adcore.NDFileHDFIO(prefix + hdf_suffix)
+        driver = KinetixDriverIO(prefix + drv_suffix)
+        controller = KinetixController(driver)
+
+        writer = writer_cls.with_io(
+            prefix,
+            path_provider,
+            dataset_source=driver,
+            fileio_suffix=fileio_suffix,
+            plugins=plugins,
+        )
 
         super().__init__(
-            KinetixController(self.drv),
-            adcore.ADHDFWriter(
-                self.hdf,
-                path_provider,
-                lambda: self.name,
-                adcore.ADBaseDatasetDescriber(self.drv),
-            ),
-            config_sigs=(self.drv.acquire_time,),
+            controller=controller,
+            writer=writer,
+            plugins=plugins,
             name=name,
+            config_sigs=config_sigs,
         )
-
-    @property
-    def hints(self) -> Hints:
-        return self._writer.hints

ophyd_async/epics/adkinetix/_kinetix_controller.py

@@ -1,8 +1,6 @@
 import asyncio
 
 from ophyd_async.core import (
-    AsyncStatus,
-    DetectorController,
     DetectorTrigger,
     TriggerInfo,
 )
@@ -18,37 +16,27 @@ KINETIX_TRIGGER_MODE_MAP = {
 }
 
 
-class KinetixController(DetectorController):
+class KinetixController(adcore.ADBaseController[KinetixDriverIO]):
     def __init__(
         self,
         driver: KinetixDriverIO,
+        good_states: frozenset[adcore.DetectorState] = adcore.DEFAULT_GOOD_STATES,
     ) -> None:
-        self._drv = driver
-        self._arm_status: AsyncStatus | None = None
+        super().__init__(driver, good_states=good_states)
 
     def get_deadtime(self, exposure: float | None) -> float:
         return 0.001
 
     async def prepare(self, trigger_info: TriggerInfo):
         await asyncio.gather(
-            self._drv.trigger_mode.set(KINETIX_TRIGGER_MODE_MAP[trigger_info.trigger]),
-            self._drv.num_images.set(trigger_info.total_number_of_triggers),
-            self._drv.image_mode.set(adcore.ImageMode.MULTIPLE),
+            self.driver.trigger_mode.set(
+                KINETIX_TRIGGER_MODE_MAP[trigger_info.trigger]
+            ),
+            self.driver.num_images.set(trigger_info.total_number_of_triggers),
+            self.driver.image_mode.set(adcore.ImageMode.MULTIPLE),
         )
         if trigger_info.livetime is not None and trigger_info.trigger not in [
             DetectorTrigger.VARIABLE_GATE,
             DetectorTrigger.CONSTANT_GATE,
         ]:
-            await self._drv.acquire_time.set(trigger_info.livetime)
-
-    async def arm(self):
-        self._arm_status = await adcore.start_acquiring_driver_and_ensure_status(
-            self._drv
-        )
-
-    async def wait_for_idle(self):
-        if self._arm_status:
-            await self._arm_status
-
-    async def disarm(self):
-        await adcore.stop_busy_record(self._drv.acquire, False, timeout=1)
+            await self.driver.acquire_time.set(trigger_info.livetime)

ophyd_async/epics/adpilatus/__init__.py

@@ -1,5 +1,5 @@
-from ._pilatus import PilatusDetector, PilatusReadoutTime
-from ._pilatus_controller import PilatusController
+from ._pilatus import PilatusDetector
+from ._pilatus_controller import PilatusController, PilatusReadoutTime
 from ._pilatus_io import PilatusDriverIO, PilatusTriggerMode
 
 __all__ = [