added EGU options to Attributes in Int and Float

Author: evvaaaa

src/fastcs/backends/epics/ioc.py

@@ -187,9 +187,11 @@ def _get_input_record(pv: str, attribute: AttrR) -> RecordWrapper:
         case Bool(znam, onam):
             return builder.boolIn(pv, ZNAM=znam, ONAM=onam, **attribute_fields)
         case Int():
-            return builder.longIn(pv, **attribute_fields)
+            return builder.longIn(pv, EGU=attribute.datatype.units, **attribute_fields)
         case Float(prec):
-            return builder.aIn(pv, PREC=prec, **attribute_fields)
+            return builder.aIn(
+                pv, EGU=attribute.datatype.units, PREC=prec, **attribute_fields
+            )
         case String():
             return builder.longStringIn(pv, **attribute_fields)
         case _:
@@ -236,7 +238,13 @@ def _get_output_record(pv: str, attribute: AttrW, on_update: Callable) -> Any:
             isinstance(v, str) for v in attribute.allowed_values
         )
         state_keys = dict(zip(MBB_STATE_FIELDS, attribute.allowed_values, strict=False))
-        return builder.mbbOut(pv, always_update=True, on_update=on_update, **state_keys, **attribute_fields)
+        return builder.mbbOut(
+            pv,
+            always_update=True,
+            on_update=on_update,
+            **state_keys,
+            **attribute_fields,
+        )
 
     match attribute.datatype:
         case Bool(znam, onam):
@@ -247,12 +255,27 @@ def _get_output_record(pv: str, attribute: AttrW, on_update: Callable) -> Any:
                 always_update=True,
                 on_update=on_update,
             )
-        case Int():
-            return builder.longOut(pv, always_update=True, on_update=on_update, **attribute_fields)
-        case Float(prec):
-            return builder.aOut(pv, always_update=True, on_update=on_update, PREC=prec, **attribute_fields)
+        case Int(units=units):
+            return builder.longOut(
+                pv,
+                always_update=True,
+                on_update=on_update,
+                EGU=units,
+                **attribute_fields,
+            )
+        case Float(prec=prec, units=units):
+            return builder.aOut(
+                pv,
+                always_update=True,
+                on_update=on_update,
+                EGU=units,
+                PREC=prec,
+                **attribute_fields,
+            )
         case String():
-            return builder.longStringOut(pv, always_update=True, on_update=on_update, **attribute_fields)
+            return builder.longStringOut(
+                pv, always_update=True, on_update=on_update, **attribute_fields
+            )
         case _:
             raise FastCSException(
                 f"Unsupported type {type(attribute.datatype)}: {attribute.datatype}"

src/fastcs/datatypes.py

@@ -25,6 +25,8 @@ def dtype(self) -> type[T]:  # Using property due to lack of Generic ClassVars
 class Int(DataType[int]):
     """`DataType` mapping to builtin ``int``."""
 
+    units: str | None = None
+
     @property
     def dtype(self) -> type[int]:
         return int
@@ -35,6 +37,7 @@ class Float(DataType[float]):
     """`DataType` mapping to builtin ``float``."""
 
     prec: int = 2
+    units: str | None = None
 
     @property
     def dtype(self) -> type[float]:

tests/backends/epics/test_ioc.py

@@ -222,15 +222,21 @@ def test_ioc(mocker: MockerFixture, mapping: Mapping):
 
     # Check records are created
     builder.boolIn.assert_called_once_with(f"{DEVICE}:ReadBool", ZNAM="OFF", ONAM="ON")
-    builder.longIn.assert_any_call(f"{DEVICE}:ReadInt")
-    builder.aIn.assert_called_once_with(f"{DEVICE}:ReadWriteFloat_RBV", PREC=2)
+    builder.longIn.assert_any_call(f"{DEVICE}:ReadInt", EGU=None)
+    builder.aIn.assert_called_once_with(
+        f"{DEVICE}:ReadWriteFloat_RBV", PREC=2, EGU=None
+    )
     builder.aOut.assert_any_call(
-        f"{DEVICE}:ReadWriteFloat", always_update=True, on_update=mocker.ANY, PREC=2
+        f"{DEVICE}:ReadWriteFloat",
+        always_update=True,
+        on_update=mocker.ANY,
+        PREC=2,
+        EGU=None,
     )
-    builder.longIn.assert_any_call(f"{DEVICE}:BigEnum")
-    builder.longIn.assert_any_call(f"{DEVICE}:ReadWriteInt_RBV")
+    builder.longIn.assert_any_call(f"{DEVICE}:BigEnum", EGU=None)
+    builder.longIn.assert_any_call(f"{DEVICE}:ReadWriteInt_RBV", EGU=None)
     builder.longOut.assert_called_with(
-        f"{DEVICE}:ReadWriteInt", always_update=True, on_update=mocker.ANY
+        f"{DEVICE}:ReadWriteInt", always_update=True, on_update=mocker.ANY, EGU=None
     )
     builder.mbbIn.assert_called_once_with(
         f"{DEVICE}:StringEnum_RBV", ZRST="red", ONST="green", TWST="blue"
@@ -390,10 +396,9 @@ def test_long_pv_names_discarded(mocker: MockerFixture):
         f"{DEVICE}:{short_pv_name}",
         always_update=True,
         on_update=mocker.ANY,
+        EGU=None,
     )
-    builder.longIn.assert_called_once_with(
-        f"{DEVICE}:{short_pv_name}_RBV",
-    )
+    builder.longIn.assert_called_once_with(f"{DEVICE}:{short_pv_name}_RBV", EGU=None)
 
     long_pv_name = long_attr_name.title().replace("_", "")
     with pytest.raises(AssertionError):