dara-components 1.21.12__py3-none-any.whl → 1.21.14__py3-none-any.whl

dara/components/__init__.py

@@ -17,6 +17,7 @@ limitations under the License.
 # ruff: noqa: F401, F403
 
 from importlib.metadata import version
+from inspect import isclass
 
 from pydantic import BaseModel
 
@@ -33,7 +34,7 @@ __version__ = version('dara-components')
 
 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/components/common/button.py

@@ -110,6 +110,10 @@ class Button(LayoutComponent):
     ```
 
     :param disabled: A variable, condition, or bool to disabled the button when true
+    :param loading: A variable, condition, or bool to set the button to a loading state, showing a spinner.
+       By default, the button will automatically be set to loading=True while the onclick action is running,
+       equivalent to `Button(..., onclick=my_action, loading=my_action.loading)`. You can opt out of this behaviour by
+       simply setting `loading=False`.
     :param onclick: An Action that is triggered by clicking the button
     :param icon: An optional icon to display, see dara.core.css.get_icon for details
     :param styling: A style of the button, can be 'primary', 'secondary', 'error', 'plain' or 'ghost'
@@ -120,6 +124,7 @@ class Button(LayoutComponent):
     """
 
     disabled: Optional[Union[Condition, ClientVariable, bool]] = None
+    loading: Optional[Union[Condition, ClientVariable, bool]] = None
     onclick: Optional[Action] = None
     icon: Optional[str] = None
     styling: Optional[ButtonStyle] = None

dara/components/common/table.py

@@ -16,7 +16,7 @@ limitations under the License.
 """
 
 from enum import Enum
-from typing import Any, List, Literal, Optional, Sequence, Union
+from typing import Any, ClassVar, List, Literal, Optional, Sequence, Union
 
 from fastapi.encoders import jsonable_encoder
 from pandas import DataFrame
@@ -47,6 +47,9 @@ class TableFormatterType(Enum):
     THRESHOLD = 'threshold'
 
 
+TFormatterType = type[TableFormatterType]
+
+
 class TableFormatterCompareCondition(Enum):
     EQUAL = 'equal'
 
@@ -58,6 +61,9 @@ class TableFilter(Enum):
     DATETIME = 'datetime'
 
 
+TFilterType = type[TableFilter]
+
+
 class Column(BaseModel):
     """
     Internal representation of a Table column, required for serialization to work correctly
@@ -862,8 +868,8 @@ class Table(ContentComponent):
     max_rows: Optional[int] = None
     suppress_click_events_for_selection: Optional[bool] = False
 
-    TableFormatterType = TableFormatterType
-    TableFilter = TableFilter
+    TableFormatterType: ClassVar[TFormatterType] = TableFormatterType
+    TableFilter: ClassVar[TFilterType] = TableFilter
 
     @field_validator('data')
     @classmethod

dara/components/graphs/components/node_hierarchy_builder.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, ClassVar, Dict, List, Optional, Union
 
 from pydantic import field_validator
 
@@ -36,7 +36,7 @@ class Node(BaseModel):
     name: str
     meta: Optional[NodeMeta] = None
 
-    Meta = NodeMeta
+    Meta: ClassVar[type[NodeMeta]] = NodeMeta
 
 
 class NodeHierarchyBuilder(StyledComponentInstance):

dara/components/plotting/plotly/plotly.py

@@ -16,7 +16,7 @@ limitations under the License.
 """
 
 from enum import Enum
-from typing import Any, List, Optional
+from typing import Any, ClassVar, List, Optional
 
 import plotly.graph_objects as go
 import plotly.io as pio
@@ -114,8 +114,8 @@ class Plotly(StyledComponentInstance):
     figure: str
     events: Optional[List[PlotlyEvent]] = None
 
-    EventName = PlotlyEventName
-    Event = PlotlyEvent
+    EventName: ClassVar[type[PlotlyEventName]] = PlotlyEventName
+    Event: ClassVar[type[PlotlyEvent]] = PlotlyEvent
 
     model_config = ConfigDict(
         arbitrary_types_allowed=True,

dara/components/umd/dara.components.umd.js

@@ -51941,11 +51941,13 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
   const StyledButton$1 = core$1.injectCss(G(Button$4)`
     flex: ${(props) => props.isSimpleButton ? void 0 : "1 1 100%"};
 `);
-  function Button({ children: children2, className, disabled: disabled2, icon, onclick, outline, styling, ...props }, ref) {
+  function Button({ children: children2, className, disabled: disabled2, icon, onclick, outline, styling, loading, ...props }, ref) {
     const [style2, css2] = core$1.useComponentStyles(props);
     const onClick = core$1.useAction(onclick);
-    const loading = core$1.useActionIsLoading(onclick);
+    const actionLoading = core$1.useActionIsLoading(onclick);
     const disabledValue = core$1.useConditionOrVariable(disabled2);
+    const propLoading = core$1.useConditionOrVariable(loading);
+    const loadingValue = loading === null || loading === void 0 ? actionLoading : propLoading;
     const Icon2 = icon ? core$1.getIcon(icon) : null;
     const iconColor = Array.isArray(children2) ? children2?.[0]?.props?.color || "inherit" : "inherit";
     return /* @__PURE__ */ React__namespace.createElement(
@@ -51956,7 +51958,7 @@ You must set sticky: 'left' | 'right' for the '${bugWithUnderColumnsSticky.Heade
         className,
         disabled: disabledValue,
         isSimpleButton: typeof children2 === "string" || children2[0]?.name === "Text",
-        loading,
+        loading: loadingValue,
         onClick: (e3) => {
           if (props.stop_click_propagation !== false) {
             e3.stopPropagation();

{dara_components-1.21.12.dist-info → dara_components-1.21.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-components
-Version: 1.21.12
+Version: 1.21.14
 Summary: Components for the Dara Framework
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: bokeh (>=3.1.0,<3.2.0)
 Requires-Dist: cai-causal-graph (>=0.3.6)
 Requires-Dist: certifi (>=2024.7.4)
-Requires-Dist: dara-core (==1.21.12)
+Requires-Dist: dara-core (==1.21.14)
 Requires-Dist: dill (>=0.3.0,<0.4.0)
 Requires-Dist: matplotlib (>=2.0.0)
 Requires-Dist: pandas (>=1.1.0,<3.0.0)
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown
 
 # Dara Components
 
-<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)

{dara_components-1.21.12.dist-info → dara_components-1.21.14.dist-info}/RECORD

@@ -1,10 +1,10 @@
-dara/components/__init__.py,sha256=JjN7EAGU-tM7I7YHyKRAuZlcbpJFcVcFaGit5StehDs,1372
+dara/components/__init__.py,sha256=C_FZGdU_DrybumO2aVYEpVmSJ00WnDtVxWjlvv_HRJ8,1420
 dara/components/common/__init__.py,sha256=amZWLKVUsq987chihQxzNj40WyspcbBEtEqR0mTZ_pA,4076
 dara/components/common/accordion.py,sha256=_JQGdhtC97YlV3_MUydeXTN7rKJFsWHy2JQzq_c0CXU,9498
 dara/components/common/anchor.py,sha256=ceN-6Vc0ekWz9VrFkFChO_Hm-FGMI1nMc9DJBAv9hnc,2877
 dara/components/common/base_component.py,sha256=rUFmLbe8DHL8S_ey5h93zuIP62cK26zknWwUF5eqp9I,4619
 dara/components/common/bullet_list.py,sha256=yk4lFAn6Bzx9UByp27P7ioVidAfsTPl5d4hIkG7MRkQ,1433
-dara/components/common/button.py,sha256=MIiQ6KSyO6z13kHd7lHAoxQeAGVYguYELLStw3JwBz0,4907
+dara/components/common/button.py,sha256=DhB-qgh46_vmoEVbxItYI5onMum_60hatyAUmOSoHWk,5351
 dara/components/common/button_bar.py,sha256=3_q6ccopXP0Gx_wdsGnejU6oN8D98lsOyQKBNhx-AQA,3802
 dara/components/common/card.py,sha256=-_14Um86g_VQVLcCXDv-PpfkiH_pN68J4ZIcZ4lp3kY,2102
 dara/components/common/carousel.py,sha256=T-d4w2pF9wB5sNsXe2i3rEfiZoRZJd5D4jVD9ctw-Qk,5344
@@ -36,7 +36,7 @@ dara/components/common/spacer.py,sha256=ZRSl_fLntnumalaL41FYpBKDxOUgWgndkkLdDLl8
 dara/components/common/stack.py,sha256=FLw0IbQpW7l9A6LDS_KPCeQP0J7QKGYhVZ1RhAjBjpE,5562
 dara/components/common/switch.py,sha256=8t3Bra3TdJzQ3fEdra0e8xNJSoDFAy6x8OlaxYddFhY,1548
 dara/components/common/tabbed_card.py,sha256=S7m09fBNFR64UG9STcF1w-FriRZ3uKzif9W7q_Xro6E,2342
-dara/components/common/table.py,sha256=H_M_FJ65VyAUKtOR-o8Etg_YSRXNHTc4lzh9ZG3cZfo,30064
+dara/components/common/table.py,sha256=-rzvtm_s0hhd7oScPotZu7buKLQ1EfGVhDtf2nZWPhg,30201
 dara/components/common/text.py,sha256=f-Dvo5vfuOauMlut-L1Jided2dxy8VrUuij6DVa5BZo,1986
 dara/components/common/textarea.py,sha256=F8dmyinylAjjXMhNwfiWInrCFuAnWuCPTsKKiEUkmOw,2106
 dara/components/common/time_utils.py,sha256=UbAws5HBptJ-xH-m4QRDDET-9leOQu9WdywmExBuqIc,1746
@@ -47,7 +47,7 @@ dara/components/graphs/components/__init__.py,sha256=GdWwL5spSsATOU57EmMqOf6t7az
 dara/components/graphs/components/base_graph_component.py,sha256=-joDvAQ0Ybvj6fiDevGlGNysMlbKpOJlHLbX7iWDbFs,4430
 dara/components/graphs/components/causal_graph_viewer.py,sha256=oQpvW_Vb9xE-gAF7JFOpPU_4kukXSPcZZ7BBLqX3y0Y,12439
 dara/components/graphs/components/edge_encoder.py,sha256=P75YnABZHIFvQ8y6sUMiyRKTtVD_gU3QyDgbESbBms8,6926
-dara/components/graphs/components/node_hierarchy_builder.py,sha256=mE8OXy_wbojWpnc5vq9zF77lnVI0k1E25DNbD-BiM2E,4362
+dara/components/graphs/components/node_hierarchy_builder.py,sha256=KfJp_miwbXyXzY_rp0Jnek-yN4RsRdyzatbk_hhtQ28,4398
 dara/components/graphs/definitions.py,sha256=M46KV4VSNDnwAcfYoJnx71B_EZIuDAIRG2_mD9LtwOA,5316
 dara/components/graphs/graph_layout.py,sha256=Qb3zdcpolDQi_hFHAc2wGELUCvyeVfOqTOiVK-8uvW8,13852
 dara/components/plotting/__init__.py,sha256=u-wb5iAJBzDLEiXjaMuFy1rLAP_QzfnOvm1ZqMXsgac,797
@@ -59,7 +59,7 @@ dara/components/plotting/matplotlib/__init__.py,sha256=XNvSBKg8ML2IhMm9fJ5-OOHAI
 dara/components/plotting/matplotlib/matplotlib.py,sha256=VUeOJZ6bTVrsJezmGqUJdezi6Vp53voB9BBWAGfTtrQ,1851
 dara/components/plotting/palettes.py,sha256=dAFOLzDsb5Cq-ffhegLsElaJueGzCJ7Px6J7frMe_YY,8001
 dara/components/plotting/plotly/__init__.py,sha256=vbFmz0BhPw6LktZxtVc4iv5eXRlc-5OqhBKOleUVaBw,835
-dara/components/plotting/plotly/plotly.py,sha256=t0twKC-_gUYDdNcNZ0ZsvvWreJbSVsumoZGRFTZmFE8,4786
+dara/components/plotting/plotly/plotly.py,sha256=xfKY4QjxkUEJ8ogBz43O2WIHWkrrg87REdUd4adbHHw,4858
 dara/components/plotting/plotly/themes.py,sha256=i7jpJOfhHVdyJAzTTcDoukUgZNPpH6atXrsZ8s3_dUw,4459
 dara/components/smart/__init__.py,sha256=PzggApMAClCo62aexuZ60MXWJclYfeuXwyZUrYVHOeM,1171
 dara/components/smart/chat/__init__.py,sha256=1J6s1YYBuDYg7Vft5vhMzkGHp2vjqUWy3BZQB4Es6mM,796
@@ -79,9 +79,9 @@ dara/components/smart/data_slicer/utils/core.py,sha256=4M_HA8oBzAkHklHgmaJ-qiKA3
 dara/components/smart/data_slicer/utils/data_preview.py,sha256=OAphjMrm3F76XmJ09X7sZSeOeKqGJFwN5ooo3qcyrG4,1722
 dara/components/smart/data_slicer/utils/plotting.py,sha256=TB00576kbA6y1eRuZBe09UAcZmluY4iJsKmYnXZ3hWQ,3389
 dara/components/smart/hierarchy.py,sha256=3RtHj68gA8H_X9FxQdaeSJloTqe8ciH52ku6f7zy33M,2902
-dara/components/umd/dara.components.umd.js,sha256=dnoqtLQt21gIW8c1B7_ZYF4Q049SnzgH42r0QvoruJc,6855502
+dara/components/umd/dara.components.umd.js,sha256=RciXoiTSMp5321RlwRKkD5L4rgc8C3y6X1hmknnnMKw,6855690
 dara/components/umd/style.css,sha256=Qm0_kcxXBDoXvvPTc7YCttkl1zMFifdcp-KufTunPNY,162729
-dara_components-1.21.12.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_components-1.21.12.dist-info/METADATA,sha256=IujtlTvMXJ4pyL7KACUbGtREBI-eHI7USa8rHSgP71w,2746
-dara_components-1.21.12.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_components-1.21.12.dist-info/RECORD,,
+dara_components-1.21.14.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_components-1.21.14.dist-info/METADATA,sha256=DKjh1iyNj3iBb12LESn_V3vp4__dagAPSqOdaZ2XcNE,2746
+dara_components-1.21.14.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_components-1.21.14.dist-info/RECORD,,