dara-components 1.8.5__py3-none-any.whl → 1.22.1__py3-none-any.whl

dara/components/smart/code_editor/util.py

@@ -16,7 +16,7 @@ limitations under the License.
 """
 
 import ast
-from typing import Any, List, Optional
+from typing import Any
 
 DEFAULT_WHITELIST = [
     # Inbuilts
@@ -41,7 +41,7 @@ class ScriptVisitor(ast.NodeVisitor):
 
     _function_blacklist = ['read_pickle', 'read_csv', 'read_fwf']
 
-    def __init__(self, undeclared_whitelist: List[str]):
+    def __init__(self, undeclared_whitelist: list[str]):
         self.undeclared_whitelist = undeclared_whitelist
         self.declared_vars: list = []
         super().__init__()
@@ -63,9 +63,9 @@ class ScriptVisitor(ast.NodeVisitor):
                 self.declared_vars.append(target.id)
         self.generic_visit(node)
 
-    def visit_Attribute(self, attr):
-        self._check_dunder(attr, attr.attr)
-        self.generic_visit(attr)
+    def visit_Attribute(self, node):
+        self._check_dunder(node, node.attr)
+        self.generic_visit(node)
 
     def visit_FunctionDef(self, node):
         self._check_dunder(node, node.name)
@@ -89,7 +89,7 @@ class ScriptVisitor(ast.NodeVisitor):
         self.generic_visit(node)
 
     def visit_Call(self, node):
-        func_name: Optional[str] = None
+        func_name: str | None = None
         if isinstance(node.func, ast.Name):
             func_name = node.func.id
         elif isinstance(node.func, ast.Attribute):
@@ -106,7 +106,7 @@ class ScriptVisitor(ast.NodeVisitor):
         raise SyntaxError(f'Imports are not allowed: {node.names}')
 
 
-def run_script(script: str, injections: dict = {}, whitelist: List[str] = DEFAULT_WHITELIST) -> Any:
+def run_script(script: str, injections: dict | None = None, whitelist: list[str] = DEFAULT_WHITELIST) -> Any:
     """
     Run a given script in a "sandbox".
     Disallows imports, most globals except whitelisted ones.
