dara-components 1.21.9__py3-none-any.whl → 1.21.23__py3-none-any.whl

dara/components/common/if_cmp.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import ClassVar, List, Optional, Union
+from typing import ClassVar
 
 from pydantic import field_validator
 
@@ -24,13 +24,13 @@ from dara.core.definitions import ComponentInstance
 from dara.core.interactivity import AnyVariable, Condition, Operator
 
 
-def cast_list(value: Union[ComponentInstance, List[Union[ComponentInstance, None]]]) -> List[ComponentInstance]:
+def cast_list(value: ComponentInstance | list[ComponentInstance | None]) -> list[ComponentInstance]:
     """
     Cast the value to a list if it is not or return original list if it is.
 
     :param value: the value to cast
     """
-    return [v for v in value if v is not None] if isinstance(value, List) else [value]
+    return [v for v in value if v is not None] if isinstance(value, list) else [value]
 
 
 ConditionType = type[Condition]
@@ -66,8 +66,8 @@ class If(ModifierComponent):
     """
 
     condition: Condition
-    true_children: List[ComponentInstance]
-    false_children: List[ComponentInstance]
+    true_children: list[ComponentInstance]
+    false_children: list[ComponentInstance]
 
     Condition: ClassVar[ConditionType] = Condition
 
@@ -85,9 +85,9 @@ class If(ModifierComponent):
 
     def __init__(
         self,
-        condition: Union[Condition, AnyVariable],  # type: ignore
-        true_children: Union[ComponentInstance, List[Union[ComponentInstance, None]]],
-        false_children: Optional[Union[ComponentInstance, List[Union[ComponentInstance, None]]]] = None,
+        condition: Condition | AnyVariable,  # type: ignore
+        true_children: ComponentInstance | list[ComponentInstance | None],
+        false_children: ComponentInstance | list[ComponentInstance | None] | None = None,
     ):
         if false_children is None:
             false_children = []

dara/components/common/input.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Optional
-
 from dara.components.common.base_component import FormComponent
 from dara.core.base_definitions import Action
 from dara.core.interactivity import Variable
@@ -58,8 +56,8 @@ class Input(FormComponent):
     :param id: the key to be used if this component is within a form
     """
 
-    id: Optional[str] = None
-    placeholder: Optional[str] = None
-    type: Optional[str] = None
-    onchange: Optional[Action] = None
-    value: Optional[Variable] = None
+    id: str | None = None
+    placeholder: str | None = None
+    type: str | None = None
+    onchange: Action | None = None
+    value: Variable | None = None

dara/components/common/label.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List, Optional, Union
-
 from pydantic import field_validator
 
 from dara.components.common.base_component import ContentComponent
@@ -65,13 +63,13 @@ class Label(ContentComponent):
     :param label_width: A optional string containing the width the label should take
     """
 
-    value: Union[str, ComponentInstance]
+    value: str | ComponentInstance
     direction: Direction = Direction.VERTICAL
-    label_width: Optional[str] = None
+    label_width: str | None = None
 
     @field_validator('children')
     @classmethod
-    def validate_only_one_child(cls, children: List[ComponentInstance]) -> List[ComponentInstance]:
+    def validate_only_one_child(cls, children: list[ComponentInstance]) -> list[ComponentInstance]:
         if len(children) > 1:
             raise TypeError(
                 'More than one component was passed to the Label component. Label accepts only one child component'

dara/components/common/markdown.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Union
-
 from dara.components.common.base_component import BaseDashboardComponent
 from dara.core.interactivity import ClientVariable
 
@@ -42,8 +40,8 @@ class Markdown(BaseDashboardComponent):
     if the markdown is user-provided
     """
 
-    markdown: Union[ClientVariable, str]
+    markdown: ClientVariable | str
     html_raw: bool = False
 
-    def __init__(self, markdown: Union[ClientVariable, str], html_raw: bool = False, **kwargs):
+    def __init__(self, markdown: ClientVariable | str, html_raw: bool = False, **kwargs):
         super().__init__(markdown=markdown, html_raw=html_raw, **kwargs)

dara/components/common/overlay.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Optional
-
 from pydantic import field_validator
 
 from dara.components.common.base_component import LayoutComponent
