ophyd-async 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

ophyd_async/epics/adcore/_single_trigger.py

@@ -3,13 +3,8 @@ from collections.abc import Sequence
 
 from bluesky.protocols import Triggerable
 
-from ophyd_async.core import (
-    AsyncStatus,
-    ConfigSignal,
-    HintedSignal,
-    SignalR,
-    StandardReadable,
-)
+from ophyd_async.core import AsyncStatus, SignalR, StandardReadable
+from ophyd_async.core import StandardReadableFormat as Format
 
 from ._core_io import ADBaseIO, NDPluginBaseIO
 from ._utils import ImageMode
@@ -24,14 +19,15 @@ class SingleTriggerDetector(StandardReadable, Triggerable):
         **plugins: NDPluginBaseIO,
     ) -> None:
         self.drv = drv
-        self.__dict__.update(plugins)
+        for k, v in plugins.items():
+            setattr(self, k, v)
 
         self.add_readables(
             [self.drv.array_counter, *read_uncached],
-            wrapper=HintedSignal.uncached,
+            Format.HINTED_UNCACHED_SIGNAL,
         )
 
-        self.add_readables([self.drv.acquire_time], wrapper=ConfigSignal)
+        self.add_readables([self.drv.acquire_time], Format.CONFIG_SIGNAL)
 
         super().__init__(name=name)
 

ophyd_async/epics/adcore/_utils.py

@@ -1,11 +1,16 @@
 from dataclasses import dataclass
-from enum import Enum
 
-from ophyd_async.core import DEFAULT_TIMEOUT, SignalRW, T, wait_for_value
-from ophyd_async.core._signal import SignalR
+from ophyd_async.core import (
+    DEFAULT_TIMEOUT,
+    SignalDatatypeT,
+    SignalR,
+    SignalRW,
+    StrictEnum,
+    wait_for_value,
+)
 
 
-class ADBaseDataType(str, Enum):
+class ADBaseDataType(StrictEnum):
     Int8 = "Int8"
     UInt8 = "UInt8"
     Int16 = "Int16"
@@ -73,25 +78,25 @@ def convert_param_dtype_to_np(datatype: str) -> str:
     return np_datatype
 
 
-class FileWriteMode(str, Enum):
+class FileWriteMode(StrictEnum):
     single = "Single"
     capture = "Capture"
     stream = "Stream"
 
 
-class ImageMode(str, Enum):
+class ImageMode(StrictEnum):
     single = "Single"
     multiple = "Multiple"
     continuous = "Continuous"
 
 
-class NDAttributeDataType(str, Enum):
+class NDAttributeDataType(StrictEnum):
     INT = "INT"
     DOUBLE = "DOUBLE"
     STRING = "STRING"
 
 
-class NDAttributePvDbrType(str, Enum):
+class NDAttributePvDbrType(StrictEnum):
     DBR_SHORT = "DBR_SHORT"
     DBR_ENUM = "DBR_ENUM"
     DBR_INT = "DBR_INT"
@@ -122,8 +127,8 @@ class NDAttributeParam:
 
 
 async def stop_busy_record(
-    signal: SignalRW[T],
-    value: T,
+    signal: SignalRW[SignalDatatypeT],
+    value: SignalDatatypeT,
     timeout: float = DEFAULT_TIMEOUT,
     status_timeout: float | None = None,
 ) -> None:

ophyd_async/epics/adkinetix/__init__.py

@@ -1,9 +1,10 @@
 from ._kinetix import KinetixDetector
 from ._kinetix_controller import KinetixController
-from ._kinetix_io import KinetixDriverIO
+from ._kinetix_io import KinetixDriverIO, KinetixTriggerMode
 
 __all__ = [
     "KinetixDetector",
     "KinetixController",
     "KinetixDriverIO",
+    "KinetixTriggerMode",
 ]

ophyd_async/epics/adkinetix/_kinetix_controller.py

@@ -1,8 +1,11 @@
 import asyncio
 
-from ophyd_async.core import DetectorController, DetectorTrigger
-from ophyd_async.core._detector import TriggerInfo
-from ophyd_async.core._status import AsyncStatus
+from ophyd_async.core import (
+    AsyncStatus,
+    DetectorController,
+    DetectorTrigger,
+    TriggerInfo,
+)
 from ophyd_async.epics import adcore
 
 from ._kinetix_io import KinetixDriverIO, KinetixTriggerMode

