ophyd-async 0.14.0__tar.gz → 0.14.1__tar.gz

{ophyd_async-0.14.0 → ophyd_async-0.14.1}/.copier-answers.yml

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

{ophyd_async-0.14.0 → ophyd_async-0.14.1}/.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.0a5/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.1/how-to.html).

{ophyd_async-0.14.0 → ophyd_async-0.14.1}/.github/workflows/_test.yml

@@ -13,9 +13,6 @@ on:
         type: string
         description: The path to look for tests
         required: true
-    secrets:
-      CODECOV_TOKEN:
-        required: true
 
 env:
   # https://github.com/pytest-dev/pytest/issues/2042
@@ -59,5 +56,3 @@ jobs:
         with:
           name: ${{ inputs.python-version }}/${{ inputs.runs-on }}/${{ inputs.tests-path }}
           files: cov.xml
-        env:
-          CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

{ophyd_async-0.14.0 → ophyd_async-0.14.1}/.github/workflows/ci.yml

@@ -20,14 +20,16 @@ jobs:
         runs-on: ["ubuntu-latest", "windows-latest"] # can add macos-latest
         python-version: ["3.11", "3.12", "3.13"]
         tests-path: ["", "tests/system_tests"]
+        include:
+          - runs-on: "ubuntu-latest"
+            python-version: "3.11"
+            tests-path: "tests/system_tests_tango"
       fail-fast: false
     uses: ./.github/workflows/_test.yml
     with:
       runs-on: ${{ matrix.runs-on }}
       python-version: ${{ matrix.python-version }}
       tests-path: ${{ matrix.tests-path }}
-    secrets:
-      CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
 
   docs:
     uses: ./.github/workflows/_docs.yml

ophyd_async-0.14.1/.github/workflows/claude.yml

@@ -0,0 +1,52 @@
+name: Claude PR Comment Review
+# https://github.com/anthropics/claude-code-action/blob/main/docs/solutions.md#automatic-pr-code-review
+# https://skywork.ai/blog/how-to-use-claude-code-for-prs-code-reviews-guide/#step-3-add-a-comment-triggered-workflow-copy-pasteable
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  review:
+    if: ${{ contains(github.event.comment.body, '@claude') && github.event.issue.pull_request != null }}
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+      id-token: write
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          fetch-depth: 1
+
+      - run: find
+
+      - uses: anthropics/claude-code-action@v1
+        with:
+          anthropic_api_key: ${{ secrets.ANTHROPIC_API_KEY }}
+          track_progress: true # ✨ Enables tracking comments
+          prompt: |
+            REPO: ${{ github.repository }}
+            PR NUMBER: ${{ github.event.issue.number }}
+
+            Please review this pull request with a focus on:
+            - Code quality and best practices
+            - Potential bugs or issues
+            - Security implications
+            - Performance considerations
+
+            Note: The PR branch is already checked out in the current working directory.
+
+            Make sure to:
+            - Use `gh pr comment` for concise top-level feedback
+            - Use `mcp__github_inline_comment__create_inline_comment` to highlight specific code issues
+            - Put all detailed feedback and recommendations in inline comments and do not duplicate in the main PR comment
+            - Anywhere you have a line number reference, use an inline comment
+            - Check structure is consist with existing code style
+            - Skip style issues already handled by linters
+            - Check for duplication of code already in the repository; aim for re-use where sensible
+            - Favour composition over inheritence
+            - Respond in concise bullet point form; avoid restating code
+
+          claude_args: |
+            --allowedTools "mcp__github_inline_comment__create_inline_comment,Bash(gh pr comment:*),Bash(gh pr diff:*),Bash(gh pr view:*)"

{ophyd_async-0.14.0 → ophyd_async-0.14.1}/.pre-commit-config.yaml

@@ -3,7 +3,7 @@ repos:
     rev: v5.0.0
     hooks:
       - id: check-added-large-files
-        args: ["--maxkb=1000"] # uv.lock is more than 500kB
+        exclude: ^uv.lock
       - id: check-yaml
       - id: check-merge-conflict
       - id: end-of-file-fixer

{ophyd_async-0.14.0/src/ophyd_async.egg-info → ophyd_async-0.14.1}/PKG-INFO

@@ -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 → ophyd_async-0.14.1}/src/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 = 'g3da44d6fb'
+__commit_id__ = commit_id = 'g9b567b214'

{ophyd_async-0.14.0 → ophyd_async-0.14.1}/src/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-0.14.0 → ophyd_async-0.14.1}/src/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-0.14.0 → ophyd_async-0.14.1}/src/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-0.14.0 → ophyd_async-0.14.1}/src/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-0.14.0 → ophyd_async-0.14.1}/src/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-0.14.0 → ophyd_async-0.14.1}/src/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-0.14.0 → ophyd_async-0.14.1}/src/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 → ophyd_async-0.14.1/src/ophyd_async.egg-info}/PKG-INFO

@@ -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 → ophyd_async-0.14.1}/src/ophyd_async.egg-info/SOURCES.txt

