Attributes can accept kwargs used to populate EPICS records fields

src/fastcs/attributes.py

@@ -51,19 +51,19 @@ def __init__(
         access_mode: AttrMode,
         group: str | None = None,
         handler: Any = None,
-        dropdown_mapping: dict[str, T] | None = None,
+        **kwargs: Any,
     ) -> None:
         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: str | None = group
-        self._dropdown_mapping: dict[str, T] | None = dropdown_mapping
+        self._kwargs = kwargs
 
     @property
-    def dropdown_mapping(self) -> dict[str, T] | None:
-        return self._dropdown_mapping
+    def kwargs(self) -> dict[str, T] | None:
+        return self._kwargs
 
     @property
     def datatype(self) -> DataType[T]:
@@ -91,9 +91,9 @@ def __init__(
         access_mode=AttrMode.READ,
         group: str | None = None,
         handler: Updater | None = None,
-        dropdown_mapping: dict[str, T] | None = None,
+        **kwargs: Any,
     ) -> None:
-        super().__init__(datatype, access_mode, group, handler, dropdown_mapping)  # type: ignore
+        super().__init__(datatype, access_mode, group, handler, **kwargs)  # type: ignore
         self._value: T = datatype.dtype()
         self._update_callback: AttrCallback[T] | None = None
         self._updater = handler
@@ -124,9 +124,9 @@ def __init__(
         access_mode=AttrMode.WRITE,
         group: str | None = None,
         handler: Sender | None = None,
-        dropdown_mapping: dict[str, T] | None = None,
+        **kwargs: Any,
     ) -> None:
-        super().__init__(datatype, access_mode, group, handler, dropdown_mapping)  # type: ignore
+        super().__init__(datatype, access_mode, group, handler, **kwargs)  # type: ignore
         self._process_callback: AttrCallback[T] | None = None
         self._write_display_callback: AttrCallback[T] | None = None
         self._sender = handler
@@ -164,9 +164,9 @@ def __init__(
         access_mode=AttrMode.READ_WRITE,
         group: str | None = None,
         handler: Handler | None = None,
-        dropdown_mapping: dict[str, T] | None = None,
+        **kwargs: Any,
     ) -> None:
-        super().__init__(datatype, access_mode, group, handler, dropdown_mapping)  # type: ignore
+        super().__init__(datatype, access_mode, group, handler, **kwargs)  # type: ignore
 
     async def process(self, value: T) -> None:
         await self.set(value)

src/fastcs/backends/epics/gui.py

@@ -31,6 +31,7 @@
 from fastcs.exceptions import FastCSException
 from fastcs.mapping import Mapping, SingleMapping
 from fastcs.util import snake_to_pascal
+from fastcs.backends.epics.utils import get_mbb_record_fields
 
 
 class EpicsGUIFormat(Enum):
@@ -78,13 +79,21 @@ def _get_write_widget(attribute: Attribute) -> WriteWidget:
             case Float():
                 return TextWrite()
             case Int():
-                if attribute.dropdown_mapping is None:
-                    return TextWrite()
-                return ComboBox(choices=list(attribute.dropdown_mapping.keys()))
+                if any(
+                    (True for kw in attribute.kwargs if kw in get_mbb_record_fields())
+                ):
+                    choices = [
+                        v
+                        for k, v in attribute.kwargs.items()
+                        if k in get_mbb_record_fields()
+                    ]
+                    return ComboBox(choices=choices)
+                return TextWrite()
             case String():
-                if attribute.dropdown_mapping is None:
-                    return TextWrite(format=TextFormat.string)
-                return ComboBox(choices=list(attribute.dropdown_mapping.values()))
+                allowed_values = attribute.kwargs.get("allowed_values", None)
+                if isinstance(allowed_values, list):  # is not None
+                    return ComboBox(choices=allowed_values)
+                return TextWrite(format=TextFormat.string)
             case _:
                 raise FastCSException(f"Unsupported type {type(datatype)}: {datatype}")
 

src/fastcs/backends/epics/ioc.py

@@ -11,25 +11,7 @@
 from fastcs.datatypes import Bool, Float, Int, String
 from fastcs.exceptions import FastCSException
 from fastcs.mapping import Mapping
-
-ENUM_ST_MAPPING = {
-    0: "ZRST",
-    1: "ONST",
-    2: "TWST",
-    3: "THST",
-    4: "FRST",
-    5: "FVST",
-    6: "SXST",
-    7: "SVST",
-    8: "EIST",
-    9: "NIST",
-    10: "TEST",
-    11: "ELST",
-    12: "TVST",
-    13: "TTST",
-    14: "FTST",
-    15: "FFST",
-}
+from fastcs.backends.epics.utils import get_mbb_record_fields, get_epics_record_fields
 
 
 @dataclass
