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

dara/core/base_definitions.py

@@ -23,6 +23,7 @@ import abc
 import uuid
 from collections.abc import Awaitable, Mapping
 from enum import Enum
+from inspect import isclass
 from typing import (
     TYPE_CHECKING,
     Annotated,
@@ -72,7 +73,11 @@ def annotation_has_base_model(typ: Any) -> bool:
         pass
 
     # Handle simple types
-    return typ is BaseModel or issubclass(typ, BaseModel)
+    try:
+        return typ is BaseModel or (isclass(typ) and issubclass(typ, BaseModel))
+    except:  # noqa: E722
+        # cannot check if it's a subclass, just return false
+        return False
 
 
 # This reverts v1->v2 change to make any BaseModel field duck-type serializable.
@@ -440,7 +445,7 @@ class PendingTask(BaseTask):
 
 
 class RouterPath(BaseModel):
-    path: Optional[str] = None
+    pathname: Optional[str] = None
     """
     A URL pathname, beginning with '/'.
     """

dara/core/interactivity/__init__.py

@@ -17,6 +17,8 @@ limitations under the License.
 
 from __future__ import annotations
 
+from inspect import isclass
+
 from pydantic import BaseModel
 
 from dara.core.interactivity.actions import (
@@ -80,7 +82,7 @@ __all__ = [
 
 for symbol in list(globals().values()):
     try:
-        if issubclass(symbol, BaseModel) and symbol is not BaseModel:
+        if isclass(symbol) and issubclass(symbol, BaseModel) and symbol is not BaseModel:
             symbol.model_rebuild()
     except Exception as e:
         from dara.core.logging import dev_logger

dara/core/router/router.py

@@ -118,6 +118,19 @@ class BaseRoute(BaseModel):
     Metadata for the route. This is used to store arbitrary data that can be used by the application.
     """
 
+    fallback: SerializeAsAny[Optional[ComponentInstance]] = Field(default=None)
+    """
+    Fallback component to render while `on_load` is running.
+    If not set, Dara will wait until `on_load` completes before completing the navigation.
+    If provided, Dara will navigate immediately and show the fallback component while `on_load` is running.
+
+    Note that this impacts the navigation when nested routes are involved. For example,
+    when navigating from `/a` to `/b/c` (assuming `b` and `c` both have `on_load` actions),
+    Dara will hold the navigation until both `b` and `c` have completed their `on_load` actions.
+    If only one of them is slow, you might want to consider setting an explicit `fallback` for it
+    if it's desirable to navigate to the other route immediately.
+    """
+
     on_load: SerializeAsAny[Optional[Action]] = Field(default=None)
     """
     Action to execute when the route is loaded.
@@ -303,6 +316,7 @@ class HasChildRoutes(BaseModel):
         id: Optional[str] = None,
         metadata: Optional[dict] = None,
         on_load: Optional[Action] = None,
+        fallback: Optional[ComponentInstance] = None,
     ):
         """
         Standard route with a unique URL segment and content to render
@@ -313,6 +327,8 @@ class HasChildRoutes(BaseModel):
         :param name: unique name for the route, used for window.name display. If not set, defaults to the route path.
         :param id: unique id for the route
         :param metadata: metadata for the route
+        :param on_load: action to execute when the route is loaded
+        :param fallback: fallback component to render while `on_load` is running
         """
         if metadata is None:
             metadata = {}
@@ -325,6 +341,7 @@ class HasChildRoutes(BaseModel):
             id=id,
             metadata=metadata,
             on_load=on_load,
+            fallback=fallback,
         )
         route._attach_to_parent(self)
         self.children.append(route)
@@ -338,6 +355,7 @@ class HasChildRoutes(BaseModel):
         id: Optional[str] = None,
         metadata: Optional[dict] = None,
         on_load: Optional[Action] = None,
+        fallback: Optional[ComponentInstance] = None,
     ):
         """
         Layout route creates a route with a layout component to render without adding any segments to the URL
@@ -368,6 +386,8 @@ class HasChildRoutes(BaseModel):
         :param case_sensitive: whether the route is case sensitive
         :param id: unique id for the route
         :param metadata: metadata for the route
+        :param on_load: action to execute when the route is loaded
+        :param fallback: fallback component to render while `on_load` is running
         """
         if metadata is None:
             metadata = {}
@@ -378,6 +398,7 @@ class HasChildRoutes(BaseModel):
             id=id,
             metadata=metadata,
             on_load=on_load,