ophyd_async/epics/adkinetix/_kinetix_io.py

@@ -1,16 +1,15 @@
-from enum import Enum
-
+from ophyd_async.core import StrictEnum
 from ophyd_async.epics import adcore
-from ophyd_async.epics.signal import epics_signal_rw_rbv
+from ophyd_async.epics.core import epics_signal_rw_rbv
 
 
-class KinetixTriggerMode(str, Enum):
+class KinetixTriggerMode(StrictEnum):
     internal = "Internal"
     edge = "Rising Edge"
     gate = "Exp. Gate"
 
 
-class KinetixReadoutMode(str, Enum):
+class KinetixReadoutMode(StrictEnum):
     sensitivity = 1
     speed = 2
     dynamic_range = 3

ophyd_async/epics/adpilatus/_pilatus_controller.py

@@ -2,12 +2,12 @@ import asyncio
 
 from ophyd_async.core import (
     DEFAULT_TIMEOUT,
+    AsyncStatus,
     DetectorController,
     DetectorTrigger,
+    TriggerInfo,
     wait_for_value,
 )
-from ophyd_async.core._detector import TriggerInfo
-from ophyd_async.core._status import AsyncStatus
 from ophyd_async.epics import adcore
 
 from ._pilatus_io import PilatusDriverIO, PilatusTriggerMode

ophyd_async/epics/adpilatus/_pilatus_io.py

@@ -1,10 +1,9 @@
-from enum import Enum
-
+from ophyd_async.core import StrictEnum
 from ophyd_async.epics import adcore
-from ophyd_async.epics.signal import epics_signal_r, epics_signal_rw_rbv
+from ophyd_async.epics.core import epics_signal_r, epics_signal_rw_rbv
 
 
-class PilatusTriggerMode(str, Enum):
+class PilatusTriggerMode(StrictEnum):
     internal = "Internal"
     ext_enable = "Ext. Enable"
     ext_trigger = "Ext. Trigger"

ophyd_async/epics/adsimdetector/_sim_controller.py

@@ -2,11 +2,11 @@ import asyncio
 
 from ophyd_async.core import (
     DEFAULT_TIMEOUT,
+    AsyncStatus,
     DetectorController,
     DetectorTrigger,
+    TriggerInfo,
 )
-from ophyd_async.core._detector import TriggerInfo
-from ophyd_async.core._status import AsyncStatus
 from ophyd_async.epics import adcore
 
 

ophyd_async/epics/advimba/__init__.py

@@ -1,9 +1,12 @@
 from ._vimba import VimbaDetector
 from ._vimba_controller import VimbaController
-from ._vimba_io import VimbaDriverIO
+from ._vimba_io import VimbaDriverIO, VimbaExposeOutMode, VimbaOnOff, VimbaTriggerSource
 
 __all__ = [
     "VimbaDetector",
     "VimbaController",
     "VimbaDriverIO",
+    "VimbaExposeOutMode",
+    "VimbaOnOff",
+    "VimbaTriggerSource",
 ]

ophyd_async/epics/advimba/_vimba_controller.py

@@ -1,8 +1,11 @@
 import asyncio
 
-from ophyd_async.core import DetectorController, DetectorTrigger
-from ophyd_async.core._detector import TriggerInfo
-from ophyd_async.core._status import AsyncStatus
+from ophyd_async.core import (
+    AsyncStatus,
+    DetectorController,
+    DetectorTrigger,
+    TriggerInfo,
+)
 from ophyd_async.epics import adcore
 
 from ._vimba_io import VimbaDriverIO, VimbaExposeOutMode, VimbaOnOff, VimbaTriggerSource

ophyd_async/epics/advimba/_vimba_io.py

@@ -1,10 +1,9 @@
-from enum import Enum
-
+from ophyd_async.core import StrictEnum
 from ophyd_async.epics import adcore
-from ophyd_async.epics.signal import epics_signal_rw_rbv
+from ophyd_async.epics.core import epics_signal_rw_rbv
 
 
-class VimbaPixelFormat(str, Enum):
+class VimbaPixelFormat(StrictEnum):
     internal = "Mono8"
     ext_enable = "Mono12"
     ext_trigger = "Ext. Trigger"