@@ -45,7 +43,7 @@ class Overlay(LayoutComponent):
     :param position: the position of the overlay; can be top-left, top-right, bottom-left, bottom-right
     """
 
-    show: Optional[ClientVariable] = None
+    show: ClientVariable | None = None
 
     @field_validator('position')
     @classmethod

dara/components/common/progress_bar.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Optional, Union
-
 from pydantic import field_validator
 
 from dara.components.common.base_component import ContentComponent
@@ -48,9 +46,9 @@ class ProgressBar(ContentComponent):
     :param color: Optional color property for the progress bar, this should be the hex value of the color.
     """
 
-    progress: Union[int, ClientVariable]
+    progress: int | ClientVariable
     small: bool = False
-    color: Optional[str] = None
+    color: str | None = None
 
     @field_validator('progress')
     @classmethod

dara/components/common/radio_group.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Any, List, Optional, Union
+from typing import Any
 
 from pydantic import field_validator
 from typing_extensions import TypedDict
@@ -29,7 +29,7 @@ from dara.core.visual.components.types import Direction
 
 class RadioItem(TypedDict):
     value: Any
-    label: Union[str, ComponentInstance]
+    label: str | ComponentInstance
 
 
 class RadioGroup(FormComponent):
@@ -91,16 +91,16 @@ class RadioGroup(FormComponent):
     :param id: the key to be used if this component is within a form
     """
 
-    items: Union[List[RadioItem], List[str], ClientVariable]
-    value: Optional[Variable[Any]] = None
-    list_styling: Optional[bool] = False
-    onchange: Optional[Action] = None
+    items: list[RadioItem] | list[str] | ClientVariable
+    value: Variable[Any] | None = None
+    list_styling: bool | None = False
+    onchange: Action | None = None
     direction: Direction = Direction.VERTICAL
-    id: Optional[str] = None
+    id: str | None = None
 
     @field_validator('items', mode='before')
     @classmethod
-    def validate_items(cls, items: Any) -> Union[List[RadioItem], ClientVariable]:
+    def validate_items(cls, items: Any) -> list[RadioItem] | ClientVariable:
         if isinstance(items, ClientVariable):
             return items
         if len(items) == 0:

dara/components/common/select.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Any, List, Optional, Union
+from typing import Any
 
 from pydantic import ValidationInfo, field_validator
 
@@ -36,11 +36,11 @@ class ListSection(BaseModel):
     """
 
     label: str
-    items: List[Union[Item, str, dict]]
+    items: list[Item | str | dict]
 
     @field_validator('items')
     @classmethod
-    def validate_items(cls, items: Any) -> List[Item]:
+    def validate_items(cls, items: Any) -> list[Item]:
         if len(items) == 0:
             raise ValueError('Items of ListSection was empty, you must provide at least one item to the component')
         return [Item.to_item(item) for item in items]
@@ -125,18 +125,18 @@ class Select(FormComponent):
     :param value: A Variable instance recording the component's state
     """
 
-    id: Optional[str] = None
+    id: str | None = None
     multiselect: bool = False
     searchable: bool = False
-    items: Union[List[Union[Item, ListSection]], ClientVariable]
+    items: list[Item | ListSection] | ClientVariable
     max_rows: int = 3
-    onchange: Optional[Action] = None
-    placeholder: Optional[str] = None
-    value: Optional[Variable[Any]] = None
+    onchange: Action | None = None
+    placeholder: str | None = None
+    value: Variable[Any] | None = None
 
     @field_validator('items', mode='before')
     @classmethod
-    def validate_items(cls, items: Any, info: ValidationInfo) -> Union[List[Union[Item, ListSection]], ClientVariable]:
+    def validate_items(cls, items: Any, info: ValidationInfo) -> list[Item | ListSection] | ClientVariable:
         multiselect = info.data.get('multiselect')
         searchable = info.data.get('searchable')
         if isinstance(items, ClientVariable):
@@ -156,7 +156,7 @@ class Select(FormComponent):
         return [Item.to_item(item) for item in items]
 
 
-def _parse_item(item: Any, return_listsection: bool = False) -> Union[Item, ListSection]:
+def _parse_item(item: Any, return_listsection: bool = False) -> Item | ListSection:
     """
     Converts items to Item objects for a SectionedList. Can return a ListSection for a dictionary if
     return_listsection is set to True.

