dara-core 1.21.16__py3-none-any.whl → 1.21.17__py3-none-any.whl

dara/core/router/dependency_graph.py

@@ -1,5 +1,3 @@
-from typing import Dict
-
 from pydantic import BaseModel, Field, SerializeAsAny
 
 from dara.core.definitions import ComponentInstance
@@ -12,12 +10,12 @@ class DependencyGraph(BaseModel):
     Data structure representing dependencies for derived state on a page
     """
 
-    derived_variables: SerializeAsAny[Dict[str, DerivedVariable]] = Field(default_factory=dict)
+    derived_variables: SerializeAsAny[dict[str, DerivedVariable]] = Field(default_factory=dict)
     """
     Map of DerivedVariable instances
     """
 
-    py_components: SerializeAsAny[Dict[str, PyComponentInstance]] = Field(default_factory=dict)
+    py_components: SerializeAsAny[dict[str, PyComponentInstance]] = Field(default_factory=dict)
     """
     Map of PyComponentInstance instances
     """

dara/core/router/router.py

@@ -1,7 +1,8 @@
 import inspect
 import re
 from abc import abstractmethod
-from typing import Any, Callable, Dict, List, Literal, Optional, TypedDict, Union
+from collections.abc import Callable
+from typing import Any, Literal, Optional, TypedDict
 from urllib.parse import quote
 from uuid import uuid4
 
@@ -29,7 +30,7 @@ PARAM_REGEX = re.compile(r':([\w-]+)\??')
 STAR_REGEX = re.compile(r'\*$')
 
 
-def find_patterns(path: str) -> List[str]:
+def find_patterns(path: str) -> list[str]:
     """
     Extract param names from a React-Router-style path.
 
@@ -85,10 +86,10 @@ class RouteData(BaseModel):
     Data structure representing a route in the router
     """
 
-    content: Optional[ComponentInstance] = None
-    on_load: Optional[Action] = None
+    content: ComponentInstance | None = None
+    on_load: Action | None = None
     definition: Optional['BaseRoute'] = None
-    dependency_graph: Optional[DependencyGraph] = Field(default=None, exclude=True)
+    dependency_graph: DependencyGraph | None = Field(default=None, exclude=True)
 
 
 class BaseRoute(BaseModel):
@@ -101,13 +102,13 @@ class BaseRoute(BaseModel):
     Whether the route is case sensitive
     """
 
-    id: Optional[str] = Field(default=None, pattern=r'^[a-zA-Z0-9-_]+$')
+    id: str | None = Field(default=None, pattern=r'^[a-zA-Z0-9-_]+$')
     """
     Unique identifier for the route.
     Must only contain alphanumeric characters, dashes and underscores.
     """
 
-    name: Optional[str] = None
+    name: str | None = None
     """
     Name of the route, used for window.title display. If not set, defaults to
     the route path.
@@ -118,7 +119,7 @@ class BaseRoute(BaseModel):
     Metadata for the route. This is used to store arbitrary data that can be used by the application.
     """
 
-    fallback: SerializeAsAny[Optional[ComponentInstance]] = Field(default=None)
+    fallback: SerializeAsAny[ComponentInstance | None] = Field(default=None)
     """
     Fallback component to render while `on_load` is running.
     If not set, Dara will wait until `on_load` completes before completing the navigation.
@@ -131,7 +132,7 @@ class BaseRoute(BaseModel):
     if it's desirable to navigate to the other route immediately.
     """
 
-    on_load: SerializeAsAny[Optional[Action]] = Field(default=None)
+    on_load: SerializeAsAny[Action | None] = Field(default=None)
     """
     Action to execute when the route is loaded.
     Guaranteed to be executed before the route content is rendered.
@@ -142,7 +143,7 @@ class BaseRoute(BaseModel):
     Internal unique identifier for the route
     """
 
-    compiled_data: Optional[RouteData] = Field(default=None, exclude=True, repr=False)
+    compiled_data: RouteData | None = Field(default=None, exclude=True, repr=False)
     """
     Internal compiled data for the route
     """
@@ -235,7 +236,7 @@ class BaseRoute(BaseModel):
         return self.compiled_data
 
     @property
-    def full_path(self) -> Optional[str]:
+    def full_path(self) -> str | None:
         """
         Compute the full path from root to this route.
         Returns None if route is not attached to a router.
@@ -279,7 +280,7 @@ class HasChildRoutes(BaseModel):
     Mixin class for objects that can have child routes.
     """
 
