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

dara/core/configuration.py

@@ -17,20 +17,13 @@ limitations under the License.
 
 import os
 import pathlib
+from collections.abc import Callable
 from inspect import isclass, isfunction
 from types import ModuleType
 from typing import (
     Any,
-    Callable,
-    Dict,
-    List,
     Literal,
-    Optional,
-    Set,
-    Tuple,
-    Type,
     TypeVar,
-    Union,
 )
 
 from fastapi.middleware import Middleware
@@ -75,34 +68,34 @@ class Configuration(BaseModel):
 
     auth_config: BaseAuthConfig
     registry_lookup: CustomRegistryLookup
-    actions: List[ActionDef]
-    endpoint_configurations: List[EndpointConfiguration]
-    components: List[ComponentTypeAnnotation]
-    context_components: List[ComponentInstance]
+    actions: list[ActionDef]
+    endpoint_configurations: list[EndpointConfiguration]
+    components: list[ComponentTypeAnnotation]
+    context_components: list[ComponentInstance]
     enable_devtools: bool
-    module_dependencies: Dict[str, str]
+    module_dependencies: dict[str, str]
     live_reload: bool
     powered_by_causalens: bool
     router: Router
-    pages: Dict[str, Page]
-    routes: Set[ApiRoute]
-    scheduled_jobs: List[Tuple[Union[ScheduledJob, ScheduledJobFactory], Callable, Optional[List[Any]]]] = []
-    startup_functions: List[Callable]
-    static_folders: List[str]
+    pages: dict[str, Page]
+    routes: set[ApiRoute]
+    scheduled_jobs: list[tuple[ScheduledJob | ScheduledJobFactory, Callable, list[Any] | None]] = []
+    startup_functions: list[Callable]
+    static_folders: list[str]
     static_files_dir: str
-    package_tag_processors: List[Callable[[Dict[str, List[str]]], Dict[str, List[str]]]]
+    package_tag_processors: list[Callable[[dict[str, list[str]]], dict[str, list[str]]]]
     template_extra_js: str
-    task_module: Optional[str] = None
+    task_module: str | None = None
     template: str
-    template_renderers: Dict[str, Callable[..., Template]]
-    theme: Union[BaseTheme, str]
+    template_renderers: dict[str, Callable[..., Template]]
+    theme: BaseTheme | str
     title: str
-    ws_handlers: Dict[str, Callable[[str, Any], Any]]
-    encoders: Dict[Type[Any], Encoder]
-    middlewares: List[Middleware]
+    ws_handlers: dict[str, Callable[[str, Any], Any]]
+    encoders: dict[type[Any], Encoder]
+    middlewares: list[Middleware]
     model_config = ConfigDict(extra='forbid', arbitrary_types_allowed=True)
 
