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

dara/core/internal/websocket.py

@@ -20,7 +20,7 @@ import inspect
 import math
 import uuid
 from contextvars import ContextVar
-from typing import Any, Dict, Literal, Optional, Set, Tuple, Union
+from typing import Any, Literal
 from uuid import uuid4
 
 import anyio
@@ -56,14 +56,14 @@ class DaraClientMessage(BaseModel):
 
     type: Literal['message'] = 'message'
     channel: str
-    chunk_count: Optional[int] = None
+    chunk_count: int | None = None
     message: Any
 
 
 class CustomClientMessagePayload(BaseModel):
     model_config = ConfigDict(serialize_by_alias=True)
 
-    rchan: Optional[str] = Field(default=None, alias='__rchan')
+    rchan: str | None = Field(default=None, alias='__rchan')
     """Return channel if the message is expected to have a response for"""
 
     kind: str
@@ -89,17 +89,17 @@ class CustomClientMessage(BaseModel):
     message: CustomClientMessagePayload
 
 
-ClientMessage = Union[DaraClientMessage, CustomClientMessage]
+ClientMessage = DaraClientMessage | CustomClientMessage
 
 
 # Server message types
 class ServerMessagePayload(BaseModel):
     model_config = ConfigDict(serialize_by_alias=True, extra='allow')
 
-    rchan: Optional[str] = Field(default=None, alias='__rchan')
+    rchan: str | None = Field(default=None, alias='__rchan')
     """Return channel if the message is expected to have a response for"""
 
-    response_for: Optional[str] = Field(default=None, alias='__response_for')
+    response_for: str | None = Field(default=None, alias='__response_for')
     """ID of the __rchan included in the original client message if this message is a response to a client message"""
 
     @model_serializer(mode='wrap')
@@ -140,11 +140,11 @@ class CustomServerMessage(BaseModel):
     message: CustomServerMessagePayload
 
 
-ServerPayload = Union[ServerMessagePayload, CustomServerMessagePayload]
-LoosePayload = Union[ServerPayload, dict]
-ServerMessage = Union[DaraServerMessage, CustomServerMessage]
+ServerPayload = ServerMessagePayload | CustomServerMessagePayload
+LoosePayload = ServerPayload | dict
+ServerMessage = DaraServerMessage | CustomServerMessage
 
-WS_CHANNEL: ContextVar[Optional[str]] = ContextVar('ws_channel', default=None)
+WS_CHANNEL: ContextVar[str | None] = ContextVar('ws_channel', default=None)
 
 
 class WebSocketHandler:
@@ -167,7 +167,7 @@ class WebSocketHandler:
     Stream containing messages to send to the client.
     """
 
-    pending_responses: Dict[str, Tuple[Event, Optional[Any]]]
+    pending_responses: dict[str, tuple[Event, Any | None]]
     """
     A map of pending responses from the client. The key is the message ID and the value is a tuple of the event to
     notify when the response is received and the response data.
@@ -276,7 +276,7 @@ class WebSocketHandler:
         # unreachable but needed for pylint to be happy
         return None
 
-    async def send_and_wait(self, message: ServerMessage) -> Optional[Any]:
+    async def send_and_wait(self, message: ServerMessage) -> Any | None:
         """
         Send a message to the client and return the client's response
 
@@ -300,7 +300,7 @@ class WebSocketHandler:
         return response_data
 
 
-def get_user_channels(user_identifier: str) -> Set[str]:
+def get_user_channels(user_identifier: str) -> set[str]:
     """
     Get connected websocket channels associated with a given user.
 
@@ -311,7 +311,7 @@ def get_user_channels(user_identifier: str) -> Set[str]:
     if sessions_registry.has(user_identifier):
         user_sessions = sessions_registry.get(user_identifier)
 
-        channels: Set[str] = set()
+        channels: set[str] = set()
         for session_id in user_sessions:
             if websocket_registry.has(session_id):
                 channels |= websocket_registry.get(session_id)
@@ -327,7 +327,7 @@ class WebsocketManager:
     """
 
     def __init__(self):
-        self.handlers: Dict[str, WebSocketHandler] = {}
+        self.handlers: dict[str, WebSocketHandler] = {}
         """
         A mapping of channel IDs to WebSocketHandler instances.
         """
@@ -354,7 +354,7 @@ class WebsocketManager:
         self.handlers[channel_id] = handler
         return handler
 
-    async def broadcast(self, message: LoosePayload, custom=False, ignore_channel: Optional[str] = None):
+    async def broadcast(self, message: LoosePayload, custom=False, ignore_channel: str | None = None):
         """
         Send a message to all connected clients.
 
