Split epics make record

src/fastcs/transports/epics/ca/ioc.py

@@ -7,14 +7,15 @@
 from softioc.pythonSoftIoc import RecordWrapper
 
 from fastcs.attributes import AttrR, AttrRW, AttrW
-from fastcs.datatypes import DataType, DType_T
+from fastcs.datatypes import Bool, DataType, DType_T, Enum, Float, Int, String, Waveform
+from fastcs.exceptions import FastCSError
 from fastcs.logging import bind_logger
 from fastcs.methods import Command
 from fastcs.tracer import Tracer
 from fastcs.transports.controller_api import ControllerAPI
 from fastcs.transports.epics import EpicsIOCOptions
 from fastcs.transports.epics.ca.util import (
-    builder_callable_from_attribute,
+    MBB_MAX_CHOICES,
     cast_from_epics_type,
     cast_to_epics_type,
     record_metadata_from_attribute,
@@ -177,36 +178,124 @@ async def async_record_set(value: DType_T):
 
         record.set(cast_to_epics_type(attribute.datatype, value))
 
-    record = _make_record(pv, attribute)
+    record = _make_in_record(pv, attribute)
     _add_attr_pvi_info(record, pv_prefix, attr_name, "r")
 
     attribute.add_on_update_callback(async_record_set)
 
 
-def _make_record(
+def _make_in_record(
     pv: str,
     attribute: AttrR | AttrW | AttrRW,
-    on_update: Callable | None = None,
-    out_record: bool = False,
 ) -> RecordWrapper:
-    builder_callable = builder_callable_from_attribute(attribute, on_update is None)
+    datatype_record_metadata = record_metadata_from_datatype(attribute.datatype)
+    attribute_record_metadata = record_metadata_from_attribute(attribute)
+
+    match attribute.datatype:
+        case Bool():
+            record = builder.boolIn(
+                pv, **datatype_record_metadata, **attribute_record_metadata
+            )
+        case Int():
+            record = builder.longIn(
+                pv, **datatype_record_metadata, **attribute_record_metadata
+            )
+        case Float():
+            record = builder.aIn(
+                pv, **datatype_record_metadata, **attribute_record_metadata
+            )
+        case String():
+            record = builder.longStringIn(
+                pv, **datatype_record_metadata, **attribute_record_metadata
+            )
+        case Enum():
+            if len(attribute.datatype.members) > MBB_MAX_CHOICES:
+                record = builder.longStringIn(
+                    pv,
+                    **datatype_record_metadata,
+                    **attribute_record_metadata,
+                )
+            else:
+                record = builder.mbbIn(
+                    pv,
+                    **datatype_record_metadata,
+                    **attribute_record_metadata,
+                )
+        case Waveform():
+            record = builder.WaveformIn(
+                pv, **datatype_record_metadata, **attribute_record_metadata
+            )
+        case _:
+            raise FastCSError(
+                f"EPICS unsupported datatype on {attribute}: {attribute.datatype}"
+            )
+
+    def datatype_updater(datatype: DataType):
+        for name, value in record_metadata_from_datatype(datatype).items():
+            record.set_field(name, value)
+
+    attribute.add_update_datatype_callback(datatype_updater)
+    return record
+
+
+def _make_out_record(
+    pv: str,
+    attribute: AttrR | AttrW | AttrRW,
+    on_update: Callable,
+) -> RecordWrapper:
     datatype_record_metadata = record_metadata_from_datatype(
-        attribute.datatype, out_record
+        attribute.datatype, out_record=True
     )
     attribute_record_metadata = record_metadata_from_attribute(attribute)
 
-    update = (
-        {"on_update": on_update, "always_update": True, "blocking": True}
-        if on_update
-        else {}
-    )
+    update = {"on_update": on_update, "always_update": True, "blocking": True}
+
+    match attribute.datatype:
+        case Bool():
+            record = builder.boolOut(
+                pv, **update, **datatype_record_metadata, **attribute_record_metadata
+            )
+        case Int():
+            record = builder.longOut(
+                pv, **update, **datatype_record_metadata, **attribute_record_metadata
+            )
+        case Float():
+            record = builder.aOut(
+                pv, **update, **datatype_record_metadata, **attribute_record_metadata
+            )
+        case String():
+            record = builder.longStringOut(
+                pv, **update, **datatype_record_metadata, **attribute_record_metadata
+            )
+        case Enum():
+            if len(attribute.datatype.members) > MBB_MAX_CHOICES:
+                record = builder.longStringOut(
+                    pv,
+                    **update,
+                    **datatype_record_metadata,
+                    **attribute_record_metadata,
+                )
 
-    record = builder_callable(
-        pv, **update, **datatype_record_metadata, **attribute_record_metadata
-    )
+            else:
+                record = builder.mbbOut(
+                    pv,
+                    **update,
+                    **datatype_record_metadata,
+                    **attribute_record_metadata,
+                )
+        case Waveform():
+            record = builder.WaveformOut(
+                pv, **update, **datatype_record_metadata, **attribute_record_metadata
+            )
+        case _:
+            raise FastCSError(
+                f"EPICS unsupported datatype on {attribute}: {attribute.datatype}"
+            )
 
     def datatype_updater(datatype: DataType):
-        for name, value in record_metadata_from_datatype(datatype, out_record).items():
+        for name, value in record_metadata_from_datatype(
+            datatype, out_record=True
+        ).items():
             record.set_field(name, value)
 
     attribute.add_update_datatype_callback(datatype_updater)
@@ -230,7 +319,7 @@ async def set_setpoint_without_process(value: DType_T):
 
         record.set(cast_to_epics_type(attribute.datatype, value), process=False)
 
-    record = _make_record(pv, attribute, on_update=on_update, out_record=True)
+    record = _make_out_record(pv, attribute, on_update=on_update)
 
     _add_attr_pvi_info(record, pv_prefix, attr_name, "w")
 

src/fastcs/transports/epics/ca/util.py

@@ -2,12 +2,9 @@
 from dataclasses import asdict
 from typing import Any
 
-from softioc import builder
-
-from fastcs.attributes import Attribute, AttrR, AttrRW, AttrW
+from fastcs.attributes import Attribute, AttrR, AttrW
 from fastcs.datatypes import Bool, DType_T, Enum, Float, Int, String, Waveform
 from fastcs.datatypes.datatype import DataType
-from fastcs.exceptions import FastCSError
 
 _MBB_FIELD_PREFIXES = (
     "ZR",
@@ -154,29 +151,3 @@ def cast_to_epics_type(datatype: DataType[DType_T], value: DType_T) -> Any:
             return value
         case _:
             raise ValueError(f"Unsupported datatype {datatype}")
-
-
-def builder_callable_from_attribute(
-    attribute: AttrR | AttrW | AttrRW, make_in_record: bool
-):
-    """Returns a callable to make the softioc record from an attribute instance."""
-    match attribute.datatype:
-        case Bool():
-            return builder.boolIn if make_in_record else builder.boolOut
-        case Int():
-            return builder.longIn if make_in_record else builder.longOut
-        case Float():
-            return builder.aIn if make_in_record else builder.aOut
-        case String():
-            return builder.longStringIn if make_in_record else builder.longStringOut
-        case Enum():
-            if len(attribute.datatype.members) > MBB_MAX_CHOICES:
-                return builder.longStringIn if make_in_record else builder.longStringOut
-            else:
-                return builder.mbbIn if make_in_record else builder.mbbOut
-        case Waveform():
-            return builder.WaveformIn if make_in_record else builder.WaveformOut
-        case _:
-            raise FastCSError(
-                f"EPICS unsupported datatype on {attribute}: {attribute.datatype}"
-            )

tests/transports/epics/ca/test_ca_util.py

@@ -1,12 +1,9 @@
 import enum
 
 import pytest
-from softioc import builder
 
-from fastcs.attributes import AttrRW
 from fastcs.datatypes import Bool, Enum, Float, Int, String
 from fastcs.transports.epics.ca.util import (
-    builder_callable_from_attribute,
     cast_from_epics_type,
     cast_to_epics_type,
     record_metadata_from_datatype,
@@ -137,21 +134,6 @@ def test_cast_from_epics_validations(datatype, input):
         cast_from_epics_type(datatype, input)
 
 
-@pytest.mark.parametrize(
-    "datatype,in_record,out_record",
-    [
-        (Enum(ShortEnum), builder.mbbIn, builder.mbbOut),
-        # long enums use string even if all values are ints
-        (Enum(LongEnum), builder.longStringIn, builder.longStringOut),
-        (Enum(LongMixedEnum), builder.longStringIn, builder.longStringOut),
-    ],
-)
-def test_builder_callable_enum_types(datatype, in_record, out_record):
-    attr = AttrRW(datatype)
-    assert builder_callable_from_attribute(attr, False) == out_record
-    assert builder_callable_from_attribute(attr, True) == in_record
-
-
 def test_drive_metadata_from_datatype():
     dtype = Float(units="mm", min=-10.0, max=10.0, min_alarm=-5, max_alarm=5, prec=3)
     out_arguments = record_metadata_from_datatype(dtype, True)

tests/transports/epics/ca/test_initial_value.py

@@ -59,16 +59,18 @@ async def test_initial_values_set_in_ca(mocker):
         loop,
     )
 
-    record_spy = mocker.spy(ca_ioc, "_make_record")
+    record_spy = mocker.spy(ca_ioc, "_make_in_record")
+    record_spy_out = mocker.spy(ca_ioc, "_make_out_record")
 
     task = asyncio.create_task(fastcs.serve(interactive=False))
     try:
         async with asyncio.timeout(3):
-            while not record_spy.spy_return_list:
+            while not record_spy.spy_return_list or not record_spy_out.spy_return_list:
                 await asyncio.sleep(0)
 
         initial_values = {
-            wrapper.name: wrapper.get() for wrapper in record_spy.spy_return_list
+            wrapper.name: wrapper.get()
+            for wrapper in record_spy.spy_return_list + record_spy_out.spy_return_list
         }
         for name, value in {
             "SOFTIOC_INITIAL_DEVICE:Bool": 1,