dara-core 1.16.1__py3-none-any.whl → 1.16.3__py3-none-any.whl

dara/core/base_definitions.py

@@ -41,12 +41,14 @@ from typing import (
 
 import anyio
 from anyio.streams.memory import MemoryObjectSendStream
+from fastapi.encoders import jsonable_encoder
 from pydantic import (
     BaseModel,
     ConfigDict,
     Field,
     SerializeAsAny,
     SerializerFunctionWrapHandler,
+    field_serializer,
     model_serializer,
 )
 from pydantic._internal._model_construction import ModelMetaclass
@@ -536,6 +538,10 @@ class ActionImpl(DaraBaseModel):
         dict_form['__typename'] = 'ActionImpl'
         return dict_form
 
+    @field_serializer('*')
+    def serialize_field(self, value: Any):
+        return jsonable_encoder(value)
+
 
 ActionInstance = Union[ActionImpl, AnnotatedAction]
 """

dara/core/cli.py

@@ -118,12 +118,12 @@ def start(
     # This enables HotModuleReloading when enable_hmr=True
     if enable_hmr:
         os.environ['DARA_HMR_MODE'] = 'TRUE'
-        os.environ['VITE_REACTJS_HMR'] = 'True'
-        os.environ['VITE_SERVE_MODE'] = 'True'
+        os.environ['VITE_HOT_RELOAD'] = 'True'
+        os.environ['VITE_IS_REACT'] = 'True'
     else:
         os.environ['DARA_HMR_MODE'] = 'FALSE'
-        os.environ['VITE_REACTJS_HMR'] = 'False'
-        os.environ['VITE_SERVE_MODE'] = 'False'
+        os.environ['VITE_HOT_RELOAD'] = 'False'
+        os.environ['VITE_IS_REACT'] = 'False'
 
     # Tell frontend to restart on WS reconnection
     if reload:

dara/core/configuration.py

@@ -463,7 +463,7 @@ class ConfigurationBuilder:
             if len(options) > 0:
                 dev_logger.warning(f'Options provided for a function middleware {middleware}, but they will be ignored')
         elif isclass(middleware):
-            constructed_middleware = Middleware(middleware, **options)
+            constructed_middleware = Middleware(middleware, **options)   # type: ignore
         else:
             raise ValueError(f'Invalid middleware type: {type(middleware)}')
 

dara/core/interactivity/plain_variable.py

@@ -21,6 +21,7 @@ from contextlib import contextmanager
 from contextvars import ContextVar
 from typing import Any, Callable, Generic, List, Optional, TypeVar
 
+from fastapi.encoders import jsonable_encoder
 from pydantic import (
     ConfigDict,
     SerializerFunctionWrapHandler,
@@ -108,14 +109,10 @@ class Variable(NonDataVariable, Generic[VariableType]):
         This ensures that users can define a serializer with config.add_encoder and it will be used
         when serializing the Variable.default.
         """
-        from dara.core.internal.encoder_registry import encoder_registry
-
-        default_type = type(default)
+        from dara.core.internal.encoder_registry import get_jsonable_encoder
 
         try:
-            for encoder_type, encoder in encoder_registry.items():
-                if default_type is encoder_type or _is_subclass_safe(default_type, encoder_type):
-                    return encoder['serialize'](default)
+            return jsonable_encoder(default, custom_encoder=get_jsonable_encoder())
         except Exception as e:
             dev_logger.error(
                 f'Error serializing default value of Variable {self.uid}, falling back to default serialization',

dara/core/internal/encoder_registry.py

@@ -19,6 +19,7 @@ from inspect import Parameter, isclass
 from typing import (
     Any,
     Callable,
+    Dict,
     MutableMapping,
     Optional,
     Type,
@@ -196,6 +197,7 @@ encoder_registry: MutableMapping[Type[Any], Encoder] = {
 try:
     # technically you can use dara core without this package
     from cai_causal_graph import CausalGraph, Skeleton
+    from cai_causal_graph.graph_components import Node
 except ImportError:
     # If the import fails, we don't need to register the encoders for these types
     pass
@@ -204,10 +206,18 @@ else:
         {
             CausalGraph: Encoder(serialize=lambda x: x.to_dict(), deserialize=lambda x: CausalGraph.from_dict(x)),
             Skeleton: Encoder(serialize=lambda x: x.to_dict(), deserialize=lambda x: Skeleton.from_dict(x)),
+            Node: Encoder(serialize=lambda x: x.to_dict(), deserialize=lambda x: Node.from_dict(x)),
         }
     )
 
 
+def get_jsonable_encoder() -> Dict[Type[Any], Callable[..., Any]]:
+    """
+    Get the encoder registry as a dict of {type: serialize} pairs
+    """
+    return {k: v['serialize'] for k, v in encoder_registry.items()}
+
+
 def deserialize(value: Any, typ: Optional[Type]):
     """
     Deserialize a value into a given type.

dara/core/internal/settings.py

@@ -45,7 +45,7 @@ class Settings(BaseSettings):
     sso_jwt_algo: str = 'ES256'
     sso_verify_audience: bool = False
     sso_extra_audience: Optional[List[str]] = None
-    model_config = SettingsConfigDict(env_file='.env')
+    model_config = SettingsConfigDict(env_file='.env', extra='allow')
 
 
 def generate_env_content():

dara/core/main.py

@@ -89,6 +89,7 @@ def _start_application(config: Configuration):
 
     # Setup the main template to work with Vite
     os.environ['VITE_MANIFEST_PATH'] = f'{config.static_files_dir}/manifest.json'
+    os.environ['VITE_STATIC_PATH'] = config.static_files_dir
     import fastapi_vite_dara
 
     if len(config.pages) > 0:

dara/core/visual/components/__init__.py

@@ -14,6 +14,13 @@ 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.
 """
+
+from inspect import isclass
+from typing import Optional  # needed for model_rebuild
+
+from pydantic import BaseModel
+
+from dara.core.interactivity import Variable  # needed for model_rebuild
 from dara.core.visual.components.dynamic_component import (
     DynamicComponent,
     DynamicComponentDef,
@@ -53,3 +60,12 @@ __all__ = [
     'RowFallbackDef',
     'Fallback',
 ]
+
+for symbol in list(globals().values()) + [Fallback.Default, Fallback.Row]:
+    try:
+        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
+
+        dev_logger.warning(f'Error rebuilding model "{symbol}": {e}')

{dara_core-1.16.1.dist-info → dara_core-1.16.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.16.1
+Version: 1.16.3
 Summary: Dara Framework Core
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -20,12 +20,12 @@ 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.16.1)
+Requires-Dist: create-dara-app (==1.16.3)
 Requires-Dist: croniter (>=1.0.15,<3.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.16.1) ; extra == "all"
+Requires-Dist: dara-components (==1.16.3) ; extra == "all"
 Requires-Dist: exceptiongroup (>=1.1.3,<2.0.0)
-Requires-Dist: fastapi (==0.109.0)
+Requires-Dist: fastapi (>=0.115.0,<0.116.0)
 Requires-Dist: fastapi_vite_dara (==0.4.0)
 Requires-Dist: httpx (>=0.23.0)
 Requires-Dist: jinja2 (>=2.1.1,<3.2.0)
@@ -45,14 +45,14 @@ Requires-Dist: responses (>=0.18.0,<0.19.0)
 Requires-Dist: tblib (>=1.7.0,<2.0.0)
 Requires-Dist: toml (>=0.10.2,<0.11.0)
 Requires-Dist: typing-extensions (>=4.5.0)
-Requires-Dist: uvicorn[standard] (>=0.22.0,<0.23.0)
+Requires-Dist: uvicorn[standard] (>=0.23.1)
 Requires-Dist: xlrd
 Project-URL: Repository, https://github.com/causalens/dara
 Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.16.1/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.16.3/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)
@@ -97,7 +97,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.16.1/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.16.3/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:
 
@@ -114,9 +114,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.16.1/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.16.1/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.16.1/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.16.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.16.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.16.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. |
 
 Check out our [App Gallery](https://dara.causalens.com/gallery) for more inspiration!
 
@@ -143,9 +143,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.16.1/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.16.3/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.16.1/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.16.3/LICENSE).
 

{dara_core-1.16.1.dist-info → dara_core-1.16.3.dist-info}/RECORD

@@ -6,9 +6,9 @@ dara/core/auth/basic.py,sha256=IMkoC1OeeRmnmjIqPHpybs8zSdbLlNKYLRvj08ajirg,4692
 dara/core/auth/definitions.py,sha256=7SoUBlYQhccop4Rl0XlHjSBjBU41ZbCZHS7Y-fL9g84,3501
 dara/core/auth/routes.py,sha256=1gOe1Z2Vv5MtpW5uvUYvyYWTJ_BDoLRllji1Plk4nss,7180
 dara/core/auth/utils.py,sha256=sFQWbkclDi2842mhauTeLh5g5RsSrzS7AxlKSSnzhYM,7320
-dara/core/base_definitions.py,sha256=MoLQ2VdtCtbGun15Zn7gvpgK-HFV3vvi5Xm-HpUYq8U,17661
-dara/core/cli.py,sha256=uttatNgqyJ86lj_IMLDJsEebh_sR3M2Ka7TncnT_PeU,8080
-dara/core/configuration.py,sha256=w_6MADhjSkbNV3otOdiDnPYYngq_bFeF1fSRabja7Tg,21211
+dara/core/base_definitions.py,sha256=6PFJpeHADl518TgkFHrQ7U2442S2RM5fTKkpm6_pAcY,17839
+dara/core/cli.py,sha256=2nDBanx4yRF7H-Uxefw3FHLDr1TclxouWJYXnY0B71g,8074
+dara/core/configuration.py,sha256=MQMWvG_poVRWQV05pv2zjXkM8cUPxVTYts0H0Pf7F5o,21228
 dara/core/css.py,sha256=KWCJTPpx4tTezP9VJO3k-RSVhWwomJr-4USoLz9vNAs,1771
 dara/core/data_utils.py,sha256=5GGz4vk6srLO8HMySiAEk_xZCvmf0SeTTgVi-N4qaKY,12636
 dara/core/defaults.py,sha256=jRYXdLrEL5NvCDZ2On3Bxije25qvVAduSgrR5PjmUO0,4103
@@ -24,7 +24,7 @@ dara/core/interactivity/derived_data_variable.py,sha256=u2HOts5rtmzK3D1K383YfYYQ
 dara/core/interactivity/derived_variable.py,sha256=eJXZ6OJgMdi_LJHvEeO-eRNmunONME2_ANu_5WyRPEU,21728
 dara/core/interactivity/filtering.py,sha256=BZsWsQvXPhn6WUoAFpAtgN6hXlGDudPbi4h97Qao2ic,9197
 dara/core/interactivity/non_data_variable.py,sha256=ewPaNaTpMixR5YCVY1pjmyHgeC53K0CsjQxMusbJsiw,1147
-dara/core/interactivity/plain_variable.py,sha256=CRDvHgWK2tZQSb8uxK-uIPtvsG1YOcQ5decKXYddeLg,9658
+dara/core/interactivity/plain_variable.py,sha256=RWqD-RO-2RoGxqNQcItBTNrgMB2ssnG2Zc-Omn-H0Yk,9532
 dara/core/interactivity/url_variable.py,sha256=1ZPFHO3gq7ZuATHt4S9x5ijmk4GBVlUv5KJN6DkM49w,4357
 dara/core/internal/__init__.py,sha256=QN0wbG9HPQ_vXh8BO8DnBXeYLIENVTNtRmYzZf1lx7c,577
 dara/core/internal/cache_store/__init__.py,sha256=7JCmQwNIMzfyLZGnsk0BbT1EdDFO_PRZz86E9ATcC6c,139
@@ -38,7 +38,7 @@ dara/core/internal/custom_response.py,sha256=aSPonh8AdRjioTk1MaPwdaJHkO4R4aG_osG
 dara/core/internal/dependency_resolution.py,sha256=y0CUop-RNNhwZLbafeqjhNEiTY549mLvDyNMTfvEl2Q,5456
 dara/core/internal/devtools.py,sha256=YmJdYKEqfxrpXFYAM5sJ2wUtUhfvaCMbb9PuDcqFdt4,2441
 dara/core/internal/download.py,sha256=2_fNIWDsV9f0BptTQRhBuIFXOO4th9pcYaIB7lsPcJU,3183
-dara/core/internal/encoder_registry.py,sha256=Jfi1p6qm3xNPH4IoCfOWribqCYHsEU9d7BuV0kVcBWs,10890
+dara/core/internal/encoder_registry.py,sha256=oxsk1liCkN2Oqp4a8EyUxZ5JxIyXly-_UnliAnAhvng,11275
 dara/core/internal/execute_action.py,sha256=4lcU4ElyMlaybIv5oDlahsncJA4PM-6hLOKbtEpHPRI,7021
 dara/core/internal/hashing.py,sha256=bKskv9n7s83uYVRxva77EC9exMbMZudmWsrsTPmg8W8,1139
 dara/core/internal/import_discovery.py,sha256=rh9RS-NCkux_dShIe-XXjX2LiJQN8WiJ5cltrb0YlUE,7853
@@ -56,7 +56,7 @@ dara/core/internal/registry.py,sha256=ONCDusqaL0q59Py_r8-fFVN3vbkkDf5TXzNvbB9SrG
 dara/core/internal/registry_lookup.py,sha256=8snHu2wUUsngXjHyHh6eZqL_WwonTTQB6-WBX-R_WZg,2238
 dara/core/internal/routing.py,sha256=-t6EXkQWlri4jcSLRvUce9PCGH4MN3wma2VVOzcBfyI,22918
 dara/core/internal/scheduler.py,sha256=tKpyN_yhtEepfqfkNTfFep055dl-Lq1_Itte6FTkH9o,12978
-dara/core/internal/settings.py,sha256=JWLPP_BrxVPeOKUDEoeWGYAz68hTzD_7h0QBuAwQZfw,3908
+dara/core/internal/settings.py,sha256=ViEni6lVXvbP6Ofb0VoTaWXkI0XajmD-LBpqz1LzwpA,3923
 dara/core/internal/store.py,sha256=kLRDuYEFwqpJMS0CmL5jGmETs645Xcug4jlelJqk5w4,7706
 dara/core/internal/tasks.py,sha256=oCfmOMm3pVH0-dvZzJv4nspCRWc_u-J3J7lmNI_ys5E,24763
 dara/core/internal/utils.py,sha256=b1YYkn8qHl6-GY6cCm2MS1NXRS9j_rElYCKMZOxJgrY,8232
@@ -75,7 +75,7 @@ dara/core/js_tooling/templates/dara.config.json,sha256=RZG_R_xJv_5rYIoz2QZulcG49
 dara/core/js_tooling/templates/vite.config.template.ts,sha256=f7_DbAQPDq6FJcOFJDnf2bMtzsvGWnN6VclRJjVdql8,631
 dara/core/log_configs/logging.yaml,sha256=YJyD18psAmSVz6587dcEOyoulLuRFFu1g8yMXl1ylM0,706
 dara/core/logging.py,sha256=QXf8qQDNdh5UW5-jnYwFz7U7KDmhPiZXmObBal_mwPo,13093
-dara/core/main.py,sha256=wc1Q5GJxZN4MWzhkq0sONO3MrsVtNEIA04YvawmnPZQ,18087
+dara/core/main.py,sha256=-KxI_gq_0URRbiEyO32wmCyFEy9aL7BM-iE_D9MKlxo,18148
 dara/core/metrics/__init__.py,sha256=2UqpWHv-Ie58QLJIHJ9Szfjq8xifAuwy5FYGUIFwWtI,823
 dara/core/metrics/cache.py,sha256=bGXwjO_rSc-FkS3PnPi1mvIZf1x-hvmG113dAUk1g-Y,2616
 dara/core/metrics/runtime.py,sha256=YP-6Dz0GeI9_Yr7bUk_-OqShyFySGH_AKpDO126l6es,1833
@@ -84,7 +84,7 @@ dara/core/persistence.py,sha256=RaGiGQE3oIzEH7kHC1ZXji2VJa0aP0ewMjt1wRWYWjI,1063
 dara/core/umd/dara.core.umd.js,sha256=dJIDEmWOw_J6bmktPc4M9LxtKT5MEmkTWd8YeLxihA8,4869323
 dara/core/umd/style.css,sha256=YQtQ4veiSktnyONl0CU1iU1kKfcQhreH4iASi1MP7Ak,4095007
 dara/core/visual/__init__.py,sha256=QN0wbG9HPQ_vXh8BO8DnBXeYLIENVTNtRmYzZf1lx7c,577
-dara/core/visual/components/__init__.py,sha256=mlmlTKelYVZoyEKGLLO-_HgLwI4uEpVwHVZajpXfSZk,1726
+dara/core/visual/components/__init__.py,sha256=4km21GLMLM2cr42SwehLUD7DJOlzvhwHl5hdG1OqmIM,2274
 dara/core/visual/components/dynamic_component.py,sha256=w7rxrM9ZTNvkHymkAto_s9UKg7EE8VrlpL9QdRe4sgY,692
 dara/core/visual/components/fallback.py,sha256=9bhDbyGrWjdSuMX_8eSggkicSjgIa8mP75y9oFNIXK8,3303
 dara/core/visual/components/invalid_component.py,sha256=Q6O9rAwVUNZXjEmliAKLfWf2lsyYK5JhgQvMM6jVco8,901
@@ -104,8 +104,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=nS_gQvOzCt5hTmj74d0_siq_9QWuj6wNuir4VCHy0Dk,2779
 dara/core/visual/themes/light.py,sha256=-Tviq8oEwGbdFULoDOqPuHO0UpAZGsBy8qFi0kAGolQ,1944
-dara_core-1.16.1.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.16.1.dist-info/METADATA,sha256=zfnjgw-hLmoDtW7Lq-sTkoKbzxAcOevL2Ea295jwu9E,7439
-dara_core-1.16.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.16.1.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.16.1.dist-info/RECORD,,
+dara_core-1.16.3.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.16.3.dist-info/METADATA,sha256=a_y6tpw54xTyDSqGoGyQZYpV2ZtFqLiWqlZPWCftFZY,7440
+dara_core-1.16.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.16.3.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.16.3.dist-info/RECORD,,