dara/components/common/slider.py

@@ -16,7 +16,7 @@ limitations under the License.
 """
 
 from decimal import ROUND_FLOOR, Decimal
-from typing import Any, List, Optional, Union
+from typing import Any
 
 from pydantic import Field, ValidationInfo, field_validator
 
@@ -130,21 +130,21 @@ class Slider(FormComponent):
     :param id: the key to be used if this component is within a form
     """
 
-    domain: List[float]
-    onchange: Optional[Action] = None
-    step: Optional[float] = Field(None, validate_default=True)
+    domain: list[float]
+    onchange: Action | None = None
+    step: float | None = Field(None, validate_default=True)
     rail_from_start: bool = True
-    rail_labels: Optional[List[str]] = None
+    rail_labels: list[str] | None = None
     rail_to_end: bool = False
-    thumb_labels: Optional[List[str]] = None
-    ticks: Optional[List[Union[float, int]]] = None
-    value: Optional[Variable[Any]] = None
+    thumb_labels: list[str] | None = None
+    ticks: list[float | int] | None = None
+    value: Variable[Any] | None = None
     disable_input_alternative: bool = False
-    id: Optional[str] = None
+    id: str | None = None
 
     @field_validator('domain')
     @classmethod
-    def domain_valid(cls, v: List[float]) -> List[float]:
+    def domain_valid(cls, v: list[float]) -> list[float]:
         if len(v) != 2:
             raise ValueError(f'Domain must be a list of length two [min, max], found {v}')
 
@@ -155,7 +155,7 @@ class Slider(FormComponent):
 
     @field_validator('step')
     @classmethod
-    def step_valid(cls, v: Optional[float], info: ValidationInfo) -> Optional[float]:
+    def step_valid(cls, v: float | None, info: ValidationInfo) -> float | None:
         # domain validation must have failed, skip
         if 'domain' not in info.data:
             return v

dara/components/common/spacer.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Union
-
 from pydantic import field_validator
 
 from dara.components.common.base_component import ContentComponent
@@ -84,8 +82,8 @@ class Spacer(ContentComponent):
     """
 
     line: bool = False
-    size: Union[int, str] = '0.75rem'
-    inset: Union[int, str] = '0rem'
+    size: int | str = '0.75rem'
+    inset: int | str = '0rem'
 
     @field_validator('size', 'inset')
     @classmethod

dara/components/common/stack.py

@@ -16,7 +16,6 @@ limitations under the License.
 """
 
 import logging
-from typing import Union
 
 from dara.components.common.base_component import LayoutComponent
 from dara.core.definitions import ComponentInstance
@@ -135,11 +134,11 @@ class Stack(LayoutComponent):
     :param scroll: Whether to scroll the content of the stack, defaults to False
     """
 
-    collapsed: Union[Variable[bool], bool] = False
+    collapsed: Variable[bool] | bool = False
     direction: Direction = Direction.VERTICAL
-    hug: Union[bool, None] = False
+    hug: bool | None = False
     scroll: bool = False
 
     # Dummy init that just passes through arguments to superclass, fixes Pylance complaining about types
-    def __init__(self, *args: Union[ComponentInstance, None], **kwargs):
+    def __init__(self, *args: ComponentInstance | None, **kwargs):
         super().__init__(*args, **kwargs)

dara/components/common/switch.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Optional
-
 from dara.components.common.base_component import FormComponent
 from dara.core.base_definitions import Action
 from dara.core.interactivity import Variable
@@ -44,6 +42,6 @@ class Switch(FormComponent):
     :param id: the key to be used if this component is within a form
     """
 
-    value: Optional[Variable[bool]] = None
-    onchange: Optional[Action] = None
-    id: Optional[str] = None
+    value: Variable[bool] | None = None
+    onchange: Action | None = None
+    id: str | None = None

dara/components/common/tabbed_card.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Optional
-
 from dara.components.common.base_component import LayoutComponent
 from dara.core.interactivity import ClientVariable
 