-    def get_package_map(self) -> Dict[str, str]:
+    def get_package_map(self) -> dict[str, str]:
         """
         Get a map of python package names to js package names, based on currently
         registered components, actions etc.
@@ -145,28 +138,28 @@ class ConfigurationBuilder:
 
     auth_config: BaseAuthConfig
     registry_lookup: CustomRegistryLookup
-    _actions: List[ActionDef]
-    _components: List[ComponentTypeAnnotation]
-    _module_dependencies: Dict[str, str]
-    _errors: List[str]
+    _actions: list[ActionDef]
+    _components: list[ComponentTypeAnnotation]
+    _module_dependencies: dict[str, str]
+    _errors: list[str]
     enable_devtools: bool
     live_reload: bool
-    _pages: Dict[str, Page]
-    _template_renderers: Dict[str, Callable[..., Template]]
-    _endpoint_configurations: List[EndpointConfiguration]
-    _static_folders: List[str]
-    _package_tags_processors: List[Callable[[Dict[str, List[str]]], Dict[str, List[str]]]]
+    _pages: dict[str, Page]
+    _template_renderers: dict[str, Callable[..., Template]]
+    _endpoint_configurations: list[EndpointConfiguration]
+    _static_folders: list[str]
+    _package_tags_processors: list[Callable[[dict[str, list[str]]], dict[str, list[str]]]]
     _template_extra_js: str
-    _custom_ws_handlers: Dict[str, Callable[[str, Any], Any]]
-    _custom_encoders: Dict[Type[Any], Encoder]
-    _middlewares: List[Middleware]
-    routes: Set[ApiRoute]
+    _custom_ws_handlers: dict[str, Callable[[str, Any], Any]]
+    _custom_encoders: dict[type[Any], Encoder]
+    _middlewares: list[Middleware]
+    routes: set[ApiRoute]
     router: Router
     static_files_dir: str
-    scheduled_jobs: List[Tuple[Union[ScheduledJob, ScheduledJobFactory], Callable, Optional[List[Any]]]] = []
-    startup_functions: List[Callable]
-    context_components: List[ComponentInstance]
-    task_module: Optional[str]
+    scheduled_jobs: list[tuple[ScheduledJob | ScheduledJobFactory, Callable, list[Any] | None]] = []
+    startup_functions: list[Callable]
+    context_components: list[ComponentInstance]
+    task_module: str | None
     _template: str
     theme: BaseTheme
     title: str
@@ -224,7 +217,7 @@ class ConfigurationBuilder:
     def powered_by_causalens(self, value):
         self._powered_by_causalens = value
 
-    def add_action(self, action: Type[ActionImpl], local: bool = False):
+    def add_action(self, action: type[ActionImpl], local: bool = False):
         """
         Register an Action with the application.
 
@@ -276,7 +269,7 @@ class ConfigurationBuilder:
         self.context_components.append(component)
         self.add_component(component.__class__)
 
-    def add_component(self, component: Type[ComponentInstance], local: bool = False):
+    def add_component(self, component: type[ComponentInstance], local: bool = False):
         """
         Register a Component with the application.
 
@@ -381,7 +374,7 @@ class ConfigurationBuilder:
     EncoderType = TypeVar('EncoderType')
 
     def add_encoder(
-        self, typ: Type[EncoderType], serialize: Callable[[EncoderType], Any], deserialize: Callable[[Any], EncoderType]
+        self, typ: type[EncoderType], serialize: Callable[[EncoderType], Any], deserialize: Callable[[Any], EncoderType]
     ):
         """
         Register a custom encoder, which serialize and deserialize the type
@@ -398,7 +391,7 @@ class ConfigurationBuilder:
         self._custom_encoders[typ] = encoder
         return encoder
 
-    def add_package_tags_processor(self, processor: Callable[[Dict[str, List[str]]], Dict[str, List[str]]]):
+    def add_package_tags_processor(self, processor: Callable[[dict[str, list[str]]], dict[str, list[str]]]):
         """
         Append a package tag processor. This is a function that takes a dictionary of package names to lists of script/link tags included
         when running in the UMD mode.
@@ -411,12 +404,12 @@ class ConfigurationBuilder:
     def add_page(
         self,
         name: str,
-        content: Union[ComponentInstanceType, Type[CallableClassComponent], str],
-        icon: Optional[str] = None,
-        route: Optional[str] = None,
-        include_in_menu: Optional[bool] = True,
-        reset_vars_on_load: Optional[List[AnyVariable]] = None,
-        on_load: Optional[Action] = None,
+        content: ComponentInstanceType | type[CallableClassComponent] | str,
+        icon: str | None = None,
+        route: str | None = None,
+        include_in_menu: bool | None = True,
+        reset_vars_on_load: list[AnyVariable] | None = None,
+        on_load: Action | None = None,
     ):
         """
         Add a new page to the layout of the platform. Switching between pages relies on the template implementing a
@@ -508,7 +501,7 @@ class ConfigurationBuilder:
 
         return registry_lookup
 
