Use attach_session_metadata decorator

.github/actions/install_requirements/action.yml

@@ -9,7 +9,7 @@ inputs:
     required: true
   python_version:
     description: Python version to install
-    default: "3.9"
+    default: "3.11"
 
 runs:
   using: composite

.github/workflows/code.yml

@@ -32,7 +32,7 @@ jobs:
       fail-fast: false
       matrix:
         os: ["ubuntu-latest"] # can add windows-latest, macos-latest
-        python: ["3.9", "3.10", "3.11"]
+        python: ["3.10", "3.11"]
         install: [".[dev]", "-e .[dev]"]
 
     runs-on: ${{ matrix.os }}

pyproject.toml

@@ -7,7 +7,6 @@ name = "dls-bluesky-core"
 classifiers = [
     "Development Status :: 3 - Alpha",
     "License :: OSI Approved :: Apache Software License",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
 ]
@@ -16,11 +15,12 @@ dependencies = [
     "ophyd",
     "ophyd_async",
     "scanspec",
+    "dls-dodal",
 ] # Add project dependencies here, e.g. ["click", "numpy"]
 dynamic = ["version"]
 license.file = "LICENSE"
 readme = "README.rst"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 
 [project.optional-dependencies]
 dev = [

src/dls_bluesky_core/plans/wrapped.py

@@ -1,7 +1,9 @@
 from typing import Any, List, Mapping, Optional, Union
 
 import bluesky.plans as bp
+import bluesky.preprocessors as bpp
 from bluesky.protocols import Readable
+from dodal.plans.data_session_metadata import attach_data_session_metadata_decorator
 
 from dls_bluesky_core.core import MsgGenerator
 
@@ -14,37 +16,34 @@ def count(
     detectors: List[Readable],
     num: int = 1,
     delay: Optional[Union[float, List[float]]] = None,
+    baseline: Optional[List[Readable]] = None,
     metadata: Optional[Mapping[str, Any]] = None,
 ) -> MsgGenerator:
     """
     Take `n` readings from a device
 
     Args:
         detectors (List[Readable]): Readable devices to read
-        num (int, optional): Number of readings to take. Defaults to 1.
-        delay (Optional[Union[float, List[float]]], optional): Delay between readings.
-                                                               Defaults to None.
-        metadata (Optional[Mapping[str, Any]], optional): Key-value metadata to include
-                                                          in exported data.
-                                                          Defaults to None.
+        num (int): Number of readings to take. Defaults to 1.
+        delay (Optional[Union[float, List[float]]]): Delay between readings.
+                                                        Defaults to None.
+        baseline (Optional[List[Readable]]): List of devices to read at start
+                                                        and end of scan
+        metadata (Optional[Mapping[str, Any]]): Key-value metadata to include
+                                                        in exported data.
+                                                        Defaults to None.
 
     Returns:
         MsgGenerator: _description_
 
     Yields:
         Iterator[MsgGenerator]: _description_
     """
-    plan_args = (
-        {  # If bp.count added delay to plan_args, we could remove all md handling
-            "detectors": list(map(repr, detectors)),
-            "num": num,
-            "delay": delay,
-        }
-    )
-
-    _md = {
-        "plan_args": plan_args,
-        **(metadata or {}),
-    }
-
-    yield from bp.count(detectors, num, delay=delay, md=_md)
+    baseline = baseline or []
+
+    @bpp.baseline_decorator(baseline)
+    @attach_data_session_metadata_decorator(provider=None)
+    def inner_plan() -> MsgGenerator:
+        yield from bp.count(detectors, num, delay=delay, md=metadata)
+
+    yield from inner_plan()

tests/test_boilerplate_removed.py

@@ -2,6 +2,7 @@
 This file checks that all the example boilerplate text has been removed.
 It can be deleted when all the contained tests pass
 """
+
 import sys
 from pathlib import Path