Merge pull request #113 from DiamondLightSource/sleep_timing

Fix period of scan tasks

Author: GDYendell

src/fastcs/attributes.py

@@ -69,9 +69,10 @@ def __init__(
         allowed_values: list[T] | None = None,
         description: str | None = None,
     ) -> None:
-        assert (
-            datatype.dtype in ATTRIBUTE_TYPES
-        ), f"Attr type must be one of {ATTRIBUTE_TYPES}, received type {datatype.dtype}"
+        assert datatype.dtype in ATTRIBUTE_TYPES, (
+            f"Attr type must be one of {ATTRIBUTE_TYPES}"
+            ", received type {datatype.dtype}"
+        )
         self._datatype: DataType[T] = datatype
         self._access_mode: AttrMode = access_mode
         self._group = group

src/fastcs/backend.py

@@ -83,9 +83,9 @@ def _link_attribute_sender_class(single_mapping: SingleMapping) -> None:
     for attr_name, attribute in single_mapping.attributes.items():
         match attribute:
             case AttrW(sender=Sender()):
-                assert (
-                    not attribute.has_process_callback()
-                ), f"Cannot assign both put method and Sender object to {attr_name}"
+                assert not attribute.has_process_callback(), (
+                    f"Cannot assign both put method and Sender object to {attr_name}"
+                )
 
                 callback = _create_sender_callback(attribute, single_mapping.controller)
                 attribute.set_process_callback(callback)
@@ -154,9 +154,13 @@ def _get_periodic_scan_coros(scan_dict: dict[float, list[Callable]]) -> list[Cal
 
 
 def _create_periodic_scan_coro(period, methods: list[Callable]) -> Callable:
+    async def _sleep():
+        await asyncio.sleep(period)
+
+    methods.append(_sleep)  # Create periodic behavior
+
     async def scan_coro() -> None:
         while True:
             await asyncio.gather(*[method() for method in methods])
-            await asyncio.sleep(period)
 
     return scan_coro

src/fastcs/transport/epics/util.py

@@ -36,9 +36,9 @@ def attr_is_enum(attribute: Attribute) -> bool:
 
     """
     match attribute:
-        case Attribute(
-            datatype=String(), allowed_values=allowed_values
-        ) if allowed_values is not None and len(allowed_values) <= MBB_MAX_CHOICES:
+        case Attribute(datatype=String(), allowed_values=allowed_values) if (
+            allowed_values is not None and len(allowed_values) <= MBB_MAX_CHOICES
+        ):
             return True
         case _:
             return False

tests/test_launch.py

@@ -102,7 +102,7 @@ def test_over_defined_schema():
 
 def test_version():
     impl_version = "0.0.1"
-    expected = f"SingleArg: {impl_version}\n" f"FastCS: {__version__}\n"
+    expected = f"SingleArg: {impl_version}\nFastCS: {__version__}\n"
     app = _launch(SingleArg, version=impl_version)
     result = runner.invoke(app, ["version"])
     assert result.exit_code == 0

tests/transport/epics/test_ioc.py

@@ -436,7 +436,7 @@ def test_long_pv_names_discarded(mocker: MockerFixture):
 
     assert long_name_controller.command_short_name.fastcs_method.enabled
     long_command_name = (
-        "command_with_" "reallyreallyreallyreallyreallyreallyreally_long_name"
+        "command_with_reallyreallyreallyreallyreallyreallyreally_long_name"
     )
     assert not getattr(long_name_controller, long_command_name).fastcs_method.enabled