ophyd-async 0.14.0__py3-none-any.whl → 0.14.1__py3-none-any.whl

ophyd_async/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.14.0'
-__version_tuple__ = version_tuple = (0, 14, 0)
+__version__ = version = '0.14.1'
+__version_tuple__ = version_tuple = (0, 14, 1)
 
 __commit_id__ = commit_id = None

ophyd_async/core/__init__.py

@@ -48,6 +48,7 @@ from ._protocol import AsyncConfigurable, AsyncReadable, AsyncStageable, Watcher
 from ._providers import (
     AutoIncrementFilenameProvider,
     AutoIncrementingPathProvider,
+    AutoMaxIncrementingPathProvider,
     DatasetDescriber,
     FilenameProvider,
     PathInfo,
@@ -222,6 +223,7 @@ __all__ = [
     "FilenameProvider",
     "StaticFilenameProvider",
     "AutoIncrementFilenameProvider",
+    "AutoMaxIncrementingPathProvider",
     "UUIDFilenameProvider",
     # Datatset
     "DatasetDescriber",

ophyd_async/core/_providers.py

@@ -1,9 +1,10 @@
+import re
 import uuid
 from abc import abstractmethod
 from collections.abc import Callable
 from dataclasses import dataclass
 from datetime import date
-from pathlib import PurePath, PureWindowsPath
+from pathlib import Path, PurePath, PureWindowsPath
 from typing import Protocol
 from urllib.parse import urlunparse
 
@@ -157,6 +158,98 @@ class StaticPathProvider(PathProvider):
         )
 
 
+class AutoMaxIncrementingPathProvider(PathProvider):
+    """Increment directory name on each call by checking existing directories.
+
+    Looks through directories in a specified base path to increment directory name.
+    PathInfo gives path like base_path/0001_dirname/dirname, or
+    base_path/yyyy-mm-dd/0001_dirname/dirname if dated is true. Here,
+    the '0001' is the value which gets incremented if the file exists already.
+
+    It's recommended for the base path provider to be non-incrementing.
+
+    Args:
+    base_path_provider: Path to create directories inside of. Note that the filename of
+    this provider is used as the top level directory and the filename
+    max_digits: Number of digits to pad onto the parent directory.
+    starting_value: Number to start incrementing from.
+    dated: Whether to create an extra directory to specify the day.
+
+    """
+
+    def __init__(
+        self,
+        base_path_provider: PathProvider,
+        max_digits: int = 4,
+        starting_value: int = 0,
+        dated: bool = False,
+    ):
+        self._base_path_provider = base_path_provider
+        self._max_digits = max_digits
+        self._next_value = starting_value
+        self._dated = dated
+
+    def _get_highest_number_from(self, path: Path) -> int:
+        # Look through directories in path which end in "_{number} and get highest
+        # number"
+        highest_number = 0
+        candidates = [
+            x for x in path.iterdir() if x.is_dir() and re.match(r"^\d+_", x.name)
+        ]
+        if candidates:
+            highest_number = max(
+                int(x.name.split("_", maxsplit=1)[0]) for x in candidates
+            )
+        else:
+            highest_number = self._next_value
+        return highest_number
+
+    def __call__(self, device_name: str | None = None) -> PathInfo:
+        base_path_info = self._base_path_provider.__call__()
+        base_path_dir = Path(base_path_info.directory_path)
+        if self._dated:
+            # Make sure we are the max ID of any other days to keep numbering
+            # consistent.
+            cands = [
+                self._get_highest_number_from(x)
+                for x in base_path_dir.iterdir()
+                if re.match(r"^\d\d\d\d-\d\d-\d\d$", x.name)
+            ]
+            if cands:
+                self._next_value = max(max(cands) + 1, self._next_value)
+
+            path = base_path_dir / date.today().strftime("%Y-%m-%d")
+        else:
+            path = base_path_dir
+
+        val_to_use = self._next_value
+
+        # Get the highest number using files in path, or use
+        # stored next value if no files are found.
+        if path.exists():
+            highest_number = self._get_highest_number_from(path)
+            val_to_use = (
+                highest_number + 1
+                if not highest_number == self._next_value
+                else highest_number
+            )
+
+        self._next_value = val_to_use + 1
+
+        filename = base_path_info.filename
+
+        padded_counter = f"{val_to_use:0{self._max_digits}}"
+        full_path = (
+            path / f"{padded_counter}_{filename.strip('_')}" / filename.rstrip("_")
+        )
+        return PathInfo(
+            directory_path=full_path.parent,
+            directory_uri=None,
+            filename=full_path.name,
+            create_dir_depth=0,
+        )
+
+
 class AutoIncrementingPathProvider(PathProvider):
     """Provides a new numerically incremented path on each call."""
 

ophyd_async/epics/pmac/_pmac_trajectory.py

@@ -10,6 +10,7 @@ from ophyd_async.core import (
     AsyncStatus,
     FlyerController,
     error_if_none,
+    gather_dict,
     observe_value,
     set_and_wait_for_value,
     wait_for_value,
@@ -202,12 +203,25 @@ class PmacTrajectoryTriggerLogic(FlyerController):
         coord = self.pmac.coord[motor_info.cs_number]
         coros = []
         await coord.defer_moves.set(True)
+
+        motor_readbacks = await gather_dict(
+            {motor: motor.user_readback.get_value() for motor in ramp_up_position}
+        )
+
+        move_times = [
+            abs(position - motor_readbacks[motor])
+            / motor_info.motor_max_velocity[motor]
+            for motor, position in ramp_up_position.items()
+        ]
+
+        longest_time = max(move_times)
+
         for motor, position in ramp_up_position.items():
             coros.append(
                 set_and_wait_for_value(
                     coord.cs_axis_setpoint[motor_info.motor_cs_index[motor]],
                     position,
-                    set_timeout=10,
+                    set_timeout=longest_time + DEFAULT_TIMEOUT,
                     wait_for_set_completion=False,
                 )
             )

ophyd_async/fastcs/eiger/_eiger_io.py

@@ -29,7 +29,7 @@ class EigerDetectorIO(Device):
     frame_time: SignalRW[float]
     nimages: SignalRW[int]
     ntrigger: SignalRW[int]
-    nexpi: SignalRW[int]
+    nexpi: SignalRW[int] | None
     trigger_mode: SignalRW[str]
     roi_mode: SignalRW[str]
     photon_energy: SignalRW[float]

ophyd_async/fastcs/panda/_control.py

@@ -35,7 +35,8 @@ class PandaPcapController(DetectorController):
         await wait_for_value(self.pcap.active, True, timeout=1)
 
     async def wait_for_idle(self):
-        pass
+        if self._arm_status and not self._arm_status.done:
+            await self._arm_status
 
     async def disarm(self):
         await self.pcap.arm.set(False)

ophyd_async/tango/core/__init__.py

@@ -9,7 +9,9 @@ from ._signal import (
     tango_signal_x,
 )
 from ._tango_transport import (
+    AttributeInfoEx,
     AttributeProxy,
+    CommandInfo,
     CommandProxy,
     CommandProxyReadCharacter,
     TangoDoubleStringTable,
@@ -21,6 +23,7 @@ from ._tango_transport import (
     get_python_type,
     get_source_metadata,
     get_tango_trl,
+    parse_precision,
 )
 from ._utils import (
     DevStateEnum,
@@ -30,7 +33,9 @@ from ._utils import (
 )
 
 __all__ = [
+    "AttributeInfoEx",
     "AttributeProxy",
+    "CommandInfo",
     "CommandProxy",
     "CommandProxyReadCharacter",
     "DevStateEnum",
@@ -44,6 +49,7 @@ __all__ = [
     "infer_python_type",
     "infer_signal_type",
     "make_backend",
+    "parse_precision",
     "tango_signal_r",
     "tango_signal_rw",
     "tango_signal_w",

ophyd_async/tango/core/_tango_transport.py

@@ -1,6 +1,7 @@
 import asyncio
 import functools
 import logging
+import re
 import time
 from abc import abstractmethod
 from collections.abc import Callable, Coroutine, Sequence
@@ -582,6 +583,15 @@ class CommandProxy(TangoProxy):
         pass
 
 
+PRECISION_PATTERN = re.compile(r"%\d*\.(\d+)f")
+
+
+def parse_precision(config: AttributeInfoEx):
+    if config.format and (matches := PRECISION_PATTERN.findall(config.format)):
+        return int(matches[0])
+    return None
+
+
 def get_dtype_extended(datatype) -> object | None:
     """For converting tango types to numpy datatype formats."""
     # DevState tango type does not have numpy equivalents
@@ -639,17 +649,8 @@ def get_source_metadata(
             if tr_dtype == CmdArgType.DevState:
                 _choices = list(DevState.names.keys())
 
-            _precision = None
-            if config.format:
-                try:
-                    _precision = int(config.format.split(".")[1].split("f")[0])
-                except (ValueError, IndexError) as exc:
-                    # If parsing config.format fails, _precision remains None.
-                    logger.warning(
-                        "Failed to parse precision from config.format: %s. Error: %s",
-                        config.format,
-                        exc,
-                    )
+            _precision = parse_precision(config)
+
             no_limits = Limits(
                 control=LimitsRange(high=None, low=None),
                 warning=LimitsRange(high=None, low=None),

{ophyd_async-0.14.0.dist-info → ophyd_async-0.14.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ophyd-async
-Version: 0.14.0
+Version: 0.14.1
 Summary: Asynchronous Bluesky hardware abstraction code, compatible with control systems like EPICS and Tango
 Author-email: Tom Cobb <tom.cobb@diamond.ac.uk>
 License: BSD 3-Clause License

{ophyd_async-0.14.0.dist-info → ophyd_async-0.14.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 ophyd_async/__init__.py,sha256=dcAA3qsj1nNIMe5l-v2tlduZ_ypwBmyuHe45Lsq4k4w,206
 ophyd_async/__main__.py,sha256=n_U4O9bgm97OuboUB_9eK7eFiwy8BZSgXJ0OzbE0DqU,481
 ophyd_async/_docs_parser.py,sha256=gPYrigfSbYCF7QoSf2UvE-cpQu4snSssl7ZWN-kKDzI,352
-ophyd_async/_version.py,sha256=Byw420VruQzJ1exmj6PcZ9zpcSTgfBRBp5ZU4O6rwSc,706
+ophyd_async/_version.py,sha256=a3VJZDtDsD7dO22j4y92zbdkUlJwzXf_QabiVquJm1Y,706
 ophyd_async/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ophyd_async/core/__init__.py,sha256=3YD4rtXXJy5HWBsefK0nC-j2xC5tfiFbD7KJbN3nFvw,6008
+ophyd_async/core/__init__.py,sha256=GJxLNTxXD3Qlghq6CNe-mCeludgBBpHkHXkbDFojdHQ,6084
 ophyd_async/core/_derived_signal.py,sha256=TuZza_j3J1Bw4QSqBYB9Ta2FyQP5BycO3nSHVtJ890Q,13015
 ophyd_async/core/_derived_signal_backend.py,sha256=Ibce9JHghiI5Ir8w0pUYULHL2qWkobeUYc0-CDrsO2E,12615
 ophyd_async/core/_detector.py,sha256=9fYbBPmRnMGADcDTYkspDAL2uzhtNNiKCEeBUU0oKaY,14942
@@ -16,7 +16,7 @@ ophyd_async/core/_log.py,sha256=DxKR4Nz3SgTaTzKBZWqt-w48yT8WUAr_3Qr223TEWRw,3587
 ophyd_async/core/_mock_signal_backend.py,sha256=cFovZEwwqYKV2LuQDZStSr3TFFvA31IJeSRoheHnZ8Q,3401
 ophyd_async/core/_mock_signal_utils.py,sha256=ePFBDaon2lFT0vcnAaCRuoLr953QV6tYgHmY2fXQW-8,5520
 ophyd_async/core/_protocol.py,sha256=wQ_snxhTprHqEjQb1HgFwBljwolMY6A8C3xgV1PXwdU,4051
-ophyd_async/core/_providers.py,sha256=WBht3QCgvGc0stNcwH6z4Zr6hAz3e01-88NjsYI2w6I,9740
+ophyd_async/core/_providers.py,sha256=IO6xlAVQLkbECT96ezgzoDfZ_OhbD9NrDdXvEcyWJkI,13087
 ophyd_async/core/_readable.py,sha256=iBo1YwA5bsAbzLbznvmSnzKDWUuGkLh850Br3BXsgeU,11707
 ophyd_async/core/_settings.py,sha256=_ZccbXKP7j5rG6-bMKk7aaLr8hChdRDAPY_YSR71XXM,4213
 ophyd_async/core/_signal.py,sha256=OEfjW_BIC3dVxgsWC0aVUj9rQL36KHkNTBCUVXjSRFo,28274
@@ -85,7 +85,7 @@ ophyd_async/epics/odin/__init__.py,sha256=7kRqVzwoD8PVtp7Nj9iQWlgbLeoWE_8oiq-B0k
 ophyd_async/epics/odin/_odin_io.py,sha256=YDBrS15PnEKe5SHmz397Emh--lZSQEnbR3G7p8pbShY,6533
 ophyd_async/epics/pmac/__init__.py,sha256=GqJTiJudqE9pu050ZNED09F9tKRfazn0wBsojsMH2gg,273
 ophyd_async/epics/pmac/_pmac_io.py,sha256=cbChieNrDWRzrr5Mdsqtm2Azp8sG0KHP9rGeJxmbYrA,4332
-ophyd_async/epics/pmac/_pmac_trajectory.py,sha256=hzAcpLNmFoNceubsjk6mjsmg6-PgSjWUu1a8Exyvi6I,7729
+ophyd_async/epics/pmac/_pmac_trajectory.py,sha256=DzO6gfvbK8M3Ec6vq0WTlz0RRYGNzP8qDJIMWTWJeLo,8150
 ophyd_async/epics/pmac/_pmac_trajectory_generation.py,sha256=3IIxXa0r6-2uNnILKLGxp3xosOZx8MubKF-F_OM7uaw,27331
 ophyd_async/epics/pmac/_utils.py,sha256=MfuY6NicT7wkwVIWAZkWoCu1ZoSzy6jda1wLK9XAOLA,8614
 ophyd_async/epics/testing/__init__.py,sha256=aTIv4D2DYrpnGco5RQF8QuLG1SfFkIlTyM2uYEKXltA,522
@@ -98,7 +98,7 @@ ophyd_async/fastcs/core.py,sha256=pL_srtTrfuoBHUjDFpxES92owFq9M4Jve0Skk1oeuFA,51
 ophyd_async/fastcs/eiger/__init__.py,sha256=RxwOFjERKy5tUD_IDGCGuMh716FaZgCq7R9elPixBwo,312
 ophyd_async/fastcs/eiger/_eiger.py,sha256=jo3K5dM3Co_RDYIyO6poCVDqp2g_1z4MqnYftwnMhUk,1103
 ophyd_async/fastcs/eiger/_eiger_controller.py,sha256=Cucj-1M-1CaxSJxHZmHs3f_OXwtTIspcqUFhRNGzn_E,2361
-ophyd_async/fastcs/eiger/_eiger_io.py,sha256=yNozTKX4CMoqIaFvyKJEs5RXXGJ4VITP_T4TIFHWRmc,1242
+ophyd_async/fastcs/eiger/_eiger_io.py,sha256=mVgDC296B4RkSObWBiA7AXtVRTQw388lJPw2roQctFs,1249
 ophyd_async/fastcs/jungfrau/__init__.py,sha256=xwTaPiqvtyyljP2acz07FSlUW79Io8EsKks9ENgbumA,765
 ophyd_async/fastcs/jungfrau/_controller.py,sha256=TvUxRuP3NJFTOcyHeMn5-1Va7HzOJswWCYSGdp1NMFI,5778
 ophyd_async/fastcs/jungfrau/_jungfrau.py,sha256=KAHCmRHMyzIh-r2JXVJcQOGLkCOOdW5Mao_KChITO2s,929
@@ -107,7 +107,7 @@ ophyd_async/fastcs/jungfrau/_utils.py,sha256=QpdWbPT_31Jwyi7INFMRq9hncSZIK_4J3l6
 ophyd_async/fastcs/odin/__init__.py,sha256=da1PTClDMl-IBkrSvq6JC1lnS-K_BASzCvxVhNxN5Ls,13
 ophyd_async/fastcs/panda/__init__.py,sha256=GbnPqH_13wvyPK1CvRHGAViamKVWHY9n-sTmfAdcnMA,1229
 ophyd_async/fastcs/panda/_block.py,sha256=Bffta9IkuSq_NSvidDvLyC1YUrfQCwMhppsu1Te7vec,2679
-ophyd_async/fastcs/panda/_control.py,sha256=xtW3dH_MLQoycgP-4vJtYx1M9alHjWo13iu9UFTgwzY,1306
+ophyd_async/fastcs/panda/_control.py,sha256=lUogRZMkQk4eZFghTuhwSDLqxR16-DQvx9MyFpg10Qc,1387
 ophyd_async/fastcs/panda/_hdf_panda.py,sha256=tL_OWHxlMQcMZGq9sxHLSeag6hP9MRIbTPn1W0u0iNI,1237
 ophyd_async/fastcs/panda/_table.py,sha256=maKGoKypEuYqTSVWGgDO6GMEKOtlDm9Dn5YiYdBzu6c,2486
 ophyd_async/fastcs/panda/_trigger.py,sha256=iBxW4YMfRYrpg7AoQaHb7rHKCE95UbSxguRuR9FOgw8,7610
@@ -132,11 +132,11 @@ ophyd_async/sim/_pattern_generator.py,sha256=kuxvyX2gIxrywhQRhaO1g8YluBT7LBkE20I
 ophyd_async/sim/_point_detector.py,sha256=wMG_ncvm99WMCPihlFyuMEf3UknAxCpB1hpk3uKiENE,3024
 ophyd_async/sim/_stage.py,sha256=_SywbmSQwxf7JLx68qwo0RpiB3oIWlbTLmvRKxUoig0,1602
 ophyd_async/tango/__init__.py,sha256=g9xzjlzPpUAP12YI-kYwfAoLSYPAQdL1S11R2c-cius,60
-ophyd_async/tango/core/__init__.py,sha256=dO2tG_y61zZFQRQh5L37Ps-IqNf-DGOT77Ov5Kobfhs,1349
+ophyd_async/tango/core/__init__.py,sha256=cgO5GWfEZqjH0Aj9KUeoZwxMrOQOTn9V9kaYel7j0x4,1473
 ophyd_async/tango/core/_base_device.py,sha256=X5ncxaWKOfRhhqPyT8tmTBJGc3ldGthw1ZCe_j_M2Tg,5088
 ophyd_async/tango/core/_converters.py,sha256=xI_RhMR8dY6IVORUZVVCL9LdYnEE6TA6BBPX_lTu06w,2183
 ophyd_async/tango/core/_signal.py,sha256=8mIxRVEVjhDN33LDbbKZWGMUYn9Gl5ZMEIYw6GSBTUE,5569
-ophyd_async/tango/core/_tango_transport.py,sha256=KxjhHqKADrOvzGi9tbOQXUWdsJ0NKGejWxHItxpUsjg,37401
+ophyd_async/tango/core/_tango_transport.py,sha256=fPICZzsF9Rf53sHtM3NXlKmhF-8CNO2prra3msD74R0,37177
 ophyd_async/tango/core/_utils.py,sha256=pwT7V1DNWSyPOSzvDZ6OsDZTjaV-pAeDLDlmgtHVcNM,1673
 ophyd_async/tango/demo/__init__.py,sha256=_j-UicTnckuIBp8PnieFMOMnLFGivnaKdmo9o0hYtzc,256
 ophyd_async/tango/demo/_counter.py,sha256=m6zxOJLbHgCEBAapVc1UiOOqKj5lvrlxjA6mXWMRMjo,1200
@@ -154,8 +154,8 @@ ophyd_async/testing/_one_of_everything.py,sha256=U9ui7B-iNHDM3H3hIWUuaCb8Gc2eLlU
 ophyd_async/testing/_single_derived.py,sha256=5-HOTzgePcZ354NK_ssVpyIbJoJmKyjVQCxSwQXUC-4,2730
 ophyd_async/testing/_utils.py,sha256=zClRo5ve8RGia7wQnby41W-Zprj-slOA5da1LfYnuhw,45
 ophyd_async/testing/_wait_for_pending.py,sha256=YZAR48n-CW0GsPey3zFRzMJ4byDAr3HvMIoawjmTrHw,732
-ophyd_async-0.14.0.dist-info/licenses/LICENSE,sha256=pU5shZcsvWgz701EbT7yjFZ8rMvZcWgRH54CRt8ld_c,1517
-ophyd_async-0.14.0.dist-info/METADATA,sha256=1H2TzMmCIJfib07o1qSOHNYJVDHgqkwIUn9wPjzoYNU,5703
-ophyd_async-0.14.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ophyd_async-0.14.0.dist-info/top_level.txt,sha256=-hjorMsv5Rmjo3qrgqhjpal1N6kW5vMxZO3lD4iEaXs,12
-ophyd_async-0.14.0.dist-info/RECORD,,
+ophyd_async-0.14.1.dist-info/licenses/LICENSE,sha256=pU5shZcsvWgz701EbT7yjFZ8rMvZcWgRH54CRt8ld_c,1517
+ophyd_async-0.14.1.dist-info/METADATA,sha256=I2Y_2-lFXNeZYNYDhNxPvrubLM8bd8d5OzPbPzdn0mM,5703
+ophyd_async-0.14.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ophyd_async-0.14.1.dist-info/top_level.txt,sha256=-hjorMsv5Rmjo3qrgqhjpal1N6kW5vMxZO3lD4iEaXs,12
+ophyd_async-0.14.1.dist-info/RECORD,,