dara-core 1.12.4__py3-none-any.whl → 1.12.5__py3-none-any.whl

dara/core/internal/websocket.py

@@ -14,7 +14,8 @@ 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
 import uuid
 from contextvars import ContextVar
@@ -51,9 +52,22 @@ class DaraClientMessage(BaseModel):
 
 
 class CustomClientMessagePayload(BaseModel):
+    rchan: Optional[str] = Field(default=None, alias='__rchan')
+    """Return channel if the message is expected to have a response for"""
+
     kind: str
     data: Any
 
+    def dict(self, *args, **kwargs):
+        # Force by_alias to True to use __rchan name
+        result = super().dict(*args, **{**kwargs, 'by_alias': True})
+
+        # remove rchan if None
+        if '__rchan' in result and result.get('__rchan') is None:
+            result.pop('__rchan')
+
+        return result
+
 
 class CustomClientMessage(BaseModel):
     """
@@ -71,6 +85,9 @@ class ServerMessagePayload(BaseModel):
     rchan: Optional[str] = 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')
+    """ID of the __rchan included in the original client message if this message is a response to a client message"""
+
     class Config:
         extra = 'allow'
 
@@ -82,6 +99,10 @@ class ServerMessagePayload(BaseModel):
         if '__rchan' in result and result.get('__rchan') is None:
             result.pop('__rchan')
 
+        # remove response_for if None
+        if '__response_for' in result and result.get('__response_for') is None:
+            result.pop('__response_for')
+
         return result
 
 
@@ -159,11 +180,13 @@ class WebSocketHandler:
         """
         await self.send_stream.send(message)
 
-    async def process_client_message(self, message: ClientMessage):
+    def process_client_message(self, message: ClientMessage):
         """
         Process a message received from the client.
         Handles resolving pending responses.
 
+        Can return a coroutine to be awaited by the caller.
+
         :param message: The message to process
         """
         if message.type == 'message':
@@ -190,26 +213,51 @@ class WebSocketHandler:
                         self.pending_responses[message_id] = (event, message.message)
                         event.set()
 
+            return None
+
         if message.type == 'custom':
             # import required internals
             from dara.core.internal.registries import custom_ws_handlers_registry
-            from dara.core.internal.utils import run_user_handler
 
             data = message.message.data
             kind = message.message.kind
 
             try:
                 handler = custom_ws_handlers_registry.get(kind)
-                response = await run_user_handler(handler, args=(self.channel_id, data))
 
-                # If the handler returns a response, send it to the client
-                if response is not None:
-                    await self.send_message(
-                        CustomServerMessage(message=CustomServerMessagePayload(kind=kind, data=response))
-                    )
+                # Sync handler are processed directly, async ones scheduled as a task
+                if inspect.iscoroutinefunction(handler):
+
+                    async def wrapper():
+                        response = await handler(self.channel_id, data)
+                        if response is not None:
+                            await self.send_message(
+                                CustomServerMessage(
+                                    message=CustomServerMessagePayload(
+                                        kind=kind, data=response, __response_for=message.message.rchan
+                                    )
+                                )
+                            )
+
+                    asyncio.create_task(wrapper())
+                    return None
+                else:
+                    response = handler(self.channel_id, data)
+                    if response is not None:
+                        # Return a coroutine for the caller to await
+                        return self.send_message(
+                            CustomServerMessage(
+                                message=CustomServerMessagePayload(
+                                    kind=kind, data=response, __response_for=message.message.rchan
+                                )
+                            )
+                        )
             except KeyError as e:
                 eng_logger.error(f'No handler found for custom message kind {kind}', e)