-    def add_middleware(self, middleware: Union[type, Callable], **options: Any):
+    def add_middleware(self, middleware: type | Callable, **options: Any):
         """
         Add a middleware to the application. The middleware can be a class or a callable.
         """
@@ -526,8 +519,8 @@ class ConfigurationBuilder:
 
     def set_theme(
         self,
-        main_theme: Optional[Union[ThemeDef, ClientVariable, Literal['light'], Literal['dark']]] = None,
-        base_theme: Optional[Union[Literal['light'], Literal['dark']]] = None,
+        main_theme: ThemeDef | ClientVariable | Literal['light'] | Literal['dark'] | None = None,
+        base_theme: Literal['light'] | Literal['dark'] | None = None,
     ):
         """
         Sets the color theme of the app. Takes ThemeDef models for the app, and reverts
@@ -554,7 +547,7 @@ class ConfigurationBuilder:
         """
         self.startup_functions.append(startup_function)
 
-    def scheduler(self, job: ScheduledJob, args: Union[None, List[Any]] = None):
+    def scheduler(self, job: ScheduledJob, args: None | list[Any] = None):
         if args is None:
             args = []
 
@@ -563,7 +556,7 @@ class ConfigurationBuilder:
 
         return _wrapper_func
 
-    def _run_discovery(self, module: Union[ModuleType, dict]):
+    def _run_discovery(self, module: ModuleType | dict):
         """
         Run import discovery in a given module, adding actions and components found to the config
 

dara/core/css.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Literal, Optional
+from typing import Literal
 
 # Re-export CSSProperties for easier importing
 from dara.core.visual.css import CSSProperties  # noqa: F401
@@ -27,7 +27,7 @@ IconSize = Literal['1x', '2x', '3x', '4x', '5x', '6x', '7x', '8x', '9x', '10x',
 def get_icon(
     name: str,
     style: IconStyle = 'solid',
-    size: Optional[IconSize] = None,
+    size: IconSize | None = None,
 ):
     """
     Get FontAwesome icon class string. Can be used for components requiring an icon name. The size be any one of the

dara/core/data_utils.py

@@ -17,7 +17,6 @@ limitations under the License.
 
 import io
 import os
-from typing import List, Optional, Union
 
 import pandas
 from pandas import DataFrame
@@ -75,7 +74,7 @@ class FileStore(BaseModel):
         scope = get_cache_scope(cache_type)
         return os.path.join(self.root_path, scope)
 
-    def list_files(self, cache_type: CacheType) -> List[str]:
+    def list_files(self, cache_type: CacheType) -> list[str]:
         """
         List files in a directory for a given cache type
 
@@ -101,7 +100,7 @@ class FileStore(BaseModel):
         file_path = os.path.join(scope_path, name)
         return os.path.exists(file_path)
 
-    def get_file(self, cache_type: CacheType, name: str) -> Optional[io.BufferedReader]:
+    def get_file(self, cache_type: CacheType, name: str) -> io.BufferedReader | None:
         """
         Get a BufferedReader to read a file from the data store
 
@@ -160,7 +159,7 @@ class DataFactory(BaseModel):
         file_store = FileStore(root_path=root_path)
         super().__init__(file_store=file_store)
 
-    def list_datasets(self, cache: CacheType = CacheType.GLOBAL) -> List[str]:
+    def list_datasets(self, cache: CacheType = CacheType.GLOBAL) -> list[str]:
         """
         Get a list of datasets (filenames) available for a given cache type
 
@@ -171,9 +170,9 @@ class DataFactory(BaseModel):
 
     def list_datasets_var(
         self,
-        cache: Union[CacheType, ClientVariable] = CacheType.GLOBAL,
-        polling_interval: Optional[int] = None,
-    ) -> DerivedVariable[List[str]]:
+        cache: CacheType | ClientVariable = CacheType.GLOBAL,
+        polling_interval: int | None = None,
+    ) -> DerivedVariable[list[str]]:
         """
         Create a DerivedVariable which stores a list of datasets (filenames) available for a given cache type
 
