dara-core 1.15.7__py3-none-any.whl → 1.16.0a1__py3-none-any.whl

dara/core/visual/components/fallback.py

@@ -17,14 +17,14 @@ limitations under the License.
 
 from typing import ClassVar
 
-from dara.core.definitions import BaseFallback, JsComponentDef, StyledComponentInstance
+from dara.core.definitions import BaseFallback, JsComponentDef
 
 DefaultFallbackDef = JsComponentDef(name='DefaultFallback', js_module='@darajs/core', py_module='dara.core')
 RowFallbackDef = JsComponentDef(name='RowFallback', js_module='@darajs/core', py_module='dara.core')
 
 
 class Fallback:
-    class Default(BaseFallback, StyledComponentInstance):
+    class Default(BaseFallback):
         """
         ![FallbackDefault](../../../../../docs/packages/dara-core/assets/FallbackDefault.gif)
 
@@ -49,7 +49,7 @@ class Fallback:
 
         py_component: ClassVar[str] = 'DefaultFallback'
 
-    class Row(BaseFallback, StyledComponentInstance):
+    class Row(BaseFallback):
         """
         ![FallbackRow](../../../../../docs/packages/dara-core/assets/FallbackRow.gif)
 

dara/core/visual/components/invalid_component.py

@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance
 
 
@@ -24,6 +26,4 @@ class InvalidComponent(ComponentInstance):
     """
 
     error: str
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/menu.py

@@ -17,6 +17,8 @@ limitations under the License.
 
 from typing import List
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance, JsComponentDef, TemplateRouterLink
 
 MenuDef = JsComponentDef(name='Menu', js_module='@darajs/core', py_module='dara.core')
@@ -24,6 +26,4 @@ MenuDef = JsComponentDef(name='Menu', js_module='@darajs/core', py_module='dara.
 
 class Menu(ComponentInstance):
     routes: List[TemplateRouterLink]
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/progress_tracker.py

@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance, JsComponentDef
 
 ProgressTrackerDef = JsComponentDef(name='ProgressTracker', js_module='@darajs/core', py_module='dara.core')
@@ -49,5 +51,4 @@ class ProgressTracker(ComponentInstance):
 
     """
 
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/raw_string.py

