ophyd-async 0.13.5__tar.gz → 0.13.7__tar.gz

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier
-_commit: 5.0.0a3
+_commit: 5.0.0a4
 _src_path: https://github.com/DiamondLightSource/python-copier-template
 author_email: tom.cobb@diamond.ac.uk
 author_name: Tom Cobb

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/.devcontainer/devcontainer.json

@@ -8,16 +8,24 @@
     "remoteEnv": {
         // Allow X11 apps to run inside the container
         "DISPLAY": "${localEnv:DISPLAY}",
+        // Put things that allow it in the persistent cache
+        "PRE_COMMIT_HOME": "/cache/pre-commit",
+        "UV_CACHE_DIR": "/cache/uv",
+        "UV_PYTHON_CACHE_DIR": "/cache/uv-python",
+        // Make a venv that is specific for this workspace path as the cache is shared
+        "UV_PROJECT_ENVIRONMENT": "/cache/venv-for${localWorkspaceFolder}",
         // Do the equivalent of "activate" the venv so we don't have to "uv run" everything
-        "VIRTUAL_ENV": "/workspaces/${localWorkspaceFolderBasename}/.venv",
-        "PATH": "/workspaces/${localWorkspaceFolderBasename}/.venv/bin:${containerEnv:PATH}"
+        "VIRTUAL_ENV": "/cache/venv-for${localWorkspaceFolder}",
+        "PATH": "/cache/venv-for${localWorkspaceFolder}/bin:${containerEnv:PATH}",
+        // Help external service fixtures match docker compose working directory with the host
+        "EXAMPLE_SERVICES_PATH": "${localWorkspaceFolder}/example-services"
     },
     "customizations": {
         "vscode": {
             // Set *default* container specific settings.json values on container create.
             "settings": {
                 // Use the container's python by default
-                "python.defaultInterpreterPath": "/workspaces/${localWorkspaceFolderBasename}/.venv/bin/python",
+                "python.defaultInterpreterPath": "/cache/venv-for${localWorkspaceFolder}/bin/python",
                 // Don't activate the venv as it is already in the PATH
                 "python.terminal.activateEnvInCurrentTerminal": false,
                 "python.terminal.activateEnvironment": false,
@@ -47,14 +55,14 @@
         }
     },
     // Create the config folder for the bash-config feature and uv cache
-    // NOTE: The uv cache can get large, DLS users should read
-    // https://dev-guide.diamond.ac.uk/linux-user-environment/how-tos/disk-quota-troubleshooting
-    "initializeCommand": "mkdir -p ${localEnv:HOME}/.config/terminal-config ${localEnv:HOME}/.cache/uv",
+    "initializeCommand": "mkdir -p ${localEnv:HOME}/.config/terminal-config",
     "runArgs": [
         // Allow the container to access the host X11 display and EPICS CA
         "--net=host",
         // Make sure SELinux does not disable with access to host filesystems like tmp
-        "--security-opt=label=disable"
+        "--security-opt=label=disable",
+        // add the docker socket environment variable to the container
+        "-e=DOCKER_HOST=${localEnv:DOCKER_HOST}"
     ],
     "mounts": [
         // Mount in the user terminal config folder so it can be edited
@@ -63,20 +71,27 @@
             "target": "/user-terminal-config",
             "type": "bind"
         },
-        // Keep a persistent cross container cache for uv
+        // Keep a persistent cross container cache for uv, pre-commit, and the venvs
         {
-            "source": "${localEnv:HOME}/.cache/uv",
-            "target": "/root/.cache/uv",
+            "source": "devcontainer-shared-cache",
+            "target": "/cache",
+            "type": "volume"
+        },
+        // Match host external services file paths (internal docker starts them on the host)
+        {
+            "source": "${localWorkspaceFolder}/example-services",
+            "target": "${localWorkspaceFolder}/example-services",
             "type": "bind"
         },
-        // Use a volume mount for the uv venv so it is local to the container
+        // Mount the user sockets folder
         {
-            "target": "/workspaces/${localWorkspaceFolderBasename}/.venv",
-            "type": "volume"
+            "source": "${localEnv:XDG_RUNTIME_DIR}",
+            "target": "${localEnv:XDG_RUNTIME_DIR}",
+            "type": "bind"
         }
     ],
     // Mount the parent as /workspaces so we can pip install peers as editable
     "workspaceMount": "source=${localWorkspaceFolder}/..,target=/workspaces,type=bind",