@@ -262,7 +261,7 @@ class DataFactory(BaseModel):
         """
         return os.path.join(self.file_store.get_scoped_path(cache), name)
 
-    def read_dataset(self, name: str, cache: CacheType = CacheType.GLOBAL) -> Optional[DataFrame]:
+    def read_dataset(self, name: str, cache: CacheType = CacheType.GLOBAL) -> DataFrame | None:
         """
         Read a dataset from disk to a DataFrame.
 
@@ -288,9 +287,9 @@ class DataFactory(BaseModel):
 
     def read_dataset_var(
         self,
-        name: Union[str, ClientVariable],
-        cache: Union[CacheType, ClientVariable] = CacheType.GLOBAL,
-        polling_interval: Optional[int] = None,
+        name: str | ClientVariable,
+        cache: CacheType | ClientVariable = CacheType.GLOBAL,
+        polling_interval: int | None = None,
     ) -> DerivedVariable:
         """
         Create a DerivedVariable which reads a specific dataset from disk
@@ -318,9 +317,7 @@ class DataFactory(BaseModel):
         """
         self.file_store.delete_file(cache, name)
 
-    def delete_dataset_action(
-        self, name: Union[str, ClientVariable], cache: Union[CacheType, ClientVariable] = CacheType.GLOBAL
-    ):
+    def delete_dataset_action(self, name: str | ClientVariable, cache: CacheType | ClientVariable = CacheType.GLOBAL):
         """
         Get a SideEffect action which deletes a given dataset
 
@@ -332,9 +329,7 @@ class DataFactory(BaseModel):
 
         return SideEffect(lambda ctx: self.delete_dataset(ctx.extras[0], ctx.extras[1]), extras=[name_var, cache_var])
 
-    def download_dataset_action(
-        self, name: Union[str, ClientVariable], cache: Union[CacheType, ClientVariable] = CacheType.GLOBAL
-    ):
+    def download_dataset_action(self, name: str | ClientVariable, cache: CacheType | ClientVariable = CacheType.GLOBAL):
         """
         Get a DownloadContent action which downloads a dataset with a given name as a .csv
 

dara/core/defaults.py