-    children: SerializeAsAny[List['BaseRoute']] = Field(default_factory=list)
+    children: SerializeAsAny[list['BaseRoute']] = Field(default_factory=list)
     """
     List of child routes.
     Should not be set directly. Use `set_children` or one of the `add_*` methods instead.
@@ -310,13 +311,13 @@ class HasChildRoutes(BaseModel):
         self,
         *,
         path: str,
-        content: Union[Callable[..., ComponentInstance], ComponentInstance],
+        content: Callable[..., ComponentInstance] | ComponentInstance,
         case_sensitive: bool = False,
-        name: Optional[str] = None,
-        id: Optional[str] = None,
-        metadata: Optional[dict] = None,
-        on_load: Optional[Action] = None,
-        fallback: Optional[ComponentInstance] = None,
+        name: str | None = None,
+        id: str | None = None,
+        metadata: dict | None = None,
+        on_load: Action | None = None,
+        fallback: ComponentInstance | None = None,
     ):
         """
         Standard route with a unique URL segment and content to render
@@ -350,12 +351,12 @@ class HasChildRoutes(BaseModel):
     def add_layout(
         self,
         *,
-        content: Union[Callable[..., ComponentInstance], ComponentInstance],
+        content: Callable[..., ComponentInstance] | ComponentInstance,
         case_sensitive: bool = False,
-        id: Optional[str] = None,
-        metadata: Optional[dict] = None,
-        on_load: Optional[Action] = None,
-        fallback: Optional[ComponentInstance] = None,
+        id: str | None = None,
+        metadata: dict | None = None,
+        on_load: Action | None = None,
+        fallback: ComponentInstance | None = None,
     ):
         """
         Layout route creates a route with a layout component to render without adding any segments to the URL
@@ -409,10 +410,10 @@ class HasChildRoutes(BaseModel):
         *,
         path: str,
         case_sensitive: bool = False,
-        id: Optional[str] = None,
-        metadata: Optional[dict] = None,
-        on_load: Optional[Action] = None,
-        fallback: Optional[ComponentInstance] = None,
+        id: str | None = None,
+        metadata: dict | None = None,
+        on_load: Action | None = None,
+        fallback: ComponentInstance | None = None,
     ):
         """
         Prefix route creates a group of routes with a common prefix without a specific component to render
@@ -450,13 +451,13 @@ class HasChildRoutes(BaseModel):
     def add_index(
         self,
         *,
-        content: Union[Callable[..., ComponentInstance], ComponentInstance],
+        content: Callable[..., ComponentInstance] | ComponentInstance,
         case_sensitive: bool = False,
-        name: Optional[str] = None,
-        id: Optional[str] = None,
-        metadata: Optional[dict] = None,
-        on_load: Optional[Action] = None,
-        fallback: Optional[ComponentInstance] = None,
+        name: str | None = None,
+        id: str | None = None,
+        metadata: dict | None = None,
+        on_load: Action | None = None,
+        fallback: ComponentInstance | None = None,
     ):
         """
         Index routes render into their parent's Outlet() at their parent URL (like a default child route).
@@ -518,7 +519,7 @@ class IndexRoute(BaseRoute):
     """
 
     index: Literal[True] = True
-    content: Union[Callable[..., ComponentInstance], ComponentInstance] = Field(exclude=True)
+    content: Callable[..., ComponentInstance] | ComponentInstance = Field(exclude=True)
 
     def compile(self):
         super().compile()
@@ -538,7 +539,7 @@ class PageRoute(BaseRoute, HasChildRoutes):
     """
 
     path: str
-    content: Union[Callable[..., ComponentInstance], ComponentInstance] = Field(exclude=True)
+    content: Callable[..., ComponentInstance] | ComponentInstance = Field(exclude=True)
 
     def __init__(self, *children: BaseRoute, **kwargs):
         routes = list(children)
@@ -588,7 +589,7 @@ class LayoutRoute(BaseRoute, HasChildRoutes):
     - Project and EditProject will be rendered into the ProjectLayout outlet while ProjectsHome will not.
     """
 
-    content: Union[Callable[..., ComponentInstance], ComponentInstance] = Field(exclude=True)
+    content: Callable[..., ComponentInstance] | ComponentInstance = Field(exclude=True)
 
     def __init__(self, *children: BaseRoute, **kwargs):
         routes = list(children)