@@ -28,6 +28,7 @@ uv.lock
 .github/workflows/_test.yml
 .github/workflows/_tox.yml
 .github/workflows/ci.yml
+.github/workflows/claude.yml
 .github/workflows/periodic.yml
 docs/conf.py
 docs/explanations.md
@@ -250,11 +251,11 @@ tests/system_tests/epics/signal/test_signals.py
 tests/system_tests/epics/signal/test_yaml_save_ca.yaml
 tests/system_tests/epics/signal/test_yaml_save_pva.yaml
 tests/system_tests/fastcs/panda/test_panda_connect.py
-tests/system_tests/tango/conftest.py
-tests/system_tests/tango/context_subprocess.py
-tests/system_tests/tango/test_base_device.py
-tests/system_tests/tango/test_tango_signals.py
-tests/system_tests/tango/test_tango_transport.py
+tests/system_tests_tango/conftest.py
+tests/system_tests_tango/context_subprocess.py
+tests/system_tests_tango/test_base_device.py
+tests/system_tests_tango/test_tango_signals.py
+tests/system_tests_tango/test_tango_transport.py
 tests/unit_tests/__init__.py
 tests/unit_tests/test_branching.py
 tests/unit_tests/test_cli.py

{ophyd_async-0.14.0/tests/system_tests/tango → ophyd_async-0.14.1/tests/system_tests_tango}/conftest.py

@@ -1,4 +1,4 @@
-import os
+import asyncio
 import pickle
 import socket
 import subprocess
@@ -30,15 +30,9 @@ def reset_tango_asyncio():
 
 
 def pytest_collection_modifyitems(config, items):
-    tango_dir = os.path.join("system_tests", "tango")
+    tango_dir = "system_tests_tango"
     for item in items:
         if tango_dir in str(item.fspath):
-            if sys.version_info >= (3, 12):
-                item.add_marker(
-                    pytest.mark.skip(
-                        reason="Tango is currently not supported on Python 3.12: https://github.com/bluesky/ophyd-async/issues/681"
-                    )
-                )
             if sys.platform.startswith(
                 "win"
             ):  # expect "win32", but open to a future change: https://mail.python.org/pipermail/patches/2000-May/000648.html
@@ -222,3 +216,21 @@ def everything_signal_info():
     )
 
     return signal_info
+
+
+@pytest.fixture
+def event_loop():
+    """Create a fresh event loop for each test."""
+    loop = asyncio.new_event_loop()
+    asyncio.set_event_loop(loop)
+
+    yield loop
+
+    # Cancel all pending tasks
+    pending = asyncio.all_tasks(loop)
+    for task in pending:
+        task.cancel()
+    loop.run_until_complete(asyncio.gather(*pending, return_exceptions=True))
+
+    loop.close()
+    asyncio.set_event_loop(None)

{ophyd_async-0.14.0/tests/system_tests/tango → ophyd_async-0.14.1/tests/system_tests_tango}/test_tango_signals.py

@@ -6,6 +6,7 @@ from typing import TypeVar, get_origin
 
 import numpy as np
 import pytest
+from tango.asyncio import DeviceProxy
 from test_base_device import TestDevice
 
 from ophyd_async.core import NotConnectedError, SignalRW, StandardReadable, StrictEnum
