dara-components 1.17.6__py3-none-any.whl → 1.18.1__py3-none-any.whl

dara/components/__init__.py

@@ -14,6 +14,8 @@ 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.
 """
+# ruff: noqa: F401, F403
+
 from importlib.metadata import version
 
 from pydantic import BaseModel

dara/components/common/__init__.py

@@ -14,6 +14,7 @@ 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.
 """
+# ruff: noqa: F401, F403
 
 from dara.components.common.accordion import Accordion, AccordionItem
 from dara.components.common.anchor import Anchor

dara/components/common/base_component.py

@@ -78,7 +78,7 @@ class LayoutComponent(BaseDashboardComponent):
     :param align: the align-items value to be passed to the component
     """
 
-    position: str = 'relative'
+    position: Union[str, None] = 'relative'
 
     justify: Optional[JustifyContent] = None
 
@@ -92,15 +92,15 @@ class LayoutComponent(BaseDashboardComponent):
         if ComponentInstance.isinstance(component) is False:
             name = self.__class__.__name__
             raise TypeError(f'You may only append other components to a {name} component. Not: {component}')
-        self.children.append(component)   # type: ignore
+        self.children.append(component)  # type: ignore
 
     def pop(self):
         """
         Pops the last child from the list of children and returns it. Raises an IndexError if the parent is empty
         """
-        if len(self.children) == 0:   # type: ignore
+        if len(self.children) == 0:  # type: ignore
             raise IndexError(f'{self.__class__.__name__} is empty')
-        return self.children.pop()   # type: ignore
+        return self.children.pop()  # type: ignore
 
 
 class ContentComponent(BaseDashboardComponent):
@@ -114,8 +114,8 @@ class ContentComponent(BaseDashboardComponent):
         super().__init__(*args, **kwargs)
 
         cmp_name = self.__class__.__name__
-        if len(self.children) != 0:   # type: ignore
-            for child in self.children:   # type: ignore # pylint: disable=not-an-iterable
+        if len(self.children) != 0:  # type: ignore
+            for child in self.children:  # type: ignore
                 if isinstance(child, LayoutComponent):
                     raise LayoutError(f'A {child.__class__.__name__} component cannot be nested inside a {cmp_name}')
 

dara/components/common/button.py

@@ -16,7 +16,7 @@ limitations under the License.
 """
 
 from enum import Enum
-from typing import Optional, Union
+from typing import Optional, Union, cast
 
 from dara.components.common.base_component import LayoutComponent
 from dara.components.common.text import Text
@@ -134,4 +134,4 @@ class Button(LayoutComponent):
         if not styling and isinstance(children, ComponentInstance) and not isinstance(children, Text):
             style = ButtonStyle.PLAIN
 
-        super().__init__(child, styling=style, **kwargs)
+        super().__init__(cast(ComponentInstance, child), styling=style, **kwargs)

dara/components/common/dropzone.py

@@ -81,7 +81,7 @@ class UploadDropzone(StyledComponentInstance):
         on_drop: Optional[Action] = None,
         accept: Optional[str] = None,
         enable_paste: Optional[bool] = False,
-        **kwargs
+        **kwargs,
     ):
         from dara.core.interactivity.any_data_variable import upload
         from dara.core.internal.registries import upload_resolver_registry

dara/components/common/heading.py

@@ -74,6 +74,8 @@ class Heading(ContentComponent):
 
     @property
     def anchor_name(self):
+        if isinstance(self.heading, NonDataVariable):
+            raise ValueError('Heading anchor name cannot be accessed directly from a variable')
         return re.sub(r'\s+', '-', self.heading.lower())
 
     def __init__(self, heading: Union[str, NonDataVariable], **kwargs):

dara/components/common/if_cmp.py

@@ -95,5 +95,7 @@ class If(ModifierComponent):
             condition = Condition(operator=Operator.TRUTHY, other=None, variable=condition)
 
         super().__init__(
-            condition=condition, true_children=cast_list(true_children), false_children=cast_list(false_children)  # type: ignore
+            condition=condition,
+            true_children=cast_list(true_children),
+            false_children=cast_list(false_children),  # type: ignore
         )

dara/components/common/label.py

@@ -72,7 +72,6 @@ class Label(ContentComponent):
     @field_validator('children')
     @classmethod
     def validate_only_one_child(cls, children: List[ComponentInstance]) -> List[ComponentInstance]:
