WIP

Author: evvaaaa

pyproject.toml

@@ -119,3 +119,6 @@ lint.select = [
 # See https://github.com/DiamondLightSource/python-copier-template/issues/154
 # Remove this line to forbid private member access in tests
 "tests/**/*" = ["SLF001"]
+# Ruff wants us to use `(|)` instead of `Union[,]` in types, but pyright warns against
+# it. For now we'll use `Union` and turn the ruff error off.
+"**" = ["UP007"]

src/fastcs_pandablocks/__init__.py

@@ -4,7 +4,8 @@
 
 from fastcs.backends.epics.backend import EpicsBackend
 from fastcs.backends.epics.gui import EpicsGUIFormat
-from fastcs.backends.epics.ioc import EpicsIOCOptions, PvNamingConvention
+from fastcs.backends.epics.ioc import EpicsIOCOptions
+from fastcs.backends.epics.util import EpicsNameOptions, PvNamingConvention
 
 from ._version import __version__
 from .gui import PandaGUIOptions
@@ -15,17 +16,23 @@
 
 
 def ioc(
-    prefix: EpicsName,
+    epics_prefix: EpicsName,
     hostname: str,
     screens_directory: Path | None = None,
-    poll_period: float = DEFAULT_POLL_PERIOD,
     clear_bobfiles: bool = False,
+    poll_period: float = DEFAULT_POLL_PERIOD,
+    naming_convention: PvNamingConvention = PvNamingConvention.CAPITALIZED,
+    pv_separator: str = ":",
 ):
+    name_options = EpicsNameOptions(
+        pv_naming_convention=naming_convention, pv_separator=pv_separator
+    )
+    epics_ioc_options = EpicsIOCOptions(terminal=True, name_options=name_options)
+
     controller = PandaController(hostname, poll_period)
-    epics_ioc_options = EpicsIOCOptions(
-        terminal=True, pv_naming_convention=PvNamingConvention.CAPITALIZED
+    backend = EpicsBackend(
+        controller, pv_prefix=str(epics_prefix), ioc_options=epics_ioc_options
     )
-    backend = EpicsBackend(controller, pv_prefix=str(prefix), options=epics_ioc_options)
 
     if clear_bobfiles and not screens_directory:
         raise ValueError("`clear_bobfiles` is True with no `screens_directory`")

src/fastcs_pandablocks/__main__.py

@@ -4,6 +4,8 @@
 import logging
 from pathlib import Path
 
+from fastcs.backends.epics.ioc import PvNamingConvention
+
 from fastcs_pandablocks import DEFAULT_POLL_PERIOD, ioc
 from fastcs_pandablocks.types import EpicsName
 
@@ -57,7 +59,19 @@ def main():
         "--poll-period",
         default=DEFAULT_POLL_PERIOD,
         type=float,
-        help="Period to poll",
+        help="Period in seconds with which to poll the panda.",
+    )
+    run_parser.add_argument(
+        "--pv-naming-convention",
+        default=PvNamingConvention.CAPITALIZED.name,
+        choices=[choice.name for choice in PvNamingConvention],
+        help="Naming convention of the EPICS PVs.",
+    )
+    run_parser.add_argument(
+        "--pv-separator",
+        default=":",
+        type=str,
+        help="Separator to use between EPICS PV sections.",
     )
 
     parsed_args = parser.parse_args()
@@ -72,8 +86,10 @@ def main():
         EpicsName(prefix=parsed_args.prefix),
         parsed_args.hostname,
         screens_directory=Path(parsed_args.screens_dir),
-        poll_period=parsed_args.poll_period,
         clear_bobfiles=parsed_args.clear_bobfiles,
+        poll_period=parsed_args.poll_period,
+        naming_convention=PvNamingConvention(parsed_args.pv_naming_convention),
+        pv_separator=parsed_args.pv_separator,
     )
 
 

src/fastcs_pandablocks/handler.py

@@ -0,0 +1,23 @@
+from typing import Any
+
+from fastcs.attributes import AttrW, Handler, Sender
+
+from fastcs_pandablocks.types import AttrType, PandaName
+
+
+class DefaultFieldSender(Sender):
+    def __init__(self, panda_name: PandaName):
+        self.panda_name = panda_name
+
+    async def put(self, controller: Any, attr: AttrW, value: str) -> None:
+        await controller.put_value_to_panda(self.panda_name, value)
+
+
+class UpdateEguSender(Sender):
+    def __init__(self, attr_to_update: AttrType):
+        """Update the attr"""
+        self.attr_to_update = attr_to_update
+
+    async def put(self, controller: Any, attr: AttrW, value: str) -> None:
+        # TODO find out how to update attr_to_update's EGU with the value
+        ...

src/fastcs_pandablocks/handlers.py

@@ -34,11 +34,14 @@ def __init__(
                 field_info,  # type: ignore
             )
             self.fields[field_raw_name] = field
-            if field.block_attribute:
-                setattr(self, *field.block_attribute)
+
+    def initialise(self):
+        for field_name, field in self.fields.items():
+            if field.named_attribute:
+                setattr(self, *field.named_attribute)
             if field.sub_field_controller:
                 self.register_sub_controller(
-                    field_panda_name.attribute_name, field.sub_field_controller
+                    field_name, sub_controller=field.sub_field_controller
                 )
 
 
@@ -106,8 +109,8 @@ def __getitem__(
             return block
         field = block.fields[name.field]
         if not name.sub_field:
-            assert field.block_attribute
-            return field.block_attribute.attribute
+            assert field.named_attribute
+            return field.named_attribute.attribute
 
         sub_field = getattr(field.sub_field_controller, name.sub_field)
         return sub_field

src/fastcs_pandablocks/panda/blocks.py

@@ -28,18 +28,15 @@ async def connect(self) -> None:
         self._blocks.parse_introspected_data(
             self._raw_panda.blocks, self._raw_panda.fields
         )
-        for attr_name, controller in self._blocks.flattened_attribute_tree():
-            self.register_sub_controller(attr_name, controller)
-
         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()
 
+        for attr_name, controller in self._blocks.flattened_attribute_tree():
+            self.register_sub_controller(attr_name, controller)
+            controller.initialise()
+
     # TODO https://github.com/DiamondLightSource/FastCS/issues/62
     @scan(0.1)
     async def update(self):