dls-dodal 1.52.0__tar.gz → 1.53.0__tar.gz

{dls_dodal-1.52.0 → dls_dodal-1.53.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.52.0
+Version: 1.53.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License

{dls_dodal-1.52.0 → dls_dodal-1.53.0}/src/dls_dodal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.52.0
+Version: 1.53.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>
 License:                                  Apache License

{dls_dodal-1.52.0 → dls_dodal-1.53.0}/src/dodal/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.52.0'
-__version_tuple__ = version_tuple = (1, 52, 0)
+__version__ = version = '1.53.0'
+__version_tuple__ = version_tuple = (1, 53, 0)

{dls_dodal-1.52.0 → dls_dodal-1.53.0}/src/dodal/beamlines/adsim.py

@@ -1,15 +1,11 @@
-from pathlib import Path
-
 from ophyd_async.epics.adsimdetector import SimDetector
 
 from dodal.common.beamlines.beamline_utils import (
     device_factory,
     get_path_provider,
-    set_path_provider,
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.common.beamlines.device_helpers import DET_SUFFIX, HDF5_SUFFIX
-from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
 from dodal.devices.motors import XThetaStage
 from dodal.log import set_beamline as set_log_beamline
 from dodal.utils import BeamlinePrefix
@@ -19,13 +15,6 @@ PREFIX = BeamlinePrefix("t01")
 set_log_beamline(BL)
 set_utils_beamline(BL)
 
-set_path_provider(
-    StaticVisitPathProvider(
-        BL,
-        Path("/tmp"),
-        client=LocalDirectoryServiceClient(),
-    )
-)
 
 """
 Beamline module for use with the simulated AreaDetector and motors.
@@ -47,11 +36,23 @@ How to use the devices in a plan:
 In an ipython terminal run:
 
 ```python
+from pathlib import Path
+
 from bluesky.run_engine import RunEngine
+from ophyd_async.core import StaticPathProvider, UUIDFilenameProvider
 
 from dodal.beamlines.adsim import det, stage
+from dodal.common.beamlines.beamline_utils import set_path_provider
 from dodal.plans import count
 
+
+set_path_provider(
+    StaticPathProvider(
+        UUIDFilenameProvider(),
+        "/tmp", # The directory for `det` to write to- may be mounted as a volume
+    )
+)
+
 RE = RunEngine()
 d = det(connect_immediately=True)
 s = stage(connect_immediately=True)

{dls_dodal-1.52.0 → dls_dodal-1.53.0}/system_tests/test_adsim.py

@@ -15,10 +15,14 @@ from event_model.documents import (
     StreamResource,
 )
 from ophyd_async.core import (
+    PathProvider,
     StandardDetector,
+    StaticPathProvider,
+    UUIDFilenameProvider,
 )
 
 from dodal.beamlines import adsim
+from dodal.common.beamlines.beamline_utils import clear_path_provider, set_path_provider
 from dodal.devices.motors import XThetaStage
 from dodal.plans import count
 
@@ -56,7 +60,16 @@ def with_env():
 
 
 @pytest.fixture
-def det(RE) -> Generator[StandardDetector]:
+def path_provider() -> Generator[PathProvider]:
+    # path must be available to the `det` container, so cannot use tmp_path
+    path_provider = StaticPathProvider(UUIDFilenameProvider(), "/tmp")
+    set_path_provider(path_provider)
+    yield path_provider
+    clear_path_provider()
+
+
+@pytest.fixture
+def det(RE, path_provider: PathProvider) -> Generator[StandardDetector]:
     yield adsim.det(connect_immediately=True)
     adsim.det.cache_clear()
 
@@ -94,7 +107,6 @@ def test_plan_produces_expected_start_document(
     assert start.get("detectors") == ["det"]
     assert start.get("num_points") == shape[0]
     assert start.get("num_intervals") == shape[0] - 1
-    assert cast(str, start.get("data_session")).startswith("adsim")
 
     assert (hints := start.get("hints")) and (
         hints.get("dimensions") == [(("time",), "primary")]