-
         if len(children) > 1:
             raise TypeError(
                 'More than one component was passed to the Label component. Label accepts only one child component'

dara/components/common/slider.py

@@ -168,10 +168,7 @@ class Slider(FormComponent):
         # If step is not provided, run inference to check if the
         # client-side computed step is compatible with the domain range.
         # The actual step is computed in the client-side but we check it here to fail early.
-        if v is None:
-            step = compute_step(domain_range)
-        else:
-            step = Decimal(str(v))
+        step = compute_step(domain_range) if v is None else Decimal(str(v))
 
         # Not divisible
         if domain_range % step != 0:

dara/components/common/stack.py

@@ -137,7 +137,7 @@ class Stack(LayoutComponent):
 
     collapsed: Union[Variable[bool], bool] = False
     direction: Direction = Direction.VERTICAL
-    hug: bool = False
+    hug: Union[bool, None] = False
     scroll: bool = False
 
     # Dummy init that just passes through arguments to superclass, fixes Pylance complaining about types

dara/components/common/table.py

@@ -376,7 +376,7 @@ class Column(BaseModel):
     unique_items: Optional[List[str]] = None
     filter: Optional[TableFilter] = None
     formatter: Optional[dict] = None
-    label: Optional[str] = Field(default=None, validate_default=True)   # mimics always=True in pydantic v1
+    label: Optional[str] = Field(default=None, validate_default=True)  # mimics always=True in pydantic v1
     sticky: Optional[str] = None
     tooltip: Optional[str] = None
     width: Optional[Union[int, str]] = None
@@ -402,13 +402,12 @@ class Column(BaseModel):
         formatter_type = formatter.get('type')
         if formatter_type not in TableFormatterType:
             raise ValueError(
-                f"Invalid formatter type: {formatter.get('type')}, accepted values {list(TableFormatterType)}"
+                f'Invalid formatter type: {formatter.get("type")}, accepted values {list(TableFormatterType)}'
             )
         if formatter_type in (TableFormatterType.NUMBER, TableFormatterType.PERCENT):
             precision = formatter.get('precision')
-            if precision is not None:
-                if not isinstance(precision, int) or precision <= 0:
-                    raise ValueError(f'Invalid precision value: {precision}, must be positive integer')
+            if precision is not None and (not isinstance(precision, int) or precision <= 0):
+                raise ValueError(f'Invalid precision value: {precision}, must be positive integer')
         elif formatter_type == TableFormatterType.NUMBER_INTL:
             locales = formatter.get('locales')
             if not isinstance(locales, str) or not (
@@ -442,9 +441,9 @@ class Column(BaseModel):
                     )
                 lower_bound = threshold.get('bounds')[0]
                 upper_bound = threshold.get('bounds')[1]
-                if not (isinstance(lower_bound, int) or isinstance(lower_bound, float)):
+                if not (isinstance(lower_bound, (int, float))):
                     raise ValueError(f'Invalid bound type: {lower_bound}, must be int or float')
-                if not (isinstance(upper_bound, int) or isinstance(upper_bound, float)):
+                if not (isinstance(upper_bound, (int, float))):
                     raise ValueError(f'Invalid bound type: {upper_bound}, must be int or float')
         elif formatter_type == TableFormatterType.BADGE:
             badges = formatter.get('badges')
@@ -461,7 +460,7 @@ class Column(BaseModel):
                     )
                 if not isinstance(badges[badge].get('color'), str):
                     raise ValueError(
-                        f"Invalid color: {badges[badge].get('color')} for badge: {badges[badge]}, must be a string"
+                        f'Invalid color: {badges[badge].get("color")} for badge: {badges[badge]}, must be a string'
                     )
         return formatter
 

dara/components/common/text.py

