Update to pvi 0.8.1

Update to pass PV prefix into EPICS backend so that it can
be included on Signals.

Author: GDYendell

pyproject.toml

@@ -13,7 +13,7 @@ description = "Control system agnostic framework for building Device support in
 dependencies = [
     "numpy",
     "pydantic",
-    "pvi~=0.7.1",
+    "pvi~=0.8.1",
     "softioc",
 ]
 dynamic = ["version"]

src/fastcs/backends/epics/backend.py

@@ -6,16 +6,17 @@
 
 
 class EpicsBackend:
-    def __init__(self, mapping: Mapping):
+    def __init__(self, mapping: Mapping, pv_prefix: str = "MY-DEVICE-PREFIX"):
         self._mapping = mapping
+        self._pv_prefix = pv_prefix
 
     def create_docs(self, options: EpicsDocsOptions | None = None) -> None:
         docs = EpicsDocs(self._mapping)
         docs.create_docs(options)
 
     def create_gui(self, options: EpicsGUIOptions | None = None) -> None:
-        gui = EpicsGUI(self._mapping)
+        gui = EpicsGUI(self._mapping, self._pv_prefix)
         gui.create_gui(options)
 
     def get_ioc(self) -> EpicsIOC:
-        return EpicsIOC(self._mapping)
+        return EpicsIOC(self._mapping, self._pv_prefix)

src/fastcs/backends/epics/gui.py

@@ -5,7 +5,7 @@
 from pvi._format.dls import DLSFormatter
 from pvi.device import (
     LED,
-    CheckBox,
+    ButtonPanel,
     Component,
     Device,
     Grid,
@@ -19,6 +19,7 @@
     TextFormat,
     TextRead,
     TextWrite,
+    ToggleButton,
     Tree,
     WriteWidget,
 )
@@ -42,18 +43,16 @@ class EpicsGUIOptions:
 
 
 class EpicsGUI:
-    def __init__(self, mapping: Mapping) -> None:
+    def __init__(self, mapping: Mapping, pv_prefix: str) -> None:
         self._mapping = mapping
+        self._pv_prefix = pv_prefix
 
-    @staticmethod
-    def _get_pv(attr_path: str, name: str):
+    def _get_pv(self, attr_path: str, name: str):
         if attr_path:
             attr_path = ":" + attr_path
         attr_path += ":"
 
-        pv = attr_path.upper() + name.title().replace("_", "")
-
-        return pv
+        return f"{self._pv_prefix}{attr_path.upper()}{name.title().replace('_', '')}"
 
     @staticmethod
     def _get_read_widget(datatype: DataType) -> ReadWidget:
@@ -71,43 +70,46 @@ def _get_read_widget(datatype: DataType) -> ReadWidget:
     def _get_write_widget(datatype: DataType) -> WriteWidget:
         match datatype:
             case Bool():
-                return CheckBox()
+                return ToggleButton()
             case Int() | Float():
                 return TextWrite()
             case String():
                 return TextWrite(format=TextFormat.string)
             case _:
                 raise FastCSException(f"Unsupported type {type(datatype)}: {datatype}")
 
-    @classmethod
-    def _get_attribute_component(cls, attr_path: str, name: str, attribute: Attribute):
-        pv = cls._get_pv(attr_path, name)
+    def _get_attribute_component(self, attr_path: str, name: str, attribute: Attribute):
+        pv = self._get_pv(attr_path, name)
         name = name.title().replace("_", "")
 
         match attribute:
             case AttrRW():
-                read_widget = cls._get_read_widget(attribute.datatype)
-                write_widget = cls._get_write_widget(attribute.datatype)
+                read_widget = self._get_read_widget(attribute.datatype)
+                write_widget = self._get_write_widget(attribute.datatype)
                 return SignalRW(
                     name=name,
-                    pv=pv,
-                    widget=write_widget,
+                    write_pv=pv,
+                    write_widget=write_widget,
                     read_pv=pv + "_RBV",
                     read_widget=read_widget,
                 )
             case AttrR():
-                read_widget = cls._get_read_widget(attribute.datatype)
-                return SignalR(name=name, pv=pv, widget=read_widget)
+                read_widget = self._get_read_widget(attribute.datatype)
+                return SignalR(name=name, read_pv=pv, read_widget=read_widget)
             case AttrW():
-                write_widget = cls._get_write_widget(attribute.datatype)
-                return SignalW(name=name, pv=pv, widget=TextWrite())
+                write_widget = self._get_write_widget(attribute.datatype)
+                return SignalW(name=name, write_pv=pv, write_widget=TextWrite())
 
-    @classmethod
-    def _get_command_component(cls, attr_path: str, name: str):
-        pv = cls._get_pv(attr_path, name)
+    def _get_command_component(self, attr_path: str, name: str):
+        pv = self._get_pv(attr_path, name)
         name = name.title().replace("_", "")
 
-        return SignalX(name=name, pv=pv, value="1")
+        return SignalX(
+            name=name,
+            write_pv=pv,
+            value="1",
+            write_widget=ButtonPanel(actions={name: "1"}),
+        )
 
     def create_gui(self, options: EpicsGUIOptions | None = None) -> None:
         if options is None:
@@ -136,7 +138,7 @@ def create_gui(self, options: EpicsGUIOptions | None = None) -> None:
 
         device = Device(label="Simple Device", children=components)
 
-        formatter.format(device, "MY-DEVICE-PREFIX", options.output_path)
+        formatter.format(device, options.output_path)
 
     def extract_mapping_components(self, mapping: SingleMapping) -> list[Component]:
         components: Tree[Component] = []

src/fastcs/backends/epics/ioc.py

@@ -113,8 +113,9 @@ def _create_and_link_command_pvs(mapping: Mapping) -> None:
 
 
 class EpicsIOC:
-    def __init__(self, mapping: Mapping):
+    def __init__(self, mapping: Mapping, pv_prefix: str):
         self._mapping = mapping
+        self._pv_prefix = pv_prefix
 
     def run(self, options: EpicsIOCOptions | None = None) -> None:
         if options is None:
@@ -125,7 +126,7 @@ def run(self, options: EpicsIOCOptions | None = None) -> None:
         backend = Backend(self._mapping, dispatcher.loop)
 
         # Set the record prefix
-        builder.SetDeviceName("MY-DEVICE-PREFIX")
+        builder.SetDeviceName(self._pv_prefix)
 
         _create_and_link_attribute_pvs(self._mapping)