Updated FastCS to 0.9.0 and fixed enum issue

Author: LuisFSegalla

src/fastcs_pandablocks/__init__.py

@@ -3,8 +3,8 @@
 from pathlib import Path
 
 from fastcs import FastCS
-from fastcs.launch import EpicsPVAOptions
 from fastcs.transport import EpicsGUIOptions, EpicsIOCOptions
+from fastcs.transport.epics.pva.options import EpicsPVAOptions
 
 from . import panda, types
 from ._version import __version__
@@ -19,7 +19,7 @@ def ioc(
     screens_directory: Path | None = None,
     poll_period: float = DEFAULT_POLL_PERIOD,
 ):
-    p4p_ioc_options = EpicsPVAOptions(ioc=EpicsIOCOptions(pv_prefix=pv_prefix))
+    p4p_ioc_options = EpicsPVAOptions(pva_ioc=EpicsIOCOptions(pv_prefix=pv_prefix))
     if screens_directory:
         if not screens_directory.is_dir():
             raise ValueError(

src/fastcs_pandablocks/panda/blocks/blocks.py

@@ -26,7 +26,7 @@
 
 from fastcs_pandablocks.panda.client_wrapper import RawPanda
 from fastcs_pandablocks.panda.handlers import (
-    ArmHandler,
+    ArmSender,
     BitGroupOnUpdate,
     CaptureHandler,
     DefaultFieldHandler,
@@ -133,9 +133,9 @@ async def _add_pcap_arm(self):
         pcap_block.add_attribute(
             pcap_name + PandaName(field="Arm"),
             AttrRW(
-                Enum(ArmHandler.ArmCommand),
+                Enum(ArmSender.ArmCommand),
                 description="Arm/Disarm the PandA.",
-                handler=ArmHandler(self._raw_panda.arm, self._raw_panda.disarm),
+                handler=ArmSender(self._raw_panda.arm, self._raw_panda.disarm),
                 group=WidgetGroup.CAPTURE.value,
             ),
         )
@@ -512,7 +512,9 @@ async def updated_scaled_on_offset_change(*_):
             handler=CaptureHandler(
                 capture_panda_name, self._raw_panda.put_value_to_panda
             ),
-            initial_value=capture_enum.members[int(initial_values[panda_name])],
+            initial_value=capture_enum.members[
+                capture_enum.names.index(initial_values[capture_panda_name])
+            ],
         )
         parent_block.add_attribute(
             capture_panda_name,

src/fastcs_pandablocks/panda/handlers.py

@@ -1,11 +1,15 @@
 import asyncio
 import enum
-import logging
 from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
 from typing import Any
 
-from fastcs.attributes import AttrR, AttrRW, AttrW, Handler, Sender, Updater
+from fastcs.attributes import (
+    AttrHandlerR,
+    AttrHandlerRW,
+    AttrHandlerW,
+    AttrRW,
+)
 from fastcs.datatypes import Bool, DataType, Enum, Float, Int, String, T
 
 from fastcs_pandablocks.types import PandaName
@@ -47,7 +51,7 @@ def attribute_value_to_panda_value(fastcs_datatype: DataType[T], value: T) -> st
             raise NotImplementedError(f"Unknown datatype {fastcs_datatype}")
 
 
-class DefaultFieldSender(Sender):
+class DefaultFieldSender(AttrHandlerW):
     """Default sender for sending introspected attributes."""
 
     def __init__(
@@ -60,11 +64,8 @@ def __init__(
         self.panda_name = panda_name
         self.put_value_to_panda = put_value_to_panda
 
-    async def put(self, controller: Any, attr: AttrW[T], value: T) -> None:
-        await self.put_value_to_panda(self.panda_name, attr.datatype, value)
 
-
-class DefaultFieldUpdater(Updater):
+class DefaultFieldUpdater(AttrHandlerR):
     """Default updater for updating introspected attributes."""
 
     #: We update the fields from the top level
@@ -73,11 +74,8 @@ class DefaultFieldUpdater(Updater):
     def __init__(self, panda_name: PandaName):
         self.panda_name = panda_name
 
-    async def update(self, controller: Any, attr: AttrR) -> None:
-        pass  # TODO: update the attr with the value from the panda
-
 
-class DefaultFieldHandler(DefaultFieldSender, DefaultFieldUpdater, Handler):
+class DefaultFieldHandler(DefaultFieldSender, DefaultFieldUpdater, AttrHandlerRW):
     """Default handler for sending and updating introspected attributes."""
 
     def __init__(
@@ -90,20 +88,12 @@ def __init__(
         super().__init__(panda_name, put_value_to_panda)
 
 
-class TableFieldHandler(Handler):
+class TableFieldHandler(AttrHandlerRW):
     """A handler for updating Table valued attributes."""
 
     def __init__(self, panda_name: PandaName):
         self.panda_name = panda_name
 
-    async def update(self, controller: Any, attr: AttrR) -> None:
-        # TODO: Convert to panda value
-        ...
-
-    async def put(self, controller: Any, attr: AttrW, value: Any) -> None:
-        # TODO: Convert to attribtue value
-        ...
-
 
 class CaptureHandler(DefaultFieldHandler):
     """A handler for capture attributes. Not currently used."""
@@ -143,7 +133,7 @@ async def __call__(self, value: Any):
         )
 
 
-class ArmHandler(Handler):
+class ArmSender(AttrHandlerW):
     """A sender for arming and disarming the Pcap."""
 
     class ArmCommand(enum.Enum):
@@ -157,16 +147,3 @@ def __init__(
     ):
         self.arm = arm
         self.disarm = disarm
-
-    async def put(
-        self, controller: Any, attr: AttrW[ArmCommand], value: ArmCommand
-    ) -> None:
-        if value is self.ArmCommand.ARM:
-            logging.info("Arming PandA.")
-            await self.arm()
-        else:
-            logging.info("Disarming PandA.")
-            await self.disarm()
-
-    async def update(self, controller: Any, attr: AttrR[ArmCommand]) -> None:
-        pass