@@ -131,13 +131,13 @@ def run_script(script: str, injections: dict = {}, whitelist: List[str] = DEFAUL
 
     """
     # Validate that the script is safe
+    if injections is None:
+        injections = {}
     module: ast.Module = ast.parse(script)
     visitor = ScriptVisitor([*whitelist, *injections.keys()])
     visitor.visit(module)
 
     # Run the script
     loc: dict = {}
-    exec(
-        script, injections, loc
-    )   # nosec B102 # this is unsafe but we make best effort with the above to make it as safe as possible
-    return loc.get('return_val', None)
+    exec(script, injections, loc)  # nosec B102 # this is unsafe but we make best effort with the above to make it as safe as possible
+    return loc.get('return_val')

dara/components/smart/data_slicer/__init__.py

@@ -17,8 +17,12 @@ limitations under the License.
 
 from dara.components.smart.data_slicer.data_slicer import DataSlicer
 from dara.components.smart.data_slicer.data_slicer_modal import DataSlicerModal
+from dara.components.smart.data_slicer.extension.filter_status_button import (
+    FilterStatusButton,
+)
 
 __all__ = [
     'DataSlicer',
     'DataSlicerModal',
+    'FilterStatusButton',
 ]

dara/components/smart/data_slicer/data_slicer.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List, Union
-
 from pandas import DataFrame
 
 from dara.components import (
@@ -51,29 +49,29 @@ from dara.components.smart.data_slicer.utils.plotting import render_input_plot
 from dara.core import DerivedVariable, Variable, py_component
 from dara.core.actions import UpdateVariable
 from dara.core.definitions import ComponentInstance, discover
-from dara.core.interactivity import AnyDataVariable, DataVariable, DerivedDataVariable
+from dara.core.interactivity import AnyVariable, ServerVariable
 
 NO_RESULTS_FOUND = Stack(Text('No results found'))
 TABLE_ROWS = 5
 
 
-def increment(ctx: UpdateVariable.Ctx):
+def increment(ctx: UpdateVariable.Ctx):  # type: ignore
     return ctx.inputs.old + 1
 
 
 @discover
 class DataSlicer:
-    def __init__(self, data: Union[DataFrame, AnyDataVariable], rows_to_show: int = 10):
+    def __init__(self, data: DataFrame | AnyVariable, rows_to_show: int = 10):
         """
         DataSlicer component allows the user to select a subset of a dataset by variable ranges or individual rows.
-        Once instantiated, the `DerivedDataVariable` returned by `get_output()` will contain the filtered data.
+        Once instantiated, the `DerivedVariable` returned by `get_output()` will contain the filtered data.
 
         Displayed inline.
 
         :param data: input data
         :param rows_to_show: number of rows to show in the 'Head' and 'Tail' sections of filter preview
         """
-        self.data_var = data if isinstance(data, AnyDataVariable) else DataVariable(data)
+        self.data_var = data if isinstance(data, AnyVariable) else ServerVariable(data)
         self.selected_column = Variable(None)
         self.rows_to_show = Variable(rows_to_show)
 
@@ -82,14 +80,12 @@ class DataSlicer:
         self.table_columns = DerivedVariable(get_columns, variables=[self.column_definitions])
 
         self.current_variable_filters = Variable([])
-        self.preview_output = DerivedDataVariable(
-            apply_filters, variables=[self.current_variable_filters, self.data_var]
-        )
+        self.preview_output = DerivedVariable(apply_filters, variables=[self.current_variable_filters, self.data_var])
 
         # Table preview outputs
-        self.describe_data = DerivedDataVariable(get_describe_data, variables=[self.preview_output])
-        self.head_data = DerivedDataVariable(get_head_data, variables=[self.preview_output, self.rows_to_show])
-        self.tail_data = DerivedDataVariable(get_tail_data, variables=[self.preview_output, self.rows_to_show])
+        self.describe_data = DerivedVariable(get_describe_data, variables=[self.preview_output])
+        self.head_data = DerivedVariable(get_head_data, variables=[self.preview_output, self.rows_to_show])
+        self.tail_data = DerivedVariable(get_tail_data, variables=[self.preview_output, self.rows_to_show])
 
         # This is a workaround for issues in DO-230
         self.manual_output_trigger = Variable(0)
@@ -99,20 +95,20 @@ class DataSlicer:
             variables=[self.current_variable_filters, self.manual_output_trigger],
             deps=[self.manual_output_trigger],
         )
-        self.final_output = DerivedDataVariable(
+        self.final_output = DerivedVariable(
             lambda x, _y: x,
             variables=[self.preview_output, self.manual_output_trigger],
             deps=[self.manual_output_trigger],
         )
 
-    def get_output(self) -> DerivedDataVariable:
+    def get_output(self) -> DerivedVariable:
         """
         Get the DerivedVariable containing filtered data
         """
         return self.final_output
 
     @py_component
-    def describe_table(self, columns: List[Column]):
+    def describe_table(self, columns: list[Column]):
         """
         Display data.describe() as a Table
         """
@@ -122,14 +118,14 @@ class DataSlicer:
         return Table(data=self.describe_data, columns=cols, max_rows=TABLE_ROWS)
 
     @py_component
-    def table_head(self, columns: List[Column]):
+    def table_head(self, columns: list[Column]):
         """
         Display data.head() as a Table
         """
         return Table(data=self.head_data, columns=columns, max_rows=TABLE_ROWS)
 
     @py_component
-    def table_tail(self, columns: List[Column]):
+    def table_tail(self, columns: list[Column]):
         """
         Display data.tail() as a Table
         """

dara/components/smart/data_slicer/data_slicer_modal.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Union
-
 from pandas import DataFrame
 
 from dara.components.common import Button, Heading, Modal, Stack
@@ -30,11 +28,11 @@ from dara.core.definitions import ComponentInstance, discover
 from dara.core.interactivity import AnyDataVariable, DerivedVariable, Variable
 
 
-def toggle_variable(ctx: UpdateVariable.Ctx):
+def toggle_variable(ctx: UpdateVariable.Ctx):  # type: ignore
     return not ctx.inputs.old
 
 
-def increment(ctx: UpdateVariable.Ctx):
+def increment(ctx: UpdateVariable.Ctx):  # type: ignore
     return ctx.inputs.old + 1
 
 
@@ -42,14 +40,14 @@ def increment(ctx: UpdateVariable.Ctx):
 class DataSlicerModal(DataSlicer):
     def __init__(
         self,
-        data: Union[DataFrame, AnyDataVariable],
+        data: DataFrame | AnyDataVariable,
         rows_to_show: int = 10,
         button_top_position: str = '5%',
     ):
         """
         DataSlicerModal component is a modal version of the DataSlicer component.
 
-        Once instantiated, the `DerivedDataVariable` returned by `get_output()` will contain the filtered data.
+        Once instantiated, the `DerivedVariable` returned by `get_output()` will contain the filtered data.
 
         When included in a page, it adds a Filter button to the top-right corner of the screen which
         displays current filter status when hovered. The button opens up a modal with the DataSlicer when clicked.

dara/components/smart/data_slicer/extension/data_slicer_filter.py

@@ -16,11 +16,10 @@ limitations under the License.
 """
 
 from enum import Enum
-from typing import List, Optional
 
-from pydantic import BaseModel
 from typing_extensions import TypedDict
 
+from dara.core.base_definitions import DaraBaseModel as BaseModel
 from dara.core.definitions import ComponentInstance
 from dara.core.interactivity import AnyVariable, Variable
 
@@ -61,6 +60,6 @@ class DataSlicerFilter(ComponentInstance):
 
     js_module = '@darajs/components'
 
-    filters: Variable[List[FilterInstance]]
+    filters: Variable[list[FilterInstance]]
     columns: AnyVariable
-    height: Optional[str] = None
+    height: str | None = None

dara/components/smart/data_slicer/extension/filter_status_button.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Optional
-
 from typing_extensions import TypedDict
 
 from dara.core.base_definitions import Action
@@ -45,4 +43,4 @@ class FilterStatusButton(ComponentInstance):
 
     filter_stats: AnyVariable
     on_click: Action
-    top_position: Optional[str] = '5%'
+    top_position: str | None = '5%'

dara/components/smart/data_slicer/utils/core.py

@@ -17,7 +17,7 @@ limitations under the License.
 
 import re
 from datetime import datetime, timezone
-from typing import Any, List, Optional, Union
+from typing import Any, Optional, cast
 
 import numpy
 from pandas import DataFrame, Series
@@ -60,17 +60,17 @@ def infer_column_type(data: DataFrame, col: str) -> ColumnType:
         return ColumnType.CATEGORICAL
 
 
-def get_column_definitions(data: DataFrame) -> List[ColumnDefinition]:
-    symbols: List[str] = data.columns.values.tolist()
+def get_column_definitions(data: DataFrame) -> list[ColumnDefinition]:
+    symbols: list[str] = data.columns.values.tolist()
 
     return [ColumnDefinition(name=s, type=infer_column_type(data, s)) for s in symbols if s != '__index__']
 
 
-def get_column_items(column_defs: List[ColumnDefinition]) -> list:
+def get_column_items(column_defs: list[ColumnDefinition]) -> list:
     return [{'label': c['name'], 'value': c['name']} for c in column_defs]
 
 
-def isnumber(*values: Union[str, float]):
+def isnumber(*values: str | float):
     """
     Check if all values are numeric strings (ints, floats etc)
     """
@@ -83,7 +83,7 @@ def isnumber(*values: Union[str, float]):
     return True
 
 
-def apply_range_filter(range_filter: str, column: Series) -> Optional['Series[bool]']:
+def apply_range_filter(range_filter: str, column: Series) -> Optional['Series']:
     """
     Apply a 'range' filter on a column
 
@@ -93,7 +93,7 @@ def apply_range_filter(range_filter: str, column: Series) -> Optional['Series[bo
     final_range_filter = None
 
     # Look for groups of [<something>]
-    ranges: List[str] = re.findall(r'\[[^\[\]]+\]', range_filter)
+    ranges: list[str] = re.findall(r'\[[^\[\]]+\]', range_filter)
 
     for rang in ranges:
         if ',' not in rang:
@@ -107,8 +107,8 @@ def apply_range_filter(range_filter: str, column: Series) -> Optional['Series[bo
         upper_raw = upper_raw.strip()
 
         # Replace ':' symbols with (-)infinity
-        lower: Union[str, float] = float('-inf') if lower_raw == ':' else lower_raw
-        upper: Union[str, float] = float('inf') if upper_raw == ':' else upper_raw
+        lower: str | float = float('-inf') if lower_raw == ':' else lower_raw
+        upper: str | float = float('inf') if upper_raw == ':' else upper_raw
 
         # Only consider the range valid if the limits are numbers and lower < upper
         if lower != '' and upper != '' and isnumber(lower, upper):
@@ -126,7 +126,7 @@ def apply_range_filter(range_filter: str, column: Series) -> Optional['Series[bo
     return final_range_filter
 
 
-def apply_values_filter(values_filter: str, column: Series, col_type: ColumnType) -> Optional['Series[bool]']:
+def apply_values_filter(values_filter: str, column: Series, col_type: ColumnType) -> Optional['Series']:
     """
     Apply a 'values' filter on a column
 
@@ -135,7 +135,7 @@ def apply_values_filter(values_filter: str, column: Series, col_type: ColumnType
     """
     final_values_filter = None
 
-    values: List[Any] = (
+    values: list[Any] = (
         [v.strip() for v in values_filter.split(',') if v != ''] if ',' in values_filter else [values_filter.strip()]
     )
 
@@ -177,7 +177,7 @@ def parseISO(date: str) -> numpy.datetime64:
     return numpy.datetime64(d)
 
 
-def apply_date_filter(from_date: str, to_date: str, column: 'Series[numpy.datetime64]') -> Optional['Series[bool]']:
+def apply_date_filter(from_date: str, to_date: str, column: 'Series') -> Optional['Series']:
     """
     Apply a 'from_date' and 'to_date' filters to a column
 
@@ -189,18 +189,18 @@ def apply_date_filter(from_date: str, to_date: str, column: 'Series[numpy.dateti
 
     if from_date != '':
         from_timestamp = parseISO(from_date)
-        from_date_filter = column.gt(from_timestamp)   # type: ignore
+        from_date_filter = column.gt(from_timestamp)  # type: ignore
         final_date_filter = from_date_filter
 
     if to_date != '':
         to_timestamp = parseISO(to_date)
-        to_date_filter = column.lt(to_timestamp)   # type: ignore
+        to_date_filter = column.lt(to_timestamp)  # type: ignore
         final_date_filter = final_date_filter & to_date_filter if final_date_filter is not None else to_date_filter
 
     return final_date_filter
 
 
-def apply_filters(variable_filters: List[FilterInstance], data: DataFrame) -> DataFrame:
+def apply_filters(variable_filters: list[FilterInstance], data: DataFrame) -> DataFrame:
     """
     Apply filters on data
 
@@ -212,9 +212,9 @@ def apply_filters(variable_filters: List[FilterInstance], data: DataFrame) -> Da
     for fil in variable_filters:
         var = fil['column']
 
-        values_filter: Optional['Series[bool]'] = None
-        range_filter: Optional['Series[bool]'] = None
-        date_filter: Optional['Series[bool]'] = None
+        values_filter: Series | None = None
+        range_filter: Series | None = None
+        date_filter: Series | None = None
 
         if var is None or var.strip() == '':
             continue
@@ -223,14 +223,14 @@ def apply_filters(variable_filters: List[FilterInstance], data: DataFrame) -> Da
 
         # Range filter
         if fil['range'] != '' and 'range' in ALLOWED_FILTERS[column_type]:
-            range_filter = apply_range_filter(fil['range'], data[var])
+            range_filter = apply_range_filter(fil['range'], cast(Series, data[var]))
 
         # Values filter
         if fil['values'] != '' and 'values' in ALLOWED_FILTERS[column_type]:
-            values_filter = apply_values_filter(fil['values'], data[var], column_type)
+            values_filter = apply_values_filter(fil['values'], cast(Series, data[var]), column_type)
 
         if (fil['from_date'] != '' or fil['to_date'] != '') and ('from_date' in ALLOWED_FILTERS[column_type]):
-            date_filter = apply_date_filter(fil['from_date'], fil['to_date'], data[var])
+            date_filter = apply_date_filter(fil['from_date'], fil['to_date'], cast(Series, data[var]))
 
         # OR all of the defined filters together
         final_filter = None
@@ -242,10 +242,10 @@ def apply_filters(variable_filters: List[FilterInstance], data: DataFrame) -> Da
         if final_filter is not None:
             output = output[final_filter]
 
-    return output
+    return cast(DataFrame, output)
 
 
-def get_filter_stats(input_data: DataFrame, output_data: DataFrame, filters: List[FilterInstance]) -> FilterStats:
+def get_filter_stats(input_data: DataFrame, output_data: DataFrame, filters: list[FilterInstance]) -> FilterStats:
     """
     Get filter statistics
 

dara/components/smart/data_slicer/utils/data_preview.py

@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List
-
 from pandas import DataFrame
 
 from dara.components.common.table import Column, TableFormatterType
@@ -39,7 +37,7 @@ def get_tail_data(df: DataFrame, rows_to_show: int) -> DataFrame:
     return df.tail(rows_to_show).fillna('NaN')
 
 
-def get_columns(col_defs: List[ColumnDefinition]) -> List[Column]:
+def get_columns(col_defs: list[ColumnDefinition]) -> list[Column]:
     cols = []
 
     for col_def in col_defs:

dara/components/smart/data_slicer/utils/plotting.py

@@ -15,9 +15,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from typing import cast
+
 import numpy
 from bokeh.plotting import figure
-from pandas import DataFrame
+from pandas import DataFrame, Series
 from scipy.stats import gaussian_kde
 
 from dara.components.common import Stack, Text
@@ -43,9 +45,9 @@ def _plot_x_numerical(dataset: DataFrame, x: str, **kwargs):
         sizing_mode='stretch_both',
         **kwargs,
     )
-    p.toolbar.logo = None   # type: ignore
+    p.toolbar.logo = None  # type: ignore
 
-    pdf = gaussian_kde(df[x].dropna())
+    pdf = gaussian_kde(cast(DataFrame, df[x]).dropna())
     y = pdf(lin)
     p.line(
         lin,
@@ -63,10 +65,10 @@ def _plot_x_categorical(dataset: DataFrame, x: str, **kwargs):
     df = dataset.copy()
     df = df[[x]].dropna().astype(str)
 
-    values_counts = df[x].value_counts()
+    values_counts = cast(Series, df[x]).value_counts()
 
     p = figure(
-        x_range=sorted(list(df[x].unique())),
+        x_range=sorted(list(cast(Series, df[x]).unique())),
         title=f'Histogram - {x}',
         toolbar_location=None,
         tools='',
@@ -76,7 +78,7 @@ def _plot_x_categorical(dataset: DataFrame, x: str, **kwargs):
 
     p.vbar(x=values_counts.index, top=values_counts.values, width=0.5, color=BLUE)
 
-    p.toolbar.logo = None   # type: ignore
+    p.toolbar.logo = None  # type: ignore
 
     p.xgrid.grid_line_color = None
 

dara/components/smart/hierarchy.py

@@ -15,13 +15,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List, Optional, Union
-
-from pydantic import BaseModel
+from typing import Optional
 
 from dara.core.base_definitions import Action
+from dara.core.base_definitions import DaraBaseModel as BaseModel
 from dara.core.definitions import StyledComponentInstance
-from dara.core.interactivity import NonDataVariable
+from dara.core.interactivity import ClientVariable
 
 
 class Node(BaseModel):
@@ -30,13 +29,13 @@ class Node(BaseModel):
     are represented by stacking further Node components as children of a Node.
     """
 
-    children: Optional[List['Node']]
+    children: list['Node'] | None
     id: str
     label: str
     weight: float
 
     @staticmethod
-    def from_string(name: str, weight: Optional[float] = None, children: Optional[List['Node']] = None):
+    def from_string(name: str, weight: float | None = None, children: list['Node'] | None = None):
         return Node(id=name, label=name, children=children, weight=weight if weight is not None else 0.0)
 
     def find_node(self, target: str) -> Optional['Node']:
@@ -59,7 +58,7 @@ class Node(BaseModel):
         return None
 
 
-Node.update_forward_refs()
+Node.model_rebuild()
 
 
 class HierarchySelector(StyledComponentInstance):
@@ -74,7 +73,7 @@ class HierarchySelector(StyledComponentInstance):
     allow_leaf_select: bool = True
     hierarchy: Node
     open_all: bool = True
-    value: NonDataVariable
+    value: ClientVariable
 
 
 class HierarchyViewer(StyledComponentInstance):
@@ -87,5 +86,5 @@ class HierarchyViewer(StyledComponentInstance):
 
     allow_leaf_click: bool = True
     allow_parent_click: bool = True
-    hierarchy: Union[Node, NonDataVariable]
-    on_click_node: Optional[Action] = None
+    hierarchy: Node | ClientVariable
+    on_click_node: Action | None = None

{dara_components-1.8.5.dist-info → dara_components-1.22.1.dist-info}/METADATA

@@ -1,21 +1,21 @@
 Metadata-Version: 2.1
 Name: dara-components
-Version: 1.8.5
+Version: 1.22.1
 Summary: Components for the Dara Framework
 Home-page: https://dara.causalens.com/
 License: Apache-2.0
 Author: Patricia Jacob
 Author-email: patricia@causalens.com
-Requires-Python: >=3.8.0,<3.12.0
+Requires-Python: >=3.10.0,<3.13.0
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: bokeh (>=3.1.0,<3.2.0)
+Classifier: Programming Language :: Python :: 3.12
+Requires-Dist: bokeh (==3.1.1)
 Requires-Dist: cai-causal-graph (>=0.3.6)
-Requires-Dist: dara-core (==1.8.5)
+Requires-Dist: certifi (>=2024.7.4)
+Requires-Dist: dara-core (==1.22.1)
 Requires-Dist: dill (>=0.3.0,<0.4.0)
 Requires-Dist: matplotlib (>=2.0.0)
 Requires-Dist: pandas (>=1.1.0,<3.0.0)
@@ -27,7 +27,7 @@ Description-Content-Type: text/markdown
 
 # Dara Components
 
-<img src="https://github.com/causalens/dara/blob/VERSION-1.8.5/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.22.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)