dara-core 1.21.11__py3-none-any.whl → 1.21.13__py3-none-any.whl

dara/core/base_definitions.py

@@ -31,6 +31,7 @@ from typing import (
     ClassVar,
     Dict,
     List,
+    Literal,
     Optional,
     Tuple,
     Union,
@@ -438,6 +439,60 @@ class PendingTask(BaseTask):
         return self.result
 
 
+class RouterPath(BaseModel):
+    path: Optional[str] = None
+    """
+    A URL pathname, beginning with '/'.
+    """
+
+    search: Optional[str] = None
+    """
+    A URL search string, beginning with '?'.
+    """
+
+    hash: Optional[str] = None
+    """
+    A URL hash string, beginning with '#'.
+    """
+
+
+class NavigateOptions(BaseModel):
+    """
+    Options for the navigate action
+    """
+
+    replace: bool = False
+    """
+    Replaces the current entry in the history stack instead of pushing a new one.
+
+    ```
+    # with a history stack like this
+    A -> B
+
+    # normal link click pushes a new entry
+    A -> B -> C
+
+    # but with `replace`, B is replaced by C
+    A -> C
+    ```
+    """
+
+    relative: Literal['route', 'path'] = 'route'
+    """
+    Defines the relative path behavior for the link.
+
+    ```python
+    NavigateOptions(to='..') # default, relative='route'
+    NavigateOptions(to='..', relative='path')
+    ```
+
+    Consider a route hierarchy where a parent route pattern is "blog" and a child route pattern is "blog/:slug/edit".
+    - route — default, resolves the link relative to the route pattern. In the example above, a relative link of "..." will remove both :slug/edit segments back to "/blog".
+    - path — relative to the path so "..." will only remove one URL segment up to "/blog/:slug"
+    Note that index routes and layout routes do not have paths so they are not included in the relative path calculation.
+    """
+
+
 class AnnotatedAction(BaseModel):
     """
     Represents a single call to an @action-annotated action.

dara/core/interactivity/actions.py

@@ -51,6 +51,8 @@ from dara.core.base_definitions import (
     ActionImpl,
     ActionResolverDef,
     AnnotatedAction,
+    NavigateOptions,
+    RouterPath,
     TaskProgressUpdate,
 )
 from dara.core.base_definitions import DaraBaseModel as BaseModel
@@ -372,9 +374,15 @@ class NavigateToImpl(ActionImpl):
 
     py_name = 'NavigateTo'
 
-    url: Optional[str] = None
+    url: Union[str, RouterPath]
+
     new_tab: bool = False
 
+    options: Optional[NavigateOptions] = None
+    """
+    Options for relative navigations
+    """
+
 
 @deprecated('Use @action or `NavigateToImpl` for simple cases')
 def NavigateTo(
@@ -947,7 +955,9 @@ class ActionCtx:
         """
         return await TriggerVariable(variable=variable, force=force).execute(self)
 
-    async def navigate(self, url: str, new_tab: bool = False):
+    async def navigate(
+        self, url: Union[str, RouterPath], new_tab: bool = False, options: Optional[NavigateOptions] = None
+    ):
         """
         Navigate to a given url
 
@@ -991,8 +1001,9 @@ class ActionCtx:
 
         :param url: the url to navigate to
         :param new_tab: whether to open the url in a new tab, defaults to False
+        :param options: options for relative navigations, defaults to None
         """
-        return await NavigateToImpl(url=url, new_tab=new_tab).execute(self)
+        return await NavigateToImpl(url=url, new_tab=new_tab, options=options).execute(self)
 
     async def logout(self):
         """

dara/core/internal/pool/utils.py

@@ -68,7 +68,7 @@ def store_in_shared_memory(content: Any) -> SharedMemoryPointer:
         data_size = len(pickled_args)
 
         shared_mem = SharedMemory(create=True, size=data_size)
-
+        assert shared_mem.buf
         shared_mem.buf[0:data_size] = pickled_args
         shared_mem.close()
 
@@ -88,6 +88,7 @@ def read_from_shared_memory(pointer: SharedMemoryPointer) -> Any:
 
         # Read from memory
         shared_mem = SharedMemory(name=shared_mem_name)
+        assert shared_mem.buf
         data = shared_mem.buf[:data_size]
 
         # Unpickle and deepcopy

dara/core/internal/tasks.py

@@ -19,7 +19,7 @@ import contextlib
 import inspect
 import math
 from collections.abc import Awaitable
-from typing import Any, Callable, Dict, List, Optional, Set, Union, overload
+from typing import Any, Callable, Dict, List, Optional, Set, Union, cast, overload
 
 from anyio import (
     BrokenResourceError,
@@ -453,8 +453,8 @@ class TaskManager:
 
                     # Notify channels that this specific task was cancelled
                     if notify:
-                        await self._send_notification_for_pending_task(
-                            pending_task=pending_task,
+                        await self._send_notification_for_task(
+                            task=pending_task,
                             messages=[{'status': 'CANCELED', 'task_id': task_id_to_cancel}],
                         )
 
@@ -556,12 +556,14 @@ class TaskManager:
 
         return task_ids
 
-    async def _multicast_notification(self, task_id: str, messages: List[dict]):
+    async def _multicast_notification(self, task_id: str, messages: List[dict], variable_task_id: bool = True):
         """
         Send notifications to all task IDs that are related to a given task
 
         :param task: the task the notifications are related to
         :param messages: List of message dictionaries to send to all related tasks
+        :param variable_task_id: whether the task_id in messages should be replaced with the task being notified
+          or if False, the task_id should be left as is
         """
         # prevent cancellation, we need the notifications to be sent
         with CancelScope(shield=True):
@@ -581,28 +583,33 @@ class TaskManager:
                         if pending_task_id not in self.tasks:
                             continue
                         pending_task = self.tasks[pending_task_id]
-                        task_tg.start_soon(self._send_notification_for_pending_task, pending_task, messages)
+                        task_tg.start_soon(self._send_notification_for_task, pending_task, messages, variable_task_id)
 
-    async def _send_notification_for_pending_task(self, pending_task: PendingTask, messages: List[dict]):
+    async def _send_notification_for_task(self, task: BaseTask, messages: List[dict], variable_task_id: bool = True):
         """
         Send notifications for a specific PendingTask
 
         :param pending_task: The PendingTask to send notifications for
         :param messages: The messages to send
+        :param variable_task_id: whether the task_id in messages should be replaced with the task being notified
         """
         # Collect channels for this PendingTask
-        channels_to_notify = set(pending_task.notify_channels)
-        channels_to_notify.update(pending_task.task_def.notify_channels)
+        channels_to_notify = set(task.notify_channels)
+        if isinstance(task, PendingTask):
+            channels_to_notify.update(task.task_def.notify_channels)
 
         if not channels_to_notify:
             return
 
-        # Send to all channels for this PendingTask in parallel
+        # Send to all channels for this Task in parallel
         async def _send_to_channel(channel: str):
             async with create_task_group() as channel_tg:
                 for message in messages:
-                    # Create message with this PendingTask's task_id (if message has task_id)
-                    message_for_task = {**message, 'task_id': pending_task.task_id} if 'task_id' in message else message
+                    if variable_task_id:
+                        # Create message with this Task's task_id (if message has task_id)
+                        message_for_task = {**message, 'task_id': task.task_id} if 'task_id' in message else message
+                    else:
+                        message_for_task = message
                     channel_tg.start_soon(self.ws_manager.send_message, channel, message_for_task)
 
         async with create_task_group() as channel_tg:
@@ -633,13 +640,18 @@ class TaskManager:
                     async for message in receive_stream:
                         if isinstance(message, TaskProgressUpdate):
                             # Send progress notifications to related tasks
-                            progress_message = {
-                                'task_id': message.task_id,  # Will be updated per task ID in multicast
-                                'status': 'PROGRESS',
-                                'progress': message.progress,
-                                'message': message.message,
-                            }
-                            await self._multicast_notification(message.task_id, [progress_message])
+                            await self._multicast_notification(
+                                task_id=message.task_id,
+                                messages=[
+                                    {
+                                        # Will be updated per task ID in multicast
+                                        'task_id': message.task_id,
+                                        'status': 'PROGRESS',
+                                        'progress': message.progress,
+                                        'message': message.message,
+                                    }
+                                ],
+                            )
                             if isinstance(task, Task) and task.on_progress:
                                 await run_user_handler(task.on_progress, args=(message,))
                         elif isinstance(message, TaskResult):
@@ -659,10 +671,17 @@ class TaskManager:
                             # Set final result
                             await self.set_result(message.task_id, message.result)
 
-                            # Notify all PendingTasks that depend on this specific task
+                            # NOTE: this is still multicasting to all related channels to ensure
+                            # all interested parties are notified, but notably we use `variable_task_id=False`
+                            # to only notify about the task that actually completed,
+                            # as opposed to e.g. progress, errors and cancellations which
+                            # we 'bubble up' by updating the task_id in the message to the respective related task
                             await self._multicast_notification(
                                 task_id=message.task_id,
-                                messages=[{'result': message.result, 'status': 'COMPLETE', 'task_id': message.task_id}],
+                                messages=[
+                                    {'result': message.result, 'status': 'COMPLETE', 'task_id': message.task_id},
+                                ],
+                                variable_task_id=False,
                             )
 
                             # Remove the task from the registered tasks - it finished running
@@ -726,7 +745,8 @@ class TaskManager:
                             eng_logger.info(f'TaskManager finished task {task.task_id}', {'result': result})
             finally:
                 with CancelScope(shield=True):
-                    # pyright: ignore[reportUnreachable]
+                    # cast explicitly as otherwise pyright thinks it's always None here
+                    task_error = cast(Optional[ExceptionGroup], task_error)
                     if task_error is not None:
                         err = task_error
                         # Mark pending task as failed
@@ -755,8 +775,8 @@ class TaskManager:
                             error = get_error_for_channel(err)
                             message = {'status': 'ERROR', 'task_id': task.task_id, 'error': error['error']}
                             # Notify about this task failing, and a server broadcast error
-                            await self._send_notification_for_pending_task(
-                                pending_task=pending_task,
+                            await self._send_notification_for_task(
+                                task=pending_task,
                                 messages=[message, error],
                             )
                             # notify related tasks

dara/core/router/components.py

@@ -1,27 +1,16 @@
 from typing import Annotated, Any, Literal, Optional, Union
 
-from pydantic import BaseModel, BeforeValidator
-
-from dara.core.definitions import ComponentInstance, JsComponentDef, StyledComponentInstance, transform_raw_css
+from pydantic import BeforeValidator
+
+from dara.core.base_definitions import RouterPath
+from dara.core.definitions import (
+    ComponentInstance,
+    JsComponentDef,
+    StyledComponentInstance,
+    transform_raw_css,
+)
 from dara.core.interactivity import ClientVariable
-
-
-class RouterPath(BaseModel):
-    path: str
-    """
-    A URL pathname, beginning with '/'.
-    """
-
-    search: Optional[str] = None
-    """
-    A URL search string, beginning with '?'.
-    """
-
-    hash: Optional[str] = None
-    """
-    A URL hash string, beginning with '#'.
-    """
-
+from dara.core.visual.components import RawString
 
 OutletDef = JsComponentDef(name='Outlet', js_module='@darajs/core', py_module='dara.core')
 
@@ -52,8 +41,35 @@ class Navigate(ComponentInstance):
     to: Union[str, RouterPath, ClientVariable]
 
     replace: bool = False
+    """
+    Replaces the current entry in the history stack instead of pushing a new one.
+
+    ```
+    # with a history stack like this
+    A -> B
+
+    # normal link click pushes a new entry
+    A -> B -> C
+
+    # but with `replace`, B is replaced by C
+    A -> C
+    ```
+    """
 
     relative: Literal['route', 'path'] = 'route'
+    """
+    Defines the relative path behavior for the link.
+
+    ```python
+    Navigate(to='..') # default, relative='route'
+    Navigate(to='..', relative='path')
+    ```
+
+    Consider a route hierarchy where a parent route pattern is "blog" and a child route pattern is "blog/:slug/edit".
+    - route — default, resolves the link relative to the route pattern. In the example above, a relative link of "..." will remove both :slug/edit segments back to "/blog".
+    - path — relative to the path so "..." will only remove one URL segment up to "/blog/:slug"
+    Note that index routes and layout routes do not have paths so they are not included in the relative path calculation.
+    """
 
 
 LinkDef = JsComponentDef(name='Link', js_module='@darajs/core', py_module='dara.core')
@@ -121,15 +137,23 @@ class Link(StyledComponentInstance):
     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
+
     active_css: Annotated[Optional[Any], BeforeValidator(transform_raw_css)] = None
     inactive_css: Annotated[Optional[Any], BeforeValidator(transform_raw_css)] = None
 
-    # TODO: add scroll restoration if it works?
-
-    def __init__(self, *children: ComponentInstance, **kwargs):
+    def __init__(self, *children: Union[str, ComponentInstance], **kwargs):
         components = list(children)
         if 'children' not in kwargs:
             kwargs['children'] = components
+
+        if len(kwargs['children']) > 0:
+            kwargs['children'] = [RawString(content=x) if isinstance(x, str) else x for x in kwargs['children']]
+
         super().__init__(**kwargs)
 
 

dara/core/umd/dara.core.umd.cjs

@@ -51420,7 +51420,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   }
   function matchRoutesImpl(routes, locationArg, basename, allowPartial) {
     let location2 = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
-    let pathname = stripBasename(location2.pathname || "/", basename);
+    let pathname = stripBasename$1(location2.pathname || "/", basename);
     if (pathname == null) {
       return null;
     }
@@ -51712,7 +51712,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       return value;
     }
   }
-  function stripBasename(pathname, basename) {
+  function stripBasename$1(pathname, basename) {
     if (basename === "/") return pathname;
     if (!pathname.toLowerCase().startsWith(basename.toLowerCase())) {
       return null;
@@ -51911,8 +51911,8 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     reset: void 0,
     location: void 0
   };
-  var ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
-  var isAbsoluteUrl = (url) => ABSOLUTE_URL_REGEX.test(url);
+  var ABSOLUTE_URL_REGEX$1 = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
+  var isAbsoluteUrl = (url) => ABSOLUTE_URL_REGEX$1.test(url);
   var defaultMapRouteProperties = (route) => ({
     hasErrorBoundary: Boolean(route.hasErrorBoundary)
   });
@@ -53207,7 +53207,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
           const url = createBrowserURLImpl(location2, true);
           isDocumentReload = // Hard reload if it's an absolute URL to a new origin
           url.origin !== routerWindow.location.origin || // Hard reload if it's an absolute URL that does not match our basename
-          stripBasename(url.pathname, basename) == null;
+          stripBasename$1(url.pathname, basename) == null;
         }
         if (isDocumentReload) {
           if (replace22) {
@@ -54311,7 +54311,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     let path = resolveTo(
       to ? to : ".",
       getResolveToMatches(contextualMatches),
-      stripBasename(location2.pathname, basename) || location2.pathname,
+      stripBasename$1(location2.pathname, basename) || location2.pathname,
       relative === "path"
     );
     if (to == null) {
@@ -55344,7 +55344,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     if (isAbsoluteUrl(location2)) {
       let normalizedLocation = location2;
       let url = normalizedLocation.startsWith("//") ? new URL(currentUrl.protocol + normalizedLocation) : new URL(normalizedLocation);
-      let isSameBasename = stripBasename(url.pathname, basename) != null;
+      let isSameBasename = stripBasename$1(url.pathname, basename) != null;
       if (url.origin === currentUrl.origin && isSameBasename) {
         return url.pathname + url.search + url.hash;
       }
@@ -56438,11 +56438,11 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
         return shouldBlock({
           currentLocation: {
             ...currentLocation,
-            pathname: stripBasename(currentLocation.pathname, basename) || currentLocation.pathname
+            pathname: stripBasename$1(currentLocation.pathname, basename) || currentLocation.pathname
           },
           nextLocation: {
             ...nextLocation,
-            pathname: stripBasename(nextLocation.pathname, basename) || nextLocation.pathname
+            pathname: stripBasename$1(nextLocation.pathname, basename) || nextLocation.pathname
           },
           historyAction
         });
@@ -56905,7 +56905,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
       key = "default"
     } = locationProp;
     let locationContext = React__namespace.useMemo(() => {
-      let trailingPathname = stripBasename(pathname, basename);
+      let trailingPathname = stripBasename$1(pathname, basename);
       if (trailingPathname == null) {
         return null;
       }
@@ -57216,7 +57216,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     let body;
     if (isFormElement(target)) {
       let attr2 = target.getAttribute("action");
-      action = attr2 ? stripBasename(attr2, basename) : null;
+      action = attr2 ? stripBasename$1(attr2, basename) : null;
       method = target.getAttribute("method") || defaultMethod;
       encType = getFormEncType(target.getAttribute("enctype")) || defaultEncType;
       formData = new FormData(target);
@@ -57228,7 +57228,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
         );
       }
       let attr2 = target.getAttribute("formaction") || form.getAttribute("action");
-      action = attr2 ? stripBasename(attr2, basename) : null;
+      action = attr2 ? stripBasename$1(attr2, basename) : null;
       method = target.getAttribute("formmethod") || form.getAttribute("method") || defaultMethod;
       encType = getFormEncType(target.getAttribute("formenctype")) || getFormEncType(form.getAttribute("enctype")) || defaultEncType;
       formData = new FormData(form, target);
@@ -58255,7 +58255,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     ) : reqUrl;
     if (url.pathname === "/") {
       url.pathname = `_root.${extension}`;
-    } else if (basename && stripBasename(url.pathname, basename) === "/") {
+    } else if (basename && stripBasename$1(url.pathname, basename) === "/") {
       url.pathname = `${basename.replace(/\/$/, "")}/_root.${extension}`;
     } else {
       url.pathname = `${url.pathname.replace(/\/$/, "")}.${extension}`;
@@ -60069,7 +60069,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
           try {
             let currentUrl = new URL(window.location.href);
             let targetUrl = to.startsWith("//") ? new URL(currentUrl.protocol + to) : new URL(to);
-            let path = stripBasename(targetUrl.pathname, basename);
+            let path = stripBasename$1(targetUrl.pathname, basename);
             if (targetUrl.origin === currentUrl.origin && path != null) {
               to = path + targetUrl.search + targetUrl.hash;
             } else {
@@ -60149,7 +60149,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
         toPathname = toPathname.toLowerCase();
       }
       if (nextLocationPathname && basename) {
-        nextLocationPathname = stripBasename(nextLocationPathname, basename) || nextLocationPathname;
+        nextLocationPathname = stripBasename$1(nextLocationPathname, basename) || nextLocationPathname;
       }
       const endSlashPosition = toPathname !== "/" && toPathname.endsWith("/") ? toPathname.length - 1 : toPathname.length;
       let isActive = locationPathname === toPathname || !end2 && locationPathname.startsWith(toPathname) && locationPathname.charAt(endSlashPosition) === "/";
@@ -60541,7 +60541,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
         key = getKey(
           {
             ...location2,
-            pathname: stripBasename(location2.pathname, basename) || location2.pathname
+            pathname: stripBasename$1(location2.pathname, basename) || location2.pathname
           },
           matches2
         );
@@ -60704,8 +60704,8 @@ import(${JSON.stringify(manifest.entry.module)});`;
     if (!vtContext.isTransitioning) {
       return false;
     }
-    let currentPath = stripBasename(vtContext.currentLocation.pathname, basename) || vtContext.currentLocation.pathname;
-    let nextPath = stripBasename(vtContext.nextLocation.pathname, basename) || vtContext.nextLocation.pathname;
+    let currentPath = stripBasename$1(vtContext.currentLocation.pathname, basename) || vtContext.currentLocation.pathname;
+    let nextPath = stripBasename$1(vtContext.nextLocation.pathname, basename) || vtContext.nextLocation.pathname;
     return matchPath(path.pathname, nextPath) != null || matchPath(path.pathname, currentPath) != null;
   }
   function StaticRouter({
@@ -62164,7 +62164,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
   function getSingleFetchRedirect(status, headers, basename) {
     let redirect2 = headers.get("Location");
     if (basename) {
-      redirect2 = stripBasename(redirect2, basename) || redirect2;
+      redirect2 = stripBasename$1(redirect2, basename) || redirect2;
     }
     return {
       redirect: redirect2,
@@ -62291,19 +62291,19 @@ import(${JSON.stringify(manifest.entry.module)});`;
       let url = new URL(request2.url);
       let normalizedBasename = _build.basename || "/";
       let normalizedPath = url.pathname;
-      if (stripBasename(normalizedPath, normalizedBasename) === "/_root.data") {
+      if (stripBasename$1(normalizedPath, normalizedBasename) === "/_root.data") {
         normalizedPath = normalizedBasename;
       } else if (normalizedPath.endsWith(".data")) {
         normalizedPath = normalizedPath.replace(/\.data$/, "");
       }
-      if (stripBasename(normalizedPath, normalizedBasename) !== "/" && normalizedPath.endsWith("/")) {
+      if (stripBasename$1(normalizedPath, normalizedBasename) !== "/" && normalizedPath.endsWith("/")) {
         normalizedPath = normalizedPath.slice(0, -1);
       }
       let isSpaMode = getBuildTimeHeader(request2, "X-React-Router-SPA-Mode") === "yes";
       if (!_build.ssr) {
         let decodedPath = decodeURI(normalizedPath);
         if (normalizedBasename !== "/") {
-          let strippedPath = stripBasename(decodedPath, normalizedBasename);
+          let strippedPath = stripBasename$1(decodedPath, normalizedBasename);
           if (strippedPath == null) {
             errorHandler(
               new ErrorResponseImpl(
@@ -74769,30 +74769,54 @@ body,
     const root = clientExports.createRoot(container);
     root.render(/* @__PURE__ */ React.createElement(Root, { daraData, queryClient, importers }));
   }
-  function isValidHttpUrl(url) {
-    if (url.startsWith("/")) {
-      return true;
+  function getBasename() {
+    if (window.dara.base_url !== "") {
+      return new URL(window.dara.base_url, window.origin).pathname;
     }
-    let newUrl;
-    try {
-      newUrl = new URL(url);
-    } catch {
-      return false;
+    return "/";
+  }
+  const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
+  function stripBasename(pathname, basename) {
+    if (basename === "/") {
+      return pathname;
+    }
+    if (!pathname.toLowerCase().startsWith(basename.toLowerCase())) {
+      return null;
+    }
+    const startIndex = basename.endsWith("/") ? basename.length - 1 : basename.length;
+    const nextChar = pathname.charAt(startIndex);
+    if (nextChar && nextChar !== "/") {
+      return null;
     }
-    return newUrl.protocol === "http:" || newUrl.protocol === "https:";
+    return pathname.slice(startIndex) || "/";
   }
   const NavigateTo = (ctx, actionImpl) => {
-    const isValidUrl = isValidHttpUrl(actionImpl.url);
-    if (!isValidUrl) {
-      throw new Error(`Invalid URL: ${actionImpl.url}`);
-    }
-    if (actionImpl.new_tab) {
-      window.open(actionImpl.url, actionImpl.new_tab ? "_blank" : void 0);
-    } else if (actionImpl.url.startsWith("/")) {
-      ctx.navigate(actionImpl.url);
-    } else {
-      window.location.href = actionImpl.url;
+    const basename = getBasename();
+    let isExternal = false;
+    let to = actionImpl.url;
+    if (typeof actionImpl.url === "string" && ABSOLUTE_URL_REGEX.test(actionImpl.url)) {
+      try {
+        const currentUrl = new URL(window.location.href);
+        const targetUrl = new URL(actionImpl.url);
+        const path = stripBasename(targetUrl.pathname, basename);
+        if (targetUrl.origin === currentUrl.origin && path != null) {
+          to = path + targetUrl.search + targetUrl.hash;
+        } else {
+          isExternal = true;
+        }
+      } catch {
+        throw new Error(`Invalid URL: ${actionImpl.url}`);
+      }
+    }
+    if (isExternal && typeof to === "string") {
+      if (actionImpl.new_tab) {
+        window.open(to, "_blank");
+      } else {
+        window.location.href = to;
+      }
+      return;
     }
+    ctx.navigate(to, actionImpl.options);
   };
   const ResetVariables = (ctx, actionImpl) => {
     actionImpl.variables.filter(isVariable).forEach((variable) => {
@@ -98334,7 +98358,11 @@ body,
         inactiveStyle,
         onMouseMove: props.prefetch ? handleMouseMove : void 0,
         onFocus: props.prefetch ? handleFocus : void 0,
-        onTouchStart: props.prefetch ? handleTouchStart : void 0
+        onTouchStart: props.prefetch ? handleTouchStart : void 0,
+        download: props.download,
+        referrerPolicy: props.referrer_policy,
+        target: props.target,
+        rel: props.rel
       },
       props.children.map((child, idx) => /* @__PURE__ */ React__namespace.createElement(DynamicComponent$1, { component: child, key: idx }))
     ));
@@ -98758,6 +98786,7 @@ body,
   exports.fetchTabularServerVariable = fetchTabularServerVariable;
   exports.fetchTaskResult = fetchTaskResult;
   exports.findFirstPath = findFirstPath;
+  exports.getBasename = getBasename;
   exports.getComponentRegistryKey = getComponentRegistryKey;
   exports.getDeps = getDeps;
   exports.getFromPreloadCache = getFromPreloadCache;

{dara_core-1.21.11.dist-info → dara_core-1.21.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.21.11
+Version: 1.21.13
 Summary: Dara Framework Core
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -21,10 +21,10 @@ Requires-Dist: cachetools (>=5.0.0,<6.0.0)
 Requires-Dist: certifi (>=2024.7.4)
 Requires-Dist: click (==8.1.3)
 Requires-Dist: colorama (>=0.4.6,<0.5.0)
-Requires-Dist: create-dara-app (==1.21.11)
+Requires-Dist: create-dara-app (==1.21.13)
 Requires-Dist: croniter (>=1.0.15,<3.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.21.11) ; extra == "all"
+Requires-Dist: dara-components (==1.21.13) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
 Requires-Dist: fastapi (>=0.115.0,<0.116.0)
 Requires-Dist: fastapi_vite_dara (==0.4.0)
@@ -55,7 +55,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.21.11/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.21.13/img/dara_light.svg?raw=true">
 
 ![Master tests](https://github.com/causalens/dara/actions/workflows/tests.yml/badge.svg?branch=master)
 [![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0)
@@ -100,7 +100,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.21.11/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.21.13/img/components_gallery.png?raw=true)
 
 Note: `pip` installation uses [PEP 660](https://peps.python.org/pep-0660/) `pyproject.toml`-based editable installs which require `pip >= 21.3` and `setuptools >= 64.0.0`. You can upgrade both with:
 
@@ -117,9 +117,9 @@ Explore some of our favorite apps - a great way of getting started and getting t
 
 | Dara App                                                                                                 | Description                                                                                                                                                                                                       |
 | -------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| ![Large Language Model](https://github.com/causalens/dara/blob/v1.21.11/img/llm.png?raw=true)              | Demonstrates how to use incorporate a LLM chat box into your decision app to understand model insights                                                                                                            |
-| ![Plot Interactivity](https://github.com/causalens/dara/blob/v1.21.11/img/plot_interactivity.png?raw=true) | Demonstrates how to enable the user to interact with plots, trigger actions based on clicks, mouse movements and other interactions with `Bokeh` or `Plotly` plots                                                |
-| ![Graph Editor](https://github.com/causalens/dara/blob/v1.21.11/img/graph_viewer.png?raw=true)             | Demonstrates how to use the `CausalGraphViewer` component to display your graphs or networks, customising the displayed information through colors and tooltips, and updating the page based on user interaction. |
+| ![Large Language Model](https://github.com/causalens/dara/blob/v1.21.13/img/llm.png?raw=true)              | Demonstrates how to use incorporate a LLM chat box into your decision app to understand model insights                                                                                                            |
+| ![Plot Interactivity](https://github.com/causalens/dara/blob/v1.21.13/img/plot_interactivity.png?raw=true) | Demonstrates how to enable the user to interact with plots, trigger actions based on clicks, mouse movements and other interactions with `Bokeh` or `Plotly` plots                                                |
+| ![Graph Editor](https://github.com/causalens/dara/blob/v1.21.13/img/graph_viewer.png?raw=true)             | Demonstrates how to use the `CausalGraphViewer` component to display your graphs or networks, customising the displayed information through colors and tooltips, and updating the page based on user interaction. |
 
 Check out our [App Gallery](https://dara.causalens.com/gallery) for more inspiration!
 
@@ -146,9 +146,9 @@ And the supporting UI packages and tools.
 - `ui-utils` - miscellaneous utility functions
 - `ui-widgets` - widget components
 
-More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.21.11/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.21.13/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.21.11/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.21.13/LICENSE).
 

{dara_core-1.21.11.dist-info → dara_core-1.21.13.dist-info}/RECORD

@@ -6,7 +6,7 @@ dara/core/auth/basic.py,sha256=8ebWpHx53ObkuzTHIKSRdtsmKq0R5v8RuQXhZcnpTsA,4933
 dara/core/auth/definitions.py,sha256=wTsFWzX7bGHTU_vxGW50pqcmB_AmhETIIUdGB5UrMBU,3467
 dara/core/auth/routes.py,sha256=0o5KXApRbkL0F5qFsarQk_cq5lbQ3QfIHR_mwLRgBEY,7217
 dara/core/auth/utils.py,sha256=iEWP5qwfH17Mi-5t3sP-DNMUrWN0oSRk96NhieY2Zw4,7334
-dara/core/base_definitions.py,sha256=ptc6OSx-qElWWSuZB4-06kWmnj6hekpKR47eeB36igQ,16915
+dara/core/base_definitions.py,sha256=wDeXoKro7WcMB8RXImaAZrwbBYdhnN_jgd2s7eDDO2M,18386
 dara/core/cli.py,sha256=V__LAK3ozWGsVTEQHqvJwqSfpC3o6R76YGABJ-YVoSE,8185
 dara/core/configuration.py,sha256=caPebHNUmYqh9czEBwQiIDjGrH8ltsphayZICj1CRhc,23489
 dara/core/css.py,sha256=UkNZ6n7RDBLsHmpZvn_a3K2nAwxVggQJbQMKNbgXONA,1753
@@ -15,7 +15,7 @@ dara/core/defaults.py,sha256=y-PU4DhF3uEEfrFmlJnenM8jhnQDTDaOU5kuAYZE2gw,4740
 dara/core/definitions.py,sha256=I4TUJ6zu968T4PNmeqbC-u-DfiKay-4XxurLNASkDz0,18358
 dara/core/http.py,sha256=-OzbCHlYSnfVnw2492C_UmaWOI5oSONfWk03eEGxSRI,4761
 dara/core/interactivity/__init__.py,sha256=ZppwTvxaCsaAdf0qX6j1qTcmbj6wxVcbiaMZfwTVKtU,2679
-dara/core/interactivity/actions.py,sha256=ADLVhffplOcIWy7l74SrpZk8oCe3q12BJ9060rVDpfU,48170
+dara/core/interactivity/actions.py,sha256=_guOKc5VkXH1J91-pdTeIQumCFHkve6G0ES5rFBm1vY,48478
 dara/core/interactivity/any_data_variable.py,sha256=GhT6lzCDRlQtYG2gNNUHq4th7K3RacqDfkjaq7o4mCc,317
 dara/core/interactivity/any_variable.py,sha256=b6aMOZZc9Q4IFPPjuIbFgqYdw52-6QRsxNRj5ohZeL0,13648
 dara/core/interactivity/client_variable.py,sha256=bFc4gmKKVfAvZHmv5Y2ME1VMTxSM_v_0lcmyRNTLOKk,2320
@@ -55,7 +55,7 @@ dara/core/internal/pool/__init__.py,sha256=pBbXE5GR3abVC9Lg3i0QxfdmsrBDMJUYAYb0S
 dara/core/internal/pool/channel.py,sha256=TbyIE-PnfzzsQYhl3INOs5UIHHbF_h9bMFne5FjbWlQ,4948
 dara/core/internal/pool/definitions.py,sha256=27dtsyHsztc7zgr2axMWCn1O9pBNI_VKByGxjvKHBGc,4649
 dara/core/internal/pool/task_pool.py,sha256=MqzUtoGEjeXdpCdTmBXQmQt582u0suiL5vwrsj1slhY,17780
-dara/core/internal/pool/utils.py,sha256=HoNlHy2V0VmX5Xm2cqsFbPIOV74E2MslzTFgyNRmiB0,5411
+dara/core/internal/pool/utils.py,sha256=7M8A3lYfp3TVB6yPf-6-nnSr5j6TCqHzdT9I639lUS0,5470
 dara/core/internal/pool/worker.py,sha256=eBi3FS652goZxu9chaRT89eHDvqJW0aHjt8I5UgyESA,6808
 dara/core/internal/port_utils.py,sha256=3NN94CubNrIYQKmPM4SEwstY-UMqsbbe1M_JhyPcncA,1654
 dara/core/internal/registries.py,sha256=1lY9xrggiyUlM32pPyzFEfflW3_37QGOxTDrfWQ4CN4,3659
@@ -65,7 +65,7 @@ dara/core/internal/routing.py,sha256=El2rRuJODoTuZvyay1LSbxCX8IvGDos3dwXYn1RIHZs
 dara/core/internal/scheduler.py,sha256=rmj-NnHHToWBPuteKlf0RmKcav2Hz0Z9-l4uyrAGKSI,13069
 dara/core/internal/settings.py,sha256=DxRvXcelawaKemTcX6JIVIilibn0XO5Bd98dCXau4zg,3937
 dara/core/internal/store.py,sha256=Z4EUMwHR0DR-TVCL9csSGYE3toxh15iRpBP2c7MUgr8,6442
-dara/core/internal/tasks.py,sha256=LVRrcK_cuJ7fujSUb8S6xSkPLYmxrAcnXKxEvo7G3l0,34814
+dara/core/internal/tasks.py,sha256=84-87FtxsoCp-SrhE3w-rcMuj-yiaNs2itPYt0n-0dQ,36098
 dara/core/internal/utils.py,sha256=nUnwy1BLW9HUQro9ASAYb-AlNJkbaT_bQ1bE2e1q1wo,9088
 dara/core/internal/websocket.py,sha256=rcipt5XY48akMuLHFdvUUIgNLqzJx7ovLeiPsYVMELM,21953
 dara/core/jinja/index.html,sha256=5Sq_FwXn0F4dOyRFprfoh_tn0GUq6_aLYyYdpzQLdeM,3312
@@ -90,10 +90,10 @@ dara/core/metrics/utils.py,sha256=inR1Ab5hmWZY2lsgGwLCQOEdyhCD9PumU52X2JbwlKY,22
 dara/core/persistence.py,sha256=ZUmfAjcTwk_oYyaulDrtpiCwIg8vaOw8uTZd2qT4nNo,19410
 dara/core/router/__init__.py,sha256=yGI_MgLQU37ircCtYVNjnhqCjWQxKd5amoNqvMyrhOs,121
 dara/core/router/compat.py,sha256=WAVzDcJFJOVoIQ5inplIhXD58TWsWwTTebTCqpG4nGs,3137
-dara/core/router/components.py,sha256=K6bj04_ZPJcU9JQjaxPJkbUeaHtA_jeJNEvCqQbDf3A,5090
+dara/core/router/components.py,sha256=lnh8dCin6BunI0KILdua-zJZOuwbDbniLGb6eF_V9hM,6183
 dara/core/router/dependency_graph.py,sha256=AyjSk3DuvCgACrgpID4oSpms1X6GQJUbt-scY5X_LN4,2305
 dara/core/router/router.py,sha256=1r3rFGiftOXC6GP66hKqTdcVNDRJsZWBWvL74wNG4dA,29719
-dara/core/umd/dara.core.umd.cjs,sha256=QxIkXaGT8Otvw65YHp4yDAjv3oTEeoMKH-wSJm50Pg0,5151009
+dara/core/umd/dara.core.umd.cjs,sha256=KXoJu_06chU79sKcrZPHoEvtC7o20QLfE98puoxlvcA,5152119
 dara/core/umd/style.css,sha256=yT3PKpi2sKI2-kQIF8xtVbTPQqgpK7-Ua7tfzDPuSsI,4095881
 dara/core/visual/__init__.py,sha256=QN0wbG9HPQ_vXh8BO8DnBXeYLIENVTNtRmYzZf1lx7c,577
 dara/core/visual/components/__init__.py,sha256=nmCsnMLXeZAjkhMYz-mIFodpVY-69IO1fvwwXbFlMQ4,2447
@@ -120,8 +120,8 @@ dara/core/visual/themes/__init__.py,sha256=aM4mgoIYo2neBSw5FRzswsht7PUKjLthiHLmF
 dara/core/visual/themes/dark.py,sha256=UQGDooOc8ric73eHs9E0ltYP4UCrwqQ3QxqN_fb4PwY,1942
 dara/core/visual/themes/definitions.py,sha256=5g83t24w8Ar51Cl9REBJfCU7_DtlashBQeUTKDg3D1M,2862
 dara/core/visual/themes/light.py,sha256=-Tviq8oEwGbdFULoDOqPuHO0UpAZGsBy8qFi0kAGolQ,1944
-dara_core-1.21.11.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.21.11.dist-info/METADATA,sha256=Sy6DKIN0id1OrPQEyUk8Z0sqIyzJpBHjueqTGx7BySg,7544
-dara_core-1.21.11.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.21.11.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.21.11.dist-info/RECORD,,
+dara_core-1.21.13.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.21.13.dist-info/METADATA,sha256=TrgbUFRw_sb5zVZux8BKLvN_iDKIhlg-gx3hBBepjfA,7544
+dara_core-1.21.13.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.21.13.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.21.13.dist-info/RECORD,,