dara-core 1.14.8__py3-none-any.whl → 1.14.9__py3-none-any.whl

dara/core/internal/websocket.py

@@ -14,6 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
+
 import asyncio
 import inspect
 import math
@@ -26,7 +27,7 @@ import anyio
 from anyio import Event, create_memory_object_stream, create_task_group
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from exceptiongroup import catch
-from fastapi import HTTPException, Query
+from fastapi import Query, WebSocketException
 from fastapi.encoders import jsonable_encoder
 from jwt import DecodeError
 from pydantic import BaseModel, Field, parse_obj_as
@@ -80,6 +81,7 @@ class CustomClientMessage(BaseModel):
 
 ClientMessage = Union[DaraClientMessage, CustomClientMessage]
 
+
 # Server message types
 class ServerMessagePayload(BaseModel):
     rchan: Optional[str] = Field(default=None, alias='__rchan')
@@ -117,7 +119,7 @@ class DaraServerMessage(BaseModel):
     """
 
     type: Literal['message'] = Field(default='message', const=True)
-    message: ServerMessagePayload   # exact messages expected by frontend are defined in js/api/websocket.tsx
+    message: ServerMessagePayload  # exact messages expected by frontend are defined in js/api/websocket.tsx
 
 
 class CustomServerMessage(BaseModel):
@@ -204,7 +206,10 @@ class WebSocketHandler:
                             existing_messages.append(message.message)
                         else:
                             existing_messages = [message.message]
-                            self.pending_responses[message_id] = (event, existing_messages)
+                            self.pending_responses[message_id] = (
+                                event,
+                                existing_messages,
+                            )
 
                         # If all chunks have been received, set the event to notify the waiting coroutine
                         if len(existing_messages) == message.chunk_count:
@@ -235,7 +240,9 @@ class WebSocketHandler:
                             await self.send_message(
                                 CustomServerMessage(
                                     message=CustomServerMessagePayload(
-                                        kind=kind, data=response, __response_for=message.message.rchan
+                                        kind=kind,
+                                        data=response,
+                                        __response_for=message.message.rchan,
                                     )
                                 )
                             )
@@ -249,7 +256,9 @@ class WebSocketHandler:
                         return self.send_message(
                             CustomServerMessage(
                                 message=CustomServerMessagePayload(
-                                    kind=kind, data=response, __response_for=message.message.rchan
+                                    kind=kind,
+                                    data=response,
+                                    __response_for=message.message.rchan,
                                 )
                             )
                         )
@@ -405,7 +414,7 @@ async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=
     :param token: The authentication token
     """
     if token is None:
-        raise HTTPException(403, 'Token missing from websocket connection query parameter')
+        raise WebSocketException(code=403, reason='Token missing from websocket connection query parameter')
 
     from dara.core.auth.definitions import ID_TOKEN, SESSION_ID, USER, UserData
     from dara.core.internal.registries import (
@@ -420,10 +429,10 @@ async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=
 
     try:
         token_content: TokenData = decode_token(token)
-    except DecodeError:
-        raise HTTPException(status_code=403, detail='Invalid or expired token')
+    except DecodeError as err:
+        raise WebSocketException(code=403, reason='Invalid or expired token') from err
     except AuthError as err:
-        raise HTTPException(status_code=403, detail=err.detail)
+        raise WebSocketException(code=403, reason=str(err.detail)) from err
 
     # Register once accepted - map session id to the channel so subsequent requests can identify the client
     if websocket_registry.has(token_content.session_id):

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

@@ -56448,6 +56448,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
     }
     initialize(isReconnect = false) {
       const url = new URL(__privateGet(this, _socketUrl));
+      this.token = store.getValueSync(getTokenKey());
       url.searchParams.set("token", this.token);
       const socket = new WebSocket(url);
       __privateSet(this, _pingInterval, setInterval(() => {
@@ -56591,6 +56592,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
       }
     }
     updateToken(newToken) {
+      this.token = newToken;
       if (this.socket.readyState === WebSocket.OPEN) {
         this.socket.send(
           JSON.stringify({
@@ -56598,7 +56600,6 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
             type: "token_update"
           })
         );
-        this.token = newToken;
       }
     }
     sendCustomMessage(kind, data, awaitResponse = false) {

{dara_core-1.14.8.dist-info → dara_core-1.14.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.14.8
+Version: 1.14.9
 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.8)
+Requires-Dist: create-dara-app (==1.14.9)
 Requires-Dist: croniter (>=1.0.15,<3.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.14.8) ; extra == "all"
+Requires-Dist: dara-components (==1.14.9) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
 Requires-Dist: fastapi (==0.109.0)
 Requires-Dist: fastapi_vite_dara (==0.3.1.0)
@@ -51,7 +51,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.14.8/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.14.9/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.8/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.14.9/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.8/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.8/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.8/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.9/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.9/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.9/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.8/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.14.9/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.14.8/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.14.9/LICENSE).
 

{dara_core-1.14.8.dist-info → dara_core-1.14.9.dist-info}/RECORD

@@ -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=KlEzIofyXWX8Axe4-mUILH1PO6hnK7webmYfDeCkvxc,20642
+dara/core/internal/websocket.py,sha256=pbG-4yAalufy24LUZRiqCC5zONEjqPM98djz6ZfYCLk,20940
 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=W3h6YomUxrDAGy-mTKuZHYwnHobad-y6F9BGk6j21Z0,4878770
+dara/core/umd/dara.core.umd.js,sha256=l6rZUKQV-E-EwfoZRsbdtrlDdJsvd4RnvA_bhoGGZK4,4878822
 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.8.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.14.8.dist-info/METADATA,sha256=IoGUbYGqrQv4nGac61-oSeG8yo9qDrbj8dx8P-Vx27k,7390
-dara_core-1.14.8.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.14.8.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.14.8.dist-info/RECORD,,
+dara_core-1.14.9.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.14.9.dist-info/METADATA,sha256=oZS9KyXTmBBH1Vantb_p6XR1Hp0lZBaxw8CCtr7-saQ,7390
+dara_core-1.14.9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.14.9.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.14.9.dist-info/RECORD,,