@@ -723,11 +724,11 @@ class Router(HasChildRoutes):
         for child in self.children:
             child.compile()
 
-    def to_route_map(self) -> Dict[str, RouteData]:
+    def to_route_map(self) -> dict[str, RouteData]:
         """
         Convert the route tree into a dictionary of route data keyed by unique route identifiers.
         """
-        routes: Dict[str, RouteData] = {}
+        routes: dict[str, RouteData] = {}
 
         def _walk(route: BaseRoute):
             identifier = route.get_identifier()
@@ -749,7 +750,7 @@ class Router(HasChildRoutes):
         id: str
         metadata: dict
 
-    def get_navigable_routes(self) -> List[NavigableRoute]:
+    def get_navigable_routes(self) -> list[NavigableRoute]:
         """
         Get a flattened list of all navigable routes (PageRoute and IndexRoute only).
 
@@ -810,10 +811,10 @@ class Router(HasChildRoutes):
         print('Router')
         self._print_routes(self.children, prefix='')
 
-    def _print_routes(self, routes: List['BaseRoute'], prefix: str = ''):
+    def _print_routes(self, routes: list['BaseRoute'], prefix: str = ''):
         """Helper method to recursively print route tree structure"""
 
-        def _format_content(content: Union[Callable[..., ComponentInstance], ComponentInstance]):
+        def _format_content(content: Callable[..., ComponentInstance] | ComponentInstance):
             if isinstance(content, ComponentInstance):
                 return content.__class__.__name__
             return content.__name__
@@ -870,7 +871,7 @@ class Router(HasChildRoutes):
 
 
 def _execute_route_func(
-    content: Union[Callable[..., ComponentInstance], ComponentInstance], path: Optional[str]
+    content: Callable[..., ComponentInstance] | ComponentInstance, path: str | None
 ) -> ComponentInstance:
     """
     Executes a route function or returns a ComponentInstance directly.

dara/core/visual/components/dynamic_component.py

@@ -1,5 +1,3 @@
-from typing import Union
-
 from dara.core.definitions import ComponentInstance, JsComponentDef
 
 DynamicComponentDef = JsComponentDef(name='DynamicComponent', js_module='@darajs/core', py_module='dara.core')
@@ -14,4 +12,4 @@ class DynamicComponent(ComponentInstance):
     :param component: A Dara component instance or a dictionary representing a Dara component.
     """
 
-    component: Union[ComponentInstance, dict]
+    component: ComponentInstance | dict

dara/core/visual/components/fallback.py

@@ -48,7 +48,7 @@ class Fallback:
           but will suspend and show a fallback UI after the given timeout if the new state is not ready.
         """
 
-        py_component: ClassVar[Union[str, None]] = 'DefaultFallback'
+        py_component: ClassVar[str | None] = 'DefaultFallback'
 
     class Row(BaseFallback):
         """
@@ -73,7 +73,7 @@ class Fallback:
           but will suspend and show a fallback UI after the given timeout if the new state is not ready.
         """
 
-        py_component: ClassVar[Union[str, None]] = 'RowFallback'
+        py_component: ClassVar[str | None] = 'RowFallback'
 
     class Custom(BaseFallback):
         """
@@ -97,5 +97,5 @@ class Fallback:
           but will suspend and show a fallback UI after the given timeout if the new state is not ready.
         """
 
-        py_component: ClassVar[Union[str, None]] = 'CustomFallback'
+        py_component: ClassVar[str | None] = 'CustomFallback'
         component: StyledComponentInstance

dara/core/visual/components/for_cmp.py

@@ -1,4 +1,4 @@
-from typing import Literal, Optional, Union
+from typing import Literal
 
 from pydantic import Field
 
