ophyd-async 0.9.0__py3-none-any.whl → 0.9.0a2__py3-none-any.whl

ophyd_async/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.9.0'
+__version__ = version = '0.9.0a2'
 __version_tuple__ = version_tuple = (0, 9, 0)

ophyd_async/core/_utils.py

@@ -34,20 +34,6 @@ class StrictEnum(str, Enum, metaclass=StrictEnumMeta):
 
 class SubsetEnumMeta(StrictEnumMeta):
     def __call__(self, value, *args, **kwargs):  # type: ignore
-        """
-        Returns given value if it is a string and not a member of the enum.
-        If the value is not a string or is an enum member, default enum behavior
-        is applied. Type checking will complain if provided arbitrary string.
-
-        Returns:
-            Union[str, SubsetEnum]: If the value is a string and not a member of the
-            enum, the string is returned as is. Otherwise, the corresponding enum
-            member is returned.
-
-        Raises:
-            ValueError: If the value is not a string and cannot be converted to an enum
-            member.
-        """
         if isinstance(value, str) and not isinstance(value, self):
             return value
         return super().__call__(value, *args, **kwargs)

ophyd_async/epics/adcore/_hdf_writer.py

@@ -46,7 +46,7 @@ class ADHDFWriter(ADWriter[NDFileHDFIO]):
         )
         self._datasets: list[HDFDataset] = []
         self._file: HDFFile | None = None
-        self._filename_template = "%s%s"
+        self._include_file_number = False
 
     async def open(self, multiplier: int = 1) -> dict[str, DataKey]:
         self._file = None
@@ -63,6 +63,11 @@ class ADHDFWriter(ADWriter[NDFileHDFIO]):
             self.fileio.xml_file_name.set(""),
         )
 
+        # By default, don't add file number to filename
+        self._filename_template = "%s%s"
+        if self._include_file_number:
+            self._filename_template += "_%6.6d"
+
         # Set common AD file plugin params, begin capturing
         await self.begin_capture()
 

ophyd_async/epics/core/_aioca.py

@@ -293,27 +293,13 @@ class CaSignalBackend(EpicsSignalBackend[SignalDatatypeT]):
             write_value = self.initial_values[self.write_pv]
         else:
             write_value = self.converter.write_value(value)
-        try:
-            await caput(
-                self.write_pv,
-                write_value,
-                datatype=self.converter.write_dbr,
-                wait=wait,
-                timeout=None,
-            )
-        except CANothing as exc:
-            # If we ran into a write error, check to see if there is a list
-            # of valid choices, and if the value we tried to write is in that list.
-            valid_choices = self.converter.metadata.get("choices")
-            if valid_choices:
-                if value not in valid_choices:
-                    msg = (
-                        f"{value} is not a valid choice for {self.write_pv}, "
-                        f"valid choices: {self.converter.metadata.get('choices')}"
-                    )
-                    raise ValueError(msg) from exc
-                raise
-            raise
+        await caput(
+            self.write_pv,
+            write_value,
+            datatype=self.converter.write_dbr,
+            wait=wait,
+            timeout=None,
+        )
 
     async def get_datakey(self, source: str) -> DataKey:
         value = await self._caget(self.read_pv, FORMAT_CTRL)

ophyd_async/epics/testing/_example_ioc.py

@@ -44,7 +44,6 @@ class EpicsTestCaDevice(EpicsDevice):
     enum: A[SignalRW[EpicsTestEnum], PvSuffix("enum")]
     enum2: A[SignalRW[EpicsTestEnum], PvSuffix("enum2")]
     subset_enum: A[SignalRW[EpicsTestSubsetEnum], PvSuffix("subset_enum")]
-    enum_str_fallback: A[SignalRW[str], PvSuffix("enum_str_fallback")]
     bool_unnamed: A[SignalRW[bool], PvSuffix("bool_unnamed")]
     partialint: A[SignalRW[int], PvSuffix("partialint")]
     lessint: A[SignalRW[int], PvSuffix("lessint")]

ophyd_async/epics/testing/test_records.db

@@ -104,14 +104,6 @@ record(mbbo, "$(device)subset_enum") {
   field(PINI, "YES")
 }
 
