dara-components 1.21.9__py3-none-any.whl → 1.21.23__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, Union
+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__()
@@ -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: Union[dict, None] = None, 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.

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 (
@@ -63,7 +61,7 @@ def increment(ctx: UpdateVariable.Ctx):  # type: ignore
 
 @discover
 class DataSlicer:
-    def __init__(self, data: Union[DataFrame, AnyVariable], 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 `DerivedVariable` returned by `get_output()` will contain the filtered data.
@@ -110,7 +108,7 @@ class DataSlicer:
         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
         """
@@ -120,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
@@ -42,7 +40,7 @@ def increment(ctx: UpdateVariable.Ctx):  # type: ignore
 class DataSlicerModal(DataSlicer):
     def __init__(
         self,
-        data: Union[DataFrame, AnyDataVariable],
+        data: DataFrame | AnyDataVariable,
         rows_to_show: int = 10,
         button_top_position: str = '5%',
     ):

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

@@ -16,7 +16,6 @@ limitations under the License.
 """
 
 from enum import Enum
-from typing import List, Optional
 
 from typing_extensions import TypedDict
 
@@ -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, cast
+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)
     """
@@ -93,7 +93,7 @@ def apply_range_filter(range_filter: str, column: Series) -> Optional['Series']:
     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']:
         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):
@@ -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()]
     )
 
@@ -200,7 +200,7 @@ def apply_date_filter(from_date: str, to_date: str, column: 'Series') -> Optiona
     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'] = None
-        range_filter: Optional['Series'] = None
-        date_filter: Optional['Series'] = None
+        values_filter: Series | None = None
+        range_filter: Series | None = None
+        date_filter: Series | None = None
 
         if var is None or var.strip() == '':
             continue
@@ -245,7 +245,7 @@ def apply_filters(variable_filters: List[FilterInstance], data: DataFrame) -> Da
     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/hierarchy.py

@@ -15,7 +15,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import List, Optional, Union
+from typing import Optional
 
 from dara.core.base_definitions import Action
 from dara.core.base_definitions import DaraBaseModel as BaseModel
@@ -29,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']:
@@ -86,5 +86,5 @@ class HierarchyViewer(StyledComponentInstance):
 
     allow_leaf_click: bool = True
     allow_parent_click: bool = True
-    hierarchy: Union[Node, ClientVariable]
-    on_click_node: Optional[Action] = None
+    hierarchy: Node | ClientVariable
+    on_click_node: Action | None = None