@@ -54,7 +54,7 @@ class Text(ContentComponent):
     """
 
     text: Union[str, NonDataVariable]
-    align: str = 'left'
+    align: Union[str, None] = 'left'  # type: ignore # this is actually textAlign not align-items
     formatted: bool = False
 
     @field_validator('text')

dara/components/common/time_utils.py

@@ -39,9 +39,7 @@ def date_to_datetime(d: datetime.date, hh=23, mm=59, ss=59) -> datetime.datetime
 
 def coerce_to_timemilli(t: Union[int, float, datetime.date, datetime.datetime]) -> float:
     """Convert any of int/float/date/datetime into a timemilli."""
-    if isinstance(t, int) or isinstance(t, numpy.signedinteger):
-        return float(t)
-    elif isinstance(t, float) or isinstance(t, numpy.floating):
+    if isinstance(t, (int, numpy.signedinteger, float, numpy.floating)):
         return float(t)
     # The order matters - datetime.datetime is a subclass of the datetime.date
     elif isinstance(t, datetime.datetime):

dara/components/common/tooltip.py

@@ -84,7 +84,7 @@ class Tooltip(ModifierComponent):
         content: Union[str, ComponentInstance, Variable[str], DerivedVariable[str]],
         placement: str = 'auto',
         styling: str = 'default',
-        **kwargs
+        **kwargs,
     ):
         # Unless there's one component and it's Stack, wrap components in Stack
         if not (len(components) == 1 and isinstance(components[0], Stack)):

dara/components/common/utils.py

@@ -78,11 +78,11 @@ class Item(BaseModel):
         try:
             label = str(item)
             return Item(label=label, value=item)
-        except Exception:
+        except Exception as e:
             raise ValueError(
                 f'Item: {item} could not be parsed correctly. If your item is a complex structure please pass in an '
                 f'Item class, with a string label defined'
-            )
+            ) from e
 
 
 class CarouselItem(BaseModel):
@@ -116,7 +116,6 @@ class CarouselItem(BaseModel):
         image_height: Optional[str] = None,
         image_width: Optional[str] = None,
     ):
-
         super().__init__(
             title=title,
             subtitle=subtitle,
@@ -149,8 +148,8 @@ class CarouselItem(BaseModel):
         try:
             title = str(item)
             return CarouselItem(title=title)
-        except Exception:
+        except Exception as e:
             raise ValueError(
                 f'CarouselItem: {item} could not be parsed correctly. If your item is a complex structure please pass in an '
                 f'CarouselItem class'
-            )
+            ) from e

dara/components/graphs/__init__.py

@@ -14,6 +14,7 @@ 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.
 """
+# ruff: noqa: F401, F403
 
 from dara.components.graphs.components import *
 from dara.components.graphs.definitions import *

dara/components/graphs/components/base_graph_component.py

@@ -17,9 +17,9 @@ limitations under the License.
 
 from typing import Any, Dict, List, Optional, Union
 
-from cai_causal_graph import CausalGraph, Skeleton
 from pydantic import ConfigDict, SerializerFunctionWrapHandler, field_serializer
 