@@ -12,7 +11,7 @@ class VimbaPixelFormat(str, Enum):
     alignment = "Alignment"
 
 
-class VimbaConvertFormat(str, Enum):
+class VimbaConvertFormat(StrictEnum):
     none = "None"
     mono8 = "Mono8"
     mono16 = "Mono16"
@@ -20,7 +19,7 @@ class VimbaConvertFormat(str, Enum):
     rgb16 = "RGB16"
 
 
-class VimbaTriggerSource(str, Enum):
+class VimbaTriggerSource(StrictEnum):
     freerun = "Freerun"
     line1 = "Line1"
     line2 = "Line2"
@@ -30,17 +29,17 @@ class VimbaTriggerSource(str, Enum):
     action1 = "Action1"
 
 
-class VimbaOverlap(str, Enum):
+class VimbaOverlap(StrictEnum):
     off = "Off"
     prev_frame = "PreviousFrame"
 
 
-class VimbaOnOff(str, Enum):
+class VimbaOnOff(StrictEnum):
     on = "On"
     off = "Off"
 
 
-class VimbaExposeOutMode(str, Enum):
+class VimbaExposeOutMode(StrictEnum):
     timed = "Timed"  # Use ExposureTime PV
     trigger_width = "TriggerWidth"  # Expose for length of high signal
 

ophyd_async/epics/core/__init__.py

@@ -0,0 +1,26 @@
+from ._epics_connector import EpicsDeviceConnector, PvSuffix
+from ._epics_device import EpicsDevice
+from ._pvi_connector import PviDeviceConnector
+from ._signal import (
+    CaSignalBackend,
+    PvaSignalBackend,
+    epics_signal_r,
+    epics_signal_rw,
+    epics_signal_rw_rbv,
+    epics_signal_w,
+    epics_signal_x,
+)
+
+__all__ = [
+    "PviDeviceConnector",
+    "EpicsDeviceConnector",
+    "PvSuffix",
+    "EpicsDevice",
+    "CaSignalBackend",
+    "PvaSignalBackend",
+    "epics_signal_r",
+    "epics_signal_rw",
+    "epics_signal_rw_rbv",
+    "epics_signal_w",
+    "epics_signal_x",
+]

ophyd_async/epics/core/_aioca.py

