dara-core 1.21.12__py3-none-any.whl → 1.21.14__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.

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/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-1.21.12.dist-info → dara_core-1.21.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.21.12
+Version: 1.21.14
 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.12)
+Requires-Dist: create-dara-app (==1.21.14)
 Requires-Dist: croniter (>=1.0.15,<3.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.21.12) ; extra == "all"
+Requires-Dist: dara-components (==1.21.14) ; 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.12/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.21.14/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.12/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.21.14/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.12/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.12/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.12/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.14/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.14/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.14/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.12/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.21.14/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.21.12/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.21.14/LICENSE).
 

{dara_core-1.21.12.dist-info → dara_core-1.21.14.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=WvVUpKux8pecSDSd8MynDS9QhGNk5SJYlR5mwxdL9kg,18554
 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
@@ -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
@@ -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.12.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.21.12.dist-info/METADATA,sha256=grTJrNqVMQk1Da7XU6IVNt7Jrf1TidbxBbRnISdHPn8,7544
-dara_core-1.21.12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.21.12.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.21.12.dist-info/RECORD,,
+dara_core-1.21.14.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.21.14.dist-info/METADATA,sha256=JslUc0pvrvAletjdM8pEegcpBExpuCmmxTXtx0G4GjU,7544
+dara_core-1.21.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.21.14.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.21.14.dist-info/RECORD,,