+from cai_causal_graph import CausalGraph, Skeleton
 from dara.components.graphs.definitions import (
     DEFAULT_LEGENDS,
     EditorMode,

dara/components/graphs/components/causal_graph_viewer.py

@@ -17,9 +17,9 @@ limitations under the License.
 
 from typing import Optional, Union
 
-from cai_causal_graph import CausalGraph, Skeleton
 from pydantic import field_validator, model_validator
 
+from cai_causal_graph import CausalGraph, Skeleton
 from dara.components.graphs.components.base_graph_component import BaseGraphComponent
 from dara.components.graphs.definitions import EditorMode
 from dara.components.graphs.graph_layout import PlanarLayout

dara/components/graphs/components/edge_encoder.py

@@ -17,8 +17,6 @@ limitations under the License.
 
 from typing import Any, Dict, List, Optional, Union
 
-from cai_causal_graph.graph_components import Node
-from cai_causal_graph.type_definitions import EdgeConstraint as EdgeConstraintType
 from fastapi.encoders import jsonable_encoder
 from pydantic import (
     ConfigDict,
@@ -28,6 +26,8 @@ from pydantic import (
 )
 from typing_extensions import TypedDict
 
+from cai_causal_graph.graph_components import Node
+from cai_causal_graph.type_definitions import EdgeConstraint as EdgeConstraintType
 from dara.components.graphs.definitions import DEFAULT_LEGENDS, EditorMode, GraphLegend
 from dara.components.graphs.graph_layout import (
     GraphLayout,

dara/components/graphs/definitions.py

@@ -64,7 +64,7 @@ class SpacerLegend(Legend):
     :param label: Optional label to show in the legend
     """
 
-    type: Literal['spacer'] = Field(default='spacer', frozen=True)   # type: ignore
+    type: Literal['spacer'] = Field(default='spacer', frozen=True)  # type: ignore
     label: Optional[str] = None
 
 
@@ -79,7 +79,7 @@ class EdgeLegend(Legend):
     :param dash_array: Optional [stroke-dasharray](https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/stroke-dasharray) SVG path property - line will be dashed if specified
     """
 
-    type: Literal['edge'] = Field(default='edge', frozen=True)   # type: ignore
+    type: Literal['edge'] = Field(default='edge', frozen=True)  # type: ignore
     label: Optional[str] = None
     arrow_type: Optional[ArrowType] = ArrowType.NORMAL
     center_symbol: Optional[CenterSymbol] = CenterSymbol.NONE
@@ -96,7 +96,7 @@ class NodeLegend(Legend):
     :param highlight_color: Optional color for the node symbol rim in the legend
     """
 
-    type: Literal['node'] = Field(default='node', frozen=True)   # type: ignore
+    type: Literal['node'] = Field(default='node', frozen=True)  # type: ignore
     label: Optional[str] = None
     color: Optional[str] = 'theme.blue4'
     highlight_color: Optional[str] = 'theme.primary'

dara/components/plotting/__init__.py

@@ -14,8 +14,9 @@ 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.
 """
+# ruff: noqa: F401, F403
 
-import dara.components.plotting.palettes as PALETTES  # pylint: disable=unused-import
+import dara.components.plotting.palettes as PALETTES
 from dara.components.plotting.bokeh import *
 from dara.components.plotting.matplotlib import *
 from dara.components.plotting.plotly import *

dara/components/plotting/bokeh/bokeh.py

@@ -69,7 +69,6 @@ class Bokeh(StyledComponentInstance):
         :param document: the document to display
         """
         if figure is not None:
-
             doc = Document()
             doc.theme = _get_theme(theme)
             doc.add_root(figure)

dara/components/plotting/bokeh/utils.py

@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from typing import Union
+
 from bokeh.models import CustomJS
 from bokeh.plotting import figure
 
@@ -35,21 +37,23 @@ def figure_events(fig: figure):
         :param
         """
 
-        def generate_event(args: dict = {}):
+        def generate_event(args: Union[dict, None] = None):
             """
             Generate a CustomJS event with the code, event name and arguments provided
 
             :param args: The arguments to provide to the JS code
             """
+            if args is None:
+                args = {}
             return CustomJS(
                 args=args,
                 code=f"""
-                function {event_name.replace(' ','')+'__'+fig.id}(cb_obj, args) {{
+                function {event_name.replace(' ', '') + '__' + fig.id}(cb_obj, args) {{
                     {code}
                 }}
 
                 document.dispatchEvent(
-                    new CustomEvent("BOKEH_FIGURE_{event_name}_{fig.id}", {{ detail: {event_name.replace(' ','')+'__'+fig.id}(cb_obj, {{{','.join(args.keys())}}}) }})
+                    new CustomEvent("BOKEH_FIGURE_{event_name}_{fig.id}", {{ detail: {event_name.replace(' ', '') + '__' + fig.id}(cb_obj, {{{','.join(args.keys())}}}) }})
                 )
                 """,
             )

dara/components/plotting/plotly/plotly.py

@@ -31,7 +31,7 @@ SETTINGS = {'THEME': light_theme}
 
 # We need to set the default theme for plotly so that plotly express when setting traces is able to pick up dara theme colors
 base_template = pio.templates['plotly']
-dara_theme = base_template.layout.update(SETTINGS['THEME']['layout'])   # type: ignore
+dara_theme = base_template.layout.update(SETTINGS['THEME']['layout'])  # type: ignore
 dara_template = go.layout.Template(layout=dara_theme)
 # Set the default theme for plotly
 pio.templates['dara_theme'] = dara_template
@@ -133,7 +133,6 @@ class Plotly(StyledComponentInstance):
         events: Optional[List[PlotlyEvent]] = None,
         **kwargs,
     ):
-
         if theme is None and figure is not None:
             figure.update_layout(template=theme if theme is not None else SETTINGS['THEME'])
 

dara/components/plotting/plotly/themes.py

@@ -21,9 +21,11 @@ from dara.components.plotting.palettes import CategoricalDark10, CategoricalLigh
 from dara.core.visual.themes import dark, light
 
 light_colors = light.Light.colors
+assert light_colors is not None
 dark_colors = dark.Dark.colors
+assert dark_colors is not None
 
-light_theme = {
+light_theme: Dict[str, Dict[str, Any]] = {
     'layout': {
         'paper_bgcolor': 'rgba(255,255,255,0)',  # Set the background color of the plot
         'plot_bgcolor': 'rgba(255,255,255,0)',  # Set the background color of the plot area
@@ -81,9 +83,9 @@ light_theme = {
             },
         },
     },
-}  # type: Dict[str, Dict[str, Any]]
+}
 
-dark_theme = {
+dark_theme: Dict[str, Dict[str, Any]] = {
     'layout': {
         'paper_bgcolor': 'rgba(255,255,255,0)',  # Set the background color of the plot
         'plot_bgcolor': 'rgba(255,255,255,0)',  # Set the background color of the plot area
@@ -141,4 +143,4 @@ dark_theme = {
             },
         },
     },
-}   # type: Dict[str, Dict[str, Any]]
+}

dara/components/smart/__init__.py

