Remove repeated scans while building configuration choices

src/toad/acp/agent_configuration.py

@@ -1,3 +1,3 @@
 """Typed ACP advertisements own their selection, publication and request behavior."""
 from __future__ import annotations
 
@@ -16,8 +16,9 @@
 from formbridge.forms.declared_fields import DeclaredMetadata
 from metaclass_registry.mro_dispatch import MroDispatch, handles
 from objectstate import ObjectState
-from python_introspect import AnnotationChoices, FieldLabel
+from python_introspect import FieldLabel
 
+from python_introspect.choices import LabelledChoices
 from toad.acp.client_session import ClientSessionRequest
 from toad.core.configuration_events import ChangeConfiguration, ChangeModel
 from toad.core.events import ConfigurationChanged
@@ -116,12 +117,9 @@
 
 
 @dataclass(frozen=True)
-class AdvertisedChoices(AdvertisedSetting, AnnotationChoices, DeclaredMetadata):
-    def choices(self) -> tuple[object, ...]:
-        return tuple(choice.value for choice in self.setting.choices)
-
-    def label(self, value: object) -> str:
-        return next(choice.name for choice in self.setting.choices if choice.value == value)
+class AdvertisedChoices(AdvertisedSetting, LabelledChoices, DeclaredMetadata):
+    def labelled_choices(self) -> tuple[tuple[str, object], ...]:
+        return tuple((choice.name, choice.value) for choice in self.setting.choices)
 
     def declares(self):
         yield from type(self.setting).__mro__[:-1]

src/toad/forms/editors.py

@@ -286,7 +286,7 @@ def choices(self) -> AnnotationChoices:
         return choices
 
     def options(self) -> Iterable[tuple[str, object]]:
-        return ((self.choices.label(choice), choice) for choice in self.choices.choices())
+        return self.choices.labelled_choices()
 
 
 class EnumEditor(SelectEditor, shows=(Enum,)):