@@ -0,0 +1,323 @@
+import logging
+import sys
+from collections.abc import Sequence
+from math import isnan, nan
+from typing import Any, Generic, cast
+
+import numpy as np
+from aioca import (
+    FORMAT_CTRL,
+    FORMAT_RAW,
+    FORMAT_TIME,
+    CANothing,
+    Subscription,
+    caget,
+    camonitor,
+    caput,
+)
+from aioca.types import AugmentedValue, Dbr, Format
+from bluesky.protocols import Reading
+from epicscorelibs.ca import dbr
+from event_model import DataKey, Limits, LimitsRange
+
+from ophyd_async.core import (
+    Array1D,
+    Callback,
+    NotConnected,
+    SignalDatatype,
+    SignalDatatypeT,
+    SignalMetadata,
+    get_enum_cls,
+    get_unique,
+    make_datakey,
+    wait_for_connection,
+)
+
+from ._util import EpicsSignalBackend, format_datatype, get_supported_values
+
+
+def _limits_from_augmented_value(value: AugmentedValue) -> Limits:
+    def get_limits(limit: str) -> LimitsRange | None:
+        low = getattr(value, f"lower_{limit}_limit", nan)
+        high = getattr(value, f"upper_{limit}_limit", nan)
+        if not (isnan(low) and isnan(high)):
+            return LimitsRange(
+                low=None if isnan(low) else low,
+                high=None if isnan(high) else high,
+            )
+
+    limits = Limits()
+    if limits_range := get_limits("alarm"):
+        limits["alarm"] = limits_range
+    if limits_range := get_limits("ctrl"):
+        limits["control"] = limits_range
+    if limits_range := get_limits("disp"):
+        limits["display"] = limits_range
+    if limits_range := get_limits("warning"):
+        limits["warning"] = limits_range
+    return limits
+
+
+def _metadata_from_augmented_value(
+    value: AugmentedValue, metadata: SignalMetadata
+) -> SignalMetadata:
+    metadata = metadata.copy()
+    if hasattr(value, "units"):
+        metadata["units"] = value.units
+    if hasattr(value, "precision") and not isnan(value.precision):
+        metadata["precision"] = value.precision
+    if limits := _limits_from_augmented_value(value):
+        metadata["limits"] = limits
+    return metadata
+
+
+class CaConverter(Generic[SignalDatatypeT]):
+    def __init__(
+        self,
+        datatype: type[SignalDatatypeT],
+        read_dbr: Dbr,
+        write_dbr: Dbr | None = None,
+        metadata: SignalMetadata | None = None,
+    ):
+        self.datatype = datatype
+        self.read_dbr: Dbr = read_dbr
+        self.write_dbr: Dbr | None = write_dbr
+        self.metadata = metadata or SignalMetadata()
+
+    def write_value(self, value: Any) -> Any:
+        # The ca library will do the conversion for us
+        return value
+
+    def value(self, value: AugmentedValue) -> SignalDatatypeT:
+        # for channel access ca_xxx classes, this
+        # invokes __pos__ operator to return an instance of
+        # the builtin base class
+        return +value  # type: ignore
+
+
+class DisconnectedCaConverter(CaConverter):
+    def __getattribute__(self, __name: str) -> Any:
+        raise NotImplementedError("No PV has been set as connect() has not been called")
+
+
+class CaArrayConverter(CaConverter[np.ndarray]):
+    def value(self, value: AugmentedValue) -> np.ndarray:
+        # A less expensive conversion
+        return np.array(value, copy=False)
+
+
+class CaSequenceStrConverter(CaConverter[Sequence[str]]):
+    def value(self, value: AugmentedValue) -> Sequence[str]:
+        return [str(v) for v in value]  # type: ignore
+
+
+class CaLongStrConverter(CaConverter[str]):
+    def __init__(self):
+        super().__init__(str, dbr.DBR_CHAR_STR, dbr.DBR_CHAR_STR)
+
+    def write_value(self, value: Any) -> Any:
+        # Add a null in here as this is what the commandline caput does
+        # TODO: this should be in the server so check if it can be pushed to asyn
+        return value + "\0"
+
+
+class CaBoolConverter(CaConverter[bool]):
+    def __init__(self):
+        super().__init__(bool, dbr.DBR_SHORT)
+
+    def value(self, value: AugmentedValue) -> bool:
+        return bool(value)
+
+
+class CaEnumConverter(CaConverter[str]):
+    def __init__(self, supported_values: dict[str, str]):
+        self.supported_values = supported_values
+        super().__init__(
+            str, dbr.DBR_STRING, metadata=SignalMetadata(choices=list(supported_values))
+        )
+
+    def value(self, value: AugmentedValue) -> str:
+        return self.supported_values[str(value)]
+
+
+_datatype_converter_from_dbr: dict[
+    tuple[Dbr, bool], tuple[type[SignalDatatype], type[CaConverter]]
+] = {
+    (dbr.DBR_STRING, False): (str, CaConverter),
+    (dbr.DBR_SHORT, False): (int, CaConverter),
+    (dbr.DBR_FLOAT, False): (float, CaConverter),
+    (dbr.DBR_ENUM, False): (str, CaConverter),
+    (dbr.DBR_CHAR, False): (int, CaConverter),
+    (dbr.DBR_LONG, False): (int, CaConverter),
+    (dbr.DBR_DOUBLE, False): (float, CaConverter),
+    (dbr.DBR_STRING, True): (Sequence[str], CaSequenceStrConverter),
+    (dbr.DBR_SHORT, True): (Array1D[np.int16], CaArrayConverter),
+    (dbr.DBR_FLOAT, True): (Array1D[np.float32], CaArrayConverter),
+    (dbr.DBR_ENUM, True): (Sequence[str], CaSequenceStrConverter),
+    (dbr.DBR_CHAR, True): (Array1D[np.uint8], CaArrayConverter),
+    (dbr.DBR_LONG, True): (Array1D[np.int32], CaArrayConverter),
+    (dbr.DBR_DOUBLE, True): (Array1D[np.float64], CaArrayConverter),
+}
+
+
+def make_converter(
+    datatype: type | None, values: dict[str, AugmentedValue]
+) -> CaConverter:
+    pv = list(values)[0]
+    pv_dbr = cast(
+        Dbr, get_unique({k: v.datatype for k, v in values.items()}, "datatypes")
+    )
+    is_array = bool([v for v in values.values() if v.element_count > 1])
+    # Infer a datatype and converter from the dbr
+    inferred_datatype, converter_cls = _datatype_converter_from_dbr[(pv_dbr, is_array)]
+    # Some override cases
+    if is_array and pv_dbr == dbr.DBR_CHAR and datatype is str:
+        # Override waveform of chars to be treated as string
+        return CaLongStrConverter()
+    elif not is_array and datatype is bool and pv_dbr == dbr.DBR_ENUM:
+        # Database can't do bools, so are often representated as enums of len 2
+        pv_num_choices = get_unique(
+            {k: len(v.enums) for k, v in values.items()}, "number of choices"
+        )
+        if pv_num_choices != 2:
+            raise TypeError(f"{pv} has {pv_num_choices} choices, can't map to bool")
+        return CaBoolConverter()
+    elif not is_array and pv_dbr == dbr.DBR_ENUM:
+        pv_choices = get_unique(
+            {k: tuple(v.enums) for k, v in values.items()}, "choices"
+        )
+        if enum_cls := get_enum_cls(datatype):
+            # If explicitly requested then check
+            return CaEnumConverter(get_supported_values(pv, enum_cls, pv_choices))
+        elif datatype in (None, str):
+            # Drop to string for safety, but retain choices as metadata
+            return CaConverter(
+                str,
+                dbr.DBR_STRING,
+                metadata=SignalMetadata(choices=list(pv_choices)),
+            )
+    elif (
+        inferred_datatype is float
+        and datatype is int
+        and get_unique({k: v.precision for k, v in values.items()}, "precision") == 0
+    ):
+        # Allow int signals to represent float records when prec is 0
+        return CaConverter(int, pv_dbr)
+    elif datatype in (None, inferred_datatype):
+        # If datatype matches what we are given then allow it and use inferred converter
+        return converter_cls(inferred_datatype, pv_dbr)
+    if pv_dbr == dbr.DBR_ENUM:
+        inferred_datatype = "str | SubsetEnum | StrictEnum"
+    raise TypeError(
+        f"{pv} with inferred datatype {format_datatype(inferred_datatype)}"
+        f" cannot be coerced to {format_datatype(datatype)}"
+    )
+
+
+_tried_pyepics = False
+
+
+def _use_pyepics_context_if_imported():
+    global _tried_pyepics
+    if not _tried_pyepics:
+        ca = sys.modules.get("epics.ca", None)
+        if ca:
+            ca.use_initial_context()
+        _tried_pyepics = True
+
+
+class CaSignalBackend(EpicsSignalBackend[SignalDatatypeT]):
+    def __init__(
+        self,
+        datatype: type[SignalDatatypeT] | None,
+        read_pv: str = "",
+        write_pv: str = "",
+    ):
+        self.converter: CaConverter = DisconnectedCaConverter(float, dbr.DBR_DOUBLE)
+        self.initial_values: dict[str, AugmentedValue] = {}
+        self.subscription: Subscription | None = None
+        super().__init__(datatype, read_pv, write_pv)
+
+    def source(self, name: str, read: bool):
+        return f"ca://{self.read_pv if read else self.write_pv}"
+
+    async def _store_initial_value(self, pv: str, timeout: float):
+        try:
+            self.initial_values[pv] = await caget(
+                pv, format=FORMAT_CTRL, timeout=timeout
+            )
+        except CANothing as exc:
+            logging.debug(f"signal ca://{pv} timed out")
+            raise NotConnected(f"ca://{pv}") from exc
+
+    async def connect(self, timeout: float):
+        _use_pyepics_context_if_imported()
+        if self.read_pv != self.write_pv:
+            # Different, need to connect both
+            await wait_for_connection(
+                read_pv=self._store_initial_value(self.read_pv, timeout=timeout),
+                write_pv=self._store_initial_value(self.write_pv, timeout=timeout),
+            )
+        else:
+            # The same, so only need to connect one
+            await self._store_initial_value(self.read_pv, timeout=timeout)
+        self.converter = make_converter(self.datatype, self.initial_values)
+
+    async def _caget(self, pv: str, format: Format) -> AugmentedValue:
+        return await caget(
+            pv, datatype=self.converter.read_dbr, format=format, timeout=None
+        )
+
+    def _make_reading(self, value: AugmentedValue) -> Reading[SignalDatatypeT]:
+        return {
+            "value": self.converter.value(value),
+            "timestamp": value.timestamp,
+            "alarm_severity": -1 if value.severity > 2 else value.severity,
+        }
+
+    async def put(self, value: SignalDatatypeT | None, wait: bool):
+        if value is None:
+            write_value = self.initial_values[self.write_pv]
+        else:
+            write_value = self.converter.write_value(value)
+        await caput(
+            self.write_pv,
+            write_value,
+            datatype=self.converter.write_dbr,
+            wait=wait,
+            timeout=None,
+        )
+
+    async def get_datakey(self, source: str) -> DataKey:
+        value = await self._caget(self.read_pv, FORMAT_CTRL)
+        metadata = _metadata_from_augmented_value(value, self.converter.metadata)
+        return make_datakey(
+            self.converter.datatype, self.converter.value(value), source, metadata
+        )
+
+    async def get_reading(self) -> Reading[SignalDatatypeT]:
+        value = await self._caget(self.read_pv, FORMAT_TIME)
+        return self._make_reading(value)
+
+    async def get_value(self) -> SignalDatatypeT:
+        value = await self._caget(self.read_pv, FORMAT_RAW)
+        return self.converter.value(value)
+
+    async def get_setpoint(self) -> SignalDatatypeT:
+        value = await self._caget(self.write_pv, FORMAT_RAW)
+        return self.converter.value(value)
+
+    def set_callback(self, callback: Callback[Reading[SignalDatatypeT]] | None) -> None:
+        if callback:
+            assert (
+                not self.subscription
+            ), "Cannot set a callback when one is already set"
+            self.subscription = camonitor(
+                self.read_pv,
+                lambda v: callback(self._make_reading(v)),
+                datatype=self.converter.read_dbr,
+                format=FORMAT_TIME,
+            )
+        elif self.subscription:
+            self.subscription.close()
+            self.subscription = None