@@ -17,7 +17,7 @@ limitations under the License.
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Dict, cast
+from typing import TYPE_CHECKING, cast
 
 from dara.core.base_definitions import ActionDef
 from dara.core.interactivity.actions import (
@@ -76,7 +76,7 @@ INITIAL_CORE_INTERNALS = {'Store': _store}
 
 
 # These components are provided by the core JS of this module
-CORE_COMPONENTS: Dict[str, ComponentTypeAnnotation] = {
+CORE_COMPONENTS: dict[str, ComponentTypeAnnotation] = {
     DynamicComponent.__name__: DynamicComponentDef,
     Menu.__name__: MenuDef,
     MenuLink.__name__: MenuLinkDef,
@@ -96,7 +96,7 @@ CORE_COMPONENTS: Dict[str, ComponentTypeAnnotation] = {
 }
 
 # These actions are provided by the core JS of this module
-CORE_ACTIONS: Dict[str, ActionDef] = {
+CORE_ACTIONS: dict[str, ActionDef] = {
     'NavigateTo': NavigateToDef,
     'UpdateVariable': UpdateVariableDef,
     TriggerVariable.__name__: TriggerVariableDef,

dara/core/definitions.py

@@ -19,19 +19,15 @@ from __future__ import annotations
 
 import json
 import uuid
-from collections.abc import Awaitable, Mapping
+from collections.abc import Awaitable, Callable, Mapping
 from enum import Enum
 from typing import (
+    Annotated,
     Any,
-    Callable,
     ClassVar,
-    List,
     Literal,
-    Optional,
     Protocol,
-    Type,
     TypeVar,
-    Union,
     runtime_checkable,
 )
 
@@ -45,7 +41,6 @@ from pydantic import (
     field_validator,
     model_serializer,
 )
-from typing_extensions import Annotated
 
 from dara.core.base_definitions import Action, ComponentType
 from dara.core.base_definitions import DaraBaseModel as BaseModel
@@ -64,7 +59,7 @@ class HttpMethod(Enum):
 
 
 class Session(BaseModel):
-    session_id: Optional[str] = None
+    session_id: str | None = None
 
 
 DEFAULT_ERROR_TITLE = 'Unexpected error occurred'
@@ -99,7 +94,7 @@ class ErrorHandlingConfig(BaseModel):
     description: str = DEFAULT_ERROR_DESCRIPTION
     """Description to display in the error boundary"""
 
-    raw_css: Annotated[Optional[Any], BeforeValidator(transform_raw_css)] = None
+    raw_css: Annotated[Any | None, BeforeValidator(transform_raw_css)] = None
     """
     Raw styling to apply to the displayed error boundary.
     Accepts a CSSProperties, dict, str, or ClientVariable.
@@ -125,27 +120,27 @@ class ComponentInstance(BaseModel):
 
     uid: str = Field(default_factory=lambda: str(uuid.uuid4()))
 
-    js_module: ClassVar[Optional[str]] = None
+    js_module: ClassVar[str | None] = None
     """
     JS module including the implementation of the component.
 
     Required for non-local components.
     """
 
-    py_component: ClassVar[Optional[str]] = None
+    py_component: ClassVar[str | None] = None
     """
     Python unique component name. If not set, defaults to the class name.
     """
 
-    js_component: ClassVar[Optional[str]] = None
+    js_component: ClassVar[str | None] = None
     """
     JS component name. If not set, defaults to the class name.
     """
 
-    required_routes: ClassVar[List[ApiRoute]] = []
+    required_routes: ClassVar[list[ApiRoute]] = []
     """List of routes the component depends on. Will be implicitly added to the app if this component is used"""
 
-    raw_css: Annotated[Optional[Any], BeforeValidator(transform_raw_css)] = None
+    raw_css: Annotated[Any | None, BeforeValidator(transform_raw_css)] = None
     """
     Raw styling to apply to the component.
     Can be an dict/CSSProperties instance representing the `styles` tag, a string injected directly into the CSS of the wrapping component,
@@ -172,25 +167,25 @@ class ComponentInstance(BaseModel):
     ```
     """
 
-    track_progress: Optional[bool] = False
+    track_progress: bool | None = False
     """Whether to use ProgressTracker to display progress updates from a task the component is subscribed to"""
 
-    error_handler: Optional[ErrorHandlingConfig] = None
+    error_handler: ErrorHandlingConfig | None = None
     """Configure the error handling for the component"""
 
-    fallback: Optional[Union[BaseFallback, ComponentInstance]] = None
+    fallback: BaseFallback | ComponentInstance | None = None
     """
     Fallback component to render in place of the actual UI if it has not finished loading
     """
 
-    id_: Optional[str] = None
+    id_: str | None = None
     """
     An optional unique identifier for the component, defaults to None
 
     This is intended to help identify components with human-readable names in the serialized trees, and is also set as the `id` attribute of the DOM element
     """
 
-    for_: Optional[str] = None
+    for_: str | None = None
     """
     An optional for attribute for the component, defaults to None
 
@@ -270,7 +265,7 @@ class CallableClassComponent(Protocol):
     def __call__(self) -> ComponentInstance: ...
 
 
-DiscoverTarget = Union[Callable[..., ComponentInstance], ComponentInstance, Type[CallableClassComponent]]
+DiscoverTarget = Callable[..., ComponentInstance] | ComponentInstance | type[CallableClassComponent]
 DiscoverT = TypeVar('DiscoverT', bound=DiscoverTarget)
 
 
@@ -335,32 +330,32 @@ class StyledComponentInstance(ComponentInstance):
     :param width: the width of the component, can be an number, which will be converted to pixels, or a string
     """
 
-    align: Optional[AlignItems] = None
-    background: Optional[str] = None
-    basis: Optional[Union[int, str, bool]] = None
+    align: AlignItems | None = None
+    background: str | None = None
+    basis: int | str | bool | None = None
     bold: bool = False
-    border: Optional[str] = None
-    border_radius: Optional[Union[float, int, str]] = None
-    children: Optional[List[ComponentInstance]] = None
-    color: Optional[str] = None
-    font: Optional[str] = None
-    font_size: Optional[str] = None
-    gap: Optional[Union[float, int, str]] = None
-    grow: Optional[Union[int, str, float, bool]] = None
-    height: Optional[Union[float, int, str]] = None
-    hug: Optional[bool] = None
+    border: str | None = None
+    border_radius: float | int | str | None = None
+    children: list[ComponentInstance] | None = None
+    color: str | None = None
+    font: str | None = None
+    font_size: str | None = None
+    gap: float | int | str | None = None
+    grow: int | str | float | bool | None = None
+    height: float | int | str | None = None
+    hug: bool | None = None
     italic: bool = False
-    margin: Optional[Union[float, int, str]] = None
-    max_height: Optional[Union[float, int, str]] = None
-    max_width: Optional[Union[float, int, str]] = None
-    min_height: Optional[Union[float, int, str]] = None
-    min_width: Optional[Union[float, int, str]] = None
-    overflow: Optional[str] = None
-    position: Optional[str] = None
-    padding: Optional[Union[float, int, str]] = None
-    shrink: Optional[Union[int, str, float, bool]] = None
+    margin: float | int | str | None = None
+    max_height: float | int | str | None = None
+    max_width: float | int | str | None = None
+    min_height: float | int | str | None = None
+    min_width: float | int | str | None = None
+    overflow: str | None = None
+    position: str | None = None
+    padding: float | int | str | None = None
+    shrink: int | str | float | bool | None = None
     underline: bool = False
-    width: Optional[Union[float, int, str]] = None
+    width: float | int | str | None = None
 
     @field_validator(
         'height',
@@ -401,7 +396,7 @@ class StyledComponentInstance(ComponentInstance):
 
 
 class BaseFallback(StyledComponentInstance):
-    suspend_render: Union[bool, int] = 200
+    suspend_render: bool | int = 200
     """
     :param suspend_render: bool or int, optional
         Determines the suspense behavior of the component during state updates.
@@ -429,20 +424,20 @@ class BaseFallback(StyledComponentInstance):
 
 ComponentInstance.model_rebuild()
 
-ComponentInstanceType = Union[ComponentInstance, Callable[..., ComponentInstance]]
+ComponentInstanceType = ComponentInstance | Callable[..., ComponentInstance]
 
 
 class JsComponentDef(BaseModel):
     """Definition of a JS Component"""
 
-    js_module: Optional[str] = None
+    js_module: str | None = None
     """
     JS module where the component implementation lives.
 
     Not required for local components as they are located via dara.config.json
     """
 
-    js_component: Optional[str] = None
+    js_component: str | None = None
     """
     JS component name. If not set, defaults to `name` property.
     """
@@ -459,11 +454,11 @@ class JsComponentDef(BaseModel):
 class PyComponentDef(BaseModel):
     """Definition of a Python Component"""
 
-    func: Optional[Callable[..., Any]] = None
+    func: Callable[..., Any] | None = None
     name: str
-    dynamic_kwargs: Optional[Mapping[str, AnyVariable]] = None
-    fallback: Optional[Union[BaseFallback, ComponentInstance]] = None
-    polling_interval: Optional[int] = None
+    dynamic_kwargs: Mapping[str, AnyVariable] | None = None
+    fallback: BaseFallback | ComponentInstance | None = None
+    polling_interval: int | None = None
     render_component: Callable[..., Awaitable[Any]]
     """Handler to render the component. Defaults to dara.core.visual.dynamic_component.render_component"""
 
@@ -488,7 +483,7 @@ class PyComponentDef(BaseModel):
 
 
 # Helper type annotation for working with components
-ComponentTypeAnnotation = Union[PyComponentDef, JsComponentDef]
+ComponentTypeAnnotation = PyComponentDef | JsComponentDef
 
 
 class EndpointConfiguration(BaseModel):
@@ -507,7 +502,7 @@ class EndpointConfiguration(BaseModel):
 class ApiRoute(BaseModel):
     """Definition of a route for the application's api"""
 
-    dependencies: List[Depends] = []
+    dependencies: list[Depends] = []
     handler: Callable
     method: HttpMethod
     url: str
@@ -520,13 +515,13 @@ class ApiRoute(BaseModel):
 class Page(BaseModel):
     """Definition of a Page"""
 
-    icon: Optional[str] = None
+    icon: str | None = None
     content: ComponentInstanceType
     name: str
-    sub_pages: Optional[List[Page]] = []
+    sub_pages: list[Page] | None = []
     url_safe_name: str
-    include_in_menu: Optional[bool] = None
-    on_load: Optional[Action] = None
+    include_in_menu: bool | None = None
+    on_load: Action | None = None
     model_config = ConfigDict(extra='forbid')
 
 
@@ -534,17 +529,17 @@ class TemplateRoute(BaseModel):
     """Definition of a route for the TemplateRouter"""
 
     content: ComponentInstance
-    icon: Optional[str] = None
+    icon: str | None = None
     name: str
     route: str
-    include_in_menu: Optional[bool] = None
-    on_load: Optional[Action] = None
+    include_in_menu: bool | None = None
+    on_load: Action | None = None
 
 
 class TemplateRouterLink(BaseModel):
     """Definition of a link for the TemplateRouter"""
 
-    icon: Optional[str] = None
+    icon: str | None = None
     name: str
     route: str
 
@@ -554,8 +549,8 @@ class TemplateRouterContent(BaseModel):
 
     content: ComponentInstance
     route: str
-    on_load: Optional[Action] = None
-    name: Optional[str] = None
+    on_load: Action | None = None
+    name: str | None = None
 
 
 class Template(BaseModel):

dara/core/http.py

@@ -17,8 +17,8 @@ limitations under the License.
 
 import inspect
 from collections import OrderedDict
+from collections.abc import Callable
 from functools import wraps
-from typing import Callable, Dict, List, Type, Union
 
 from fastapi import Depends
 from fastapi.params import Depends as DependsType
@@ -26,7 +26,7 @@ from fastapi.params import Depends as DependsType
 from dara.core.definitions import ApiRoute, EndpointConfiguration, HttpMethod
 
 
-def _get_config_instances(annotations: Dict[str, type]) -> Dict[str, EndpointConfiguration]:
+def _get_config_instances(annotations: dict[str, type]) -> dict[str, EndpointConfiguration]:
     """
     Get EndpointConfiguration instances to inject given the function annotations
 
@@ -54,7 +54,7 @@ def _get_config_instances(annotations: Dict[str, type]) -> Dict[str, EndpointCon
 def _method_decorator(method: HttpMethod):
     """Create a decorator for a given HTTP method"""
 
-    def _decorator(url: str, dependencies: Union[List[DependsType], None] = None, authenticated: bool = True):
+    def _decorator(url: str, dependencies: list[DependsType] | None = None, authenticated: bool = True):
         if dependencies is None:
             dependencies = []
 
@@ -73,7 +73,7 @@ def _method_decorator(method: HttpMethod):
             new_annotations = {}
             params = OrderedDict()
 
-            configurations: List[Type[EndpointConfiguration]] = []
+            configurations: list[type[EndpointConfiguration]] = []
             sig = inspect.signature(func)
             for var_name, typ in func.__annotations__.items():
                 if inspect.isclass(typ) and issubclass(typ, EndpointConfiguration):