-    // After the container is created, install the python project in editable form
-    "postCreateCommand": "uv sync && uv run pre-commit install --install-hooks"
+    // After the container is created, recreate the venv then make pre-commit first run faster
+    "postCreateCommand": "uv venv --clear && uv sync && pre-commit install --install-hooks"
 }

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/.github/CONTRIBUTING.md

@@ -24,4 +24,4 @@ It is recommended that developers use a [vscode devcontainer](https://code.visua
 
 This project was created using the [Diamond Light Source Copier Template](https://github.com/DiamondLightSource/python-copier-template) for Python projects.
 
-For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.0a3/how-to.html).
+For more information on common tasks like setting up a developer environment, running the tests, and setting a pre-commit hook, see the template's [How-to guides](https://diamondlightsource.github.io/python-copier-template/5.0.0a4/how-to.html).

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/.github/workflows/_dist.yml

@@ -7,13 +7,13 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v6
+        uses: astral-sh/setup-uv@v7
 
       - name: Build sdist and wheel
         run: >

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/.github/workflows/_docs.yml

@@ -12,7 +12,7 @@ jobs:
         run: sleep 60
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
@@ -21,7 +21,7 @@ jobs:
         run: sudo apt-get install graphviz
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
 
       - name: Build docs
         run: uv run --locked tox -e docs

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/.github/workflows/_pypi.yml

@@ -8,7 +8,7 @@ jobs:
 
     steps:
       - name: Download dist artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: dist
           path: dist

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/.github/workflows/_release.yml

@@ -7,7 +7,7 @@ jobs:
 
     steps:
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           merge-multiple: true
 
@@ -23,7 +23,7 @@ jobs:
       - name: Create GitHub Release
         # We pin to the SHA, not the tag, for security reasons.
         # https://docs.github.com/en/actions/learn-github-actions/security-hardening-for-github-actions#using-third-party-actions
-        uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
+        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
         with:
           prerelease: ${{ contains(github.ref_name, 'a') || contains(github.ref_name, 'b') || contains(github.ref_name, 'rc') }}
           files: "*"

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/.github/workflows/_test.yml

@@ -13,10 +13,6 @@ on:
         type: string
         description: The path to look for tests
         required: true
-      needs-services:
-        type: boolean
-        description: Whether to start external services
-        required: true
     secrets:
       CODECOV_TOKEN:
         required: true
@@ -32,10 +28,11 @@ jobs:
 
     env:
       COVERAGE_PROCESS_START: .coveragerc
+      EXAMPLE_SERVICES_PATH: ./example-services
 
     steps:
       - name: Checkout repository (with submodules)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           fetch-depth: 0
@@ -47,16 +44,7 @@ jobs:
           echo "TEMP=D:\\Temp" >> $env:GITHUB_ENV
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
-
-      - if: inputs.needs-services && inputs.runs-on != 'windows-latest'
-        name: Run docker compose
-        uses: hoverkraft-tech/compose-action@v2.4.1
-        with:
-          compose-file: "./example-services/compose.yaml"
-          services: |
-            bl01t-di-cam-01
-            ca-gateway
+        uses: astral-sh/setup-uv@v7
 
       - name: Run tests win
         if: inputs.runs-on == 'windows-latest'

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/.github/workflows/_tox.yml

@@ -13,10 +13,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
 
       - name: Run tox
         run: uv run --locked tox -e ${{ inputs.tox }}

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/.github/workflows/ci.yml

@@ -19,18 +19,13 @@ jobs:
       matrix:
         runs-on: ["ubuntu-latest", "windows-latest"] # can add macos-latest
         python-version: ["3.11", "3.12", "3.13"]
-        test-config:
-          - tests-path: "tests/unit_tests"
-            needs-services: false
-          - tests-path: "tests/system_tests"
-            needs-services: true
+        tests-path: ["", "tests/system_tests"]
       fail-fast: false
     uses: ./.github/workflows/_test.yml
     with:
       runs-on: ${{ matrix.runs-on }}
       python-version: ${{ matrix.python-version }}
-      tests-path: ${{ matrix.test-config.tests-path }}
-      needs-services: ${{ matrix.test-config.needs-services }}
+      tests-path: ${{ matrix.tests-path }}
     secrets:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 

ophyd_async-0.13.7/Dockerfile

@@ -0,0 +1,25 @@
+# The devcontainer should use the developer target and run as root with podman
+# or docker with user namespaces.
+FROM ghcr.io/diamondlightsource/ubuntu-devcontainer:noble AS developer
+
+ENV DOCKER=docker-28.5.1
+ENV DOCKER_COMPOSE_RELEASE_TAG=v2.40.3
+
+# Add any system dependencies for the developer/build environment here
+RUN apt-get update -y && apt-get install -y --no-install-recommends \
+    graphviz \
+    libxcb-cursor0 \
+    qt6-base-dev \
+    curl \
+    && apt-get dist-clean
+
+# install the docker ce cli binary
+RUN curl -O https://download.docker.com/linux/static/stable/x86_64/${DOCKER}.tgz && \
+    tar xvf ${DOCKER}.tgz && \
+    cp docker/docker /usr/bin && \
+    rm -r ${DOCKER}.tgz docker
+
+# install docker-compose plugin
+RUN mkdir -p /usr/libexec/docker/cli-plugins/ && \
+    curl -SL https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_RELEASE_TAG}/docker-compose-linux-x86_64 -o /usr/libexec/docker/cli-plugins/docker-compose && \
+    chmod +x /usr/libexec/docker/cli-plugins/docker-compose