@@ -63,8 +61,8 @@ class TabbedCard(LayoutComponent):
     :param selected_tab: Optional selected tab mapped to a variable so that the selected tab can be easily accessed
     """
 
-    initial_tab: Optional[str] = None
-    selected_tab: Optional[ClientVariable] = None
+    initial_tab: str | None = None
+    selected_tab: ClientVariable | None = None
 
 
 class Tab(LayoutComponent):

dara/components/common/table.py

@@ -15,8 +15,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from collections.abc import Sequence
 from enum import Enum
-from typing import Any, List, Literal, Optional, Sequence, Union
+from typing import Any, ClassVar, Literal
 
 from fastapi.encoders import jsonable_encoder
 from pandas import DataFrame
@@ -47,6 +48,9 @@ class TableFormatterType(Enum):
     THRESHOLD = 'threshold'
 
 
+TFormatterType = type[TableFormatterType]
+
+
 class TableFormatterCompareCondition(Enum):
     EQUAL = 'equal'
 
@@ -58,6 +62,9 @@ class TableFilter(Enum):
     DATETIME = 'datetime'
 
 
+TFilterType = type[TableFilter]
+
+
 class Column(BaseModel):
     """
     Internal representation of a Table column, required for serialization to work correctly
@@ -373,27 +380,24 @@ class Column(BaseModel):
     :param type: Optional prop to specify type of column, used to determine e.g. filter type. If not specified, inferred from formatters
     """
 
-    align: Optional[str] = None
+    align: str | None = None
     col_id: str
-    unique_items: Optional[List[str]] = None
-    filter: Optional[TableFilter] = None
-    formatter: Optional[dict] = None
-    label: Optional[str] = Field(default=None, validate_default=True)  # mimics always=True in pydantic v1
-    sticky: Optional[str] = None
-    tooltip: Optional[str] = None
-    width: Optional[Union[int, str]] = None
-    type: Optional[
-        Union[
-            Literal['number'],
-            Literal['string'],
-            # Generic datetime, assumes datetime64[ns]
-            Literal['datetime'],
-            # Specific datetime64 types
-            Literal['datetime64[ns]'],
-            Literal['datetime64[ms]'],
-            Literal['datetime64[s]'],
-        ]
-    ] = None
+    unique_items: list[str] | None = None
+    filter: TableFilter | None = None
+    formatter: dict | None = None
+    label: str | None = Field(default=None, validate_default=True)  # mimics always=True in pydantic v1
+    sticky: str | None = None
+    tooltip: str | None = None
+    width: int | str | None = None
+    type: (
+        Literal['number']
+        | Literal['string']
+        | Literal['datetime']
+        | Literal['datetime64[ns]']
+        | Literal['datetime64[ms]']
+        | Literal['datetime64[s]']
+        | None
+    ) = None
 
     model_config = ConfigDict(use_enum_values=True)
 
@@ -849,21 +853,21 @@ class Table(ContentComponent):
 
     model_config = ConfigDict(ser_json_timedelta='float', use_enum_values=True, arbitrary_types_allowed=True)
 
-    columns: Optional[Union[Sequence[Union[Column, dict, str]], ClientVariable]] = None
-    data: Union[AnyVariable, DataFrame, list]
+    columns: Sequence[Column | dict | str] | ClientVariable | None = None
+    data: AnyVariable | DataFrame | list
     multi_select: bool = False
     show_checkboxes: bool = True
-    onclick_row: Optional[Action] = None
-    onselect_row: Optional[Action] = None
-    selected_indices: Optional[Union[List[int], Variable]] = None
-    search_columns: Optional[List[str]] = None
+    onclick_row: Action | None = None
+    onselect_row: Action | None = None
+    selected_indices: list[int] | Variable | None = None
+    search_columns: list[str] | None = None
     searchable: bool = False
     include_index: bool = True
-    max_rows: Optional[int] = None
-    suppress_click_events_for_selection: Optional[bool] = False
+    max_rows: int | None = None
+    suppress_click_events_for_selection: bool | None = False
 
-    TableFormatterType = TableFormatterType
-    TableFilter = TableFilter
+    TableFormatterType: ClassVar[TFormatterType] = TableFormatterType
+    TableFilter: ClassVar[TFilterType] = TableFilter
 
     @field_validator('data')
     @classmethod
@@ -902,7 +906,7 @@ class Table(ContentComponent):
     def validate_columns(cls, columns):
         if columns is None:
             return None
-        if isinstance(columns, List):
+        if isinstance(columns, list):
             cols = []
             for col in columns:
                 if isinstance(col, Column):
@@ -917,9 +921,9 @@ class Table(ContentComponent):
         else:
             raise ValueError(f'Invalid list passed to Table columns: {columns}, expected a list')
 
-    def add_column(self, col: Union[str, dict, Column]):
+    def add_column(self, col: str | dict | Column):
         """Adds a new column to the data"""
-        if not isinstance(self.columns, List):
+        if not isinstance(self.columns, list):
             raise ValueError('You cannot add_columns to a Variable type columns or if they are undefined')
         if isinstance(col, str):
             self.columns.append(Column(col_id=col))

dara/components/common/text.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Union
-
 from pydantic import field_validator
 
 from dara.components.common.base_component import ContentComponent
@@ -53,8 +51,8 @@ class Text(ContentComponent):
     :param formatted: Whether to display the text with existing formatting intact or not, default False
     """
 
