PyPI - dls-dodal - Versions diffs - 1.66.0__tar.gz → 1.68.0__tar.gz - Mend

dls-dodal 1.66.0tar.gz → 1.68.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (702) hide show

{dls_dodal-1.66.0 → dls_dodal-1.68.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.66.0
+Version: 1.68.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -231,7 +231,7 @@ Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
 Requires-Dist: pyzmq==26.3.0
 Requires-Dist: deepdiff
-Requires-Dist: daq-config-server>=v1.0.0-rc.2
+Requires-Dist: daq-config-server>=v1.0.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.66.0 → dls_dodal-1.68.0}/docs/how-to/create-beamline.md RENAMED Viewed

@@ -23,28 +23,31 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
 ```python
+    from functools import cache
+    from pathlib import Path
+    from ophyd_async.core import PathProvider
     from ophyd_async.epics.adaravis import AravisDetector
-    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 CAM_SUFFIX, HDF5_SUFFIX
-    from dodal.common.visit import LocalDirectoryServiceClient, StaticVisitPathProvider
+    from dodal.common.visit import RemoteDirectoryServiceClient, StaticVisitPathProvider
+    from dodal.device_manager import DeviceManager
     from dodal.devices.synchrotron import Synchrotron
     from dodal.log import set_beamline as set_log_beamline
-    from dodal.utils import BeamlinePrefix
+    from dodal.utils import BeamlinePrefix, get_beamline_name
     BL = get_beamline_name("s41")  # Default used when not on a live beamline
     PREFIX = BeamlinePrefix(BL)
     set_log_beamline(BL)  # Configure logging and util functions
     set_utils_beamline(BL)
-    # Currently we must hard-code the visit, determining the visit is WIP.
-    set_path_provider(
-        StaticVisitPathProvider(
+    devices = DeviceManager()
+    @devices.fixture
+    @cache
+    def path_provider() -> PathProvider:
+        # Currently we must hard-code the visit, determining the visit is WIP.
+        return StaticVisitPathProvider(
             BL,
             # Root directory for all detectors
             Path("/dls/w41/data/YYYY/cm12345-1"),
@@ -52,7 +55,7 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
             client=RemoteDirectoryServiceClient("http://s41-control:8088/api"),
             # Else if no GDA server use a LocalDirectoryServiceClient(),
         )
-    )
     """
     Define device factory functions below this point.
@@ -63,23 +66,22 @@ The following example creates a fictitious beamline ``w41``, with a simulated tw
     """
     This decorator gives extra desirable behaviour to this factory function:
     - it may be instantiated automatically, selectively on live beamline
-        - caching and re-using the result for subsequent calls
     - it automatically names the device if no name is explicitly set
     - it may be skipped when make_all_devices is called on this module
     - it must be explicitly connected (which may be automated by tools)
         - when connected it may connect to a simulated backend
         - it may be connected concurrently (when automated by tools)
-    """"
-    @device_factory(skip = BL == "s41")
+    """
+    @devices.factory(skip = BL == "s41")
     def synchrotron() -> Synchrotron:
         return Synchrotron()
-    @device_factory()
-    def d11() -> AravisDetector:
+    @devices.factory()
+    def d11(path_provider: PathProvider) -> AravisDetector:
         return AravisDetector(
             f"{PREFIX.beamline_prefix}-DI-DCAM-01:",
-            path_provider=get_path_provider(),
+            path_provider=path_provider,
             drv_suffix=CAM_SUFFIX,
             fileio_suffix=HDF5_SUFFIX,
         )

{dls_dodal-1.66.0 → dls_dodal-1.68.0}/pyproject.toml RENAMED Viewed

@@ -30,7 +30,7 @@ dependencies = [
     "scanspec>=0.7.3",
     "pyzmq==26.3.0",                  # Until we can move to RHEL 8 https://github.com/DiamondLightSource/mx-bluesky/issues/1139
     "deepdiff",
-    "daq-config-server>=v1.0.0-rc.2", # For getting Configuration settings.
+    "daq-config-server>=v1.0.0", # For getting Configuration settings.
 ]
 dynamic = ["version"]

{dls_dodal-1.66.0 → dls_dodal-1.68.0}/src/dls_dodal.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dls-dodal
-Version: 1.66.0
+Version: 1.68.0
 Summary: Ophyd devices and other utils that could be used across DLS beamlines
 Author-email: Dominic Oram <dominic.oram@diamond.ac.uk>, Joseph Ware <joseph.ware@diamond.ac.uk>, Oliver Silvester <Oliver.Silvester@diamond.ac.uk>, Noemi Frisina <noemi.frisina@diamond.ac.uk>
 License:                                  Apache License
@@ -231,7 +231,7 @@ Requires-Dist: redis
 Requires-Dist: scanspec>=0.7.3
 Requires-Dist: pyzmq==26.3.0
 Requires-Dist: deepdiff
-Requires-Dist: daq-config-server>=v1.0.0-rc.2
+Requires-Dist: daq-config-server>=v1.0.0
 Provides-Extra: dev
 Requires-Dist: black; extra == "dev"
 Requires-Dist: diff-cover; extra == "dev"

{dls_dodal-1.66.0 → dls_dodal-1.68.0}/src/dls_dodal.egg-info/SOURCES.txt RENAMED Viewed

@@ -5,7 +5,6 @@ Dockerfile
 LICENSE
 README.md
 catalog-info.yaml
-conftest.py
 pull_request_template.md
 pyproject.toml
 .devcontainer/devcontainer.json
@@ -89,6 +88,7 @@ src/dodal/__init__.py
 src/dodal/__main__.py
 src/dodal/_version.py
 src/dodal/cli.py
+src/dodal/device_manager.py
 src/dodal/log.py
 src/dodal/utils.py
 src/dodal/beamline_specific_utils/__init__.py
@@ -121,6 +121,7 @@ src/dodal/beamlines/i11.py
 src/dodal/beamlines/i13_1.py
 src/dodal/beamlines/i15.py
 src/dodal/beamlines/i15_1.py
+src/dodal/beamlines/i16.py
 src/dodal/beamlines/i17.py
 src/dodal/beamlines/i18.py
 src/dodal/beamlines/i19_1.py
@@ -157,7 +158,6 @@ src/dodal/common/beamlines/device_helpers.py
 src/dodal/devices/__init__.py
 src/dodal/devices/aperture.py
 src/dodal/devices/aperturescatterguard.py
-src/dodal/devices/apple2_undulator.py
 src/dodal/devices/backlight.py
 src/dodal/devices/baton.py
 src/dodal/devices/bimorph_mirror.py
@@ -231,26 +231,24 @@ src/dodal/devices/detector/det_resolution.py
 src/dodal/devices/detector/detector.py
 src/dodal/devices/detector/detector_motion.py
 src/dodal/devices/electron_analyser/__init__.py
-src/dodal/devices/electron_analyser/detector.py
-src/dodal/devices/electron_analyser/energy_sources.py
-src/dodal/devices/electron_analyser/enums.py
-src/dodal/devices/electron_analyser/types.py
-src/dodal/devices/electron_analyser/util.py
-src/dodal/devices/electron_analyser/abstract/__init__.py
-src/dodal/devices/electron_analyser/abstract/base_detector.py
-src/dodal/devices/electron_analyser/abstract/base_driver_io.py
-src/dodal/devices/electron_analyser/abstract/base_region.py
-src/dodal/devices/electron_analyser/abstract/types.py
+src/dodal/devices/electron_analyser/base/__init__.py
+src/dodal/devices/electron_analyser/base/base_controller.py
+src/dodal/devices/electron_analyser/base/base_detector.py
+src/dodal/devices/electron_analyser/base/base_driver_io.py
+src/dodal/devices/electron_analyser/base/base_enums.py
+src/dodal/devices/electron_analyser/base/base_region.py
+src/dodal/devices/electron_analyser/base/base_util.py
+src/dodal/devices/electron_analyser/base/energy_sources.py
 src/dodal/devices/electron_analyser/specs/__init__.py
-src/dodal/devices/electron_analyser/specs/detector.py
-src/dodal/devices/electron_analyser/specs/driver_io.py
-src/dodal/devices/electron_analyser/specs/enums.py
-src/dodal/devices/electron_analyser/specs/region.py
+src/dodal/devices/electron_analyser/specs/specs_detector.py
+src/dodal/devices/electron_analyser/specs/specs_driver_io.py
+src/dodal/devices/electron_analyser/specs/specs_enums.py
+src/dodal/devices/electron_analyser/specs/specs_region.py
 src/dodal/devices/electron_analyser/vgscienta/__init__.py
-src/dodal/devices/electron_analyser/vgscienta/detector.py
-src/dodal/devices/electron_analyser/vgscienta/driver_io.py
-src/dodal/devices/electron_analyser/vgscienta/enums.py
-src/dodal/devices/electron_analyser/vgscienta/region.py
+src/dodal/devices/electron_analyser/vgscienta/vgscienta_detector.py
+src/dodal/devices/electron_analyser/vgscienta/vgscienta_driver_io.py
+src/dodal/devices/electron_analyser/vgscienta/vgscienta_enums.py
+src/dodal/devices/electron_analyser/vgscienta/vgscienta_region.py
 src/dodal/devices/i02_1/__init__.py
 src/dodal/devices/i02_1/fast_grid_scan.py
 src/dodal/devices/i02_1/sample_motors.py
@@ -263,6 +261,7 @@ src/dodal/devices/i03/undulator_dcm.py
 src/dodal/devices/i04/__init__.py
 src/dodal/devices/i04/beamsize.py
 src/dodal/devices/i04/constants.py
+src/dodal/devices/i04/max_pixel.py
 src/dodal/devices/i04/murko_results.py
 src/dodal/devices/i04/transfocator.py
 src/dodal/devices/i05/__init__.py
@@ -275,7 +274,10 @@ src/dodal/devices/i09/enums.py
 src/dodal/devices/i09_1/__init__.py
 src/dodal/devices/i09_1/enums.py
 src/dodal/devices/i09_1_shared/__init__.py
+src/dodal/devices/i09_1_shared/hard_energy.py
 src/dodal/devices/i09_1_shared/hard_undulator_functions.py
+src/dodal/devices/i09_2_shared/__init__.py
+src/dodal/devices/i09_2_shared/i09_apple2.py
 src/dodal/devices/i10/__init__.py
 src/dodal/devices/i10/diagnostics.py
 src/dodal/devices/i10/i10_apple2.py
@@ -315,6 +317,7 @@ src/dodal/devices/i19/diffractometer.py
 src/dodal/devices/i19/mapt_configuration.py
 src/dodal/devices/i19/pin_col_stages.py
 src/dodal/devices/i19/access_controlled/__init__.py
+src/dodal/devices/i19/access_controlled/attenuator_motor_squad.py
 src/dodal/devices/i19/access_controlled/blueapi_device.py
 src/dodal/devices/i19/access_controlled/hutch_access.py
 src/dodal/devices/i19/access_controlled/shutter.py
@@ -335,6 +338,11 @@ src/dodal/devices/i24/dual_backlight.py
 src/dodal/devices/i24/focus_mirrors.py
 src/dodal/devices/i24/pmac.py
 src/dodal/devices/i24/vgonio.py
+src/dodal/devices/insertion_device/__init__.py
+src/dodal/devices/insertion_device/apple2_undulator.py
+src/dodal/devices/insertion_device/energy_motor_lookup.py
+src/dodal/devices/insertion_device/id_enum.py
+src/dodal/devices/insertion_device/lookup_table_models.py
 src/dodal/devices/mx_phase1/__init__.py
 src/dodal/devices/mx_phase1/beamstop.py
 src/dodal/devices/oav/__init__.py
@@ -365,7 +373,6 @@ src/dodal/devices/util/__init__.py
 src/dodal/devices/util/adjuster_plans.py
 src/dodal/devices/util/epics_util.py
 src/dodal/devices/util/lookup_tables.py
-src/dodal/devices/util/lookup_tables_apple2.py
 src/dodal/devices/xspress3/__init__.py
 src/dodal/devices/xspress3/xspress3.py
 src/dodal/devices/xspress3/xspress3_channel.py
@@ -389,7 +396,7 @@ src/dodal/plans/bimorph.py
 src/dodal/plans/configure_arm_trigger_and_disarm_detector.py
 src/dodal/plans/load_panda_yaml.py
 src/dodal/plans/save_panda.py
-src/dodal/plans/scanspec.py
+src/dodal/plans/spec_path.py
 src/dodal/plans/verify_undulator_gap.py
 src/dodal/plans/wrapped.py
 src/dodal/plans/preprocessors/__init__.py
@@ -399,7 +406,10 @@ src/dodal/testing/electron_analyser/device_factory.py
 src/dodal/testing/fixtures/__init__.py
 src/dodal/testing/fixtures/run_engine.py
 src/dodal/testing/fixtures/utils.py
+src/dodal/testing/fixtures/devices/__init__.py
+src/dodal/testing/fixtures/devices/apple2.py
 system_tests/__init__.py
+system_tests/conftest.py
 system_tests/test_adsim.py
 system_tests/test_cli.py
 system_tests/test_oav_system.py
@@ -415,6 +425,7 @@ tests/fake_beamline_misbehaving_builtins.py
 tests/fake_beamline_some_devices_working.py
 tests/fake_device_factory_beamline.py
 tests/test_cli.py
+tests/test_device_manager.py
 tests/test_log.py
 tests/test_utils.py
 tests/beamlines/__init__.py
@@ -438,7 +449,6 @@ tests/devices/__init__.py
 tests/devices/conftest.py
 tests/devices/test_aperture.py
 tests/devices/test_aperture_scatterguard.py
-tests/devices/test_apple2_undulator.py
 tests/devices/test_attenuator.py
 tests/devices/test_backlight.py
 tests/devices/test_bart_robot.py
@@ -491,27 +501,27 @@ tests/devices/detector/test_data/__init__.py
 tests/devices/detector/test_data/test_det_dist_converter.txt
 tests/devices/electron_analyser/__init__.py
 tests/devices/electron_analyser/conftest.py
-tests/devices/electron_analyser/test_detector.py
-tests/devices/electron_analyser/test_energy_sources.py
-tests/devices/electron_analyser/test_util.py
-tests/devices/electron_analyser/abstract/__init__.py
-tests/devices/electron_analyser/abstract/test_base_detector.py
-tests/devices/electron_analyser/abstract/test_base_driver_io.py
-tests/devices/electron_analyser/abstract/test_base_region.py
+tests/devices/electron_analyser/base/__init__.py
+tests/devices/electron_analyser/base/test_base_controller.py
+tests/devices/electron_analyser/base/test_base_detector.py
+tests/devices/electron_analyser/base/test_base_driver_io.py
+tests/devices/electron_analyser/base/test_base_region.py
+tests/devices/electron_analyser/base/test_base_util.py
+tests/devices/electron_analyser/base/test_energy_sources.py
 tests/devices/electron_analyser/helper_util/__init__.py
 tests/devices/electron_analyser/helper_util/assert_func.py
 tests/devices/electron_analyser/helper_util/sequence.py
 tests/devices/electron_analyser/specs/__init__.py
-tests/devices/electron_analyser/specs/test_detector.py
-tests/devices/electron_analyser/specs/test_driver_io.py
-tests/devices/electron_analyser/specs/test_region.py
+tests/devices/electron_analyser/specs/test_specs_detector.py
+tests/devices/electron_analyser/specs/test_specs_driver_io.py
+tests/devices/electron_analyser/specs/test_specs_region.py
 tests/devices/electron_analyser/test_data/__init__.py
 tests/devices/electron_analyser/test_data/specs_sequence.seq
 tests/devices/electron_analyser/test_data/vgscienta_sequence.seq
 tests/devices/electron_analyser/vgscienta/__init__.py
-tests/devices/electron_analyser/vgscienta/test_detector.py
-tests/devices/electron_analyser/vgscienta/test_driver_io.py
-tests/devices/electron_analyser/vgscienta/test_region.py
+tests/devices/electron_analyser/vgscienta/test_vgscienta_detector.py
+tests/devices/electron_analyser/vgscienta/test_vgscienta_driver_io.py
+tests/devices/electron_analyser/vgscienta/test_vgsicenta_region.py
 tests/devices/i02_1/__init__.py
 tests/devices/i02_1/test_fast_grid_scan.py
 tests/devices/i03/__init__.py
@@ -521,6 +531,7 @@ tests/devices/i03/test_undulator_dcm.py
 tests/devices/i04/__init__.py
 tests/devices/i04/conftest.py
 tests/devices/i04/test_beamsize.py
+tests/devices/i04/test_max_pixel.py
 tests/devices/i04/test_murko_results.py
 tests/devices/i04/test_transfocator.py
 tests/devices/i07/IIDCalibrationTable.txt
@@ -530,9 +541,17 @@ tests/devices/i07/test_id.py
 tests/devices/i09/__init__.py
 tests/devices/i09_1/__init__.py
 tests/devices/i09_1_shared/__init__.py
+tests/devices/i09_1_shared/test_hard_energy.py
 tests/devices/i09_1_shared/test_undulator_functions.py
 tests/devices/i09_1_shared/test_data/__init__.py
 tests/devices/i09_1_shared/test_data/test_lookuptable_i09_hu.txt
+tests/devices/i09_2_shared/__init__.py
+tests/devices/i09_2_shared/test_i09_apple2.py
+tests/devices/i09_2_shared/test_data/ExpectedJIDEnergy2GapCalibrations.json
+tests/devices/i09_2_shared/test_data/ExpectedJIDEnergy2PhaseCalibrations.json
+tests/devices/i09_2_shared/test_data/JIDEnergy2GapCalibrations.csv
+tests/devices/i09_2_shared/test_data/JIDEnergy2PhaseCalibrations.csv
+tests/devices/i09_2_shared/test_data/__init__.py
 tests/devices/i10/__init__.py
 tests/devices/i10/test_i10_apple2.py
 tests/devices/i10/test_data/IDEnergy2GapCalibrations.csv
@@ -559,6 +578,8 @@ tests/devices/i19/test_diffractometer.py
 tests/devices/i19/test_mapt.py
 tests/devices/i19/test_pin_col.py
 tests/devices/i19/access_controlled/__init__.py
+tests/devices/i19/access_controlled/test_attenuator_motor_squad.py
+tests/devices/i19/access_controlled/test_attenuator_position_demand.py
 tests/devices/i19/access_controlled/test_shutter.py
 tests/devices/i22/__init__.py
 tests/devices/i22/test_dcm.py
@@ -570,6 +591,12 @@ tests/devices/i24/test_dual_backlight.py
 tests/devices/i24/test_focus_mirrors.py
 tests/devices/i24/test_pmac.py
 tests/devices/i24/test_vgonio.py
+tests/devices/insertion_device/__init__.py
+tests/devices/insertion_device/conftest.py
+tests/devices/insertion_device/test_apple2_undulator.py
+tests/devices/insertion_device/test_energy_motor_lookup.py
+tests/devices/insertion_device/test_lookup_tables_models.py
+tests/devices/insertion_device/util.py
 tests/devices/mx_phase1/__init__.py
 tests/devices/mx_phase1/test_beamstop.py
 tests/devices/oav/__init__.py
@@ -608,7 +635,6 @@ tests/devices/test_data/test_lookup_table.txt
 tests/devices/util/__init__.py
 tests/devices/util/test_adjuster_plans.py
 tests/devices/util/test_lookup_tables.py
-tests/devices/util/test_lookup_tables_apple2.py
 tests/devices/util/test_data/__init__.py
 tests/devices/util/test_data/test_beamline_dcm_roll_converter.txt
 tests/devices/util/test_data/test_beamline_dcm_roll_converter_non_monotonic.txt

{dls_dodal-1.66.0 → dls_dodal-1.68.0}/src/dls_dodal.egg-info/requires.txt RENAMED Viewed

@@ -16,7 +16,7 @@ redis
 scanspec>=0.7.3
 pyzmq==26.3.0
 deepdiff
-daq-config-server>=v1.0.0-rc.2
+daq-config-server>=v1.0.0
 [dev]
 black

{dls_dodal-1.66.0 → dls_dodal-1.68.0}/src/dodal/_version.py RENAMED Viewed

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
-__version__ = version = '1.66.0'
-__version_tuple__ = version_tuple = (1, 66, 0)
+__version__ = version = '1.68.0'
+__version_tuple__ = version_tuple = (1, 68, 0)
-__commit_id__ = commit_id = 'g400fe8430'
+__commit_id__ = commit_id = 'gf919ae5e3'

{dls_dodal-1.66.0 → dls_dodal-1.68.0}/src/dodal/beamlines/b07.py RENAMED Viewed

@@ -3,7 +3,7 @@ from dodal.common.beamlines.beamline_utils import (
 )
 from dodal.common.beamlines.beamline_utils import set_beamline as set_utils_beamline
 from dodal.devices.b07 import Grating, LensMode, PsuMode
-from dodal.devices.electron_analyser import EnergySource
+from dodal.devices.electron_analyser.base import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron

{dls_dodal-1.66.0 → dls_dodal-1.68.0}/src/dodal/beamlines/b07_1.py RENAMED Viewed

@@ -6,7 +6,7 @@ from dodal.devices.b07_1 import (
     Grating,
     LensMode,
 )
-from dodal.devices.electron_analyser import EnergySource
+from dodal.devices.electron_analyser.base import EnergySource
 from dodal.devices.electron_analyser.specs import SpecsDetector
 from dodal.devices.pgm import PlaneGratingMonochromator
 from dodal.devices.synchrotron import Synchrotron

dls-dodal 1.66.0__tar.gz → 1.68.0__tar.gz

dls-dodal 1.66.0tar.gz → 1.68.0tar.gz