-                return
+            return None
+
+        # unreachable but needed for pylint to be happy
+        return None
 
     async def send_and_wait(self, message: ServerMessage) -> Optional[Any]:
         """
@@ -446,8 +494,10 @@ async def ws_handler(websocket: WebSocket, token: Optional[str] = Query(default=
                         else:
                             try:
                                 parsed_data = parse_obj_as(ClientMessage, data)
-                                # Process the message in a separate task group to avoid blocking the receive task
-                                tg.start_soon(handler.process_client_message, parsed_data)
+                                result = handler.process_client_message(parsed_data)
+                                # Process the resulting coroutine before moving on to next message
+                                if inspect.iscoroutine(result):
+                                    await result
                             except Exception as e:
                                 eng_logger.error('Error processing client WS message', error=e)
 

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

@@ -26409,6 +26409,19 @@ var __privateWrapper = (obj, member, setter, getter) => ({
       }
     }).call(commonjsGlobal$1);
   })(lodash$2, lodash$2.exports);
+  let nanoid = (size2 = 21) => crypto.getRandomValues(new Uint8Array(size2)).reduce((id, byte) => {
+    byte &= 63;
+    if (byte < 36) {
+      id += byte.toString(36);
+    } else if (byte < 62) {
+      id += (byte - 26).toString(36).toUpperCase();
+    } else if (byte > 62) {
+      id += "-";
+    } else {
+      id += "_";
+    }
+    return id;
+  }, "");
   styled__default.default.span`
     display: flex;
     flex-direction: column;
@@ -29610,7 +29623,8 @@ var __privateWrapper = (obj, member, setter, getter) => ({
     CodeComponentThemes2["LIGHT"] = "light";
   })(CodeComponentThemes || (CodeComponentThemes = {}));
   styled__default.default.pre`
-    min-width: fit-content;
+    overflow-x: auto;
+
     margin: 0;
     padding: 1rem;
 
@@ -56561,8 +56575,31 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         );
       }
     }
-    sendCustomMessage(kind, data) {
+    sendCustomMessage(kind, data, awaitResponse = false) {
       if (this.socket.readyState === WebSocket.OPEN) {
+        if (awaitResponse) {
+          const rchan = nanoid();
+          return new Promise((resolve) => {
+            const subscription = this.customMessages$().pipe().subscribe({
+              next: (msg) => {
+                if (msg.message.__response_for === rchan) {
+                  resolve(msg);
+                  subscription.unsubscribe();
+                }
+              }
+            });
+            this.socket.send(
+              JSON.stringify({
+                message: {
+                  data,
+                  kind,
+                  __rchan: rchan
+                },
+                type: "custom"
+              })
+            );
+          });
+        }
         this.socket.send(
           JSON.stringify({
             message: {
@@ -56572,6 +56609,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
             type: "custom"
           })
         );
+        return Promise.resolve(null);
       }
     }
   }

{dara_core-1.12.4.dist-info → dara_core-1.12.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.12.4
+Version: 1.12.5
 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.12.4)
+Requires-Dist: create-dara-app (==1.12.5)
 Requires-Dist: croniter (>=1.0.15,<2.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.12.4) ; extra == "all"
+Requires-Dist: dara-components (==1.12.5) ; 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.12.4/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.12.5/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.12.4/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.12.5/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.12.4/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.12.4/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.12.4/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.12.5/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.12.5/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.12.5/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!
 
@@ -127,9 +127,9 @@ This repository covers the Dara Application Framework first-party packages.
 - `dara-components`: Components for the Dara Framework.
 - `create-dara-app`: A CLI tool for creating new Dara applications.
 
-More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.12.4/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.12.5/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.12.4/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.12.5/LICENSE).
 

{dara_core-1.12.4.dist-info → dara_core-1.12.5.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=CCmjbnMpIqtb2suNCJaI4p8WJokjK4WpyMKbEEJ8IJo,18164
+dara/core/internal/websocket.py,sha256=dhvE7KnolBHwPy9E6Ac1tjzOn0fAtdhDdcMUs47WuuQ,20138
 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=2AENw8gbOqzcrJb4t6wRkhib7sSHN4E4EpUxbbsPQ0g,4875712
+dara/core/umd/dara.core.umd.js,sha256=eAzeW0wT8sdeoYKEmTdPPlD_OsxRP9PHJUTko912TAM,4876798
 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.12.4.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.12.4.dist-info/METADATA,sha256=kQSyg7YDJh31Z6uHrVx9mOnmE7sObbF7858Iu4SLnns,6771
-dara_core-1.12.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.12.4.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.12.4.dist-info/RECORD,,
+dara_core-1.12.5.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.12.5.dist-info/METADATA,sha256=tVMv9uBzRnUMr8zkJch56lrN0WLyJF5KZqzffynj174,6771
+dara_core-1.12.5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.12.5.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.12.5.dist-info/RECORD,,