@@ -15,6 +16,7 @@ from ophyd_async.tango.core import (
     TangoDevice,
     TangoSignalBackend,
     get_full_attr_trl,
+    parse_precision,
     tango_signal_r,
     tango_signal_rw,
     tango_signal_w,
@@ -417,11 +419,7 @@ async def test_assert_val_reading_everything_tango(
         everything_device.my_state_spectrum, esi["my_state_spectrum"].initial
     )
 
-    # await assert_val_reading(everything_device.str_image, esi["str_image"].initial)
     await assert_val_reading(everything_device.bool_image, esi["bool_image"].initial)
-    # await assert_val_reading(
-    #     everything_device.strenum_image, esi["strenum_image"].initial
-    # )
     await assert_val_reading(everything_device.int8_image, esi["int8_image"].initial)
     await assert_val_reading(everything_device.uint8_image, esi["uint8_image"].initial)
     await assert_val_reading(everything_device.int16_image, esi["int16_image"].initial)
@@ -442,14 +440,10 @@ async def test_assert_val_reading_everything_tango(
     await assert_val_reading(
         everything_device.float64_image, esi["float64_image"].initial
     )
-    # await assert_val_reading(
-    #     everything_device.my_state_image, esi["my_state_image"].initial
-    # )
 
 
 @pytest.mark.asyncio
 async def test_set_callback(everything_device_trl):
-    # await prepare_device(everything_device_trl, "float32", 1.0)
     source = get_full_attr_trl(everything_device_trl, "float32")
     transport = await make_backend(float, source, connect=False)
 
@@ -496,7 +490,6 @@ async def test_set_callback(everything_device_trl):
 @pytest.mark.asyncio
 @pytest.mark.parametrize("allow", [True, False])
 async def test_tango_transport_allow_events(everything_device_trl, allow):
-    # await prepare_device(echo_device, "float32", 1.0)
     source = get_full_attr_trl(everything_device_trl, "float32")
     transport = await make_backend(float, source, connect=False)
     transport.allow_events(allow)
@@ -505,7 +498,6 @@ async def test_tango_transport_allow_events(everything_device_trl, allow):
 
 @pytest.mark.asyncio
 async def test_tango_transport_set_polling(everything_device_trl):
-    # await prepare_device(echo_device, "float32", 1.0)
     source = get_full_attr_trl(everything_device_trl, "float32")
     transport = await make_backend(float, source, connect=False)
     transport.set_polling(True, 0.1, 1, 0.1)
@@ -515,7 +507,6 @@ async def test_tango_transport_set_polling(everything_device_trl):
 @pytest.mark.asyncio
 @pytest.mark.timeout(12.0)
 async def test_attribute_subscribe_callback(everything_device_trl):
-    # await prepare_device(echo_device, "float32", 1.0)
     source = get_full_attr_trl(everything_device_trl, "int64")
     backend = await make_backend(int, source)
     attr_proxy = backend.proxies[source]
@@ -543,7 +534,6 @@ async def test_attribute_subscribe_callback(everything_device_trl):
 
 @pytest.mark.asyncio
 async def test_attribute_unsubscribe_callback(everything_device_trl):
-    # await prepare_device(echo_device, "float32", 1.0)
     source = get_full_attr_trl(everything_device_trl, "float32")
     backend = await make_backend(float, source)
     attr_proxy = backend.proxies[source]
@@ -556,3 +546,23 @@ async def test_attribute_unsubscribe_callback(everything_device_trl):
     attr_proxy.unsubscribe_callback()
     assert not attr_proxy.has_subscription()
     await asyncio.sleep(0.1)
+
+
+@pytest.mark.asyncio
+@pytest.mark.timeout(3.0)
+async def test_parse_precision(everything_device_trl):
+    proxy = await DeviceProxy(everything_device_trl)
+    for attr in proxy.get_attribute_list():
+        config = await proxy.get_attribute_config(attr)
+        precision = parse_precision(config)
+        if attr in [
+            "float32",
+            "float32_image",
+            "float32_spectrum",
+            "float64",
+            "float64_image",
+            "float64_spectrum",
+        ]:
+            assert precision == 2
+        else:
+            assert precision is None

{ophyd_async-0.14.0 → ophyd_async-0.14.1}/tests/unit_tests/core/test_providers.py

@@ -1,5 +1,6 @@
 import itertools
 import os
+import shutil
 import sys
 import uuid
 from datetime import date
@@ -10,6 +11,9 @@ import pytest
 from ophyd_async.core import (
     AutoIncrementFilenameProvider,
     AutoIncrementingPathProvider,
+    AutoMaxIncrementingPathProvider,
+    PathInfo,
+    StaticFilenameProvider,
     StaticPathProvider,
     UUIDFilenameProvider,
     YMDPathProvider,
@@ -75,6 +79,59 @@ def test_auto_increment_path_provider(static_filename_provider, tmp_path):
     assert os.path.basename(info.directory_path) == "00002"
 
 
+def test_auto_max_increment_path_provider(tmp_path: Path):
+    def write_file(info: PathInfo):
+        os.makedirs(info.directory_path)
+        with open(f"{info.directory_path}/{info.filename}", "w"):
+            ...
+
+    filename = "capture"
+    base_provider = StaticPathProvider(StaticFilenameProvider("capture"), tmp_path)
+
+    try:
+        # Test multiple increments
+        path_provider = AutoMaxIncrementingPathProvider(base_provider, max_digits=3)
+        info = path_provider()
+        write_file(info)
+        expected_path = tmp_path / f"000_{filename}"
+        assert info.directory_path == expected_path
+        info = path_provider()
+        write_file(info)
+        expected_path = tmp_path / f"001_{filename}"
+        assert info.directory_path == expected_path
+
+        # Test fresh path provider continues incrementing
+        path_provider = AutoMaxIncrementingPathProvider(base_provider)
+        info = path_provider()
+        write_file(info)
+        expected_path = tmp_path / f"0002_{filename}"
+        assert info.directory_path == expected_path
+
+        # Test path provider in dated mode
+        path_provider = AutoMaxIncrementingPathProvider(base_provider, dated=True)
+        info = path_provider()
+        write_file(info)
+        assert (
+            info.directory_path
+            == tmp_path / date.today().strftime("%Y-%m-%d") / f"0000_{filename}"
+        )
+        info = path_provider()
+        write_file(info)
+        assert (
+            info.directory_path
+            == tmp_path / date.today().strftime("%Y-%m-%d") / f"0001_{filename}"
+        )
+
+    finally:
+        # Tidy up directory - although they should have been
+        # created in a temporary location
+        for file in tmp_path.iterdir():
+            if file.is_file():
+                file.unlink()
+            elif file.is_dir():
+                shutil.rmtree(file)
+
+
 def test_ymd_path_provider(static_filename_provider, tmp_path):
     ymd_path_provider = YMDPathProvider(static_filename_provider, tmp_path)
     current_date = date.today()