cleaned up after rebase

src/ophyd_async/core/soft_signal_backend.py

@@ -90,7 +90,7 @@ def __init__(self, datatype: Union[RuntimeEnum, Enum]):  # type: ignore
         if issubclass(datatype, Enum):
             self.choices = tuple(v.value for v in datatype)
         else:
-            self.choices = datatype.choices
+            self.choices = tuple(datatype.choices)
 
     def write_value(self, value: Union[Enum, str]) -> str:
         if isinstance(value, Enum):
@@ -99,12 +99,11 @@ def write_value(self, value: Union[Enum, str]) -> str:
             return value
 
     def get_datakey(self, source: str, value, **metadata) -> DataKey:
-        choices = [e.value for e in self.enum_class]
         return {
             "source": source,
             "dtype": "string",
             "shape": [],
-            "choices": choices,
+            "choices": self.choices,
             **metadata,
         }
 

src/ophyd_async/epics/_backend/common.py

@@ -1,6 +1,8 @@
 from enum import Enum
 from typing import Dict, Optional, Tuple, Type, TypedDict
 
+from ophyd_async.core.signal_backend import RuntimeEnum
+
 common_meta = {
     "units",
     "precision",
@@ -24,7 +26,6 @@ class Limits(TypedDict):
     def __bool__(self) -> bool:
         return any(self.alarm, self.control, self.display, self.warning)
 
-from ophyd_async.core.signal_backend import RuntimeEnum
 
 
 def get_supported_values(

tests/epics/test_signals.py

@@ -19,7 +19,7 @@
 from aioca import CANothing, purge_channel_caches
 from bluesky.protocols import DataKey, Reading
 
-from ophyd_async.core import SignalBackend, T, get_dtype, load_from_yaml, save_to_yaml
+from ophyd_async.core import SignalBackend, T, load_from_yaml, save_to_yaml
 from ophyd_async.core.signal_backend import RuntimeEnum
 from ophyd_async.core.utils import NotConnected
 from ophyd_async.epics._backend.common import LimitPair, Limits
@@ -245,7 +245,10 @@ def get_dtype(suffix: str) -> str:
 
     d = {"dtype": dtype, "shape": [len(value)] if dtype == "array" else []}
     if get_internal_dtype(suffix) == "enum":
-        d["choices"] = [e.value for e in type(value)]
+        if issubclass(type(value), Enum):
+            d["choices"] = [e.value for e in type(value)]
+        else:
+            d["choices"] = list(value.choices)
 
     d.update(_metadata[protocol].get(get_internal_dtype(suffix), {}))
 
@@ -264,7 +267,6 @@ def get_dtype(suffix: str) -> str:
         (float, "float", 3.141, 43.5, {"ca", "pva"}),
         (str, "str", "hello", "goodbye", {"ca", "pva"}),
         (MyEnum, "enum", MyEnum.b, MyEnum.c, {"ca", "pva"}),
-        (RuntimeEnum["Aaa", "Bbb"], "enum", "Bbb", "Ccc", {"ca", "pva"}),
         # numpy arrays of numpy types
         (
             npt.NDArray[np.int8],