dara-core 1.14.0a3__py3-none-any.whl → 1.14.2__py3-none-any.whl

dara/core/auth/routes.py

@@ -19,15 +19,7 @@ from inspect import iscoroutinefunction
 from typing import Union, cast
 
 import jwt
-from fastapi import (
-    APIRouter,
-    BackgroundTasks,
-    Cookie,
-    Depends,
-    HTTPException,
-    Request,
-    Response,
-)
+from fastapi import APIRouter, Cookie, Depends, HTTPException, Request, Response
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 
 from dara.core.auth.base import BaseAuthConfig
@@ -116,7 +108,6 @@ async def _revoke_session(response: Response, credentials: HTTPAuthorizationCred
 @auth_router.post('/refresh-token')
 async def handle_refresh_token(
     response: Response,
-    background_tasks: BackgroundTasks,
     dara_refresh_token: Union[str, None] = Cookie(default=None),
     credentials: HTTPAuthorizationCredentials = Depends(HTTPBearer()),
 ):

dara/core/auth/utils.py

@@ -186,13 +186,13 @@ Shared token refresh cache instance
 
 
 async def cached_refresh_token(
-    func: Callable[[TokenData, str], Tuple[str, str]], old_token_data: TokenData, refresh_token: str
+    do_refresh_token: Callable[[TokenData, str], Tuple[str, str]], old_token_data: TokenData, refresh_token: str
 ):
     """
     A utility to run a token refresh method with caching to prevent multiple concurrent refreshes
     and short-term caching to reduce unnecessary refreshes from multiple tabs/windows.
 
-    :param func: The function to run to refresh the token
+    :param do_refresh_token: The function to perform the token refresh
     :param old_token_data: The old token data
     :param refresh_token: The refresh token to use
     """
@@ -213,7 +213,7 @@ async def cached_refresh_token(
             return cached_result
 
         # Run the refresh function
-        result = await to_thread.run_sync(func, old_token_data, refresh_token)
+        result = await to_thread.run_sync(do_refresh_token, old_token_data, refresh_token)
 
         # update cache
         token_refresh_cache.set_cached_value(cache_key, result)

dara/core/internal/websocket.py

@@ -495,7 +495,7 @@ async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=
                         # Heartbeat to keep connection alive
                         if data['type'] == 'ping':
                             await websocket.send_json({'type': 'pong', 'message': None})
-                        if data['type'] == 'token_update':
+                        elif data['type'] == 'token_update':
                             try:
                                 # update Auth context vars for the WS connection
                                 update_context(decode_token(data['message']))

dara/core/umd/dara.core.umd.js

@@ -55047,10 +55047,10 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       return JSON.stringify(serializable);
     }
   }