+            fallback=fallback,
         )
         route._attach_to_parent(self)
         self.children.append(route)
@@ -391,6 +412,7 @@ class HasChildRoutes(BaseModel):
         id: Optional[str] = None,
         metadata: Optional[dict] = None,
         on_load: Optional[Action] = None,
+        fallback: Optional[ComponentInstance] = None,
     ):
         """
         Prefix route creates a group of routes with a common prefix without a specific component to render
@@ -413,10 +435,14 @@ class HasChildRoutes(BaseModel):
         :param case_sensitive: whether the route is case sensitive
         :param id: unique id for the route
         :param metadata: metadata for the route
+        :param on_load: action to execute when the route is loaded
+        :param fallback: fallback component to render while `on_load` is running
         """
         if metadata is None:
             metadata = {}
-        route = PrefixRoute(path=path, case_sensitive=case_sensitive, id=id, metadata=metadata, on_load=on_load)
+        route = PrefixRoute(
+            path=path, case_sensitive=case_sensitive, id=id, metadata=metadata, on_load=on_load, fallback=fallback
+        )
         route._attach_to_parent(self)
         self.children.append(route)
         return route
@@ -430,6 +456,7 @@ class HasChildRoutes(BaseModel):
         id: Optional[str] = None,
         metadata: Optional[dict] = None,
         on_load: Optional[Action] = None,