@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance
 
 
@@ -25,6 +27,4 @@ class RawString(ComponentInstance):
     """
 
     content: str
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/router_content.py

@@ -17,6 +17,8 @@ limitations under the License.
 
 from typing import List
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import (
     ComponentInstance,
     JsComponentDef,
@@ -28,6 +30,4 @@ RouterContentDef = JsComponentDef(name='RouterContent', js_module='@darajs/core'
 
 class RouterContent(ComponentInstance):
     routes: List[TemplateRouterContent]
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/sidebar_frame.py

@@ -17,6 +17,8 @@ limitations under the License.
 
 from typing import Optional
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance, JsComponentDef
 
 SideBarFrameDef = JsComponentDef(name='SideBarFrame', js_module='@darajs/core', py_module='dara.core')
@@ -32,6 +34,4 @@ class SideBarFrame(ComponentInstance):
     side_bar_padding: Optional[str] = None
     side_bar_position: Optional[str] = None
     side_bar_width: Optional[str] = None
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/components/topbar_frame.py

@@ -17,6 +17,8 @@ limitations under the License.
 
 from typing import Optional
 
+from pydantic import ConfigDict
+
 from dara.core.definitions import ComponentInstance, JsComponentDef
 
 TopBarFrameDef = JsComponentDef(name='TopBarFrame', js_module='@darajs/core', py_module='dara.core')
@@ -32,6 +34,4 @@ class TopBarFrame(ComponentInstance):
     top_bar_padding: Optional[str] = None
     top_bar_position: Optional[str] = None
     top_bar_height: Optional[str] = None
-
-    class Config:
-        extra = 'forbid'
+    model_config = ConfigDict(extra='forbid')

dara/core/visual/css/__init__.py

@@ -24,7 +24,7 @@ from __future__ import annotations
 
 from typing import Literal, Optional, Union
 
-from pydantic import Field
+from pydantic import ConfigDict, Field
 
 from dara.core.base_definitions import DaraBaseModel
 
@@ -7684,8 +7684,4 @@ class CSSProperties(DaraBaseModel):
         default=None,
         description='The non-standard **`zoom`** CSS property can be used to control the magnification level of an element. `transform: scale()` should be used instead of this property, if possible. However, unlike CSS Transforms, `zoom` affects the layout size of the element.\n\n**Syntax**: `normal | reset | <number> | <percentage>`\n\n**Initial value**: `normal`\n\n| Chrome | Firefox | Safari  |  Edge  |   IE    |\n| :----: | :-----: | :-----: | :----: | :-----: |\n| **1**  |   No    | **3.1** | **12** | **5.5** |',
     )
-
-    class Config:
-        extra = 'allow'
-        use_enum_values = True
-        smart_union = True
+    model_config = ConfigDict(extra='allow', use_enum_values=True)

dara/core/visual/dynamic_component.py

@@ -14,9 +14,6 @@ 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 __future__ import annotations
-
 import json
 import uuid
 from contextvars import ContextVar
@@ -59,8 +56,8 @@ CURRENT_COMPONENT_ID = ContextVar('current_component_id', default='')
 
 class PyComponentInstance(ComponentInstance):
     func_name: str
-    dynamic_kwargs: Optional[Mapping[str, AnyVariable]]
-    polling_interval: Optional[int]
+    dynamic_kwargs: Optional[Mapping[str, AnyVariable]] = None
+    polling_interval: Optional[int] = None
     js_module: ClassVar[Optional[str]] = None
 
 
@@ -327,7 +324,7 @@ def _make_render_safe(handler: Callable):
 
             # Handle primitives being returned by just displaying the value as a string
             safe_result = RawString(content=str(result))
-        elif not isinstance(result, ComponentInstance):
+        elif not ComponentInstance.isinstance(result):
             # Otherwise it must be a component instance, return the error for frontend to display
             safe_result = InvalidComponent(
                 error=f'PyComponent "{handler.__name__}" did not return a ComponentInstance, found "{result}"'

{dara_core-1.15.7.dist-info → dara_core-1.16.0a1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-core
-Version: 1.15.7
+Version: 1.16.0a1
 Summary: Dara Framework Core
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -20,13 +20,13 @@ 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.15.7)
+Requires-Dist: create-dara-app (==1.16.0-alpha.1)
 Requires-Dist: croniter (>=1.0.15,<3.0.0)
 Requires-Dist: cryptography (>=42.0.4)
-Requires-Dist: dara-components (==1.15.7) ; extra == "all"
+Requires-Dist: dara-components (==1.16.0-alpha.1) ; 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)
+Requires-Dist: fastapi_vite_dara (==0.4.0)
 Requires-Dist: httpx (>=0.23.0)
 Requires-Dist: jinja2 (>=2.1.1,<3.2.0)
 Requires-Dist: odfpy
@@ -35,7 +35,8 @@ Requires-Dist: packaging (>=23.1,<24.0)
 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 (>=1.8.1,<2.0.0)
+Requires-Dist: pydantic (>=2.10.0,<3.0.0)
+Requires-Dist: pydantic-settings (>=2.8.1,<3.0.0)
 Requires-Dist: pyjwt (>=2.0.1,<3.0.0)
 Requires-Dist: python-dotenv (>=0.19.2)
 Requires-Dist: python-multipart (>=0.0.7,<0.0.8)
@@ -51,7 +52,7 @@ Description-Content-Type: text/markdown
 
 # Dara Application Framework
 
-<img src="https://github.com/causalens/dara/blob/v1.15.7/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.16.0-alpha.1/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 +97,7 @@ source .venv/bin/activate
 dara start
 ```
 
-![Dara App](https://github.com/causalens/dara/blob/v1.15.7/img/components_gallery.png?raw=true)
+![Dara App](https://github.com/causalens/dara/blob/v1.16.0-alpha.1/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 +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.15.7/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.15.7/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.15.7/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.0-alpha.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.0-alpha.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.0-alpha.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. |
 
 Check out our [App Gallery](https://dara.causalens.com/gallery) for more inspiration!
 
@@ -142,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.15.7/CONTRIBUTING.md) file.
+More information on the repository structure can be found in the [CONTRIBUTING.md](https://github.com/causalens/dara/blob/v1.16.0-alpha.1/CONTRIBUTING.md) file.
 
 ## License
 
-Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.15.7/LICENSE).
+Dara is open-source and licensed under the [Apache 2.0 License](https://github.com/causalens/dara/blob/v1.16.0-alpha.1/LICENSE).
 

{dara_core-1.15.7.dist-info → dara_core-1.16.0a1.dist-info}/RECORD

@@ -1,31 +1,31 @@
-dara/core/__init__.py,sha256=w3OUU03lGXA45_Sf99CsNWL6SZ7tr7y4wRYq6pdGmhM,2186
+dara/core/__init__.py,sha256=eF6Fmf5TkWYIPiZ3CR6kMGinIcFXoA8LQN5m4EpZzHY,2094
 dara/core/actions.py,sha256=gARcrrtzYuBAVJUCtuHwpFc6PPVPb7x3ITIISCLw0GA,965
 dara/core/auth/__init__.py,sha256=H0bJoXff5wIRZmHvvQ3y9p5SXA9lM8OuLCGceYGqfb0,851
-dara/core/auth/base.py,sha256=jZNuCMoBHQcxWeLpTUzcxdbkbWUJ42jbtKgnnrwvNVA,3201
+dara/core/auth/base.py,sha256=u4INu-p9aZyxm73I_fbzwB5MDk5tNpfARu0h545L8Ho,3239
 dara/core/auth/basic.py,sha256=IMkoC1OeeRmnmjIqPHpybs8zSdbLlNKYLRvj08ajirg,4692
-dara/core/auth/definitions.py,sha256=fx-VCsElP9X97gM0Eql-4lFpLa0UryokmGZhQQat2NU,3511
+dara/core/auth/definitions.py,sha256=cPR0viun0paUNBVpP8MdBkcCoSm01qtCJDwjxiqcYS0,3465
 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/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=8VynDds7a_uKXSpeNvjOUK3qfclg0WPniFEspL-6fi8,21153
+dara/core/configuration.py,sha256=l_knar1Xwd_svUiiYZUlgZ1uzh-nVt1ZYlfi9Q3CBWU,21156
 dara/core/css.py,sha256=KWCJTPpx4tTezP9VJO3k-RSVhWwomJr-4USoLz9vNAs,1771
 dara/core/data_utils.py,sha256=TUbCQkxkMndhwQEAFpvlcNTK13Xq0WlM8uavY9qUy3o,12601
-dara/core/defaults.py,sha256=UkjWwIbo8GLyn8RZRoD3cJe174-3wHZYzvMB0hQCnMg,4150
-dara/core/definitions.py,sha256=S64F4celEbiQphAlP-_B-ScRv4io0zYhrTl8mNPKav0,21148
+dara/core/defaults.py,sha256=jRYXdLrEL5NvCDZ2On3Bxije25qvVAduSgrR5PjmUO0,4103
+dara/core/definitions.py,sha256=QouD2P2XInW6bqrhPtrfIyDi8i99Au2PTBdWBtgBVrE,16713
 dara/core/http.py,sha256=LR1Kr5Hca-Z6klNl-M8R8Q1eOfFh3hLrjVS3kVrRsKA,4658
-dara/core/interactivity/__init__.py,sha256=sYMipjx2wgaAkS5sk7HVSEsvFXlbdqAN2W1vRycQzQk,2501
-dara/core/interactivity/actions.py,sha256=uWrlz4U_K5PQECSYYiDNVB9Imc1-K3LqAnWm2Lyn1Lk,45393
-dara/core/interactivity/any_data_variable.py,sha256=npgtgAIEKNix8VGYLFCc1G3jwXr195G-1lPejj9hCB8,5261
-dara/core/interactivity/any_variable.py,sha256=HuQTcCw1ysqYcJ5T9Jl--nV_1XzDWMfGw26g6eaQM2k,13281
-dara/core/interactivity/condition.py,sha256=ynK53cGuVMC852X6kkbrgltcdpIX7Otw7j1DEXEO4Q8,1424
-dara/core/interactivity/data_variable.py,sha256=NNSQAeyNDOdpQ_h4B8LSuuwGkiiRqoiF_QHNk9uA760,11654
-dara/core/interactivity/derived_data_variable.py,sha256=730kg9_5Xf78L0P7RAennomh4Y3qqUjHExODQrDwjU8,15179
-dara/core/interactivity/derived_variable.py,sha256=6xOv-E5wQj-fd9S2RVmRdE_DfkvxVGyptfZlDSj0fmY,21497
-dara/core/interactivity/filtering.py,sha256=veQbDi4ogeDO5SODOp3hpx1FQGAYKFLwnhqmbfFDyJo,9168
+dara/core/interactivity/__init__.py,sha256=3e5G5Nww33irzs1LinUmfs6wYpmSLPp9e4BHplw3gIk,2294
+dara/core/interactivity/actions.py,sha256=IXv60SHWIM5YKLlh6ndCwhwdCBd7XSdPLPoxhWKqJpM,45807
+dara/core/interactivity/any_data_variable.py,sha256=1dLLxLuDErRsgaFPSTXxZHvpVucKKty90twQE6N-_NI,5286
+dara/core/interactivity/any_variable.py,sha256=LOGhbDdYffujlRxF4LR9ZuWdai03R-EXuGsTEJAwfo0,13544
+dara/core/interactivity/condition.py,sha256=q_RDDt-DtZEUQL054Mc7zHyJIJIGACljJ2gOFygCHQc,1309
+dara/core/interactivity/data_variable.py,sha256=pvPOx6SMxHWDxoo5Ea5xqLwrBTrWN68x8lnBiblYSGg,11760
+dara/core/interactivity/derived_data_variable.py,sha256=u2HOts5rtmzK3D1K383YfYYQnb4pHZF3rTu1lfwMpPA,15323
+dara/core/interactivity/derived_variable.py,sha256=eJXZ6OJgMdi_LJHvEeO-eRNmunONME2_ANu_5WyRPEU,21728
+dara/core/interactivity/filtering.py,sha256=NXd4tzWSqSxZXXdhphm9rx9oBpofbejpvKSZy9VSfkI,9162
 dara/core/interactivity/non_data_variable.py,sha256=ewPaNaTpMixR5YCVY1pjmyHgeC53K0CsjQxMusbJsiw,1147
-dara/core/interactivity/plain_variable.py,sha256=iuISw0x14ruOnZqrRg1Zay6ny7Ey0QImRUHVg0S11e0,8017
-dara/core/interactivity/url_variable.py,sha256=DEHEvg1mE7xXlK69p1D5iZZbf4emzNe6r_RH6DHcyoc,4219
+dara/core/interactivity/plain_variable.py,sha256=M6upKnB8GPE9ENZYTiMSE5dJ1N27cJ-nAyv5MWz74Ps,8250
+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
 dara/core/internal/cache_store/base_impl.py,sha256=gQ3N2diA4QihkLctP82vxfsSBntQy4cbjsAmmcSEPP4,1237
@@ -37,12 +37,12 @@ dara/core/internal/cgroup.py,sha256=o1Qqn5LV3TOPK7lQ0xbQj01zYT1pv-X_edGx8VhFvEw,
 dara/core/internal/custom_response.py,sha256=aSPonh8AdRjioTk1MaPwdaJHkO4R4aG_osGAGCIHbtg,1341
 dara/core/internal/dependency_resolution.py,sha256=y0CUop-RNNhwZLbafeqjhNEiTY549mLvDyNMTfvEl2Q,5456
 dara/core/internal/devtools.py,sha256=YmJdYKEqfxrpXFYAM5sJ2wUtUhfvaCMbb9PuDcqFdt4,2441
-dara/core/internal/download.py,sha256=in0H-AURTfouwje6Q-WpHAENO-_g9VXLWIVLQLRE5eA,3141
+dara/core/internal/download.py,sha256=raVp0b27XOV1yF5gpbS-IBnXD1Nb4BiRTF6AzYh9pZ8,3148
 dara/core/internal/encoder_registry.py,sha256=mcZWUQgsfB8WcfSrHzKP0O-H9qeBiHf767fAvvE6otQ,10372
 dara/core/internal/execute_action.py,sha256=4lcU4ElyMlaybIv5oDlahsncJA4PM-6hLOKbtEpHPRI,7021
-dara/core/internal/hashing.py,sha256=vDlChxGrmpVsyxN3Vg3Bu0GFF7_baIRkrz059kZa4Rk,1133
+dara/core/internal/hashing.py,sha256=bKskv9n7s83uYVRxva77EC9exMbMZudmWsrsTPmg8W8,1139
 dara/core/internal/import_discovery.py,sha256=rh9RS-NCkux_dShIe-XXjX2LiJQN8WiJ5cltrb0YlUE,7853
-dara/core/internal/normalization.py,sha256=eLr1X-5fazlVmPgq8j1Qw_dLVwkVwTF9CRtSa6y5pCk,6894
+dara/core/internal/normalization.py,sha256=s618icfYaEcxI7vgsQjH54PKeefUE_gYKvDJ-D-iscI,6314
 dara/core/internal/pandas_utils.py,sha256=hWOGZbfuakDulviMpaedpi4mhP45hpe9HSRCiDhlF44,2913
 dara/core/internal/pool/__init__.py,sha256=pBbXE5GR3abVC9Lg3i0QxfdmsrBDMJUYAYb0SiAEBkk,657
 dara/core/internal/pool/channel.py,sha256=TbyIE-PnfzzsQYhl3INOs5UIHHbF_h9bMFne5FjbWlQ,4948
@@ -54,18 +54,18 @@ dara/core/internal/port_utils.py,sha256=AQOUNiFNBYKVUwQ7i9UlY1NQ3sWb5xh5GkO6P1Bm
 dara/core/internal/registries.py,sha256=9WDczIsNeSmzi6aViIq_b14lmmYGGkdsUGHpv0Sg9zo,3278
 dara/core/internal/registry.py,sha256=ONCDusqaL0q59Py_r8-fFVN3vbkkDf5TXzNvbB9SrGQ,4305
 dara/core/internal/registry_lookup.py,sha256=8snHu2wUUsngXjHyHh6eZqL_WwonTTQB6-WBX-R_WZg,2238
-dara/core/internal/routing.py,sha256=XViBysQSchhX9yoFyDoGe4r5OQ8xMfn6rvA2fi8Yd70,22847
-dara/core/internal/scheduler.py,sha256=z6OYwazBf3GYo8CzMC9IuGC2P96gI7JwxquT8GaoTMk,12944
-dara/core/internal/settings.py,sha256=wAWxl-HXjq7PW3twe_CrR-UuMRw9VBudC3eRmevZAhM,3869
-dara/core/internal/store.py,sha256=qVyU7JfC3zE2vYC2mfjmvECWMlFS9b-nMF1k-alg4Y8,7756
-dara/core/internal/tasks.py,sha256=XK-GTIyge8RBYAfzNs3rmLYVNSKIarCzPdqRSVGg-4M,24728
+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/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
-dara/core/internal/websocket.py,sha256=eEtQoz7SApvmZPKiG2aKlU2bkx2Zhz8p_HG7MOb0rio,21813
+dara/core/internal/websocket.py,sha256=qeW7KOeJ_FPkpAJNZaVwxIN_DqDv7XK7uyjTxJ8HIno,22043
 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
 dara/core/js_tooling/custom_js_scaffold/local-js-component.tsx,sha256=Ojsyeh9MYJnH_XJXGkSc8PAUZIqJcqcGTu_uRITo_88,709
-dara/core/js_tooling/js_utils.py,sha256=RsGFaK0W2ThsbWzAn5Aush7g4Lz3jpvasCEeidZcttg,26101
+dara/core/js_tooling/js_utils.py,sha256=cKkUmBrClZOCmra6lzjWoqQy3nRS87UBOelZXpE3tD4,26112
 dara/core/js_tooling/statics/favicon.ico,sha256=CJP26erMMIwQB8FFmyhoUJ-Cx1cXEopiVGxFwyxcpo0,47068
 dara/core/js_tooling/statics/tsconfig.json,sha256=ubnFjwvPHbx2F7wVWsU2VHLDeEnnOwXkTIk7hLNY8ZM,446
 dara/core/js_tooling/templates/.npmrc,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -75,38 +75,37 @@ 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=xcdxeNBis_wxioZ1EiIFqsp-87ekqq6x9ChIktmLZ2k,18075
+dara/core/main.py,sha256=wc1Q5GJxZN4MWzhkq0sONO3MrsVtNEIA04YvawmnPZQ,18087
 dara/core/metrics/__init__.py,sha256=2UqpWHv-Ie58QLJIHJ9Szfjq8xifAuwy5FYGUIFwWtI,823
 dara/core/metrics/cache.py,sha256=ybofUhZO0TCHeyhB_AtldWk1QTmTKh7GucTXpOkeTFA,2580
 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=9GBLhK_so-T-DnNOVT3zo7mHXNjwIU2TzgcIOr7XEro,10497
-dara/core/umd/dara.core.umd.js,sha256=57VF59BwRQpgC4hjRclh5Bh6r2RGBcOujHZ9nzVYxk4,4879982
+dara/core/persistence.py,sha256=RaGiGQE3oIzEH7kHC1ZXji2VJa0aP0ewMjt1wRWYWjI,10634
+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=O-Em_glGdZNO0LLl2RWmJSrQiXKxliXg_PuhVXGT81I,1811
+dara/core/visual/components/__init__.py,sha256=mlmlTKelYVZoyEKGLLO-_HgLwI4uEpVwHVZajpXfSZk,1726
 dara/core/visual/components/dynamic_component.py,sha256=w7rxrM9ZTNvkHymkAto_s9UKg7EE8VrlpL9QdRe4sgY,692
-dara/core/visual/components/fallback.py,sha256=uazqdqgmWXPHluPRl3-5DofjE_cMMyKusIsn_pHuz1s,3378
-dara/core/visual/components/for_cmp.py,sha256=h15J_uVc974ILSRVYRLOWFOqaWIllivd6j-lNjpQU4U,6600
-dara/core/visual/components/invalid_component.py,sha256=HbWj5tjD5M8o8e-s6awnkDn3boHV7GyOWhALjWGOQmk,866
-dara/core/visual/components/menu.py,sha256=xaBqHqf0P9JjnD0S5poSsovVKSOZwklm6RRfjzIJk4s,893
-dara/core/visual/components/progress_tracker.py,sha256=qgGxwk8SsRNzennzj6YSaiguPo-tHlCnD2-WeqeiEzM,1669
-dara/core/visual/components/raw_string.py,sha256=NqvjoacE3JxwVxI-qA9YV1jV0nAQamW7Zc3kdZxak44,886
-dara/core/visual/components/router_content.py,sha256=QImJuOS4c8jrqzlVmmK7Q3vf5sMIU2lK6BusbpclLnM,943
-dara/core/visual/components/sidebar_frame.py,sha256=9KRZuLdY2zLMkPDq-0duGSNhmftWv_f-FJT6qbG8FAc,1207
-dara/core/visual/components/topbar_frame.py,sha256=aHTCmaI9tX5c1yVLoPWgFbDos-P81Kzv-f3ANFeTqdQ,1220
+dara/core/visual/components/fallback.py,sha256=9bhDbyGrWjdSuMX_8eSggkicSjgIa8mP75y9oFNIXK8,3303
+dara/core/visual/components/invalid_component.py,sha256=Q6O9rAwVUNZXjEmliAKLfWf2lsyYK5JhgQvMM6jVco8,901
+dara/core/visual/components/menu.py,sha256=ied87GzIoZgmEINgX3WahBqofn-WK1PIBZAgMjR-Bxg,928
+dara/core/visual/components/progress_tracker.py,sha256=5p_nEJf7RK2oPimXL4YhAN7v0Jcx2HHQzlLxPr7Co38,1705
+dara/core/visual/components/raw_string.py,sha256=jtG9hDZz3s-sCg__Eg4__XkD80OhnNaWiRo-W88LK4M,921
+dara/core/visual/components/router_content.py,sha256=ZFJBuT-Vpn4yvbzgt5IGQbBqiWFhYfHa6mgB2O8Xt8I,978
+dara/core/visual/components/sidebar_frame.py,sha256=rXkPQF9TORuAgbMMx-BL_XDVE-CKcZHY9XV9-gZr_FI,1242
+dara/core/visual/components/topbar_frame.py,sha256=7L4Bi7Ba_gdfS6yoduXQ3k0-XQaNuahmkumyfzlpzzY,1255
 dara/core/visual/components/types.py,sha256=uH2IGufr4-I8cNbZgnEd3YbqoPFgyqG91rfNXZVG7a0,686
 dara/core/visual/css/Property.py,sha256=XJzlMeASyrquhXmaQZvrsgin3xlVfm94dHRY9aJkhXk,43028
-dara/core/visual/css/__init__.py,sha256=XEO9yc0BHLI4dbk1ziMLmHc5MW2KDDfVdqlqtlSmk-A,367298
-dara/core/visual/dynamic_component.py,sha256=bTDTYu12B3wSZmqFPisQvvnA_Q-fyYp0Ds0Y08lE-jM,13608
+dara/core/visual/css/__init__.py,sha256=OfxYRjeQweul_cF2Zgh6U9E-v933mO2MCKeh5rVZkyI,367276
+dara/core/visual/dynamic_component.py,sha256=M9HQOE0gJYbZFIV97L0kT6WCY4dJ2juT9R9YZ1TB1EA,13584
 dara/core/visual/progress_updater.py,sha256=35_fb_F68YjtYf8MMRA76FoajjfPAlutmqz5fUNgTPs,5840
 dara/core/visual/template.py,sha256=y0KJU2913Q10y1TVMpTVnIxIoUsabzYfpUHEGuX2QyM,5707
 dara/core/visual/themes/__init__.py,sha256=aM4mgoIYo2neBSw5FRzswsht7PUKjLthiHLmFIkyRKw,794
 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.15.7.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_core-1.15.7.dist-info/METADATA,sha256=KaS0eBjQh9KonsbjctwyyDDLID4YArJoWJRqcCnGKJQ,7390
-dara_core-1.15.7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_core-1.15.7.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
-dara_core-1.15.7.dist-info/RECORD,,
+dara_core-1.16.0a1.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_core-1.16.0a1.dist-info/METADATA,sha256=oKLzWHVK87YMLThSqGRswv9VGnlVNpoAVLmY_nygTjw,7513
+dara_core-1.16.0a1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_core-1.16.0a1.dist-info/entry_points.txt,sha256=H__D5sNIGuPIhVam0DChNL-To5k8Y7nY7TAFz9Mz6cc,139
+dara_core-1.16.0a1.dist-info/RECORD,,

dara/core/visual/components/for_cmp.py

@@ -1,150 +0,0 @@
-"""
-Copyright 2023 Impulse Innovations Limited
-
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-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 typing import Optional
-
-from pydantic import validator
-
-from dara.core.definitions import ComponentInstance, JsComponentDef
-from dara.core.interactivity import AnyVariable
-from dara.core.visual.components.types import Direction
-
-ForDef = JsComponentDef(name='For', js_module='@darajs/core', py_module='dara.core')
-
-
-class For(ComponentInstance):
-    """
-    The For component is a special component designed to handle rendering
-    of templated components created using the `@template` decorator. It accepts a
-    template component and a data source, then dynamically renders the template
-    component for each item in the data source.
-
-    The For component is ideal for situations where you need to generate a list
-    of components based on data, such as rendering a list of cards. It is particularly useful
-    for improving performance when rendering large lists of components.
-
-    Supports virtualization, which is enabled by default. Virtualization is a technique
-    that only renders the components that are visible on the screen which can significantly improve performance when rendering
-    large lists of components.
-
-    Virtualized example:
-
-    ```
-    from dara.core import template, For, Variable
-    from dara_dashboarding_extension import Card, Heading, Text, Button, If, Stack
-
-    var = Variable([
-        {'title': 'Experiment 1', 'description': 'Description 1', 'button_text': 'Run 1', 'button_color': 'red', 'size': 200},
-        {'title': 'Experiment 2', 'description': 'Description 2', 'button_text': 'Run 2', 'button_color': 'blue', 'extra': 'Extra text', 'size': 300},
-        ...
-    ])
-
-    @template
-    def ExperimentCard(template_var: template.Value):
-        return Card(
-            Heading(template_var.title, level=2),
-            Text(template_var.description),
-            # Conditionally render the extra field if it exists
-            If(template_var.extra, Text(template_var.extra)),
-            Button(template_var.button_text, raw_css={'backgroundColor': template_var.button_color}),
-            ...
-        )
-
-    Stack(
-        For(
-            key_accessor='title',
-            data=var,
-            template=ExperimentCard(),
-            size_accessor='size' # Use the 'size' field to determine the height of each rendered component
-        )
-    )
-    ```
-
-    In this example the For component will render an ExperimentCard for each item in the 'var' data source,
-    with the appropriate data injected into the template component. The 'title' field is used here as the
-    `key_accessor`, this works here because the title is unique for each item; in general it is recommended
-    to use a unique identifier for the `key_accessor` such as an `id` field. Note how the `size_accessor` is
-    used to determine the height of each rendered component, this is required for virtualization to work correctly.
-
-    Non-virtualized example:
-
-    ```
-    from dara.core import template, For, Variable
-    from dara_dashboarding_extension import Card, Heading, Text, Button, Stack
-
-    var = Variable([
-        {'title': 'Experiment 1', 'description': 'Description 1', 'button_text': 'Run 1', 'button_color': 'red'},
-        {'title': 'Experiment 2', 'description': 'Description 2', 'button_text': 'Run 2', 'button_color': 'blue'},
-        ...
-    ])
-
-    @template
-    def ExperimentCard(template_var: template.Value):
-        return Card(
-            Heading(template_var.title, level=2),
-            Text(template_var.description),
-            Button(template_var.button_text, raw_css={'backgroundColor': template_var.button_color}),
-            ...
-        )
-
-    Stack(
-        For(
-            key_accessor='title',
-            data=var,
-            template=ExperimentCard(),
-            virtualize=False
-        ),
-        scroll=True
-    )
-    ```
-
-
-    :param data: The variable containing the data to iterate over. Should be a list of dictionaries when serialized, DataVariables are handled out-of-the-box.
-    :param template: Templated component, created by `@template`, to render for each item in the variable.
-    :param key_accessor: a string representing a property name in the data item, which will be used as the unique identifier for each rendered
-    component. Must be unique for each item in the data source or else changes in data will not be correctly reflected in the rendered components.
-    :param size_accessor: a string representing a property name in the data item which will be used as the size of each rendered component. The property must
-    be a pixel size number (e.g. 100, 200, 300, etc). This is required when `virtualize=True` in order to correctly render the virtualized list. This corresponds
-    to item height in the vertical direction and item width in the horizontal direction.
-    :param virtualize: whether or not to use virtualization. Defaults to True. When virtualization is enabled, only the visible items are rendered, which can
-    improve performance when rendering large lists of components. Requires `size_accessor` to be set if `True`.
-    """
-
-    data: AnyVariable
-    template: ComponentInstance
-    key_accessor: str
-    size_accessor: Optional[str] = None
-    direction: Direction = Direction.VERTICAL
-    virtualize: bool = True
-
-    @validator('template')
-    @classmethod
-    def is_templated_component(cls, v: ComponentInstance):
-        if not v.templated:
-            raise ValueError(
-                '`For.template` must be a templated component. Make sure to use `@template` decorator to create a templated component'
-            )
-        return v
-
-    @validator('size_accessor')
-    @classmethod
-    def require_size_accessor_if_virtualize(cls, v: Optional[str], values: dict):
-        if v is None and values['virtualize']:
-            raise ValueError(
-                '`For.size_accessor` is required when `virtualize=True` in order to correctly render the virtualized list. Please provide a `size_accessor` or set `virtualize=False` to opt out of virtualization.'
-            )
-        return v