-    text: Union[str, ClientVariable]
-    align: Union[str, None] = 'left'  # type: ignore # this is actually textAlign not align-items
+    text: str | ClientVariable
+    align: str | None = 'left'  # type: ignore # this is actually textAlign not align-items
     formatted: bool = False
 
     @field_validator('text')
@@ -64,5 +62,5 @@ class Text(ContentComponent):
             raise ValueError(f'Invalid text passed to Text: {value}, expected a string')
         return value
 
-    def __init__(self, text: Union[str, ClientVariable], **kwargs):
+    def __init__(self, text: str | ClientVariable, **kwargs):
         super().__init__(text=text, **kwargs)

dara/components/common/textarea.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Any, Literal, Optional
+from typing import Any, Literal
 
 from dara.components.common.base_component import FormComponent
 from dara.core.base_definitions import Action
@@ -49,7 +49,7 @@ class Textarea(FormComponent):
     """
 
     autofocus: bool = False
-    value: Optional[Variable[Any]] = None
-    onchange: Optional[Action] = None
-    id: Optional[str] = None
-    resize: Optional[Literal['none', 'both', 'horizontal', 'vertical', 'block', 'inline']] = None
+    value: Variable[Any] | None = None
+    onchange: Action | None = None
+    id: str | None = None
+    resize: Literal['none', 'both', 'horizontal', 'vertical', 'block', 'inline'] | None = None

dara/components/common/time_utils.py

@@ -16,7 +16,6 @@ limitations under the License.
 """
 
 import datetime
-from typing import Union
 
 import numpy
 
@@ -37,7 +36,7 @@ def date_to_datetime(d: datetime.date, hh=23, mm=59, ss=59) -> datetime.datetime
     return datetime.datetime(d.year, d.month, d.day, hh, mm, ss)
 
 
-def coerce_to_timemilli(t: Union[int, float, datetime.date, datetime.datetime]) -> float:
+def coerce_to_timemilli(t: int | float | datetime.date | datetime.datetime) -> float:
     """Convert any of int/float/date/datetime into a timemilli."""
     if isinstance(t, (int, numpy.signedinteger, float, numpy.floating)):
         return float(t)

dara/components/common/tooltip.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Union
-
 from dara.components.common.base_component import ModifierComponent
 from dara.components.common.stack import Stack
 from dara.core.definitions import ComponentInstance
@@ -74,14 +72,14 @@ class Tooltip(ModifierComponent):
     :param styling: Defines the style of the tooltip, can be 'default' or 'error'
     """
 
-    content: Union[str, ComponentInstance, Variable[str], DerivedVariable[str]]
+    content: str | ComponentInstance | Variable[str] | DerivedVariable[str]
     placement: str = 'auto'
     styling: str = 'default'
 
     def __init__(
         self,
-        *components: Union[ComponentInstance, None],
-        content: Union[str, ComponentInstance, Variable[str], DerivedVariable[str]],
+        *components: ComponentInstance | None,
+        content: str | ComponentInstance | Variable[str] | DerivedVariable[str],
         placement: str = 'auto',
         styling: str = 'default',
         **kwargs,