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

dara/components/__init__.py

@@ -17,6 +17,7 @@ limitations under the License.
 # ruff: noqa: F401, F403
 
 from importlib.metadata import version
+from inspect import isclass
 
 from pydantic import BaseModel
 
@@ -33,7 +34,7 @@ __version__ = version('dara-components')
 
 for symbol in list(globals().values()):
     try:
-        if issubclass(symbol, BaseModel) and symbol is not BaseModel:
+        if isclass(symbol) and issubclass(symbol, BaseModel) and symbol is not BaseModel:
             symbol.model_rebuild()
     except Exception as e:
         from dara.core.logging import dev_logger

dara/components/common/accordion.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
 
@@ -79,9 +79,9 @@ class AccordionItem(BaseModel):
     :param content: Optional content to render
     """
 
-    badge: Optional[ItemBadge] = None
-    label: Union[str, ComponentInstance]
-    content: Optional[ComponentInstance] = None
+    badge: ItemBadge | None = None
+    label: str | ComponentInstance
+    content: ComponentInstance | None = None
 
 
 class Accordion(LayoutComponent):
@@ -245,28 +245,22 @@ class Accordion(LayoutComponent):
      :param onchange: An action to triggered when the component's state changes
     """
 
-    initial: Optional[Union[int, List[int]]] = 0
-    value: Optional[
-        Union[
-            Variable[Union[int, List[int]]],
-            int,
-            List[int],
-        ]
-    ] = 0
-    onchange: Optional[Action] = None
-    items: List[AccordionItem]
-    multi: Optional[bool] = True
+    initial: int | list[int] | None = 0
+    value: Variable[int | list[int]] | int | list[int] | None = 0
+    onchange: Action | None = None
+    items: list[AccordionItem]
+    multi: bool | None = True
 
     @field_validator('initial', mode='before')
     @classmethod
-    def validate_initial(cls, initial: Any) -> Union[int, List[int]]:
+    def validate_initial(cls, initial: Any) -> int | list[int]:
         if initial is not None:
             dev_logger.warning("Accordion's initial prop is now deprecated, please use value instead.")
         return initial
 
     @field_validator('items', mode='before')
     @classmethod
-    def validate_items(cls, items: Any) -> List[AccordionItem]:
+    def validate_items(cls, items: Any) -> list[AccordionItem]:
         if not isinstance(items, list):
             raise ValueError('AccordionItems must be passed as a list to the Accordion component')
         if len(items) == 0:

dara/components/common/anchor.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List, Optional, Union
+from typing_extensions import deprecated
 
 from dara.components.common.base_component import (
     ContentComponent,
@@ -27,6 +27,7 @@ from dara.core.definitions import discover
 from dara.core.interactivity import AnyVariable, DerivedVariable, Variable
 
 
+@deprecated('Use `dara.core.Link` instead')
 @discover
 class Anchor(ModifierComponent):
     """
@@ -60,17 +61,17 @@ class Anchor(ModifierComponent):
     :param new_tab: whether to open the link in a new tab
     """
 
-    href: Optional[str] = None
-    name: Optional[str] = None
+    href: str | None = None
+    name: str | None = None
     clean: bool = False
     new_tab: bool = False
 
-    def __init__(self, child: Union[ContentComponent, str, Variable[str], DerivedVariable[str]], **kwargs):
+    def __init__(self, child: ContentComponent | str | Variable[str] | DerivedVariable[str], **kwargs):
         if isinstance(child, (ContentComponent, Variable, DerivedVariable, str)) is False:
             raise LayoutError(f'Only a single ContentComponent may be passed as an Anchors child, passed : {child}')
 
         # Handle a string or Variable being passed directly to an anchor
         if isinstance(child, (str, AnyVariable)):
             child = Text(child)
-        parsed_args: List[ContentComponent] = [child]
+        parsed_args: list[ContentComponent] = [child]
         super().__init__(*parsed_args, **kwargs)

dara/components/common/base_component.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Literal, Optional, Union
+from typing import Literal
 
 from pydantic import ConfigDict
 
@@ -57,7 +57,7 @@ class BaseDashboardComponent(StyledComponentInstance):
     # Define JS module on the base component so we don't have to repeat that on each component
     js_module = '@darajs/components'
 
-    def __init__(self, *args: Union[ComponentInstance, None], **kwargs):
+    def __init__(self, *args: ComponentInstance | None, **kwargs):
         if len(args) > 0 and len(kwargs.get('children') or []) == 0:
             kwargs['children'] = list(arg for arg in args if arg is not None)
 
@@ -78,9 +78,9 @@ class LayoutComponent(BaseDashboardComponent):
     :param align: the align-items value to be passed to the component
     """
 
-    position: Union[str, None] = 'relative'
+    position: str | None = 'relative'
 
-    justify: Optional[JustifyContent] = None
+    justify: JustifyContent | None = None
 
     def append(self, component: ComponentInstance):
         """
@@ -138,4 +138,4 @@ class FormComponent(InteractiveComponent):
     A subset of InteractiveComponents which must subscribe to the Form context.
     """
 
-    id: Optional[str] = None
+    id: str | None = None

dara/components/common/bullet_list.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List, Union
-
 from dara.components.common.base_component import ContentComponent
 from dara.core.interactivity import DerivedVariable, Variable
 
@@ -42,5 +40,5 @@ class BulletList(ContentComponent):
     :param numbered: Boolean, if True then number the bullets
     """
 
-    items: Union[List[str], Variable, DerivedVariable]
+    items: list[str] | Variable | DerivedVariable
     numbered: bool = False

dara/components/common/button.py

@@ -16,7 +16,7 @@ limitations under the License.
 """
 
 from enum import Enum
-from typing import Optional, Union, cast
+from typing import cast
 
 from dara.components.common.base_component import LayoutComponent
 from dara.components.common.text import Text
@@ -110,6 +110,10 @@ class Button(LayoutComponent):
     ```
 
     :param disabled: A variable, condition, or bool to disabled the button when true
+    :param loading: A variable, condition, or bool to set the button to a loading state, showing a spinner.
+       By default, the button will automatically be set to loading=True while the onclick action is running,
+       equivalent to `Button(..., onclick=my_action, loading=my_action.loading)`. You can opt out of this behaviour by
+       simply setting `loading=False`.
     :param onclick: An Action that is triggered by clicking the button
     :param icon: An optional icon to display, see dara.core.css.get_icon for details
     :param styling: A style of the button, can be 'primary', 'secondary', 'error', 'plain' or 'ghost'
@@ -119,15 +123,16 @@ class Button(LayoutComponent):
     :param stop_click_propagation: Whether to stop the click event from propagating to the parent element, defaults to true
     """
 
-    disabled: Optional[Union[Condition, ClientVariable, bool]] = None
-    onclick: Optional[Action] = None
-    icon: Optional[str] = None
-    styling: Optional[ButtonStyle] = None
+    disabled: Condition | ClientVariable | bool | None = None
+    loading: Condition | ClientVariable | bool | None = None
+    onclick: Action | None = None
+    icon: str | None = None
+    styling: ButtonStyle | None = None
     outline: bool = False
     stop_click_propagation: bool = True
 
     def __init__(
-        self, children: Union[str, ComponentInstance, ClientVariable], styling: Optional[ButtonStyle] = None, **kwargs
+        self, children: str | ComponentInstance | ClientVariable, styling: ButtonStyle | None = None, **kwargs
     ):
         child = children
         style = styling if styling is not None else ButtonStyle.PRIMARY

dara/components/common/button_bar.py

@@ -16,7 +16,7 @@ limitations under the License.
 """
 
 from enum import Enum
-from typing import Any, List, Optional
+from typing import Any
 
 from pydantic import field_validator
 
@@ -106,15 +106,15 @@ class ButtonBar(FormComponent):
     :param styling: A style of the ButtonBar, can be 'primary' or 'secondary'
     """
 
-    items: List[Item]
-    value: Optional[Variable] = None
-    onchange: Optional[Action] = None
-    id: Optional[str] = None
+    items: list[Item]
+    value: Variable | None = None
+    onchange: Action | None = None
+    id: str | None = None
     styling: ButtonBarStyle = ButtonBarStyle.PRIMARY
 
     @field_validator('items', mode='before')
     @classmethod
-    def validate_items(cls, items: Any) -> List[Item]:
+    def validate_items(cls, items: Any) -> list[Item]:
         if not isinstance(items, list):
             raise ValueError('Items must be passed as a list to the button bar component')
         if len(items) == 0:

dara/components/common/card.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 dara.components.common.base_component import LayoutComponent
 from dara.core import ClientVariable
 from dara.core.definitions import ComponentInstance
@@ -53,9 +51,9 @@ class Card(LayoutComponent):
     :param align: How to align the content of the card, accepts any flexbox alignments
     """
 
-    subtitle: Optional[Union[str, ClientVariable]] = None
-    title: Optional[Union[str, ClientVariable]] = None
+    subtitle: str | ClientVariable | None = None
+    title: str | ClientVariable | None = None
     accent: bool = False
 
-    def __init__(self, *args: Union[ComponentInstance, None], **kwargs):
+    def __init__(self, *args: ComponentInstance | None, **kwargs):
         super().__init__(*args, **kwargs)

dara/components/common/carousel.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
 
@@ -118,13 +118,13 @@ class Carousel(ContentComponent):
     :param onchange: Action triggered when the component changes states
     """
 
-    items: Union[List[CarouselItem], ClientVariable]
-    value: Optional[Variable[int]] = None
-    onchange: Optional[Action] = None
+    items: list[CarouselItem] | ClientVariable
+    value: Variable[int] | None = None
+    onchange: Action | None = None
 
     @field_validator('items', mode='before')
     @classmethod
-    def validate_items(cls, items: Any) -> Union[List[CarouselItem], ClientVariable]:
+    def validate_items(cls, items: Any) -> list[CarouselItem] | ClientVariable:
         if isinstance(items, ClientVariable):
             return items
         if not isinstance(items, list):

dara/components/common/checkbox_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
 
@@ -97,17 +97,17 @@ class CheckboxGroup(FormComponent):
     :param id: the key to be used if this component is within a form
     """
 
-    items: Union[List[Item], ClientVariable]
-    select_max: Optional[int] = None
-    select_min: Optional[int] = None
+    items: list[Item] | ClientVariable
+    select_max: int | None = None
+    select_min: int | None = None
     list_styling: bool = False
-    value: Optional[Variable[Any]] = None
-    onchange: Optional[Action] = None
-    id: Optional[str] = None
+    value: Variable[Any] | None = None
+    onchange: Action | None = None
+    id: str | None = None
 
     @field_validator('items', mode='before')
     @classmethod
-    def validate_items(cls, items: Any) -> Union[List[Item], ClientVariable]:
+    def validate_items(cls, items: Any) -> list[Item] | ClientVariable:
         if isinstance(items, ClientVariable):
             return items
         if not isinstance(items, list):

dara/components/common/code.py

@@ -16,7 +16,7 @@ limitations under the License.
 """
 
 from enum import Enum
-from typing import ClassVar, Optional, Union
+from typing import ClassVar
 
 from dara.components.common.base_component import ContentComponent
 from dara.core.interactivity import ClientVariable
@@ -67,8 +67,8 @@ class Code(ContentComponent):
     :param language: The language to use for code highlighting
     """
 
-    code: Union[str, ClientVariable]
-    theme: Optional[Themes] = None
+    code: str | ClientVariable
+    theme: Themes | None = None
     language: str = 'python'
 
     Themes: ClassVar[ThemesType] = Themes

dara/components/common/component_select_list.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 dara.components.common.base_component import LayoutComponent
 from dara.core.base_definitions import Action
 from dara.core.base_definitions import DaraBaseModel as BaseModel
@@ -26,7 +24,7 @@ from dara.core.interactivity import Variable
 
 class ComponentItem(BaseModel):
     title: str
-    subtitle: Optional[str] = None
+    subtitle: str | None = None
     component: ComponentInstanceType
 
 
@@ -62,8 +60,8 @@ class ComponentSelectList(LayoutComponent):
      :param selected_items: The initial selected items, can be an list if multiSelect is true otherwise a string. This takes the titles of the items as value.
     """
 
-    items: List[ComponentItem]
-    items_per_row: Optional[int] = None
-    multi_select: Optional[bool] = None
-    on_select: Optional[Action] = None
-    selected_items: Optional[Variable[Union[str, List[str]]]] = None
+    items: list[ComponentItem]
+    items_per_row: int | None = None
+    multi_select: bool | None = None
+    on_select: Action | None = None
+    selected_items: Variable[str | list[str]] | None = None

dara/components/common/datepicker.py

@@ -16,7 +16,7 @@ limitations under the License.
 """
 
 from datetime import datetime
-from typing import Any, Optional
+from typing import Any
 
 from dara.components.common.base_component import FormComponent
 from dara.core.base_definitions import Action
@@ -93,12 +93,12 @@ class Datepicker(FormComponent):
     :param id: the key to be used if this component is within a form
     """
 
-    value: Optional[Variable[Any]] = None
+    value: Variable[Any] | None = None
     date_format: str = 'dd/MM/yyyy'
     enable_time: bool = False
-    max_date: Optional[datetime] = None
-    min_date: Optional[datetime] = None
+    max_date: datetime | None = None
+    min_date: datetime | None = None
     range: bool = False
     select_close: bool = True
-    onchange: Optional[Action] = None
-    id: Optional[str] = None
+    onchange: Action | None = None
+    id: str | None = None

dara/components/common/dropdown_menu.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional, Union
+from typing import Any
 
 from typing_extensions import TypedDict
 
@@ -8,22 +8,22 @@ from dara.core import Action, ClientVariable, ComponentInstance
 
 
 class MenuItem(TypedDict, total=False):
-    label: Union[str, ComponentInstance]
+    label: str | ComponentInstance
     """the label of the menu item"""
 
-    icon: Optional[str]
+    icon: str | None
     """optional icon to show next to the label, use get_icon() helper"""
 
-    style: Optional[Dict[str, Any]]
+    style: dict[str, Any] | None
     """optional style to apply to the menu item"""
 
-    prevent_close: Optional[bool]
+    prevent_close: bool | None
     """optional flag to prevent the menu from closing when the item is clicked"""
 
-    before: Optional[ComponentInstance]
+    before: ComponentInstance | None
     """optional component to show before the label"""
 
-    after: Optional[ComponentInstance]
+    after: ComponentInstance | None
     """optional component to show after the label"""
 
 
@@ -157,5 +157,5 @@ class DropdownMenu(BaseDashboardComponent):
 
     button: Button
     onclick: Action
-    menu_items: Union[List[List[MenuItem]], ClientVariable]
-    footer: Optional[ComponentInstance] = None
+    menu_items: list[list[MenuItem]] | ClientVariable
+    footer: ComponentInstance | None = None

dara/components/common/dropzone.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Callable, Optional, Union
+from collections.abc import Callable
 from uuid import uuid4
 
 from pandas import DataFrame
@@ -25,10 +25,7 @@ from dara.core.base_definitions import Action, UploadResolverDef
 from dara.core.definitions import StyledComponentInstance
 from dara.core.interactivity import ServerVariable
 
-DropzoneResolver = Union[
-    Callable[[bytes, str], DataFrame],
-    Callable[[bytes, str], None],
-]
+DropzoneResolver = Callable[[bytes, str], DataFrame] | Callable[[bytes, str], None]
 
 
 class UploadDropzone(StyledComponentInstance):
@@ -66,21 +63,21 @@ class UploadDropzone(StyledComponentInstance):
 
     js_module = '@darajs/components'
 
-    accept: Optional[str] = None
-    target: Optional[ServerVariable] = None
-    resolver: Optional[DropzoneResolver] = None
-    on_drop: Optional[Action] = None
+    accept: str | None = None
+    target: ServerVariable | None = None
+    resolver: DropzoneResolver | None = None
+    on_drop: Action | None = None
     enable_paste: bool = False
 
     model_config = ConfigDict(extra='allow')
 
     def __init__(
         self,
-        target: Optional[ServerVariable] = None,
-        resolver: Optional[DropzoneResolver] = None,
-        on_drop: Optional[Action] = None,
-        accept: Optional[str] = None,
-        enable_paste: Optional[bool] = False,
+        target: ServerVariable | None = None,
+        resolver: DropzoneResolver | None = None,
+        on_drop: Action | None = None,
+        accept: str | None = None,
+        enable_paste: bool | None = False,
         **kwargs,
     ):
         from dara.core.interactivity.any_data_variable import upload

dara/components/common/form.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List, Optional
-
 from pydantic import field_validator
 
 from dara.components.common.base_component import LayoutComponent
@@ -82,12 +80,12 @@ class Form(LayoutComponent):
     :param align: How to align the content of the form, accepts any flexbox alignments
     """
 
-    value: Optional[Variable[dict]] = None
-    onsubmit: Optional[Action] = None
+    value: Variable[dict] | None = None
+    onsubmit: Action | None = None
 
     @field_validator('children')
     @classmethod
-    def validate_children_pages(cls, children: List[ComponentInstance]) -> List[ComponentInstance]:
+    def validate_children_pages(cls, children: list[ComponentInstance]) -> list[ComponentInstance]:
         # Make sure if FormPage is included, non-pages are not direct children of the Form
         page_found = False
         non_page_found = False

dara/components/common/form_page.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List, Optional
-
 from pydantic import field_validator
 
 from dara.components.common.base_component import FormComponent
@@ -50,11 +48,11 @@ class FormPage(FormComponent):
     :param title: The title of the form page
     """
 
-    title: Optional[str] = None
+    title: str | None = None
 
     @field_validator('children')
     @classmethod
-    def validate_children(cls, children: List[ComponentInstance]) -> List[ComponentInstance]:
+    def validate_children(cls, children: list[ComponentInstance]) -> list[ComponentInstance]:
         for c in children:
             if isinstance(c, FormPage):
                 raise TypeError('FormPage detected inside another FormPage, nesting is disallowed')

dara/components/common/grid.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import ClassVar, Optional, Union
+from typing import ClassVar
 
 from dara.components.common.base_component import LayoutComponent
 from dara.core.base_definitions import DaraBaseModel as BaseModel
@@ -24,11 +24,11 @@ from dara.core.visual.components.types import Direction
 
 
 class ScreenBreakpoints(BaseModel):
-    xs: Optional[int] = None
-    sm: Optional[int] = None
-    md: Optional[int] = None
-    lg: Optional[int] = None
-    xl: Optional[int] = None
+    xs: int | None = None
+    sm: int | None = None
+    md: int | None = None
+    lg: int | None = None
+    xl: int | None = None
 
 
 class Column(LayoutComponent):
@@ -67,11 +67,11 @@ class Column(LayoutComponent):
 
     # TODO: :param order: optional number denoting the order of priority of the columns, with 1 being first to appear, and 12 the last to be added.
 
-    span: Optional[Union[int, ScreenBreakpoints]] = None
-    offset: Optional[Union[int, ScreenBreakpoints]] = None
+    span: int | ScreenBreakpoints | None = None
+    offset: int | ScreenBreakpoints | None = None
     direction: Direction = Direction.HORIZONTAL
 
-    def __init__(self, *args: Union[ComponentInstance, None], **kwargs):
+    def __init__(self, *args: ComponentInstance | None, **kwargs):
         super().__init__(*args, **kwargs)
 
 
@@ -99,9 +99,9 @@ class Row(LayoutComponent):
     :param align: How to align the content of the row, accepts any flexbox alignments
     """
 
-    column_gap: Optional[int] = None
+    column_gap: int | None = None
 
-    def __init__(self, *args: Union[ComponentInstance, None], **kwargs):
+    def __init__(self, *args: ComponentInstance | None, **kwargs):
         super().__init__(*args, **kwargs)
 
 
@@ -120,14 +120,14 @@ class Grid(LayoutComponent):
     """
 
     row_gap: str = '0.75rem'
-    breakpoints: Optional[ScreenBreakpoints] = ScreenBreakpoints()
+    breakpoints: ScreenBreakpoints | None = ScreenBreakpoints()
 
     Column: ClassVar[ColumnType] = Column
     Row: ClassVar[RowType] = Row
     Breakpoints: ClassVar[type[ScreenBreakpoints]] = ScreenBreakpoints
 
     # 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):
         """
         Grid Layout provides a flexbox grid with a twelve column system.
         Rows will automatically calculate their widths and wrap on the page as needed.

dara/components/common/heading.py

@@ -16,7 +16,6 @@ limitations under the License.
 """
 
 import re
-from typing import Union
 
 from dara.components.common.base_component import ContentComponent
 from dara.core.interactivity import ClientVariable
@@ -69,7 +68,7 @@ class Heading(ContentComponent):
     :param level: The level of heading to display, defaults to 1
     """
 
-    heading: Union[str, ClientVariable]
+    heading: str | ClientVariable
     level: int = 1
 
     @property
@@ -78,5 +77,5 @@ class Heading(ContentComponent):
             raise ValueError('Heading anchor name cannot be accessed directly from a variable')
         return re.sub(r'\s+', '-', self.heading.lower())
 
-    def __init__(self, heading: Union[str, ClientVariable], **kwargs):
+    def __init__(self, heading: str | ClientVariable, **kwargs):
         super().__init__(heading=heading, **kwargs)

dara/components/common/icon.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 ContentComponent
 
 
@@ -65,4 +63,4 @@ class Icon(ContentComponent):
     """
 
     icon: str
-    color: Optional[str] = None
+    color: str | None = None