@@ -14,6 +14,7 @@ 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.
 """
+# ruff: noqa: F401, F403
 
 from dara.components.smart.chat import Chat
 from dara.components.smart.code_editor import CodeEditor, run_script

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, List, Optional, Union
 
 DEFAULT_WHITELIST = [
     # Inbuilts
@@ -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)
@@ -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: Union[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/data_slicer.py

@@ -57,7 +57,7 @@ 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
 
 

dara/components/smart/data_slicer/data_slicer_modal.py

@@ -30,11 +30,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
 
 

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, List, Optional, Union, cast
 
 import numpy
 from pandas import DataFrame, Series
@@ -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
 
@@ -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
 
@@ -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,12 +189,12 @@ 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
@@ -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: Optional['Series'] = None
+        range_filter: Optional['Series'] = None
+        date_filter: Optional['Series'] = 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,7 +242,7 @@ 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:

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-1.17.6.dist-info → dara_components-1.18.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dara-components
-Version: 1.17.6
+Version: 1.18.1
 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.17.6)
+Requires-Dist: dara-core (==1.18.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)
@@ -28,7 +28,7 @@ Description-Content-Type: text/markdown
 
 # Dara Components
 
-<img src="https://github.com/causalens/dara/blob/v1.17.6/img/dara_light.svg?raw=true">
+<img src="https://github.com/causalens/dara/blob/v1.18.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)

{dara_components-1.17.6.dist-info → dara_components-1.18.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-dara/components/__init__.py,sha256=cZ2I2cKNPiSlzs0C1ZXu3i3kmCrcqgWoHkhl8Jg_e24,1346
-dara/components/common/__init__.py,sha256=Nts8bgfKWNYpJnGWXfbh-F9awKDBF4A9SFn-mOMKmTk,3943
+dara/components/__init__.py,sha256=JjN7EAGU-tM7I7YHyKRAuZlcbpJFcVcFaGit5StehDs,1372
+dara/components/common/__init__.py,sha256=mQMUawBq-bLnj08bSfaPdtUd_kQoHmQ651IAMfXbSbk,3968
 dara/components/common/accordion.py,sha256=dDOTktGpy4lp16OfXWBK8Gr2gD6Njdipke7Ycqk6Hho,9584
 dara/components/common/anchor.py,sha256=pcQNFG7xnf12jQnGROgyLlvwmvlsVGo8olxQVu3fXMI,2791
-dara/components/common/base_component.py,sha256=4AVH2CSeI8zzraji4C1edEtcLAb5cHfMfYpzZEoxnnk,4645
+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=Fw60s3zNfT_V2OQtrJT1Nx7n-Miuqe0Q_E7VaN6oEVI,4716
+dara/components/common/button.py,sha256=Qe1gy5aCfZRrk6GzRSPfPsoT9BbB3-HliksK8vv6yo0,4747
 dara/components/common/button_bar.py,sha256=pQhcNusM5tlYZVDOTxPqyX5__XUZb7qtNBNHmaIGdlI,3842
 dara/components/common/card.py,sha256=ojH4eoej7ZhhmqWv0CZtSeh5IhU94eakoMdPoIB5IoA,2105
 dara/components/common/carousel.py,sha256=ef0Dyqmwg1C4nPCvqb5P2jksAp8a7_492YvLl8duApg,5386
@@ -12,17 +12,17 @@ dara/components/common/checkbox_group.py,sha256=7FrAKMfR5FM7HkeexO16q3aL3RlBEIHt
 dara/components/common/code.py,sha256=SwdZMU-vKvGNfOZPxFSkeHxsMLNkI5Oh1XTA2J0ItGw,2326
 dara/components/common/component_select_list.py,sha256=1Qf1odxsG7r1x_DURbtOjIHLoHi40LL4xH8pYpzQevw,2652
 dara/components/common/datepicker.py,sha256=YGPm_EOrYb6ofWHgya0-DkYRWiD2V1Ln2l7N-ZNgyzM,3683
-dara/components/common/dropzone.py,sha256=RjjOrMuFyDpfigYhC9TOuYQefVg8eTr-YZSOWwpVrFw,4201
+dara/components/common/dropzone.py,sha256=t2iceH3eun7JzQ9rtoU-L4qi1-NbZ6CO4X23c8aVlnk,4202
 dara/components/common/form.py,sha256=Cczl5BlOIlLPvHvS_g98RxBvJx9jH17HaCo4DhAEvc8,3882
 dara/components/common/form_page.py,sha256=6O5JvkxDeEWzzoIhB9xMvSLIiIWsBJvcaT5RSOAKIB0,1890
 dara/components/common/grid.py,sha256=2x-yDCze8BgGI4FRp6HX5WR7ytK2KWKckBs8W7VhjrM,10243
-dara/components/common/heading.py,sha256=kAFmP1JIRkim793kQ3HjQfAKVXlQtk-ldzGSVv-diog,2375
+dara/components/common/heading.py,sha256=U0x9SDd-sg0bS0wVpe7dBI-qScnxQuxqyX-WaBE6PAY,2525
 dara/components/common/html_raw.py,sha256=-Atn6TejBCDkNQIa89KBOB2h2ntnjolU3HphPuFE6t4,1103
 dara/components/common/icon.py,sha256=RRKrq63Lp4eADKM4Axl4MpTwjwUTUdfluX3-gULMDkw,1948
-dara/components/common/if_cmp.py,sha256=DHJNeaMYnI-ZXNaqg5Gt6mUaLgLKR5dPh4wNPmkI0is,3914
+dara/components/common/if_cmp.py,sha256=--N3rTOyuDgmtL82Y6-WFbEaYXBCiUR7sGHxu0uZGfs,3939
 dara/components/common/image.py,sha256=ErDZ4Fv0_OzjbuqhNDDL_Nz1Q9Dq4wM7Q5aYJslCghY,2272
 dara/components/common/input.py,sha256=kfa3RIMmpzcmZuDgRQySGXzdr7LHm-aQfLHLHPFYKCU,2057
-dara/components/common/label.py,sha256=lzxc1bbktYwSY_mJXWy58JfWwUZFuQKmlnccZoPCgXY,2529
+dara/components/common/label.py,sha256=1r58lBZVEudLybaEY-GQ4TNVtQrEyy_rzJhDQva29Pc,2528
 dara/components/common/markdown.py,sha256=4-M_lyj820gzxRisVTA7cCG-91NzWPW2vZbC7qwRmkQ,1706
 dara/components/common/modal.py,sha256=x47WgB-n2Zq-C_0UhewL4KaAkTnQDT8TW2bSRm6gN2U,1526
 dara/components/common/overlay.py,sha256=TNf4a77f0FxiOC4sj4HPM8tjLp0r046EDS-jVAtgEFw,1836
@@ -30,37 +30,37 @@ dara/components/common/paragraph.py,sha256=nOw-ocgjVwPj_QP8CmSHs2y3ghStTmOPGlqWx
 dara/components/common/progress_bar.py,sha256=5hkf63t4__KaN85AlbYrzKQpBzRlvjZ3VmGXRFWQRBY,1921
 dara/components/common/radio_group.py,sha256=xePEflS_A2svCrpU25OBMMsyeC4nZCn_1y83GJT5Sfc,3761
 dara/components/common/select.py,sha256=wgRt3TjTi53X2HqlGlsf-yMuvU7aD9r5BcNHddieDr8,6823
-dara/components/common/slider.py,sha256=JKgulZ8_RB6Aby-MEhPdQc3Q-qXPU_EH_CgM-2KMQEI,6568
+dara/components/common/slider.py,sha256=VMneJKQMr02dn2Z-_aud2-NcPDxAv9VWLUgdgwr09m4,6527
 dara/components/common/spacer.py,sha256=ZRSl_fLntnumalaL41FYpBKDxOUgWgndkkLdDLl8KvI,2702
-dara/components/common/stack.py,sha256=SyVuWKVg3of4J4ANaHiG6Y7n7Vo8Cciab_F7mM5WepA,5549
+dara/components/common/stack.py,sha256=FLw0IbQpW7l9A6LDS_KPCeQP0J7QKGYhVZ1RhAjBjpE,5562
 dara/components/common/switch.py,sha256=KjFUFT-1XHyJoJYkJLeEBgUb0fTArsFuWfowniTgl3E,1594
 dara/components/common/tabbed_card.py,sha256=zftir9hSj_l_dx2dPYis0NWy5q290sdg3Q1Nx8RvFbg,2344
-dara/components/common/table.py,sha256=XJh_j4pjwaPHVoSVSn0b1zvvgcWzS6420yj4043YAnA,24640
-dara/components/common/text.py,sha256=i7q7YKyL8opz02RLT5zx8_ep47QCqyCZeyuLH_AftEQ,1916
+dara/components/common/table.py,sha256=P-qXaoFHMM69FiMH9T2Yeg0y0ZTx-89_JGj1Ls2_KbQ,24571
+dara/components/common/text.py,sha256=bYgX_IhSLPa-KuWbcCSdrNgAL6MhYQRpCNtV5octUbQ,1990
 dara/components/common/textarea.py,sha256=F8dmyinylAjjXMhNwfiWInrCFuAnWuCPTsKKiEUkmOw,2106
-dara/components/common/time_utils.py,sha256=joJgnYNEX8LxDr-FLd4NMQ8zM-syLMeL-KblL_LZT2o,1826
-dara/components/common/tooltip.py,sha256=L09quPT8Vg5YkXE06NVw1pwFprtFafQu6tFp63lmRfE,3283
-dara/components/common/utils.py,sha256=viO_hqMK9hx-8N7GZS-pcCv-fAcfBs5c8ZQaXnHLIIE,5489
-dara/components/graphs/__init__.py,sha256=diE6xO4VKrzuNi_kjAHmpRpq209BJ0ATjgWMPbmesHY,725
+dara/components/common/time_utils.py,sha256=UbAws5HBptJ-xH-m4QRDDET-9leOQu9WdywmExBuqIc,1746
+dara/components/common/tooltip.py,sha256=asAuario9NHdK_Whry9A2nzy9vZDf4UFwOTG6XIfA50,3284
+dara/components/common/utils.py,sha256=grhO9Mw2y0F57cRg-rTIlMGYAaVmPtfJNXJjBYSj924,5512
+dara/components/graphs/__init__.py,sha256=xN6ibodsLvO_ATXASRgwfzCLraoWqdKuaGovWRaGxtk,750
 dara/components/graphs/components/__init__.py,sha256=GdWwL5spSsATOU57EmMqOf6t7az1rP5S3Djd0eyL9As,1007
-dara/components/graphs/components/base_graph_component.py,sha256=mSD1b2wwj4PUg1fNzlIsJmnjfvVSejPCOLwnkzoCfpM,4430
-dara/components/graphs/components/causal_graph_viewer.py,sha256=F482u5GlTObSmQ0WPT_CMm49XmL_O8fZGDSVrTM5CIM,12439
-dara/components/graphs/components/edge_encoder.py,sha256=mLOJylm07DtSWQWA4wwC2M_6z-otcQEAEUBPqn6guX0,6929
+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=kS5gl7FDy7HAn0pclFGqRifjmr2uUDMaBq-kxy86kYM,6929
 dara/components/graphs/components/node_hierarchy_builder.py,sha256=OSA0OpEiTlnMDmte5bVq-o4l8iZoH_ADY9fuyHnLMZY,4366
-dara/components/graphs/definitions.py,sha256=_IPPPETDsDQXK4dZoQQX1bwcPtrUP55wCdSIubRpCYw,5319
+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=51gAEi68z5lsboABwuPwQ9EKx2OS4dbQIVeopWS57FA,805
+dara/components/plotting/__init__.py,sha256=u-wb5iAJBzDLEiXjaMuFy1rLAP_QzfnOvm1ZqMXsgac,797
 dara/components/plotting/bokeh/__init__.py,sha256=GpnbgTI-2XWqBDqLbkHQ73eAEth-h_k0nKqP1ixgJ8I,889
-dara/components/plotting/bokeh/bokeh.py,sha256=VH0lIt8oHHHZ8K9a8R3lKW2ErbJ3QjUVZwE5pzc0Oyw,3108
+dara/components/plotting/bokeh/bokeh.py,sha256=jNfXkorF3SNJx40RA1MGpJ2Kypx8SEPV6wpF5NDjGP8,3107
 dara/components/plotting/bokeh/themes.py,sha256=ulL5GfyJ5WXCErMfraBgskyu7GJf-zZxw9WQQDlmsrE,3746
-dara/components/plotting/bokeh/utils.py,sha256=HBoybSntm2QNKXCdYS0yDODV3HkHqNvORS1xSm1pT4M,1929
+dara/components/plotting/bokeh/utils.py,sha256=eQ4l3LYY8c2SlbkT6PUbUrjWoj_xwa3iq7O4bIPbEpI,2035
 dara/components/plotting/matplotlib/__init__.py,sha256=XNvSBKg8ML2IhMm9fJ5-OOHAIX3sGs_q10MaaK2v0EI,681
 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=3Id3Xjam4Rpgqzua9AbMaL7DxN-RtcKg1ms0llWriWs,4834
-dara/components/plotting/plotly/themes.py,sha256=FLQleyYp-IB3OpumE37N7WP5XO3LFPv3UsWpRnu9CCU,4413
-dara/components/smart/__init__.py,sha256=u4MR-88PkcVcF34sjA3BtLTUlEhnjv-2VzMUWWtO5uU,1146
+dara/components/plotting/plotly/plotly.py,sha256=q2xe2RmxDhtQZdmUgfFkIGYiSFj-eIzGFigDwukTHkw,4832
+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
 dara/components/smart/chat/chat.py,sha256=PecZyXzKTBrnIGGuJNyCdWVu--Ig68CFFIrkbaNciiE,3117
 dara/components/smart/chat/config.py,sha256=kXm_EkfE7mL-8sseZMGSqbXBTWwdIXozv37v-k-B8fg,590
@@ -68,19 +68,19 @@ dara/components/smart/chat/endpoints.py,sha256=knILdBHrb2zEtL2r6-3OumSPZKdQ_FJLk
 dara/components/smart/chat/types.py,sha256=hSV6Va-8gueYJpXxbQ2UQeFMP1RBKW4bUcNupXJkYss,1351
 dara/components/smart/code_editor/__init__.py,sha256=U568YcqDyS8lC2qzf_9TrB62er-UibnbT6IeAiDSaME,749
 dara/components/smart/code_editor/code_editor.py,sha256=TK8_k1ydWTnXPALujNsG5Eh_xrfWXWyYKq5MVquxpYQ,1281
-dara/components/smart/code_editor/util.py,sha256=sAZphgDHXI2Q2crr3qJg0lnLzY9OzuOzW_1e0EX8Rjs,4476
+dara/components/smart/code_editor/util.py,sha256=0Qu5AJVcCzaMaPblsw6BqOopA8DeWn2YPDPOf9CKmDc,4528
 dara/components/smart/data_slicer/__init__.py,sha256=_lIrZEKjZXxGDxZJ9t5kfeahMB_VbeOJYZxus1TKOyQ,914
-dara/components/smart/data_slicer/data_slicer.py,sha256=Hl9nVRgg-2Z0O5uECxiioxT2RikIygDArQXF6XKMj8I,7490
-dara/components/smart/data_slicer/data_slicer_modal.py,sha256=t7NywA5DiFiUiUnuFQbTAAVm6PM7Qjd6LGzd9OWA0QE,4120
+dara/components/smart/data_slicer/data_slicer.py,sha256=quLO0_VglaaT7p4VmK5-M-j2Q7mJcek2IrnwPSN7Fsw,7506
+dara/components/smart/data_slicer/data_slicer_modal.py,sha256=Zr8bCVqT5xp9AQS7VBSWRTPGYIkAuOjMuSmQIOnimoo,4152
 dara/components/smart/data_slicer/extension/data_slicer_filter.py,sha256=JfTzJ1HqS9u1RdmkwBGvoDB6wPKYVMfPAXUlUmysK48,1651
 dara/components/smart/data_slicer/extension/filter_status_button.py,sha256=02CgqHEBgkZg1E9v9HGrnRYvEiMNhYpajyOwGuPNV1M,1345
-dara/components/smart/data_slicer/utils/core.py,sha256=6BrmG-iwQCuwUAKQ-y9zFKLeinnzhXIaUOB58UxCYbc,8656
+dara/components/smart/data_slicer/utils/core.py,sha256=4M_HA8oBzAkHklHgmaJ-qiKA3if37hUe6dB5gse2j1E,8665
 dara/components/smart/data_slicer/utils/data_preview.py,sha256=OAphjMrm3F76XmJ09X7sZSeOeKqGJFwN5ooo3qcyrG4,1722
-dara/components/smart/data_slicer/utils/plotting.py,sha256=JYzdQLXdAD0A8k2W-764xUr7zN0Ri5nf3OQ2Nb_iuiY,3313
+dara/components/smart/data_slicer/utils/plotting.py,sha256=TB00576kbA6y1eRuZBe09UAcZmluY4iJsKmYnXZ3hWQ,3389
 dara/components/smart/hierarchy.py,sha256=9-QzEtbvP-arejhjsgl4Y5o5KHHzg6H1IGmwrX63450,2905
 dara/components/umd/dara.components.umd.js,sha256=9jY7pRiap8EWKwkx1j--H-3QAagmTuEEqIPZSHXikQM,18325165
 dara/components/umd/style.css,sha256=Qm0_kcxXBDoXvvPTc7YCttkl1zMFifdcp-KufTunPNY,162729
-dara_components-1.17.6.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
-dara_components-1.17.6.dist-info/METADATA,sha256=KGROQ3_u53ST7CVCNu9fQhllJWhma8ktNEWEjPIIvfg,2743
-dara_components-1.17.6.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-dara_components-1.17.6.dist-info/RECORD,,
+dara_components-1.18.1.dist-info/LICENSE,sha256=r9u1w2RvpLMV6YjuXHIKXRBKzia3fx_roPwboGcLqCc,10944
+dara_components-1.18.1.dist-info/METADATA,sha256=9k8ZQgdWL8Y94tNglMhQXirLjyNCz0-KvnscgcZD-tc,2743
+dara_components-1.18.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+dara_components-1.18.1.dist-info/RECORD,,