{ophyd_async-0.13.5/src/ophyd_async.egg-info → ophyd_async-0.13.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ophyd-async
-Version: 0.13.5
+Version: 0.13.7
 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.13.5 → ophyd_async-0.13.7}/docs/conf.py

@@ -206,7 +206,6 @@ intersphinx_mapping = {
     "bluesky": ("https://blueskyproject.io/bluesky/main", None),
     "scanspec": ("https://blueskyproject.io/scanspec/main", None),
     "numpy": ("https://numpy.org/devdocs/", None),
-    "databroker": ("https://blueskyproject.io/databroker/", None),
     "event-model": ("https://blueskyproject.io/event-model/main", None),
     "pytest": ("https://docs.pytest.org/en/stable/", None),
 }

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/src/ophyd_async/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.13.5'
-__version_tuple__ = version_tuple = (0, 13, 5)
+__version__ = version = '0.13.7'
+__version_tuple__ = version_tuple = (0, 13, 7)
 
-__commit_id__ = commit_id = 'gbb7c98987'
+__commit_id__ = commit_id = 'g80ae4488a'

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/src/ophyd_async/core/_mock_signal_backend.py

@@ -41,7 +41,9 @@ class MockSignalBackend(SignalBackend[SignalDatatypeT]):
     @cached_property
     def put_mock(self) -> AsyncMock:
         """Return the mock that will track calls to `put()`."""
-        put_mock = AsyncMock(name="put", spec=Callable)
+        put_mock = AsyncMock(
+            name="put", spec=Callable, side_effect=lambda *_, **__: None
+        )
         self.mock().attach_mock(put_mock, "put")
         return put_mock
 
@@ -66,8 +68,10 @@ class MockSignalBackend(SignalBackend[SignalDatatypeT]):
         return put_proceeds
 
     async def put(self, value: SignalDatatypeT | None, wait: bool):
-        await self.put_mock(value, wait=wait)
-        await self.soft_backend.put(value, wait=wait)
+        new_value = await self.put_mock(value, wait=wait)
+        if new_value is None:
+            new_value = value
+        await self.soft_backend.put(new_value, wait=wait)
         if wait:
             await self.put_proceeds.wait()
 

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/src/ophyd_async/core/_signal.py