-record(mbbo, "$(device)enum_str_fallback") {
-  field(ZRST, "Aaa")
-  field(ONST, "Bbb")
-  field(TWST, "Ccc")
-  field(VAL, "1")
-  field(PINI, "YES")
-}
-
 record(waveform, "$(device)uint8a") {
   field(NELM, "3")
   field(FTVL, "UCHAR")

{ophyd_async-0.9.0.dist-info → ophyd_async-0.9.0a2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ophyd-async
-Version: 0.9.0
+Version: 0.9.0a2
 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.9.0.dist-info → ophyd_async-0.9.0a2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 ophyd_async/__init__.py,sha256=tEfgj45lRItQ-_u8SRFPM-mpBh3gWvHXr3emhiJJG_M,225
 ophyd_async/__main__.py,sha256=n_U4O9bgm97OuboUB_9eK7eFiwy8BZSgXJ0OzbE0DqU,481
-ophyd_async/_version.py,sha256=dEuABWaRk7ju3R5JrWbpUVQ4xq7RBpvl2clGJceWAS4,411
+ophyd_async/_version.py,sha256=WoGvWoWzvgTP0yQKepGyKWmDn7k5WHXOtFan55CTGSc,413
 ophyd_async/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ophyd_async/core/__init__.py,sha256=jNna-9AJLt9ZLpkjnNpE1im8Kv_IT5t4ftjsRMrVcgI,3739
 ophyd_async/core/_detector.py,sha256=ZpoBmTmPqrOQZ8Y8zyMmsHz78VJVeAcZU7AHrdQf8lM,15241
@@ -19,7 +19,7 @@ ophyd_async/core/_signal_backend.py,sha256=LweJnF3n5cucpBX8XV20Pbh0k5pBnXhMg3GQe
 ophyd_async/core/_soft_signal_backend.py,sha256=IJp2Teu8WGRG9To6PBmkp_sVOlxh_vfLbJYkKop9zZg,5959
 ophyd_async/core/_status.py,sha256=OUKhblRQ4KU5PDsWbpvYduM7G60JMk1NqeV4eqyPtKc,5131
 ophyd_async/core/_table.py,sha256=BSlLrgYA2rAeJl5J1bdZvGDB-YFqXUIUMiAtCWcy0xw,5897
-ophyd_async/core/_utils.py,sha256=kPi8YO8_OHkCMnfn27qDCu1JrKuOXPcU5YcBC7WCXdg,10526
+ophyd_async/core/_utils.py,sha256=EIgbR5weOSBoRd75mxGZqWHx2qj8uPbIl5NuE9_mKSo,9925
 ophyd_async/core/_yaml_settings.py,sha256=nfnebGXrnLKJgzd5D9In3ZPi2hATsgrehjrR0XRHTsk,2022
 ophyd_async/epics/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ophyd_async/epics/motor.py,sha256=Sz3bxIKxxlCd8r-25eZgF81QvoetKPY0At8d4h0yi7Q,9352
@@ -37,7 +37,7 @@ ophyd_async/epics/adcore/_core_detector.py,sha256=-c5FDeMTJWniogtiyA9-8Yu67e7UgZ
 ophyd_async/epics/adcore/_core_io.py,sha256=VNlpOL7cN8hExk_cIeushgDrUwDz33gm0K4iSpNB15w,6956
 ophyd_async/epics/adcore/_core_logic.py,sha256=wevdDKYcoXiwAxchb__KjAPNtJe2g8Z6k9OzzGzP9p8,4356
 ophyd_async/epics/adcore/_core_writer.py,sha256=JuEe4INxHW5SC37orhh8Q0sbI3RUdX1kaa0f2536Gr4,8010
-ophyd_async/epics/adcore/_hdf_writer.py,sha256=tLu7MKXO7TOBLECdlV-O4IWj6w6fvzZoR6419E7iJVc,5815
+ophyd_async/epics/adcore/_hdf_writer.py,sha256=tWOgbY4a9afD5QhyhR4lfzdJm1qCPFU2UpJ-OYNRPRg,6000
 ophyd_async/epics/adcore/_jpeg_writer.py,sha256=DFv3YdqKjNq0QCb-bLBlxTaGzmHSvdU_rLB29beI46w,748
 ophyd_async/epics/adcore/_single_trigger.py,sha256=OGgZCQnicHr6IZ69nHCwzlA4YLUo3O-Zkgl6fQTZ0eg,1271
 ophyd_async/epics/adcore/_tiff_writer.py,sha256=5WXdW0thL9nv2jSMSqF-bMGQjztQZEnx3enY-nGsLiY,749
@@ -57,7 +57,7 @@ ophyd_async/epics/advimba/_vimba.py,sha256=1ccSakYY4J-5dSw8Ttzvf4HzRk0hSrpOjAgkM
 ophyd_async/epics/advimba/_vimba_controller.py,sha256=NW_QNxTTWjiGmZNZY_nNcdZlOCfgOhZ3U0GcQzAZw8g,1937
 ophyd_async/epics/advimba/_vimba_io.py,sha256=il-SZSiApx5OUQCYHUGoa0Ywu9pY01DSDvOttU15khQ,1864
 ophyd_async/epics/core/__init__.py,sha256=8NoQxEEc2Ny_L9nrD2fnGSf_2gJr1wCR1LwUeLNcIJo,588
-ophyd_async/epics/core/_aioca.py,sha256=uVLIyUFiL5abAM__eNYtik3SafQ7YJ9zQvuS43cg__4,12727
+ophyd_async/epics/core/_aioca.py,sha256=Fg2g9OUWcS2ebFt3TtLET7Yr44RRLbhpRk0t6WENyiI,12046
 ophyd_async/epics/core/_epics_connector.py,sha256=n1FlQYui8HdobPxaX3VAflrzi2UT7QCe3cFasssmVLw,1789
 ophyd_async/epics/core/_epics_device.py,sha256=kshNiKQhevsL2OZXa-r093L_sQGvGK_0J4PWVLg3Eqw,437
 ophyd_async/epics/core/_p4p.py,sha256=axxV8iKpFJl9fNEW54IkXz32ki6_IOcilwnxQFnb0Vo,16169
@@ -76,9 +76,9 @@ ophyd_async/epics/sim/_sensor.py,sha256=VMxsjLV_V3LeLqnSqIsDHVJgpu5SmASV-rlzok_l
 ophyd_async/epics/sim/mover.db,sha256=RFz0rxZue689Wh1sWTZwWeFMUrH04ttPq2u5xJH_Fp4,998
 ophyd_async/epics/sim/sensor.db,sha256=AstyG9E0R4KZBz2FZQSrV_QlrfLoU6M2cvYc15Lf548,553
 ophyd_async/epics/testing/__init__.py,sha256=aTIv4D2DYrpnGco5RQF8QuLG1SfFkIlTyM2uYEKXltA,522
-ophyd_async/epics/testing/_example_ioc.py,sha256=dv286YeoePB-AuhW6LjTIfghQUz7SHH3ZQ9gVgJOspQ,3576
+ophyd_async/epics/testing/_example_ioc.py,sha256=_crB_NVSVAwQTptU-upl3MVm0i8UsfA0QDBi9NPemoc,3505
 ophyd_async/epics/testing/_utils.py,sha256=Y5aokH545rJfu-0JDZCha91Y8p08KYiIfxDc2wnq9CQ,1599
-ophyd_async/epics/testing/test_records.db,sha256=hUD9jIzFmN6DgRDGv4-PkeJxCjRjfjvDq5GoTXMz4Zo,3492
+ophyd_async/epics/testing/test_records.db,sha256=zQ8QZ5OVMVFfLj7kSsjL7HTMcm74dzqypL0F4_6JkN8,3342
 ophyd_async/epics/testing/test_records_pva.db,sha256=NyceNGaCZXNYaXjH2VLhvKl8Z-L6dwfE_kYZKqdIcTU,4054
 ophyd_async/fastcs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ophyd_async/fastcs/core.py,sha256=MpbRLaPJwmaAuunnIV34oq1AUjT1nfv5ggtgw4I42vY,376
@@ -122,8 +122,8 @@ ophyd_async/testing/_assert.py,sha256=FvGhGVoYPul2-2ByM5U0AAdrIKc1y6gqLRK_CfYut-
 ophyd_async/testing/_mock_signal_utils.py,sha256=PABE_2Hexx5mtINuaVLASHKJEYulO-nUqiI20vE9j6s,5212
 ophyd_async/testing/_one_of_everything.py,sha256=pzj4-yM3buOKQJyUNfpMCKlg57cdALFY6hr0NDHQYZU,4160
 ophyd_async/testing/_wait_for_pending.py,sha256=YZAR48n-CW0GsPey3zFRzMJ4byDAr3HvMIoawjmTrHw,732
-ophyd_async-0.9.0.dist-info/LICENSE,sha256=pU5shZcsvWgz701EbT7yjFZ8rMvZcWgRH54CRt8ld_c,1517
-ophyd_async-0.9.0.dist-info/METADATA,sha256=Lnnb3TO75N-BVFdg4txFdhU8CelKsZPOWA0Su1o4Ty0,6751
-ophyd_async-0.9.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-ophyd_async-0.9.0.dist-info/top_level.txt,sha256=-hjorMsv5Rmjo3qrgqhjpal1N6kW5vMxZO3lD4iEaXs,12
-ophyd_async-0.9.0.dist-info/RECORD,,
+ophyd_async-0.9.0a2.dist-info/LICENSE,sha256=pU5shZcsvWgz701EbT7yjFZ8rMvZcWgRH54CRt8ld_c,1517
+ophyd_async-0.9.0a2.dist-info/METADATA,sha256=xleA5naK9np7q1T2ZXQgc3MiDFrVccBt_XTL-ReHprM,6753
+ophyd_async-0.9.0a2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+ophyd_async-0.9.0a2.dist-info/top_level.txt,sha256=-hjorMsv5Rmjo3qrgqhjpal1N6kW5vMxZO3lD4iEaXs,12
+ophyd_async-0.9.0a2.dist-info/RECORD,,