-  async function request(url, options, extras) {
+  async function request(url, ...options) {
     var _a, _b;
     const sessionToken = await store.getValue(getTokenKey());
-    const mergedOptions = extras ? { ...options, ...extras } : options;
+    const mergedOptions = options.reduce((acc, opt) => ({ ...acc, ...opt }), {});
     const { headers, ...other } = mergedOptions;
     const headersInterface = new Headers(headers);
     if (!headersInterface.has("Accept")) {
@@ -55073,7 +55073,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         const refreshedToken = await store.replaceValue(getTokenKey(), async () => {
           const refreshResponse = await fetch(`${baseUrl}/api/auth/refresh-token`, {
             headers: headersInterface,
-            ...other,
             method: "POST"
           });
           if (refreshResponse.ok) {
@@ -58095,7 +58094,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     }
     return resolver(getOrRegisterPlainVariable(variable, client, taskContext, extras));
   }
-  function tokenSubscribe(cb) {
+  function onTokenChange(cb) {
     return store.subscribe(getTokenKey(), cb);
   }
   function getSessionToken() {
@@ -58105,7 +58104,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     store.setValue(getTokenKey(), token);
   }
   function useSessionToken() {
-    return React__namespace.useSyncExternalStore(tokenSubscribe, getSessionToken);
+    return React__namespace.useSyncExternalStore(onTokenChange, getSessionToken);
   }
   const STORE_EXTRAS_MAP = /* @__PURE__ */ new Map();
   function BackendStoreSync({ children }) {
@@ -60391,7 +60390,6 @@ Inferred class string: "${iconClasses}."`
   function TemplateRoot() {
     var _a, _b, _c;
     const token = useSessionToken();
-    const [previousToken, setPreviousToken] = React.useState(token);
     const { data: config2 } = useConfig();
     const { data: template, isLoading: templateLoading } = useTemplate(config2 == null ? void 0 : config2.template);
     const { data: actions, isLoading: actionsLoading } = useActions();
@@ -60399,11 +60397,15 @@ Inferred class string: "${iconClasses}."`
     const [wsClient, setWsClient] = React.useState();
     React.useEffect(() => {
       cleanSessionCache(token);
-      if (token !== previousToken) {
-        wsClient.updateToken(token);
-        setPreviousToken(token);
+    }, [token]);
+    React.useEffect(() => {
+      if (!wsClient) {
+        return;
       }
-    }, [token, previousToken]);
+      return onTokenChange((newToken) => {
+        wsClient.updateToken(newToken);
+      });
+    }, [wsClient]);
     React.useEffect(() => {
       if (config2 == null ? void 0 : config2.title) {
         document.title = config2.title;

{dara_core-1.14.0a3.dist-info → dara_core-1.14.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.14.0a3
+Version: 1.14.2
 Summary: Dara Framework Core
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -20,10 +20,10 @@ Requires-Dist: async-asgi-testclient (>=1.4.11,<2.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.14.0-alpha.3)
+Requires-Dist: create-dara-app (==1.14.2)
 Requires-Dist: croniter (>=1.0.15,<2.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.14.0-alpha.3) ; extra == "all"
+Requires-Dist: dara-components (==1.14.2) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
 Requires-Dist: fastapi (==0.109.0)
 Requires-Dist: fastapi-vite (==0.3.1)
@@ -51,7 +51,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.14.0-alpha.3/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.14.2/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)
@@ -96,7 +96,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.14.0-alpha.3/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.14.2/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:
 
@@ -113,9 +113,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.14.0-alpha.3/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.14.0-alpha.3/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.14.0-alpha.3/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.14.2/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.14.2/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.14.2/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!
 
@@ -142,9 +142,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.14.0-alpha.3/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.14.2/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.14.0-alpha.3/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.14.2/LICENSE).
 

{dara_core-1.14.0a3.dist-info → dara_core-1.14.2.dist-info}/RECORD

@@ -4,8 +4,8 @@ dara/core/auth/__init__.py,sha256=H0bJoXff5wIRZmHvvQ3y9p5SXA9lM8OuLCGceYGqfb0,85
 dara/core/auth/base.py,sha256=jZNuCMoBHQcxWeLpTUzcxdbkbWUJ42jbtKgnnrwvNVA,3201
 dara/core/auth/basic.py,sha256=IMkoC1OeeRmnmjIqPHpybs8zSdbLlNKYLRvj08ajirg,4692
 dara/core/auth/definitions.py,sha256=fx-VCsElP9X97gM0Eql-4lFpLa0UryokmGZhQQat2NU,3511
-dara/core/auth/routes.py,sha256=k5y9G-mBDNM3sYX3rk1p1khZPKBD97rPdrs8PV2LSJs,7269
-dara/core/auth/utils.py,sha256=KRLKTd3bGxChGREBEzPVarmwxIwb8SB0JazBtUTDTc4,7277
+dara/core/auth/routes.py,sha256=1gOe1Z2Vv5MtpW5uvUYvyYWTJ_BDoLRllji1Plk4nss,7180
+dara/core/auth/utils.py,sha256=_iyS_FExxlYZVDvnHJO5uhFpOW-g8YlhBH9zz8oPsPE,7314
 dara/core/base_definitions.py,sha256=r_W_qk6_VvvskbPEPjTF6xUh3o_lkNBWMFhN1Pic8Ks,14868
 dara/core/cli.py,sha256=ycTB7QHCB-74OnKnjXqkXq-GBqyjBqo7u4v1kTgv2jE,7656
 dara/core/configuration.py,sha256=8VynDds7a_uKXSpeNvjOUK3qfclg0WPniFEspL-6fi8,21153
@@ -60,7 +60,7 @@ dara/core/internal/settings.py,sha256=wAWxl-HXjq7PW3twe_CrR-UuMRw9VBudC3eRmevZAh
 dara/core/internal/store.py,sha256=qVyU7JfC3zE2vYC2mfjmvECWMlFS9b-nMF1k-alg4Y8,7756
 dara/core/internal/tasks.py,sha256=XK-GTIyge8RBYAfzNs3rmLYVNSKIarCzPdqRSVGg-4M,24728
 dara/core/internal/utils.py,sha256=b1YYkn8qHl6-GY6cCm2MS1NXRS9j_rElYCKMZOxJgrY,8232
-dara/core/internal/websocket.py,sha256=Im4a5iqdsf8aqjkimleKOX99wE-kvHlHDyICw7bgcCk,20640
+dara/core/internal/websocket.py,sha256=KlEzIofyXWX8Axe4-mUILH1PO6hnK7webmYfDeCkvxc,20642
 dara/core/jinja/index.html,sha256=iykqiRh3H_HkcjHJeeSRXRu45nZ2y1sZX5FLdPRhlQY,726
 dara/core/jinja/index_autojs.html,sha256=MRF5J0vNfzZQm9kPEeLl23sbr08fVSRd_PAUD6Fkc_0,1253
 dara/core/js_tooling/custom_js_scaffold/index.tsx,sha256=FEzSV5o5Nyzxw6eXvGLi7BkEBkXf3brV34_7ATLnY7o,68
@@ -81,7 +81,7 @@ dara/core/metrics/cache.py,sha256=ybofUhZO0TCHeyhB_AtldWk1QTmTKh7GucTXpOkeTFA,25
 dara/core/metrics/runtime.py,sha256=YP-6Dz0GeI9_Yr7bUk_-OqShyFySGH_AKpDO126l6es,1833
 dara/core/metrics/utils.py,sha256=rYlBinxFc7VehFT5cTNXLk8gC74UEj7ZGq6vLgIDpSg,2247
 dara/core/persistence.py,sha256=TO94rPAN7jxZKVCC5YA4eE7GGDoNlCPe-BkkItV2VUE,10379
-dara/core/umd/dara.core.umd.js,sha256=NS7UoNAICvBgpZmZlKQzv9a2x5IhQO8vA_Jfq2HO73E,4877537
+dara/core/umd/dara.core.umd.js,sha256=tKXGvAz2QMypS1jccgAlZiyO3mERdzdRqhPqJ5LGlfg,4877507
 dara/core/umd/style.css,sha256=YQtQ4veiSktnyONl0CU1iU1kKfcQhreH4iASi1MP7Ak,4095007
 dara/core/visual/__init__.py,sha256=QN0wbG9HPQ_vXh8BO8DnBXeYLIENVTNtRmYzZf1lx7c,577
 dara/core/visual/components/__init__.py,sha256=O-Em_glGdZNO0LLl2RWmJSrQiXKxliXg_PuhVXGT81I,1811
@@ -105,8 +105,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=m3oN0txs65MZepqjj7AKMMxybf2aq5fTjcTwJmHqEbk,2744
 dara/core/visual/themes/light.py,sha256=-Tviq8oEwGbdFULoDOqPuHO0UpAZGsBy8qFi0kAGolQ,1944
-dara_core-1.14.0a3.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.14.0a3.dist-info/METADATA,sha256=InpFqVDrz4d-lYG2gFDs175nDCJB3923gfqcEiLRyc4,7457
-dara_core-1.14.0a3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.14.0a3.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.14.0a3.dist-info/RECORD,,
+dara_core-1.14.2.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.14.2.dist-info/METADATA,sha256=j6suOxjKVn_HOFJ_J9SwtPpl_GchXjv02nmb4wz6xBI,7383
+dara_core-1.14.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.14.2.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.14.2.dist-info/RECORD,,