@@ -369,7 +369,7 @@ class WebsocketManager:
                 tg.start_soon(handler.send_message, self._construct_message(message, custom))
 
     async def send_message_to_user(
-        self, user_id: str, message: LoosePayload, custom=False, ignore_channel: Optional[str] = None
+        self, user_id: str, message: LoosePayload, custom=False, ignore_channel: str | None = None
     ):
         """
         Send a message to all connected channels associated with the given user.
@@ -424,7 +424,7 @@ class WebsocketManager:
             del self.handlers[channel_id]
 
 
-async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=None)):
+async def ws_handler(websocket: WebSocket, token: str | None = Query(default=None)):
     """
     Websocket handler. Used for live_reloading in dev mode and for notifying the UI of task results.
 

dara/core/js_tooling/js_utils.py

@@ -24,7 +24,7 @@ import shutil
 import sys
 from enum import Enum
 from importlib.metadata import version
-from typing import Any, ClassVar, Dict, List, Literal, Optional, Set, Union, cast
+from typing import Any, ClassVar, Literal, Optional, Union, cast
 
 from packaging.version import Version
 from pydantic import BaseModel
@@ -47,7 +47,7 @@ class JsConfig(BaseModel):
     local_entry: str
     """Relative path to the local entrypoint from the package root"""
 
-    extra_dependencies: Dict[str, str]
+    extra_dependencies: dict[str, str]
     """Extra dependencies to add to package.json before running install"""
 
     package_manager: Literal['npm', 'yarn', 'pnpm']
@@ -77,13 +77,13 @@ class BuildConfig(BaseModel):
     dev: bool
     """Whether dev (HMR) mode is enabled"""
 
-    js_config: Optional[JsConfig] = None
+    js_config: JsConfig | None = None
     """Custom JS configuration from dara.config.json file"""
 
-    npm_registry: Optional[str] = None
+    npm_registry: str | None = None
     """Optional npm registry url to pull packages from"""
 
-    npm_token: Optional[str] = None
+    npm_token: str | None = None
     """Optional npm token for the registry url added above"""
 
     @staticmethod
@@ -109,7 +109,7 @@ class BuildCacheDiff(BaseModel):
     Contains a list of keys that have changed.
     """
 
-    keys: Set[BuildCacheKey]
+    keys: set[BuildCacheKey]
 
     def should_rebuild_js(self) -> bool:
         """
@@ -119,7 +119,7 @@ class BuildCacheDiff(BaseModel):
         - package_map changed - required packages changed, we need to install new packages
         - build_config changed - build config changed, we need to install with a different config
         """
-        full_rebuild_keys: Set[BuildCacheKey] = set(['static_files_dir', 'package_map', 'build_config'])
+        full_rebuild_keys: set[BuildCacheKey] = set(['static_files_dir', 'package_map', 'build_config'])
 
         return len(full_rebuild_keys.intersection(self.keys)) > 0
 
@@ -137,13 +137,13 @@ class BuildCache(BaseModel):
     how to handle the frontend assets and statics.
     """
 
-    static_folders: List[str]
+    static_folders: list[str]
     """List of static folders registered"""
 
     static_files_dir: str
     """Static files output folder"""
 
-    package_map: Dict[str, str]
+    package_map: dict[str, str]
     """Map of py_module_name to js_module_name"""
 
     build_config: BuildConfig
@@ -152,7 +152,7 @@ class BuildCache(BaseModel):
     FILENAME: ClassVar[str] = '_build.json'
 
     @staticmethod
-    def from_config(config: Configuration, build_config: Optional[BuildConfig] = None):
+    def from_config(config: Configuration, build_config: BuildConfig | None = None):
         """
         Create a BuildCache from a Configuration
 
@@ -202,7 +202,7 @@ class BuildCache(BaseModel):
                     # Otherwise copy file if doesn't already exist
                     shutil.copy2(file_or_dir_path, self.static_files_dir)
 
-    def find_favicon(self) -> Optional[str]:
+    def find_favicon(self) -> str | None:
         """
         Find the favicon in the static files directories, looks for any .ico file
 
@@ -250,7 +250,7 @@ class BuildCache(BaseModel):
             os.unlink(new_node_modules_path)
         os.symlink(node_modules_path, new_node_modules_path)
 