ophyd_async/epics/core/_epics_connector.py

@@ -0,0 +1,53 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any
+
+from ophyd_async.core import Device, DeviceConnector, DeviceFiller
+
+from ._signal import EpicsSignalBackend, get_signal_backend_type, split_protocol_from_pv
+
+
+@dataclass
+class PvSuffix:
+    read_suffix: str
+    write_suffix: str | None = None
+
+    @classmethod
+    def rbv(cls, write_suffix: str, rbv_suffix: str = "_RBV") -> PvSuffix:
+        return cls(write_suffix + rbv_suffix, write_suffix)
+
+
+def fill_backend_with_prefix(
+    prefix: str, backend: EpicsSignalBackend, annotations: list[Any]
+):
+    unhandled = []
+    while annotations:
+        annotation = annotations.pop(0)
+        if isinstance(annotation, PvSuffix):
+            backend.read_pv = prefix + annotation.read_suffix
+            backend.write_pv = prefix + (
+                annotation.write_suffix or annotation.read_suffix
+            )
+        else:
+            unhandled.append(annotation)
+    annotations.extend(unhandled)
+    # These leftover annotations will now be handled by the iterator
+
+
+class EpicsDeviceConnector(DeviceConnector):
+    def __init__(self, prefix: str) -> None:
+        self.prefix = prefix
+
+    def create_children_from_annotations(self, device: Device):
+        if not hasattr(self, "filler"):
+            protocol, prefix = split_protocol_from_pv(self.prefix)
+            self.filler = DeviceFiller(
+                device,
+                signal_backend_factory=get_signal_backend_type(protocol),
+                device_connector_factory=DeviceConnector,
+            )
+            for backend, annotations in self.filler.create_signals_from_annotations():
+                fill_backend_with_prefix(prefix, backend, annotations)
+
+            list(self.filler.create_devices_from_annotations())