ioc now successfully runs

Need to improve the subfield system

Author: evvaaaa

src/fastcs_pandablocks/gui.py

@@ -1,5 +1,4 @@
 from fastcs.backends.epics.gui import EpicsGUIOptions
 
 
-class PandaGUIOptions(EpicsGUIOptions):
-    ...
+class PandaGUIOptions(EpicsGUIOptions): ...

src/fastcs_pandablocks/panda/blocks.py

@@ -26,13 +26,23 @@ def __init__(
 
         for field_raw_name, field_info in raw_fields.items():
             field_panda_name = PandaName(field=field_raw_name)
-            print(field_raw_name)
 
             field = FIELD_TYPE_TO_FASTCS_TYPE[field_info.type][field_info.subtype](
-                field_panda_name, field_info.description
+                # TODO make type safe after match statment
+                field_panda_name,
+                field_info,  # type: ignore
             )
             self.fields[field_raw_name] = field
-            self.register_sub_controller(field_panda_name.attribute_name, field)
+            if field.only_contains_subfields:
+                self.register_sub_controller(field_panda_name.attribute_name, field)
+            else:
+                assert field.attribute_name, field
+                setattr(
+                    self,
+                    field_panda_name.attribute_name,
+                    getattr(field, field.attribute_name),
+                )
+
 
 class Blocks:
     _blocks: dict[str, dict[int | None, Block]]
@@ -51,11 +61,15 @@ def parse_introspected_data(
         ):
             iterator = (
                 range(1, block_info.number + 1)
-                if block_info.number > 1 else iter([None,])
+                if block_info.number > 1
+                else iter(
+                    [
+                        None,
+                    ]
+                )
             )
             self._blocks[block_name] = {
-                number:
-                Block(
+                number: Block(
                     PandaName(block=block_name, block_number=number),
                     block_info.number,
                     block_info.description,
@@ -67,23 +81,20 @@ def parse_introspected_data(
     async def update_field_value(self, panda_name: PandaName, value: str):
         assert panda_name.block
         assert panda_name.field
-        field = (
-            self._blocks[panda_name.block][panda_name.block_number].fields[panda_name.field]
-        )
+        field = self._blocks[panda_name.block][panda_name.block_number].fields[
+            panda_name.field
+        ]
         if panda_name.sub_field:
             field = field.sub_fields[panda_name.sub_field]
         await field.update_value(value)
 
-    def flattened_attribute_tree(
-        self
-    ) -> Generator[tuple[str, Block], None, None]:
+    def flattened_attribute_tree(self) -> Generator[tuple[str, Block], None, None]:
         for blocks in self._blocks.values():
             for block in blocks.values():
                 yield (block.panda_name.attribute_name, block)
 
     def __getitem__(
-        self,
-        name: EpicsName | PandaName
+        self, name: EpicsName | PandaName
     ) -> dict[int | None, Block] | Block | FieldType:
         if name.block is None:
             raise ValueError(f"Cannot find block for name {name}.")

src/fastcs_pandablocks/panda/controller.py

@@ -3,7 +3,6 @@
 from fastcs.controller import Controller
 from fastcs.wrappers import scan
 
-from fastcs_pandablocks import DEFAULT_POLL_PERIOD
 from fastcs_pandablocks.types import PandaName
 
 from .blocks import Blocks
@@ -12,16 +11,16 @@
 
 class PandaController(Controller):
     def __init__(self, hostname: str, poll_period: float) -> None:
-        super().__init__()
         self._raw_panda = RawPanda(hostname)
         self._blocks = Blocks()
+        self.is_connected = False
 
-        # TODO https://github.com/DiamondLightSource/FastCS/issues/62
-        #self.fastcs_method = Scan(self.update(), poll_period)
-
-    async def initialise(self) -> None: ...
+        super().__init__()
 
     async def connect(self) -> None:
+        if self.is_connected:
+            return
+
         await self._raw_panda.connect()
 
         assert self._raw_panda.blocks
@@ -32,7 +31,17 @@ async def connect(self) -> None:
         for attr_name, controller in self._blocks.flattened_attribute_tree():
             self.register_sub_controller(attr_name, controller)
 
-    @scan(DEFAULT_POLL_PERIOD) # TODO https://github.com/DiamondLightSource/FastCS/issues/62
+        self.is_connected = True
+
+    async def initialise(self) -> None:
+        """
+        We connect in initialise since FastCS doesn't connect until
+        it's already parsed sub controllers.
+        """
+        await self.connect()
+
+    # TODO https://github.com/DiamondLightSource/FastCS/issues/62
+    @scan(0.1)
     async def update(self):
         await self._raw_panda.get_changes()
         assert self._raw_panda.changes