-    def get_importers(self) -> Dict[str, str]:
+    def get_importers(self) -> dict[str, str]:
         """
         Get the importers map for this BuildCache.
         Includes `self.package_map` and a local entry if it exists.
@@ -265,7 +265,7 @@ class BuildCache(BaseModel):
 
         return importers
 
-    def get_py_modules(self) -> List[str]:
+    def get_py_modules(self) -> list[str]:
         """
         Get a list of all py modules used in this BuildCache
         """
@@ -279,7 +279,7 @@ class BuildCache(BaseModel):
 
         return list(py_modules)
 
-    def get_package_json(self) -> Dict[str, Any]:
+    def get_package_json(self) -> dict[str, Any]:
         """
         Generate a package.json file for this BuildCache
         """
@@ -320,7 +320,7 @@ class BuildCache(BaseModel):
 
         return pkg_json
 
-    def get_diff(self, other: Optional[Union['BuildCache', str]] = None) -> BuildCacheDiff:
+    def get_diff(self, other: Union['BuildCache', str] | None = None) -> BuildCacheDiff:
         """
         Get the diff between this BuildCache and another.
         Returns a list of keys that have changed.
@@ -339,7 +339,7 @@ class BuildCache(BaseModel):
         else:
             other_cache = other
 
-        diff: Set[BuildCacheKey] = set()
+        diff: set[BuildCacheKey] = set()
 
         if set(self.static_folders) != set(other_cache.static_folders):
             diff.add('static_folders')
@@ -439,7 +439,7 @@ def _get_module_file(module: str) -> str:
         return cast(str, imported_module.__file__)
 
 
-def rebuild_js(build_cache: BuildCache, build_diff: Union[BuildCacheDiff, None] = None):
+def rebuild_js(build_cache: BuildCache, build_diff: BuildCacheDiff | None = None):
     """
     Generic 'rebuild' function which bundles/prepares assets depending on the build mode chosen
 
@@ -641,7 +641,7 @@ def prepare_autojs_assets(build_cache: BuildCache):
             shutil.copy(css_asset_path, os.path.join(build_cache.static_files_dir, f'{module_name}.css'))
 
 
-def build_autojs_template(build_cache: BuildCache, config: Configuration) -> Dict[str, Any]:
+def build_autojs_template(build_cache: BuildCache, config: Configuration) -> dict[str, Any]:
     """
     Build the autojs html template by preparing context data with required tags based on packages loaded
     and including the startup script
@@ -669,7 +669,7 @@ def build_autojs_template(build_cache: BuildCache, config: Configuration) -> Dic
 
     core_version = _get_py_version('dara.core')
 