@@ -639,9 +639,10 @@ async def set_and_wait_for_other_value(
             if wait_for_set_completion:
                 await status
         except TimeoutError as exc:
+            matcher_name = getattr(matcher, "__name__", f"<{type(matcher).__name__}>")
             raise TimeoutError(
                 f"{match_signal.name} value didn't match value from"
-                f" {matcher.__name__}() in {timeout}s"
+                f" {matcher_name}() in {timeout}s"
             ) from exc
 
     return status

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/src/ophyd_async/epics/motor.py

@@ -98,9 +98,12 @@ class Motor(
         self.motor_done_move = epics_signal_r(int, prefix + ".DMOV")
         self.low_limit_travel = epics_signal_rw(float, prefix + ".LLM")
         self.high_limit_travel = epics_signal_rw(float, prefix + ".HLM")
+        self.dial_low_limit_travel = epics_signal_rw(float, prefix + ".DLLM")
+        self.dial_high_limit_travel = epics_signal_rw(float, prefix + ".DHLM")
         self.offset_freeze_switch = epics_signal_rw(OffsetMode, prefix + ".FOFF")
         self.high_limit_switch = epics_signal_r(int, prefix + ".HLS")
         self.low_limit_switch = epics_signal_r(int, prefix + ".LLS")
+        self.output_link = epics_signal_r(str, prefix + ".OUT")
         self.set_use_switch = epics_signal_rw(UseSetMode, prefix + ".SET")
 
         # Note:cannot use epics_signal_x here, as the motor record specifies that
@@ -131,16 +134,26 @@ class Motor(
         Will raise a MotorLimitsException if the given absolute positions will be
         outside the motor soft limits.
         """
-        motor_lower_limit, motor_upper_limit, egu = await asyncio.gather(
+        (
+            motor_lower_limit,
+            motor_upper_limit,
+            egu,
+            dial_lower_limit,
+            dial_upper_limit,
+        ) = await asyncio.gather(
             self.low_limit_travel.get_value(),
             self.high_limit_travel.get_value(),
             self.motor_egu.get_value(),
+            self.dial_low_limit_travel.get_value(),
+            self.dial_high_limit_travel.get_value(),
         )
 
-        # EPICS motor record treats limits of 0, 0 as no limit
-        if motor_lower_limit == 0 and motor_upper_limit == 0:
+        # EPICS motor record treats dial limits of 0, 0 as no limit
+        # Use DLLM and DHLM to check
+        if dial_lower_limit == 0 and dial_upper_limit == 0:
             return
 
+        # Use real motor limit(i.e. HLM and LLM) to check if the move is permissible
         if (
             not motor_upper_limit >= abs_start_pos >= motor_lower_limit
             or not motor_upper_limit >= abs_end_pos >= motor_lower_limit
@@ -150,6 +163,8 @@ class Motor(
                 f"{abs_start_pos}{egu} to "
                 f"{abs_end_pos}{egu} but motor limits are "
                 f"{motor_lower_limit}{egu} <= x <= {motor_upper_limit}{egu} "
+                f"dial limits are "
+                f"{dial_lower_limit}{egu} <= x <= {dial_upper_limit}"
             )
 
     @AsyncStatus.wrap

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/src/ophyd_async/epics/pmac/_pmac_io.py

@@ -6,7 +6,8 @@ from ophyd_async.core import Array1D, Device, DeviceVector, StandardReadable
 from ophyd_async.epics import motor
 from ophyd_async.epics.core import epics_signal_r, epics_signal_rw, epics_signal_x
 
-CS_LETTERS = "ABCUVWXYZ"
+# Map the CS axis letters to their index (1 indexed)
+CS_INDEX = {letter: index + 1 for index, letter in enumerate("ABCUVWXYZ")}
 
 
 class PmacTrajectoryIO(StandardReadable):
@@ -20,24 +21,20 @@ class PmacTrajectoryIO(StandardReadable):
         # 1 indexed CS axes so we can index into them from the compound motor input link
         self.positions = DeviceVector(
             {
-                i + 1: epics_signal_rw(
-                    Array1D[np.float64], f"{prefix}{letter}:Positions"
-                )
-                for i, letter in enumerate(CS_LETTERS)
+                i: epics_signal_rw(Array1D[np.float64], f"{prefix}{letter}:Positions")
+                for letter, i in CS_INDEX.items()
             }
         )
         self.use_axis = DeviceVector(
             {
-                i + 1: epics_signal_rw(bool, f"{prefix}{letter}:UseAxis")
-                for i, letter in enumerate(CS_LETTERS)
+                i: epics_signal_rw(bool, f"{prefix}{letter}:UseAxis")
+                for letter, i in CS_INDEX.items()
             }
         )
         self.velocities = DeviceVector(
             {
-                i + 1: epics_signal_rw(
-                    Array1D[np.float64], f"{prefix}{letter}:Velocities"
-                )
-                for i, letter in enumerate(CS_LETTERS)
+                i: epics_signal_rw(Array1D[np.float64], f"{prefix}{letter}:Velocities")
+                for letter, i in CS_INDEX.items()
             }
         )
         self.total_points = epics_signal_r(int, f"{prefix}TotalPoints_RBV")
@@ -76,8 +73,8 @@ class PmacCoordIO(Device):
         self.cs_port = epics_signal_r(str, f"{prefix}Port")
         self.cs_axis_setpoint = DeviceVector(
             {
-                i + 1: epics_signal_rw(float, f"{prefix}M{i + 1}:DirectDemand")
-                for i in range(len(CS_LETTERS))
+                i: epics_signal_rw(float, f"{prefix}M{i}:DirectDemand")
+                for i in CS_INDEX.values()
             }
         )
         super().__init__(name=name)

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/src/ophyd_async/epics/pmac/_pmac_trajectory.py

@@ -15,10 +15,10 @@ from ophyd_async.core import (
     wait_for_value,
 )
 from ophyd_async.epics.motor import Motor
-from ophyd_async.epics.pmac import PmacIO
-from ophyd_async.epics.pmac._pmac_io import CS_LETTERS
-from ophyd_async.epics.pmac._pmac_trajectory_generation import PVT, Trajectory
-from ophyd_async.epics.pmac._utils import (
+
+from ._pmac_io import CS_INDEX, PmacIO
+from ._pmac_trajectory_generation import PVT, Trajectory
+from ._utils import (
     _PmacMotorInfo,
     calculate_ramp_position_and_duration,
 )
@@ -131,8 +131,7 @@ class PmacTrajectoryTriggerLogic(FlyerController):
             slice, path_length, motor_info, ramp_up_time
         )
         use_axis = {
-            axis + 1: (axis in motor_info.motor_cs_index.values())
-            for axis in range(len(CS_LETTERS))
+            i: (i in motor_info.motor_cs_index.values()) for i in CS_INDEX.values()
         }
 
         coros = [
@@ -177,14 +176,14 @@ class PmacTrajectoryTriggerLogic(FlyerController):
         self, trajectory: Trajectory, motor_info: _PmacMotorInfo
     ):
         coros = []
-        for motor, number in motor_info.motor_cs_index.items():
+        for motor, cs_index in motor_info.motor_cs_index.items():
             coros.append(
-                self.pmac.trajectory.positions[number + 1].set(
+                self.pmac.trajectory.positions[cs_index].set(
                     trajectory.positions[motor]
                 )
             )
             coros.append(
-                self.pmac.trajectory.velocities[number + 1].set(
+                self.pmac.trajectory.velocities[cs_index].set(
                     trajectory.velocities[motor]
                 )
             )
@@ -206,7 +205,7 @@ class PmacTrajectoryTriggerLogic(FlyerController):
         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] + 1],
+                    coord.cs_axis_setpoint[motor_info.motor_cs_index[motor]],
                     position,
                     set_timeout=10,
                     wait_for_set_completion=False,

{ophyd_async-0.13.5 → ophyd_async-0.13.7}/src/ophyd_async/epics/pmac/_pmac_trajectory_generation.py

@@ -558,6 +558,9 @@ def _get_velocity_profile(
         # Check if all profiles have converged on min_time
         if np.isclose(new_min_time, min_time):
             for motor in motors:
+                # MIN_INTERVAL should be less than our convergence tolerance
+                # such that motors snap to the same point in the time grid
+                profiles[motor].quantize()
                 time_arrays[motor], velocity_arrays[motor] = profiles[
                     motor
                 ].make_arrays()