@@ -10,7 +10,7 @@ ForDef = JsComponentDef(name='For', js_module='@darajs/core', py_module='dara.co
 
 
 class VirtualizationConfig(DaraBaseModel):
-    size: Union[str, float, None] = None
+    size: str | float | None = None
     """
     The size of each element in the virtualized list.
     If a number is provided, it will be treated as a fixed size.
@@ -148,6 +148,6 @@ class For(ComponentInstance):
 
     items: AnyVariable
     renderer: ComponentInstance
-    placeholder: Optional[ComponentInstance] = None
-    key_accessor: Optional[str] = None
-    virtualization: Optional[VirtualizationConfig] = None
+    placeholder: ComponentInstance | None = None
+    key_accessor: str | None = None
+    virtualization: VirtualizationConfig | None = None

dara/core/visual/components/menu.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List
-
 from pydantic import ConfigDict
 from typing_extensions import deprecated
 
@@ -29,5 +27,5 @@ MenuDef = JsComponentDef(name='Menu', js_module='@darajs/core', py_module='dara.
     'Legacy component used with templates and config.add_page API. Use dara.core.visual.components.MenuLink or NavLink instead.'
 )
 class Menu(ComponentInstance):
-    routes: List[TemplateRouterLink]
+    routes: list[TemplateRouterLink]
     model_config = ConfigDict(extra='forbid')

dara/core/visual/components/router_content.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List
-
 from pydantic import ConfigDict
 
 from dara.core.definitions import (
@@ -29,5 +27,5 @@ RouterContentDef = JsComponentDef(name='RouterContent', js_module='@darajs/core'
 
 
 class RouterContent(ComponentInstance):
-    routes: List[TemplateRouterContent]
+    routes: list[TemplateRouterContent]
     model_config = ConfigDict(extra='forbid')

dara/core/visual/components/sidebar_frame.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 ConfigDict
 
 from dara.core.definitions import ComponentInstance, JsComponentDef
@@ -26,13 +24,13 @@ SideBarFrameDef = JsComponentDef(name='SideBarFrame', js_module='@darajs/core',
 
 class SideBarFrame(ComponentInstance):
     content: ComponentInstance
-    hide_logo: Optional[bool] = False
-    logo_width: Optional[str] = '80%'
-    logo_path: Optional[str] = None
-    logo_position: Optional[str] = None
+    hide_logo: bool | None = False
+    logo_width: str | None = '80%'
+    logo_path: str | None = None
+    logo_position: str | None = None
     side_bar: ComponentInstance
-    side_bar_padding: Optional[str] = None
-    side_bar_position: Optional[str] = None
-    side_bar_width: Optional[str] = None
-    powered_by_causalens: Optional[bool] = False
+    side_bar_padding: str | None = None
+    side_bar_position: str | None = None
+    side_bar_width: str | None = None
+    powered_by_causalens: bool | None = False
     model_config = ConfigDict(extra='forbid')

dara/core/visual/components/theme_provider.py

@@ -1,4 +1,4 @@
-from typing import Literal, Union
+from typing import Literal
 
 from dara.core.definitions import ComponentInstance, JsComponentDef, StyledComponentInstance
 from dara.core.interactivity.client_variable import ClientVariable
@@ -34,8 +34,8 @@ class ThemeProvider(StyledComponentInstance):
     config.router.add_page(path='theme', content=ThemePage)
     """
 
-    theme: Union[ThemeDef, ClientVariable, Literal['light', 'dark']]
-    base: Union[ClientVariable, Literal['light', 'dark']] = 'light'
+    theme: ThemeDef | ClientVariable | Literal['light', 'dark']
+    base: ClientVariable | Literal['light', 'dark'] = 'light'
 
     def __init__(self, *children: ComponentInstance, **kwargs):
         components = list(children)

dara/core/visual/components/topbar_frame.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 ConfigDict
 
 from dara.core.definitions import ComponentInstance, JsComponentDef
@@ -26,12 +24,12 @@ TopBarFrameDef = JsComponentDef(name='TopBarFrame', js_module='@darajs/core', py
 
 class TopBarFrame(ComponentInstance):
     content: ComponentInstance
-    hide_logo: Optional[bool] = False
-    logo_width: Optional[str] = '10rem'
-    logo_path: Optional[str] = None
-    logo_position: Optional[str] = None
-    top_bar: Optional[ComponentInstance] = None
-    top_bar_padding: Optional[str] = None
-    top_bar_position: Optional[str] = None
-    top_bar_height: Optional[str] = None
+    hide_logo: bool | None = False
+    logo_width: str | None = '10rem'
+    logo_path: str | None = None
+    logo_position: str | None = None
+    top_bar: ComponentInstance | None = None
+    top_bar_padding: str | None = None
+    top_bar_position: str | None = None
+    top_bar_height: str | None = None
     model_config = ConfigDict(extra='forbid')