+        fallback: Optional[ComponentInstance] = None,
     ):
         """
         Index routes render into their parent's Outlet() at their parent URL (like a default child route).
@@ -457,7 +484,13 @@ class HasChildRoutes(BaseModel):
         if metadata is None:
             metadata = {}
         route = IndexRoute(
-            content=content, case_sensitive=case_sensitive, id=id, metadata=metadata, on_load=on_load, name=name
+            content=content,
+            case_sensitive=case_sensitive,
+            id=id,
+            metadata=metadata,
+            on_load=on_load,
+            name=name,
+            fallback=fallback,
         )
         route._attach_to_parent(self)
         self.children.append(route)

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

@@ -74485,15 +74485,8 @@ body,
       [routeDefMap, routeObjects, currentMatches]
     );
   }
-  function hasServerActions(route) {
-    if (!route.on_load) {
-      return false;
-    }
-    const actions = Array.isArray(route.on_load) ? route.on_load : [route.on_load];
-    return actions.some(isAnnotatedAction);
-  }
   function shouldHoldPromise(route) {
-    return !((route.__typename === "IndexRoute" || route.__typename === "PageRoute") && hasServerActions(route));
+    return !route.fallback;
   }
   function createRouteLoader(route, snapshot) {
     return async function loader({ request: loaderRequest, params }) {
@@ -74508,7 +74501,7 @@ body,
       if (shouldHoldPromise(route)) {
         result = await result;
       }
-      return { data: result };
+      return { data: result, fallback: route.fallback };
     };
   }
   function Content({
@@ -74561,9 +74554,13 @@ body,
     return /* @__PURE__ */ React__namespace.createElement(DynamicComponent$1, { component: template });
   }
   function RouteContent(props) {
-    const { data: data2 } = useLoaderData();
+    const { data: data2, fallback } = useLoaderData();
+    const fallbackComponent = React__namespace.useMemo(
+      () => fallback ? /* @__PURE__ */ React__namespace.createElement(DynamicComponent$1, { component: fallback }) : /* @__PURE__ */ React__namespace.createElement(DefaultFallbackStatic, null),
+      [fallback]
+    );
     if (data2 instanceof Promise) {
-      return /* @__PURE__ */ React__namespace.createElement(React__namespace.Suspense, { fallback: /* @__PURE__ */ React__namespace.createElement(DefaultFallbackStatic, null) }, /* @__PURE__ */ React__namespace.createElement(Await, { resolve: data2 }, (resolved) => /* @__PURE__ */ React__namespace.createElement(Content, { ...resolved, route: props.route })));
+      return /* @__PURE__ */ React__namespace.createElement(React__namespace.Suspense, { fallback: fallbackComponent }, /* @__PURE__ */ React__namespace.createElement(Await, { resolve: data2 }, (resolved) => /* @__PURE__ */ React__namespace.createElement(Content, { ...resolved, route: props.route })));
     }
     return /* @__PURE__ */ React__namespace.createElement(Content, { ...data2, route: props.route });
   }
@@ -74794,6 +74791,16 @@ body,
     const basename = getBasename();
     let isExternal = false;
     let to = actionImpl.url;
+    if (actionImpl.new_tab) {
+      if (typeof to === "string") {
+        window.open(to, "_blank");
+      } else {
+        const url = createPath(to);
+        const targetUrl = new URL(url, window.location.origin);
+        window.open(targetUrl.toString(), "_blank");
+      }
+      return;
+    }
     if (typeof actionImpl.url === "string" && ABSOLUTE_URL_REGEX.test(actionImpl.url)) {
       try {
         const currentUrl = new URL(window.location.href);
@@ -74809,11 +74816,7 @@ body,
       }
     }
     if (isExternal && typeof to === "string") {
-      if (actionImpl.new_tab) {
-        window.open(to, "_blank");
-      } else {
-        window.location.href = to;
-      }
+      window.location.href = to;
       return;
     }
     ctx.navigate(to, actionImpl.options);

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.21.13
+Version: 1.21.15
 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.13)
+Requires-Dist: create-dara-app (==1.21.15)
 Requires-Dist: croniter (>=1.0.15,<3.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.21.13) ; extra == "all"
+Requires-Dist: dara-components (==1.21.15) ; 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)
@@ -38,7 +38,7 @@ Requires-Dist: packaging (>=23.1)
 Requires-Dist: pandas (>=1.1.0,<3.0.0)
 Requires-Dist: prometheus-client (>=0.14.1,<0.15.0)
 Requires-Dist: pyarrow
-Requires-Dist: pydantic (>=2.10.0,<3.0.0)
+Requires-Dist: pydantic (>=2.12.0,<3.0.0)
 Requires-Dist: pydantic-settings (>=2.8.1,<3.0.0)
 Requires-Dist: pyjwt (>=2.3.0,<3.0.0)
 Requires-Dist: python-dotenv (>=0.19.2)
@@ -55,7 +55,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.21.13/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.21.15/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.13/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.21.15/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.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. |
+| ![Large Language Model](https://github.com/causalens/dara/blob/v1.21.15/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.15/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.15/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.13/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.21.15/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.21.13/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.21.15/LICENSE).
 

{dara_core-1.21.13.dist-info → dara_core-1.21.15.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=wDeXoKro7WcMB8RXImaAZrwbBYdhnN_jgd2s7eDDO2M,18386
+dara/core/base_definitions.py,sha256=jtQQ9YRtDAtPnTIf1O7hRmajuZwEm65S1KHbHiNk5kY,18558
 dara/core/cli.py,sha256=V__LAK3ozWGsVTEQHqvJwqSfpC3o6R76YGABJ-YVoSE,8185
 dara/core/configuration.py,sha256=caPebHNUmYqh9czEBwQiIDjGrH8ltsphayZICj1CRhc,23489
 dara/core/css.py,sha256=UkNZ6n7RDBLsHmpZvn_a3K2nAwxVggQJbQMKNbgXONA,1753
@@ -14,7 +14,7 @@ dara/core/data_utils.py,sha256=RD5_GdyGyGr1LVThCo8mpuOMWrd9_c1iyRqjuyoarXM,12578
 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/__init__.py,sha256=LTH2OOGtJSE4684xVrkjQXpxUMlf7_re8joIOm0EjV8,2728
 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
@@ -92,8 +92,8 @@ dara/core/router/__init__.py,sha256=yGI_MgLQU37ircCtYVNjnhqCjWQxKd5amoNqvMyrhOs,
 dara/core/router/compat.py,sha256=WAVzDcJFJOVoIQ5inplIhXD58TWsWwTTebTCqpG4nGs,3137
 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=KXoJu_06chU79sKcrZPHoEvtC7o20QLfE98puoxlvcA,5152119
+dara/core/router/router.py,sha256=XiJHuEdmDVKD_AXt89v1Kg2hE3LMded2mj5Yiq7WAxY,31373
+dara/core/umd/dara.core.umd.cjs,sha256=CAfqSc0a7SEK9gTJUoKr0bksjFjfeCpKlq0Ls5XSDp0,5152269
 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.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,,
+dara_core-1.21.15.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.21.15.dist-info/METADATA,sha256=ts8ZxsLQkR0KrlAAHdF_SM-lGZtReMJdwzVQm_TumPk,7544
+dara_core-1.21.15.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.21.15.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.21.15.dist-info/RECORD,,