-    package_tags: Dict[str, List[str]] = {
+    package_tags: dict[str, list[str]] = {
         'dara.core': [
             f'<script crossorigin src="{settings.dara_base_url}/static/dara.core.umd.js?v={core_version}"></script>',
             f'<link rel="stylesheet" href="{settings.dara_base_url}/static/dara.core.css?v={core_version}"></link>',

dara/core/logging.py

@@ -20,7 +20,7 @@ import logging
 import sys
 import time
 import traceback
-from typing import Any, Dict, Optional, Union
+from typing import Any
 
 import colorama
 from colorama import Back, Fore
@@ -31,7 +31,7 @@ from starlette.types import Message
 
 colorama.init()
 
-JsonSerializable = Union[str, int, float, dict, None]
+JsonSerializable = str | int | float | dict | None
 
 one_mb = int(1024 * 1024)
 
@@ -49,32 +49,32 @@ class Logger:
         """
         return self._logger.getEffectiveLevel()
 
-    def info(self, title: str, extra: Optional[Dict[str, Any]] = None):
+    def info(self, title: str, extra: dict[str, Any] | None = None):
         """
         Log a message at the INFO level
 
         :param title: short title for the log message
         :param extra: an optional field for any extra info to be passed along
         """
-        payload: Dict[str, JsonSerializable] = {
+        payload: dict[str, JsonSerializable] = {
             'title': title,
         }
         self._logger.info(payload, extra={'content': extra})
 
-    def warning(self, title: str, extra: Optional[Dict[str, Any]] = None):
+    def warning(self, title: str, extra: dict[str, Any] | None = None):
         """
         Log a message at the WARNING level
 
         :param title: short title for the log message
         :param extra: an optional field for any extra info to be passed along
         """
-        payload: Dict[str, JsonSerializable] = {
+        payload: dict[str, JsonSerializable] = {
             'title': title,
         }
 
         self._logger.warning(payload, extra={'content': extra})
 
-    def error(self, title: str, error: BaseException, extra: Optional[Dict[str, Any]] = None):
+    def error(self, title: str, error: BaseException, extra: dict[str, Any] | None = None):
         """
         Log a message at the ERROR level
 
@@ -86,7 +86,7 @@ class Logger:
 
         self._logger.error(payload, extra={'content': extra})
 
-    def debug(self, title: str, description: Optional[str] = None, extra: Optional[Dict[str, Any]] = None):
+    def debug(self, title: str, description: str | None = None, extra: dict[str, Any] | None = None):
         """
         Log a message at the DEBUG level
 
@@ -97,7 +97,7 @@ class Logger:
         # Extract the traceback so we can add the line where this debug message was from
         frame_summary = traceback.extract_stack()[-2]
 
-        payload: Dict[str, JsonSerializable] = {
+        payload: dict[str, JsonSerializable] = {
             'filename': frame_summary.filename,
             'func_name': frame_summary.name,
             'lineno': frame_summary.lineno,
@@ -171,7 +171,7 @@ class LoggingMiddleware(BaseHTTPMiddleware):
         return response
 
 
-def _print_stacktrace(err: Optional[BaseException] = None) -> str:
+def _print_stacktrace(err: BaseException | None = None) -> str:
     """
     Prints out the current stack trace whilst unwinding all the logging calls on the way so it just shows the relevant
     parts. Will also extract any exceptions and print them at the end.
@@ -207,10 +207,10 @@ class DaraProdFormatter(logging.Formatter):
     """
 
     @staticmethod
-    def _get_payload(record: logging.LogRecord) -> Dict[str, JsonSerializable]:
-        timestamp = time.strftime('%Y-%m-%dT%H:%M:%S', time.localtime(record.created)) + '.%s' % int(record.msecs)
+    def _get_payload(record: logging.LogRecord) -> dict[str, JsonSerializable]:
+        timestamp = time.strftime('%Y-%m-%dT%H:%M:%S', time.localtime(record.created)) + f'.{int(record.msecs)}'
         if isinstance(record.msg, dict):
-            payload: Dict[str, JsonSerializable] = {
+            payload: dict[str, JsonSerializable] = {
                 'timestamp': timestamp,
                 'level': record.levelno,
                 'name': record.name,

dara/core/main.py

@@ -25,7 +25,6 @@ from contextlib import asynccontextmanager
 from importlib.util import find_spec
 from inspect import iscoroutine
 from pathlib import Path
-from typing import Optional
 
 from anyio import create_task_group
 from fastapi import FastAPI, HTTPException, Request
@@ -147,7 +146,7 @@ def _start_application(config: Configuration):
 
             utils_registry.set('TaskPool', None)
 
-            task_pool: Optional[TaskPool] = None
+            task_pool: TaskPool | None = None
 
             # Only initialize the pool if a task module is configured
             if config.task_module:
@@ -391,7 +390,7 @@ def _start_application(config: Configuration):
 
         # Catch-all, must add after adding the last api route
         @app.get('/api/{rest_of_path:path}')
-        async def not_found():
+        async def not_found(rest_of_path: str):
             raise HTTPException(status_code=404, detail='API endpoint not found')
 
         # Prepare static template data
@@ -427,13 +426,13 @@ def _start_application(config: Configuration):
             context.update(build_autojs_template(build_cache, config))
 
         @app.get('/{full_path:path}', include_in_schema=False, response_class=_TemplateResponse)
-        async def serve_app(request: Request):
+        async def serve_app(full_path: str, request: Request):
             return jinja_templates.TemplateResponse(request, template_name, context=context)
 
     else:
         # Catch-all, must be at the very end
         @app.get('/api/{rest_of_path:path}')
-        async def not_found():
+        async def not_found(rest_of_path: str):
             raise HTTPException(status_code=404, detail='API endpoint not found')
 
     return app

dara/core/metrics/cache.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Dict, Union
-
 from prometheus_client import Info
 
 from dara.core.base_definitions import DaraBaseModel as BaseModel
@@ -24,7 +22,7 @@ from dara.core.base_definitions import DaraBaseModel as BaseModel
 cache_metric = Info('cache_size', 'Current size of cache stores and registries', labelnames=['registry_name'])
 
 
-def format_bytes(num: Union[int, float]) -> str:
+def format_bytes(num: int | float) -> str:
     """
     Efficient way to format bytes to human readable,
     simplified version of https://stackoverflow.com/a/63839503
@@ -55,7 +53,7 @@ class CacheMetricsTracker(BaseModel):
     Stores and aggregates cache sizes for metrics
     """
 
-    registries: Dict[str, int] = {}
+    registries: dict[str, int] = {}
     cache_store: int = 0
 
     def update_registry(self, name: str, size: int):

dara/core/persistence.py

@@ -1,17 +1,11 @@
 import abc
 import json
 import os
-from collections.abc import Awaitable
+from collections.abc import Awaitable, Callable
 from typing import (
     TYPE_CHECKING,
     Any,
-    Callable,
-    Dict,
-    List,
     Literal,
-    Optional,
-    Set,
-    Union,
 )
 from uuid import uuid4
 
@@ -66,7 +60,7 @@ class PersistenceBackend(BaseModel, abc.ABC):
         """
 
     @abc.abstractmethod
-    async def get_all(self) -> Dict[str, Any]:
+    async def get_all(self) -> dict[str, Any]:
         """
         Get all the values as a dictionary of key-value pairs
         """
@@ -83,7 +77,7 @@ class InMemoryBackend(PersistenceBackend):
     In-memory persistence backend
     """
 
-    data: Dict[str, Any] = Field(default_factory=dict)
+    data: dict[str, Any] = Field(default_factory=dict)
 
     async def has(self, key: str) -> bool:
         return key in self.data
@@ -124,7 +118,7 @@ class FileBackend(PersistenceBackend):
             content = await f.read()
             return json.loads(content) if content else {}
 
-    async def _write_data(self, data: Dict[str, Any]):
+    async def _write_data(self, data: dict[str, Any]):
         async with await anyio.open_file(self.path, 'w') as f:
             await f.write(json.dumps(data))
 
@@ -199,16 +193,16 @@ class BackendStore(PersistenceStore):
     readonly: bool = False
 
     default_value: Any = Field(default=None, exclude=True)
-    initialized_scopes: Set[str] = Field(default_factory=set, exclude=True)
-    sequence_number: Dict[str, int] = Field(
+    initialized_scopes: set[str] = Field(default_factory=set, exclude=True)
+    sequence_number: dict[str, int] = Field(
         default_factory=dict, exclude=True
     )  # Track sequence numbers per user for patch validation
 
     def __init__(
         self,
-        backend: Optional[PersistenceBackend] = None,
-        uid: Optional[str] = None,
-        scope: Optional[str] = None,
+        backend: PersistenceBackend | None = None,
+        uid: str | None = None,
+        scope: str | None = None,
         readonly: bool = False,
     ):
         """
@@ -220,7 +214,7 @@ class BackendStore(PersistenceStore):
             if 'user' a value is stored per user
         :param readonly: whether to use the backend in read-only mode, i.e. skip syncing values from client to backend and raise if write()/delete() is called
         """
-        kwargs: Dict[str, Any] = {}
+        kwargs: dict[str, Any] = {}
         if backend:
             kwargs['backend'] = backend
 
@@ -269,7 +263,7 @@ class BackendStore(PersistenceStore):
 
         raise ValueError('User not found when trying to compute the key for a user-scoped store')
 
-    def _get_user(self, key: str) -> Optional[str]:
+    def _get_user(self, key: str) -> str | None:
         """
         Get the user for a given key. Returns None if the key is global.
         Reverts the `_get_key` method to get the user for a given key.
@@ -308,7 +302,7 @@ class BackendStore(PersistenceStore):
 
         return utils_registry.get('WebsocketManager')
 
-    def _create_msg(self, scope_key: str, **payload) -> Dict[str, Any]:
+    def _create_msg(self, scope_key: str, **payload) -> dict[str, Any]:
         """
         Create a message to send to the frontend.
         :param scope_key: scope key for sequence number
@@ -333,7 +327,7 @@ class BackendStore(PersistenceStore):
         self.sequence_number[key] = current + 1
         return self.sequence_number[key]
 
-    async def _notify_user(self, user_identifier: str, ignore_channel: Optional[str] = None, **payload):
+    async def _notify_user(self, user_identifier: str, ignore_channel: str | None = None, **payload):
         """
         Notify a given user about updates to this store.
         :param user_identifier: user to notify
@@ -346,7 +340,7 @@ class BackendStore(PersistenceStore):
             ignore_channel=ignore_channel,
         )
 
-    async def _notify_global(self, ignore_channel: Optional[str] = None, **payload):
+    async def _notify_global(self, ignore_channel: str | None = None, **payload):
         """
         Notify all users about updates to this store.
         :param ignore_channel: if specified, ignore the specified channel
@@ -357,7 +351,7 @@ class BackendStore(PersistenceStore):
             ignore_channel=ignore_channel,
         )
 
-    async def _notify_value(self, value: Any, ignore_channel: Optional[str] = None):
+    async def _notify_value(self, value: Any, ignore_channel: str | None = None):
         """
         Notify all clients about the new value for this store.
         Broadcasts to all users if scope is global or sends to the current user if scope is user.
@@ -377,7 +371,7 @@ class BackendStore(PersistenceStore):
         user_identifier = user.identity_id
         return await self._notify_user(user_identifier, value=value, ignore_channel=ignore_channel)
 
-    async def _notify_patches(self, patches: List[Dict[str, Any]]):
+    async def _notify_patches(self, patches: list[dict[str, Any]]):
         """
         Notify all clients about partial updates to this store.
         Broadcasts to all users if scope is global or sends to the current user if scope is user.
@@ -415,7 +409,7 @@ class BackendStore(PersistenceStore):
 
             await self.backend.subscribe(_on_value)
 
-    async def write_partial(self, data: Union[List[Dict[str, Any]], Any], notify: bool = True, in_place: bool = False):
+    async def write_partial(self, data: list[dict[str, Any]] | Any, notify: bool = True, in_place: bool = False):
         """
         Apply partial updates to the store using JSON Patch operations or automatic diffing.
 
@@ -474,7 +468,7 @@ class BackendStore(PersistenceStore):
 
         return updated_value
 
-    async def write(self, value: Any, notify=True, ignore_channel: Optional[str] = None):
+    async def write(self, value: Any, notify=True, ignore_channel: str | None = None):
         """
         Persist a value to the store.
 
@@ -530,7 +524,7 @@ class BackendStore(PersistenceStore):
             await self._notify_value(None)
         return await run_user_handler(self.backend.delete, (key,))
 
-    async def get_all(self) -> Dict[str, Any]:
+    async def get_all(self) -> dict[str, Any]:
         """
         Get all the values from the store as a dictionary of key-value pairs.
 

dara/core/router/compat.py

@@ -1,5 +1,3 @@
-from typing import List
-
 from dara.core.definitions import ComponentInstance
 
 from .components import Outlet
@@ -24,7 +22,7 @@ def convert_template_to_router(template):
     from dara.core.visual.components.router_content import RouterContent
 
     router = Router()
-    extracted_routes: List[TemplateRouterContent] = []
+    extracted_routes: list[TemplateRouterContent] = []
 
     # Transform the layout: replace RouterContent with Outlet and extract routes
     def transform_component(component):

dara/core/router/components.py

@@ -1,4 +1,4 @@
-from typing import Annotated, Any, Literal, Optional, Union
+from typing import Annotated, Any, Literal
 
 from pydantic import BeforeValidator
 
@@ -38,7 +38,7 @@ class Navigate(ComponentInstance):
     ```
     """
 
-    to: Union[str, RouterPath, ClientVariable]
+    to: str | RouterPath | ClientVariable
 
     replace: bool = False
     """
@@ -132,21 +132,21 @@ class Link(StyledComponentInstance):
     ```
     """
 
-    to: Union[str, RouterPath, ClientVariable]
+    to: str | RouterPath | ClientVariable
     """
     Can be a string or RouterPath object
     """
 
     # core anchor element attributes
-    target: Optional[str] = None
-    download: Optional[str] = None
-    rel: Optional[str] = None
-    referrer_policy: Optional[str] = None
+    target: str | None = None
+    download: str | None = None
+    rel: str | None = None
+    referrer_policy: str | None = None
 
-    active_css: Annotated[Optional[Any], BeforeValidator(transform_raw_css)] = None
-    inactive_css: Annotated[Optional[Any], BeforeValidator(transform_raw_css)] = None
+    active_css: Annotated[Any | None, BeforeValidator(transform_raw_css)] = None
+    inactive_css: Annotated[Any | None, BeforeValidator(transform_raw_css)] = None
 
-    def __init__(self, *children: Union[str, ComponentInstance], **kwargs):
+    def __init__(self, *children: str | ComponentInstance, **kwargs):
         components = list(children)
         if 'children' not in kwargs:
             kwargs['children'] = components