added two util function for converting select options and values

Author: jdoiro3

nicegui/element_filter.py

@@ -14,7 +14,6 @@
 from .elements.mixins.source_element import SourceElement
 from .elements.mixins.text_element import TextElement
 from .elements.notification import Notification
-from .elements.select import Select
 from .elements.tree import Tree
 
 T = TypeVar('T', bound=Element)

nicegui/elements/choice_element.py

@@ -10,7 +10,7 @@
 
 JsonPrimitive = Union[str, int, float, bool, None]
 JsonValue = Union[
-    JsonPrimitive, 
+    JsonPrimitive,
     list[str], list[int], list[float], list[bool], 'list[JsonValue]',
     tuple[str, ...], tuple[int, ...], tuple[float, ...], tuple[bool, ...], 'tuple[JsonValue, ...]',
     dict[str, str], dict[str, int], dict[str, float], dict[str, bool], 'dict[str, JsonValue]',

nicegui/elements/radio.py

@@ -1,8 +1,8 @@
 from collections.abc import Iterable
-from typing import Any, Optional, Generic, Union, overload
+from typing import Any, Generic, Optional, Union, overload
 
 from ..events import GenericEventArguments, Handler, ValueChangeEventArguments
-from .choice_element import ChoiceElement, Option, L, P, to_option
+from .choice_element import ChoiceElement, L, Option, P, to_option
 from .mixins.disableable_element import DisableableElement
 
 
@@ -31,7 +31,7 @@ def _event_args_to_value(self, e: GenericEventArguments[Optional[P]]) -> Any:
 
     def _value_to_model_value(self, value: Optional[P]) -> Optional[P]:
         return value if value in self._values else None
-    
+
 
 @overload
 def radio(

nicegui/elements/select.py

@@ -13,6 +13,20 @@
 V = TypeVar('V', bound='Union[tuple[Option[Any, Any], ...], Optional[Option[Any, Any]]]')
 
 
+def _convert_value(value: Union[tuple[T, ...], Optional[T], tuple[P, ...], Optional[P], Optional[Option[P, P]], tuple[Option[P, P], ...]]):
+    if isinstance(value, tuple) and all(isinstance(v, (str, int, float, bool)) for v in value):
+        return tuple(to_option(v) for v in value)
+    if isinstance(value, (str, int, float, bool)):
+        return to_option(value)
+    return value
+
+
+def _convert_options( options: Union[Iterable[T], Iterable[P]]):
+    if all(isinstance(v, (str, int, float, bool)) for v in options):
+        return [to_option(v) for v in options]
+    return options
+
+
 class Select(
     LabelElement,
     ValidationElement[V],
@@ -73,14 +87,7 @@ def __init__(self,
         self.new_value_to_option: Optional[Callable[[str], Optional[T]]] = new_value_to_option
         if self.new_value_mode and self.new_value_to_option is None:
             raise ValueError(f"new_value_to_option not passed. You must provide a function for handling new values when new value mode is '{self.new_value_mode}'.")
-        if isinstance(value, tuple) and all(isinstance(v, (str, int, float, bool)) for v in value):
-            value = tuple(to_option(v) for v in value)
-        if isinstance(value, (str, int, float, bool)):
-            value = to_option(value)
-        if all(isinstance(v, (str, int, float, bool)) for v in options):
-            super().__init__(label=label or None, options=[to_option(v) for v in options], value=value, on_change=on_change, validation=validation)
-        else:
-            super().__init__(label=label or None, options=options, value=value, on_change=on_change, validation=validation)
+        super().__init__(label=label or None, options=_convert_options(options), value=_convert_value(value), on_change=on_change, validation=validation)
         if new_value_mode is not None:
             self._props['new-value-mode'] = new_value_mode
             with_input = True
@@ -146,6 +153,7 @@ def _handle_new_value(self, value: str) -> Optional[T]:
         self._update_values_and_labels()
         return new_option
 
+
 @overload
 def select(
     options: Iterable[T], *, label: str = ..., value: tuple[T, ...],
@@ -158,7 +166,6 @@ def select(
     ) -> Select[tuple[T, ...], T]:
     ...
 
-
 @overload
 def select(
     options: Iterable[T], *, label: str = ..., value: Literal[None] = ...,
@@ -171,7 +178,6 @@ def select(
     ) -> Select[Optional[T], T]:
     ...
 
-
 @overload
 def select(
     options: Iterable[P], *, label: str = ..., value: tuple[P, ...],

nicegui/testing/user_interaction.py

@@ -8,8 +8,8 @@
 from nicegui.element import Element
 from nicegui.elements.mixins.disableable_element import DisableableElement
 from nicegui.elements.mixins.value_element import ValueElement
-from nicegui.elements.select import Select
 from nicegui.elements.radio import Radio
+from nicegui.elements.select import Select
 
 if TYPE_CHECKING:
     from .user import User

tests/test_binding.py

@@ -38,7 +38,7 @@ class Model:
         selection: Optional[ui.option[str, tuple[int, int]]] = None
     data = Model()
     options: list[ui.option[str, tuple[int, int]]] = [
-        ui.option("1,1", (1, 1)), ui.option("2,2", (2, 2)), ui.option("3,3", (3, 3))
+        ui.option('1,1', (1, 1)), ui.option('2,2', (2, 2)), ui.option('3,3', (3, 3))
     ]
     data.selection = options[0]
 
@@ -53,14 +53,14 @@ def page():
     screen.wait(0.3)
     screen.should_contain('2,2')
     screen.should_not_contain('1,1')
-    assert data.selection == ui.option("2,2", (2, 2))
+    assert data.selection == ui.option('2,2', (2, 2))
 
 
 def test_ui_select_with_list_of_lists(screen: Screen):
     class Model:
         selection: Optional[ui.option[str, list[int]]] = None
     data = Model()
-    options = [ui.option("1,1", [1, 1]), ui.option("2,2", [2, 2]), ui.option("3,3", [3, 3])]
+    options = [ui.option('1,1', [1, 1]), ui.option('2,2', [2, 2]), ui.option('3,3', [3, 3])]
     data.selection = options[0]
 
     @ui.page('/')
@@ -74,7 +74,7 @@ def page():
     screen.wait(0.3)
     screen.should_contain('2,2')
     screen.should_not_contain('1,1')
-    assert data.selection == ui.option("2,2", [2, 2])
+    assert data.selection == ui.option('2,2', [2, 2])
 
 
 def test_binding_to_input(screen: Screen):

tests/test_radio.py

@@ -1,6 +1,6 @@
 from nicegui import ui
-from nicegui.testing import Screen, User
 from nicegui.elements.radio import Radio
+from nicegui.testing import Screen, User
 
 
 def test_radio_click(screen: Screen):