@@ -39,21 +21,21 @@ class EpicsIOCOptions:
 
 def _get_input_record(pv_name: str, attribute: AttrR) -> RecordWrapper:
     datatype = attribute.datatype
+    epics_kwargs = {
+        k: v for k, v in attribute.kwargs.items() if k in get_epics_record_fields()
+    }
     match datatype:
         case Bool(znam, onam):
-            return builder.boolIn(pv_name, ZNAM=znam, ONAM=onam)
+            return builder.boolIn(pv_name, ZNAM=znam, ONAM=onam, **epics_kwargs)
         case Int():
-            if attribute.dropdown_mapping is None:
-                return builder.longIn(pv_name)
-            kwargs = {
-                ENUM_ST_MAPPING[enum_val]: enum_name
-                for enum_name, enum_val in attribute.dropdown_mapping.items()
-            }
-            return builder.mbbIn(pv_name, **kwargs)
+            # check if we need to use an mbb record
+            if any((True for kw in attribute.kwargs if kw in get_mbb_record_fields())):
+                return builder.mbbIn(pv_name, **epics_kwargs)
+            return builder.longIn(pv_name, **epics_kwargs)
         case Float(prec):
-            return builder.aIn(pv_name, PREC=prec)
+            return builder.aIn(pv_name, PREC=prec, **epics_kwargs)
         case String():
-            return builder.longStringIn(pv_name)
+            return builder.longStringIn(pv_name, **epics_kwargs)
         case _:
             raise FastCSException(f"Unsupported type {type(datatype)}: {datatype}")
 
@@ -69,6 +51,9 @@ async def async_wrapper(v):
 
 def _get_output_record(pv_name: str, attribute: AttrW, on_update: Callable) -> Any:
     datatype = attribute.datatype
+    epics_kwargs = {
+        k: v for k, v in attribute.kwargs.items() if k in get_epics_record_fields()
+    }
     match datatype:
         case Bool(znam, onam):
             return builder.boolOut(
@@ -77,24 +62,28 @@ def _get_output_record(pv_name: str, attribute: AttrW, on_update: Callable) -> A
                 ONAM=onam,
                 always_update=True,
                 on_update=on_update,
+                **epics_kwargs,
             )
         case Int():
+            # check if we need to use an mbb record
+            if any((True for kw in attribute.kwargs if kw in get_mbb_record_fields())):
+                return builder.mbbOut(
+                    pv_name, always_update=True, on_update=on_update, **epics_kwargs
+                )
+            return builder.longIn(pv_name, **epics_kwargs)
             if attribute.dropdown_mapping is None:
                 return builder.longOut(pv_name, always_update=True, on_update=on_update)
-            kwargs = {
-                ENUM_ST_MAPPING[enum_val]: enum_name
-                for enum_name, enum_val in attribute.dropdown_mapping.items()
-            }
-            return builder.mbbOut(
-                pv_name, always_update=True, on_update=on_update, **kwargs
-            )
         case Float(prec):
             return builder.aOut(
-                pv_name, always_update=True, on_update=on_update, PREC=prec
+                pv_name,
+                always_update=True,
+                on_update=on_update,
+                PREC=prec,
+                **epics_kwargs,
             )
         case String():
             return builder.longStringOut(
-                pv_name, always_update=True, on_update=on_update
+                pv_name, always_update=True, on_update=on_update, **epics_kwargs
             )
         case _:
             raise FastCSException(f"Unsupported type {type(datatype)}: {datatype}")

src/fastcs/backends/epics/utils.py

@@ -0,0 +1,42 @@
+def get_common_record_fields():
+    return [
+        "SCAN",
+        "PINI",
+        "PHAS",
+        "EVNT",
+        "PRIO",
+        "DISV",
+        "DISA",
+        "SDIS",
+        "PROC",
+        "DISS",
+        "LSET",
+        "LCNT",
+        "PACT",
+        "FLNK",
+    ]
+
+
+def get_mbb_record_fields():
+    return [
+        "ZRST",
+        "ONST",
+        "TWST",
+        "THST",
+        "FRST",
+        "FVST",
+        "SXST",
+        "SVST",
+        "EIST",
+        "NIST",
+        "TEST",
+        "ELST",
+        "TVST",
+        "TTST",
+        "FTST",
+        "FFST",
+    ]
+
+
+def get_epics_record_fields():
+    return get_common_record_fields() + get_mbb_record_fields()