ex4nicegui 0.2.17__py3-none-any.whl → 0.3.0__py3-none-any.whl

ex4nicegui/__init__.py

@@ -16,4 +16,4 @@ from signe import batch
 from ex4nicegui.experimental_ import gridLayout as exp_ui
 
 
-__version__ = "0.2.17"
+__version__ = "0.3.0"

ex4nicegui/bi/__init__.py

@@ -0,0 +1,3 @@
+from .index import data_source
+
+__all__ = ["data_source"]

ex4nicegui/bi/dataSource.py

@@ -0,0 +1,174 @@
+from typing import Dict, List, Optional, cast
+from ex4nicegui import to_ref, ref_computed, on
+from nicegui import globals, Client
+
+from dataclasses import dataclass
+from . import types
+from .protocols import IDataSourceAble
+
+
+@dataclass
+class DataSourceInfo:
+    source: "DataSource"
+    update_callback: types._TSourceBuildFn
+
+
+@dataclass
+class Filter:
+    callback: types._TFilterCallback
+
+
+@dataclass(frozen=True)
+class ComponentInfoKey:
+    client_id: types._TNgClientID
+    element_id: types._TElementID
+
+
+@dataclass
+class ComponentInfo:
+    key: ComponentInfoKey
+    update_callback: types._TComponentUpdateCallback
+    filter: Optional[Filter] = None
+
+
+class ComponentMap:
+    def __init__(self) -> None:
+        self._client_map: Dict[
+            types._TNgClientID, Dict[types._TElementID, ComponentInfo]
+        ] = {}
+
+    def has_client_record(self, client_id: types._TNgClientID):
+        return client_id in self._client_map
+
+    def add_info(self, info: ComponentInfo):
+        client_id = info.key.client_id
+        element_id = info.key.element_id
+
+        if client_id not in self._client_map:
+            self._client_map[client_id] = {element_id: info}
+
+        element_map = self._client_map[client_id]
+
+        if element_id not in element_map:
+            element_map[element_id] = info
+
+    def remove_client(self, client_id: types._TNgClientID):
+        if client_id in self._client_map:
+            del self._client_map[client_id]
+
+    def has_record(self, client_id: types._TNgClientID, element_id: types._TElementID):
+        return (
+            client_id in self._client_map and element_id in self._client_map[client_id]
+        )
+
+    def set_filter(
+        self,
+        client_id: types._TNgClientID,
+        element_id: types._TElementID,
+        filter: Filter,
+    ):
+        self._client_map[client_id][element_id].filter = filter
+
+    def get_all_info(self):
+        return (
+            info for ele_map in self._client_map.values() for info in ele_map.values()
+        )
+
+
+class DataSource:
+    _global_id_count: types._TDataSourceId = 0
+
+    def __init__(self, data: IDataSourceAble) -> None:
+        DataSource._global_id_count += 1
+        self.__id = DataSource._global_id_count
+
+        self._idataSource = data
+
+        data_fn = lambda: data.get_data()
+        data_fn = ref_computed(data_fn)
+
+        self.__filters = to_ref(cast(List[Filter], []))
+
+        @ref_computed
+        def apply_filters():
+            df = data_fn.value
+            for f in self.__filters.value:
+                df = f.callback(df)
+
+            return df
+
+        self.__filtered_data = apply_filters
+
+        self.__data = data_fn
+        self._component_map = ComponentMap()
+
+        @on(data_fn)
+        def _():
+            self.__notify_update()
+
+    @property
+    def data(self):
+        return self.__data.value
+
+    @property
+    def filtered_data(self):
+        return self.__filtered_data.value
+
+    @property
+    def id(self):
+        return self.__id
+
+    def _register_component(
+        self,
+        element_id: types._TElementID,
+        update_callback: types._TComponentUpdateCallback,
+    ):
+        ng_client = globals.get_client()
+        client_id = ng_client.id
+
+        if not self._component_map.has_client_record(client_id):
+
+            @ng_client.on_disconnect
+            def _(e: Client):
+                if not e.shared:
+                    self._component_map.remove_client(e.id)
+
+        self._component_map.add_info(
+            ComponentInfo(ComponentInfoKey(client_id, element_id), update_callback)
+        )
+
+        return self
+
+    def send_filter(self, element_id: types._TElementID, filter: Filter):
+        client_id = globals.get_client().id
+
+        if not self._component_map.has_record(client_id, element_id):
+            raise ValueError("element not register")
+
+        self._component_map.set_filter(client_id, element_id, filter)
+
+        self.__notify_update([ComponentInfoKey(client_id, element_id)])
+        return self
+
+    def __notify_update(self, ignore_keys: Optional[List[ComponentInfoKey]] = None):
+        ignore_keys = ignore_keys or []
+        ignore_ids_set = set(ignore_keys)
+
+        # nodify every component
+        for current_info in self._component_map.get_all_info():
+            if current_info.key in ignore_ids_set:
+                continue
+
+            # apply filters ,except current target
+            filters = [
+                info.filter.callback
+                for info in self._component_map.get_all_info()
+                if (info.key != current_info.key) and info.filter
+            ]
+
+            new_data = self._idataSource.apply_filters(self.__data.value, filters)
+            current_info.update_callback(new_data)
+
+        self.__filters.value = [
+            info.filter for info in self._component_map.get_all_info() if info.filter
+        ]

ex4nicegui/bi/dataSourceFacade.py

@@ -0,0 +1,263 @@
+from __future__ import annotations
+from typing import Any, Callable, Dict, TypeVar, Generic, Union, cast
+from nicegui import ui
+from ex4nicegui import ref_computed
+from ex4nicegui.reactive import rxui
+from .dataSource import DataSource, Filter
+from ex4nicegui.reactive.EChartsComponent.ECharts import echarts
+
+
+_TData = TypeVar("_TData")
+
+
+class DataSourceFacade(Generic[_TData]):
+    def __init__(self, ds: DataSource) -> None:
+        self._dataSource = ds
+
+    @property
+    def data(self) -> _TData:
+        """Data without any filtering"""
+        return cast(_TData, self._dataSource.data)
+
+    @property
+    def filtered_data(self) -> _TData:
+        """Data after filtering"""
+        return cast(_TData, self._dataSource.filtered_data)
+
+    def ui_select(
+        self, column: str, *, clearable=True, multiple=True, **kwargs
+    ) -> ui.select:
+        """
+        Creates a user interface select box.
+
+        Parameters:
+            column (str): The column name of the data source.
+            clearable (bool, optional): Whether to allow clearing the content of the select box. Default is True.
+            multiple (bool, optional): Whether to allow multiple selections.
+            **kwargs: Additional optional parameters that will be passed to the ui.select constructor.
+
+        Returns:
+            ui.select: An instance of a user interface select box.
+        """
+        options = self._dataSource._idataSource.duplicates_column_values(
+            self.data, column
+        )
+        kwargs.update(
+            {
+                "options": options,
+                "multiple": multiple,
+                "clearable": clearable,
+                "label": column,
+            }
+        )
+
+        cp = ui.select(**kwargs).props("use-chips outlined")
+
+        def onchange(e):
+            value = None
+            if e.args:
+                if isinstance(e.args, list):
+                    value = [arg["label"] for arg in e.args]
+                else:
+                    value = e.args["label"]
+
+            cp.value = value
+
+            def data_filter(data):
+                if cp.value is None or not cp.value:
+                    return data
+
+                cond = None
+                if isinstance(cp.value, list):
+                    cond = data[column].isin(cp.value)
+                else:
+                    cond = data[column] == cp.value
+                return data[cond]
+
+            self._dataSource.send_filter(cp.id, Filter(data_filter))
+
+        cp.on("update:modelValue", onchange)
+
+        def on_source_update(data):
+            options = self._dataSource._idataSource.duplicates_column_values(
+                data, column
+            )
+            value = cp.value
+
+            # Make the value within the options
+            if isinstance(value, list):
+                value = list(set(value) & set(options))
+            else:
+                if value not in options:
+                    value = ""
+
+            cp.set_options(options, value=value)
+
+        self._dataSource._register_component(cp.id, on_source_update)
+
+        return cp
+
+    def ui_aggrid(self, **kwargs):
+        """
+        Creates aggrid table.
+
+        Parameters:
+            **kwargs: Additional optional parameters that will be passed to the ui.aggrid constructor.
+
+        Returns:
+            ui.aggrid: aggrid table.
+        """
+        kwargs.update(
+            {"options": self._dataSource._idataSource.get_aggrid_options(self.data)}
+        )
+
+        cp = ui.aggrid(**kwargs)
+
+        def on_source_update(data):
+            cp._props["options"] = self._dataSource._idataSource.get_aggrid_options(
+                data
+            )
+            cp.update()
+
+        on_source_update(self.filtered_data)
+
+        self._dataSource._register_component(cp.id, on_source_update)
+
+        return cp
+
+    def ui_radio(self, column: str, **kwargs):
+        """
+        Creates radio Selection.
+
+        Parameters:
+            column (str): The column name of the data source.
+            **kwargs: Additional optional parameters that will be passed to the ui.radio constructor.
+
+        Returns:
+            ui.radio: An radio Selection.
+        """
+        options = self._dataSource._idataSource.duplicates_column_values(
+            self.data, column
+        )
+        kwargs.update({"options": options})
+
+        cp = ui.radio(**kwargs)
+
+        def onchange(e):
+            cp.value = cp.options[e.args]
+
+            def data_filter(data):
+                if cp.value not in cp.options:
+                    return data
+                cond = data[column] == cp.value
+                return data[cond]
+
+            self._dataSource.send_filter(cp.id, Filter(data_filter))
+
+        cp.on("update:modelValue", onchange)
+
+        def on_source_update(data):
+            options = self._dataSource._idataSource.duplicates_column_values(
+                data, column
+            )
+            value = cp.value
+            if value not in options:
+                value = ""
+
+            cp.set_options(options, value=value)
+
+        self._dataSource._register_component(cp.id, on_source_update)
+
+        return cp
+
+    def ui_slider(self, column: str, **kwargs):
+        """
+        Creates Slider.
+
+        Parameters:
+            column (str): The column name of the data source.
+            **kwargs: Additional optional parameters that will be passed to the ui.slider constructor.
+
+        Returns:
+            ui.radio: An Slider.
+        """
+        self._dataSource._idataSource.slider_check(self.data, column)
+
+        min, max = self._dataSource._idataSource.slider_min_max(self.data, column)
+        kwargs.update({"min": min, "max": max})
+
+        cp = ui.slider(**kwargs).props("label label-always switch-label-side")
+
+        def onchange():
+            def data_filter(data):
+                if cp.value is None or cp.value < min:
+                    return data
+                cond = data[column] == cp.value
+                return data[cond]
+
+            self._dataSource.send_filter(cp.id, Filter(data_filter))
+
+        cp.on("change", onchange)
+
+        def on_source_update(data):
+            min, max = self._dataSource._idataSource.slider_min_max(data, column)
+            if min is None or max is None:
+                cp.value = None
+            else:
+                cp._props["min"] = min
+                cp._props["max"] = max
+
+        self._dataSource._register_component(cp.id, on_source_update)
+
+        return cp
+
+    def ui_echarts(
+        self, fn: Callable[[Any], Union[Dict, "pyecharts.Base"]]  # pyright: ignore
+    ) -> echarts:
+        """Create charts
+
+        Args:
+            fn (Callable[[Any], Union[Dict, "pyecharts.Base"]]): builder function.
+
+        ## Examples
+
+        Support pyecharts
+
+        ```py
+        import pandas as pd
+        from ex4nicegui import bi
+        from pyecharts.charts import Bar
+
+        df = pd.DataFrame({"name": list("abcdc"), "value": range(5)})
+        ds = bi.data_source(df)
+
+        @ds.ui_echarts
+        def bar(data: pd.DataFrame):
+            c = (
+                Bar()
+                .add_xaxis(data["name"].tolist())
+                .add_yaxis("value", data["value"].tolist())
+            )
+
+            return c
+
+        bar.classes("h-[20rem]")
+        ```
+
+        """
+
+        @ref_computed
+        def chart_options():
+            options = fn(self.filtered_data)
+            if isinstance(options, Dict):
+                return options
+
+            import simplejson as json
+            from pyecharts.charts.chart import Base
+
+            if isinstance(options, Base):
+                return cast(Dict, json.loads(options.dump_options()))
+
+        cp = rxui.echarts(chart_options)  # type: ignore
+
+        return cp.element  # type: ignore

ex4nicegui/bi/index.py

@@ -0,0 +1,76 @@
+from .dataSourceFacade import DataSourceFacade
+from .dataSource import DataSource
+from .protocols import CallableDataSourceAble, DataFrameDataSourceAble
+from typing import Callable, cast, TypeVar, Union
+
+
+_TData = TypeVar("_TData")
+
+
+def data_source(data: Union[Callable[..., _TData], _TData]) -> DataSourceFacade[_TData]:
+    """Create a data source
+
+    Args:
+        data (_TData): Any supported data
+
+    Raises:
+        TypeError: Throw an error when the data type is not supported
+
+    Returns:
+        DataSourceFacade[_TData]: _description_
+
+    ## Examples
+
+    ---
+
+    pandas dataframe source:
+    ```python
+    df = pd.DataFrame({"name": list("abcdc"), "value": range(5)})
+    ds = bi.data_source(df)
+    ```
+
+    ---
+
+    Link multiple data sources
+
+    ---
+    ```python
+    df = pd.DataFrame({"name": list("abcdc"), "value": range(5)})
+    ds = bi.data_source(df)
+
+    @bi.data_source
+    def ds_other():
+        #  ds.filtered_data is DataFrame after filtering
+        where = ds.filtered_data[''].isin(['b','c','d'])
+        return ds.filtered_data[where]
+
+    ```
+
+    ---
+
+    Now, when `ds` changes, it will trigger changes to `ds_other` and thus drive the related interface components to change.
+
+    ```python
+    # select box of data source 'ds'
+    # it change will trigger changes to table
+    ds.ui_select('name')
+
+    # table of data 'ds_other'
+    ds_other.ui_aggrid()
+    ```
+
+
+    """
+    ds_protocol = None
+
+    if type(data).__name__ == "DataFrame":
+        ds_protocol = DataFrameDataSourceAble(data)
+
+    if isinstance(data, Callable):
+        ds_protocol = CallableDataSourceAble(data)
+
+    if ds_protocol is None:
+        raise TypeError(f"not support type[{type(data)}]")
+
+    ds = DataSource(ds_protocol)
+    return cast(DataSourceFacade[_TData], DataSourceFacade(ds))

ex4nicegui/bi/protocols.py

@@ -0,0 +1,111 @@
+from typing_extensions import Protocol
+from typing import Callable, Dict, List, Optional, Tuple
+
+from ex4nicegui.bi.types import _TFilterCallback
+from .types import _TFilterCallback
+from ex4nicegui.utils import common as utils_common
+
+
+class IDataSourceAble(Protocol):
+    def get_data(self):
+        ...
+
+    def apply_filters(self, data, filters: List[_TFilterCallback]):
+        ...
+
+    def duplicates_column_values(self, data, column_name: str) -> List:
+        ...
+
+    def get_aggrid_options(self, data) -> Dict:
+        ...
+
+    def slider_check(self, data, column_name: str) -> None:
+        ...
+
+    def slider_min_max(
+        self, data, column_name: str
+    ) -> Tuple[Optional[float], Optional[float]]:
+        ...
+
+
+class DataFrameDataSourceAble(IDataSourceAble):
+    def __init__(self, df) -> None:
+        self.data = df
+
+    def get_data(self):
+        return self.data
+
+    def apply_filters(self, data, filters: List[_TFilterCallback]):
+        new_data = data
+        for f in filters:
+            new_data = f(new_data)
+
+        return new_data
+
+    def duplicates_column_values(self, data, column_name: str) -> List:
+        return data[column_name].drop_duplicates().tolist()
+
+    def get_aggrid_options(self, data) -> Dict:
+        df = utils_common.convert_dataframe(data)
+        return {
+            "columnDefs": [{"field": col} for col in df.columns],
+            "rowData": df.to_dict("records"),
+        }
+
+    def slider_check(self, data, column_name: str) -> None:
+        from pandas.api.types import is_numeric_dtype
+
+        if not is_numeric_dtype(data[column_name]):
+            raise ValueError(f"column[{column_name}] must be numeric type")
+
+    def slider_min_max(
+        self, data, column_name: str
+    ) -> Tuple[Optional[float], Optional[float]]:
+        import numpy as np
+
+        min, max = data[column_name].min(), data[column_name].max()
+
+        if np.isnan(min) or np.isnan(max):
+            return None, None
+
+        return min, max
+
+
+class CallableDataSourceAble(IDataSourceAble):
+    def __init__(self, fn: Callable) -> None:
+        self.data_fn = fn
+
+    def get_data(self):
+        return self.data_fn()
+
+    def apply_filters(self, data, filters: List[_TFilterCallback]):
+        new_data = data
+        for f in filters:
+            new_data = f(new_data)
+
+        return new_data
+
+    def duplicates_column_values(self, data, column_name: str) -> List:
+        return data[column_name].drop_duplicates().tolist()
+
+    def get_aggrid_options(self, data) -> Dict:
+        df = data
+        return {
+            "columnDefs": [{"field": col} for col in df.columns],
+            "rowData": df.to_dict("records"),
+        }
+
+    def slider_check(self, data, column_name: str) -> None:
+        pass
+
+    def slider_min_max(
+        self, data, column_name: str
+    ) -> Tuple[Optional[float], Optional[float]]:
+        import numpy as np
+
+        min, max = data[column_name].min(), data[column_name].max()
+
+        if np.isnan(min) or np.isnan(max):
+            return None, None
+
+        return min, max

ex4nicegui/bi/types.py

@@ -0,0 +1,12 @@
+from typing import Callable, TypeVar
+
+
+_TData = TypeVar("_TData")
+
+_TElementID = int
+_TNgClientID = str
+_TComponentUpdateCallback = Callable[[_TData], None]
+_TFilterCallback = Callable[[_TData], _TData]
+
+_TDataSourceId = int
+_TSourceBuildFn = Callable[..., _TData]

ex4nicegui/layout/__init__.py

@@ -1,2 +1,2 @@
-# from .gridbox import grid_box
 from .gridFlex import *
+from .rxFlex import *

ex4nicegui/layout/gridFlex/gridFlex.py

@@ -147,7 +147,7 @@ class GridFlex(Element, component="GridFlex.js"):
         break_point: Optional[TBreakpoint] = None,
         **kws,
     ):
-        if area is not None:
+        if area is not None and area.strip() != "":
             areas_list = utils.areas_str2array(area)
             area = utils.areas_array2str(areas_list)
             areas_cols_len = max(map(len, areas_list))

ex4nicegui/layout/rxFlex/__init__.py

@@ -0,0 +1 @@
+from .index import rx_column, rx_row

ex4nicegui/layout/rxFlex/index.py

@@ -0,0 +1,121 @@
+from typing import Callable, List, Optional, Union, TypeVar, Generic
+from typing_extensions import Literal
+
+from ex4nicegui.layout import grid_box, mark_area
+from nicegui import ui, app
+from .types import *
+
+_T_itemWraper_add_var = TypeVar("_T_itemWraper_add_var")
+
+
+class ItemWraper:
+    def __init__(self, fn: Callable[[ui.element], ui.element]):
+        self.fn = fn
+
+    def __radd__(self, other: _T_itemWraper_add_var) -> _T_itemWraper_add_var:
+        return self.fn(other)  # type: ignore
+
+
+class rx_flex_box(ui.element):
+    def space(self):
+        return ui.element("q-space")
+
+    def gap(self, value: Union[int, float, str]):
+        if isinstance(value, (int, float)):
+            value = f"{value}rem"
+        self._style["gap"] = str(value)
+        self.update()
+        return self
+
+    def all_items_grow(self):
+        self._props["ex4ng-rx-flex-auto-grow"] = ""
+        return self
+
+
+def _q_space():
+    return ui.element("q-space")
+
+
+class rx_column(ui.column, rx_flex_box):
+    def __init__(
+        self,
+        horizontal: TColumn_Horizontal = "left",
+        vertical: TColumn_Vertical = "top",
+    ) -> None:
+        super().__init__()
+        self.tailwind.align_items
+        self.horizontal(horizontal)
+        self.vertical(vertical)
+
+        self._props["ex4ng-rx-column"] = ""
+
+    def item_horizontal(self, value: TColumn_Item_Horizontal):
+        def fn(ele: ui.element):
+            ele._style["align-self"] = Column_Item_Horizontal_map.get(value, value)
+            # ele.update()
+            return ele
+
+        return ItemWraper(fn)
+
+    def horizontal(self, value: TColumn_Horizontal):
+        self._style["align-items"] = Column_Horizontal_map.get(value, value)
+        self.update()
+        return self
+
+    def vertical(self, value: TColumn_Vertical):
+        self._style["justify-content"] = Column_Vertical_map.get(value, value)
+        self.update()
+        return self
+
+    def space(self):
+        return _q_space()
+
+
+class rx_row(ui.row, rx_flex_box):
+    def __init__(
+        self,
+        horizontal: TRow_Horizontal = "left",
+        vertical: TRow_Vertical = "top",
+    ) -> None:
+        super().__init__()
+        self.horizontal(horizontal)
+        self.vertical(vertical)
+        self._props["ex4ng-rx-row"] = ""
+
+    def item_vertical(self, value: TRow_Item_Vertical):
+        def fn(ele: ui.element):
+            ele._style["align-self"] = Row_Vertical_map.get(value, value)
+            return ele
+
+        return ItemWraper(fn)
+
+    def horizontal(self, value: TRow_Horizontal):
+        self._style["justify-content"] = Row_Horizontal_map.get(value, value)
+        self.update()
+        return self
+
+    def vertical(self, value: TRow_Vertical):
+        self._style["align-items"] = Row_Vertical_map.get(value, value)
+        self.update()
+        return
+
+    def space(self):
+        return _q_space()
+
+
+class page_view(rx_column):
+    def __init__(
+        self,
+        horizontal: TColumn_Horizontal = "left",
+        vertical: TColumn_Vertical = "top",
+    ) -> None:
+        super().__init__(horizontal, vertical)
+        self.classes("w-full h-full no-wrap")
+        ui.query("main.q-page").classes("flex")
+        ui.query(".nicegui-content").classes("grow p-0")
+
+    def all_center(self):
+        return self.horizontal("center").vertical("center")
+
+    def full_screen(self):
+        return self.classes("fullscreen")

ex4nicegui/layout/rxFlex/types.py

@@ -0,0 +1,80 @@
+# region type
+
+from typing_extensions import Literal
+
+
+Space_map = {
+    "between": "space-between",
+    "around": "space-around",
+    "evenly": "space-evenly",
+}
+
+TColumn_Item_Horizontal = Literal[
+    "auto",
+    "left",
+    "right",
+    "center",
+    "stretch",
+    "baseline",
+]
+Column_Item_Horizontal_map = {"left": "flex-start", "right": "flex-end"}
+
+
+TColumn_Horizontal = Literal[
+    "left",
+    "right",
+    "center",
+    "baseline",
+    "stretch",
+]
+
+Column_Horizontal_map = {"left": "flex-start", "right": "flex-end"}
+
+TColumn_Vertical = Literal[
+    "normal",
+    "top",
+    "bottom",
+    "center",
+    "between",
+    "around",
+    "evenly",
+    "stretch",
+]
+
+Column_Vertical_map = {"top": "flex-start", "bottom": "flex-end", **Space_map}
+
+
+TRow_Horizontal = Literal[
+    "normal",
+    "left",
+    "right",
+    "center",
+    "between",
+    "around",
+    "evenly",
+    "stretch",
+]
+
+Row_Horizontal_map = {"left": "flex-start", "right": "flex-end", **Space_map}
+
+TRow_Vertical = Literal[
+    "top",
+    "bottom",
+    "center",
+    "baseline",
+    "stretch",
+]
+
+Row_Vertical_map = {"top": "flex-start", "bottom": "flex-end"}
+
+
+TRow_Item_Vertical = Literal[
+    "auto",
+    "top",
+    "bottom",
+    "center",
+    "stretch",
+    "baseline",
+]
+TRow_Item_Vertical_map = {"top": "flex-start", "bottom": "flex-end"}
+# endregion

ex4nicegui/reactive/EChartsComponent/ECharts.js

@@ -43967,8 +43967,7 @@ const TX = { class: "echart-container relative" }, CX = /* @__PURE__ */ GL({
         l.target || t("chartClickBlank");
       });
       function s() {
-        const l = n.value.getBoundingClientRect();
-        i == null || i.resize({ width: l.width - 5, height: l.height - 5 });
+        i == null || i.resize();
       }
       ZL("resize", () => {
         s();

ex4nicegui/reactive/officials/echarts.py

@@ -26,7 +26,7 @@ class EChartsBindableUi(BindableUi[echarts]):
 
         value_kws = _convert_kws_ref2value(kws)
 
-        element = echarts(**value_kws)
+        element = echarts(**value_kws).classes("grow self-stretch h-[16rem]")
 
         super().__init__(element)
 

ex4nicegui/utils/clientScope.py

@@ -0,0 +1,42 @@
+from typing import Dict, List
+from signe.core.effect import Effect
+from signe.core.scope import IScope
+from nicegui import globals as ng_globals, Client
+
+
+_TClientID = str
+
+
+class NgClientScope(IScope):
+    def __init__(self) -> None:
+        self._effects: List[Effect] = []
+
+    def add_effect(self, effect: Effect):
+        self._effects.append(effect)
+
+    def dispose(self):
+        for effect in self._effects:
+            effect.dispose()
+
+
+class NgClientScopeManager:
+    def __init__(self) -> None:
+        self._client_scope_map: Dict[_TClientID, NgClientScope] = {}
+
+    def get_scope(self):
+        if len(ng_globals.get_slot_stack()) <= 0:
+            return
+
+        client = ng_globals.get_client()
+        if client.shared:
+            return
+
+        if client.id not in self._client_scope_map:
+            self._client_scope_map[client.id] = NgClientScope()
+
+            @client.on_disconnect
+            def _(e: Client):
+                if e.id in self._client_scope_map:
+                    self._client_scope_map[e.id].dispose()
+
+        return self._client_scope_map[client.id]

ex4nicegui/utils/signals.py

@@ -1,9 +1,12 @@
-from signe import createSignal, effect, computed, on as signe_on
+from signe import createSignal, effect as signe_effect, computed, on as signe_on
 from signe.core.signal import Signal, SignalOption
+from signe.core.effect import Effect
 from signe import utils as signe_utils
+from .clientScope import NgClientScopeManager
 from signe.types import TSetter, TGetter
 from typing import (
     Any,
+    Dict,
     TypeVar,
     Generic,
     overload,
@@ -17,6 +20,8 @@ from nicegui import ui
 
 T = TypeVar("T")
 
+_CLIENT_SCOPE_MANAGER = NgClientScopeManager()
+
 
 class ReadonlyRef(Generic[T]):
     def __init__(self, getter: TGetter[T]) -> None:
@@ -115,6 +120,39 @@ def ref(value: T):
     return cast(Ref[T], Ref(s.getValue, s.setValue, s))
 
 
+@overload
+def effect(
+    fn: None = ...,
+    *,
+    priority_level=1,
+    debug_trigger: Optional[Callable] = None,
+) -> signe_utils._TEffect_Fn[None]:
+    ...
+
+
+@overload
+def effect(
+    fn: Callable[..., None],
+    *,
+    priority_level=1,
+    debug_trigger: Optional[Callable] = None,
+) -> Effect[None]:
+    ...
+
+
+def effect(
+    fn: Optional[Callable[..., None]] = None,
+    *,
+    priority_level=1,
+    debug_trigger: Optional[Callable] = None,
+) -> Union[signe_utils._TEffect_Fn[None], Effect[None]]:
+    kws = {
+        "debug_trigger": debug_trigger,
+        "priority_level": priority_level,
+    }
+    return signe_effect(fn, **kws, scope=_CLIENT_SCOPE_MANAGER.get_scope())
+
+
 @overload
 def ref_computed(
     fn: Callable[[], T],
@@ -122,6 +160,7 @@ def ref_computed(
     desc="",
     debug_trigger: Optional[Callable[..., None]] = None,
     priority_level: int = 1,
+    debug_name: Optional[str] = None,
 ) -> ReadonlyRef[T]:
     ...
 
@@ -133,6 +172,7 @@ def ref_computed(
     desc="",
     debug_trigger: Optional[Callable[..., None]] = None,
     priority_level: int = 1,
+    debug_name: Optional[str] = None,
 ) -> Callable[[Callable[..., T]], ReadonlyRef[T]]:
     ...
 
@@ -143,14 +183,16 @@ def ref_computed(
     desc="",
     debug_trigger: Optional[Callable[..., None]] = None,
     priority_level: int = 1,
+    debug_name: Optional[str] = None,
 ) -> Union[ReadonlyRef[T], Callable[[Callable[..., T]], ReadonlyRef[T]]]:
     kws = {
         "debug_trigger": debug_trigger,
         "priority_level": priority_level,
+        "debug_name": debug_name,
     }
 
     if fn:
-        getter = computed(fn, **kws)
+        getter = computed(fn, **kws, scope=_CLIENT_SCOPE_MANAGER.get_scope())
         return cast(DescReadonlyRef[T], DescReadonlyRef(getter, desc))
     else:
 
@@ -192,20 +234,23 @@ class effect_refreshable:
             re_func.refresh()
 
         if len(self._refs) == 0:
-            runner = effect(runner)
+            runner = signe_effect(runner)
         else:
             runner = on(self._refs)(runner)
 
         return runner
 
 
-def on(refs: Union[ReadonlyRef, Sequence[ReadonlyRef]]):
+def on(
+    refs: Union[ReadonlyRef, Sequence[ReadonlyRef]],
+    effect_kws: Optional[Dict[str, Any]] = None,
+):
     if not isinstance(refs, Sequence):
         refs = [refs]
 
     getters = [getattr(r, "_ReadonlyRef___getter") for r in refs]
 
     def wrap(fn: Callable):
-        return signe_on(getters, fn)
+        return signe_on(getters, fn, effect_kws=effect_kws)
 
     return wrap

{ex4nicegui-0.2.17.dist-info → ex4nicegui-0.3.0.dist-info}/METADATA

@@ -1,19 +1,19 @@
-Metadata-Version: 2.1
-Name: ex4nicegui
-Version: 0.2.17
-Summary: ...
-Home-page: 
-Author: carson_jia
-Author-email: 568166495@qq.com
-License: MIT license
-Keywords: nicegui,ex4nicegui,webui
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Natural Language :: English
-Classifier: Programming Language :: Python :: 3.8
-Requires-Python: >=3.8
-License-File: LICENSE
-Requires-Dist: signe (>=0.1.8)
-Requires-Dist: nicegui (>=1.3.13)
-Requires-Dist: typing-extensions
-
+Metadata-Version: 2.1
+Name: ex4nicegui
+Version: 0.3.0
+Summary: ...
+Home-page: 
+Author: carson_jia
+Author-email: 568166495@qq.com
+License: MIT license
+Keywords: nicegui,ex4nicegui,webui
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Natural Language :: English
+Classifier: Programming Language :: Python :: 3.8
+Requires-Python: >=3.8
+License-File: LICENSE
+Requires-Dist: signe (>=0.2.3)
+Requires-Dist: nicegui (>=1.3.13)
+Requires-Dist: typing-extensions
+

{ex4nicegui-0.2.17.dist-info → ex4nicegui-0.3.0.dist-info}/RECORD

@@ -1,13 +1,21 @@
-ex4nicegui/__init__.py,sha256=9OkkZEITcLZ-h7lqMk4OHrHynnfSjlsBc2EeIexno34,397
+ex4nicegui/__init__.py,sha256=r2UGFOv2DxiLcgASHLLVpmZJALQYsF2VTWGRSQQMoRw,396
+ex4nicegui/bi/__init__.py,sha256=OXA3np4-3CaujOLAxza8vK0mrV0nIfNP-TQBlfbq9k8,61
+ex4nicegui/bi/dataSource.py,sha256=yue_zPniAmjq8-z4gXg718kfCXU1CU5gCwj1AufWoEc,5039
+ex4nicegui/bi/dataSourceFacade.py,sha256=S6D7h82o5loIFqHkDN4gtC1knDUuqzRF_O7t38qRibw,8024
+ex4nicegui/bi/index.py,sha256=Zuo8V_7IZnayo8vxEMFbx-BkZTkEca-QhHVrmVTHjuc,1883
+ex4nicegui/bi/protocols.py,sha256=YiLYC62nFb3UsGu4Ly9AkM-kj1TuG1vlqKLJb23xe90,3175
+ex4nicegui/bi/types.py,sha256=R6mfDqD9dONJNq1_3uPcMFUsTBr6Rdpu5KFIfsvNSN4,277
 ex4nicegui/experimental_/__init__.py,sha256=LSDd_U6eQ9g9St9kC4daau3MFGlVCRHGZJC4E0JRH34,36
 ex4nicegui/experimental_/gridLayout/__init__.py,sha256=48y_Pm0xxgC_PRnixQB5R_5rPL4FuyeoeOao_W7pm7A,49
 ex4nicegui/experimental_/gridLayout/index.py,sha256=zFXuvFroo5EC1CFjt-b4hMiEy67hGP5J1GYTKH6kpUU,4737
-ex4nicegui/layout/__init__.py,sha256=j7Yb_p3YT69QHKVcn4dCjQ43JwVUzV5hDJ7cVTh_ZGA,58
-ex4nicegui/layout/_gridbox.py,sha256=CcupbaDVbKl2g2KVWvpaSPO73tuuRvfSNuyzH2koe4U,2454
+ex4nicegui/layout/__init__.py,sha256=yYkdH0bC1nxIDr_OtvyTqR_yXkwnY5DmelaQOIwwjas,48
 ex4nicegui/layout/gridFlex/GridFlex.js,sha256=ljkxGFucBUIPksMAT5w_35sxGogC7OzxzXnOw21Z3_k,4468
 ex4nicegui/layout/gridFlex/__init__.py,sha256=98dcrOEROibl5fnzIj644CnELbUvYTid702IjhLdpfs,79
-ex4nicegui/layout/gridFlex/gridFlex.py,sha256=bAGpnLp-cjHK6p-SK8nrRQNTOylZ1HwmeGlSeWokoRs,7438
+ex4nicegui/layout/gridFlex/gridFlex.py,sha256=8zMHKgh23wVr3TXVcvv8_KzyIZLk5zPUdgf7BWgy38k,7461
 ex4nicegui/layout/gridFlex/utils.py,sha256=hBuusveBRaHSubIr2q38AP033-VtXDFE_fDzZtg4h44,1236
+ex4nicegui/layout/rxFlex/__init__.py,sha256=dllXV6cri1oOZkOCGJpI9AlUjIZ3oB99ckLIYRW8faM,38
+ex4nicegui/layout/rxFlex/index.py,sha256=XeAsxfy35RJBE2g2WGzKgskf43K4We0d2mBzWb0kbB8,3509
+ex4nicegui/layout/rxFlex/types.py,sha256=OQBo3kkmtXhMo3BDI0GjX36HPJLDV1Cm67hPZGb1k2Q,1411
 ex4nicegui/reactive/__index.py,sha256=OaN_mD2TJORxqTzh2JeKAqaOhIBqM5cBnm21RqKt7PQ,451
 ex4nicegui/reactive/__init__.py,sha256=NZUgvItxqqgzHKrt4oGZnxxV9dlEudGiv4J3fhJdvdQ,24
 ex4nicegui/reactive/drawer.py,sha256=NWMq2gnalpYAU8tT0DwGN5l8n7fuMxTIWxOfr2QvFIA,1356
@@ -16,7 +24,7 @@ ex4nicegui/reactive/local_file_picker.py,sha256=DWNzm_IP02sY-nZWN6WEWJxlwpABW6tN
 ex4nicegui/reactive/q_pagination.py,sha256=ITXBrjLnI1a5bz3Rbn7j8lZs9UJaFuMHrM9_FW_V7NA,1217
 ex4nicegui/reactive/rxui.py,sha256=NZUgvItxqqgzHKrt4oGZnxxV9dlEudGiv4J3fhJdvdQ,24
 ex4nicegui/reactive/usePagination.py,sha256=IP1NeLxaH3413KTEjtbyuzq0FVdtnKQsTZqM-W7iEgY,2468
-ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=zpB_m1dxK236_qZAiM8jzMkNCVTEPgeSV6tFpdgLZoo,1581763
+ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=qj3HUngg-pcTjNDCiz7jgz-O2Lx3aW0HhvrcsDEb0a0,1581667
 ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=LhThgTo7TSjaXIaWcG6eJojuPWyhUkDkw3tJIuCkJTw,2968
 ex4nicegui/reactive/EChartsComponent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ex4nicegui/reactive/UseDraggable/UseDraggable.js,sha256=D2_4c64qYwkqG_JzL1ZAwoNZDoz6qtHfPA_Z5RIvmIw,5235
@@ -35,7 +43,7 @@ ex4nicegui/reactive/officials/color_picker.py,sha256=s6zUBkCAqAnBnoLWS3bXFIqmCK5
 ex4nicegui/reactive/officials/column.py,sha256=3RLvVKNaDtOb8df4uS3xRfwJJPuH1ndXk_Y4Gry0Tjo,413
 ex4nicegui/reactive/officials/date.py,sha256=4muMUxoXwV_OYBoe-ucB5g20msT2zjbiyfGNZbKPdoU,2700
 ex4nicegui/reactive/officials/drawer.py,sha256=7XqP8UmkvgxglV1-vUwbo5Sx2Fz7CPr1UqBfriEagDE,2443
-ex4nicegui/reactive/officials/echarts.py,sha256=kVlKT1PPjD7BDvI8LmOfyhvhCt4KyHQEVYD9M0fQu2I,2159
+ex4nicegui/reactive/officials/echarts.py,sha256=HmQqzcvIFum6C80_b6IPmLLy-D16l_8y1IaHYFOsylk,2198
 ex4nicegui/reactive/officials/expansion.py,sha256=Z2aKsrtUpkO0Z4kO9kPwcu7piBcE_d62OAC2oVDFTGE,1528
 ex4nicegui/reactive/officials/grid.py,sha256=6brGijR9ZLqOhe5r2w4BF81R8I4kJPZxZVkbQjXwlOU,925
 ex4nicegui/reactive/officials/html.py,sha256=7CQWKu_t3MdDJX21fTC3xTMAOcg0gKZrKJsaSCpZ0e4,1687
@@ -59,10 +67,11 @@ ex4nicegui/reactive/useMouse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 ex4nicegui/tools/__init__.py,sha256=Ue6ATQC9BuQlJEcs2JnuFXZh4DYh9twKc4F7zpIPhjE,40
 ex4nicegui/tools/debug.py,sha256=HCKlVzhHx5av-983ADgwgMkScKwTreSluLA7uikGYa0,4887
 ex4nicegui/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+ex4nicegui/utils/clientScope.py,sha256=plgHxcCY1y76bK31u5zfOTX8cnYC1Jlx-N3cAgCY2G4,1143
 ex4nicegui/utils/common.py,sha256=5fsaOkoj-Ild1LGsInZXra66gJLVoVcZGAIG6YOeM6E,430
-ex4nicegui/utils/signals.py,sha256=Dwvb0Anansa0N1ZH2Ko0yCX9o-QHKbXOYEtvdrtde9g,4807
-ex4nicegui-0.2.17.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
-ex4nicegui-0.2.17.dist-info/METADATA,sha256=2PpOH1p1Ob0TY1r4xePjfy5lwtWuIpxPIMiPuXfsfYM,515
-ex4nicegui-0.2.17.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-ex4nicegui-0.2.17.dist-info/top_level.txt,sha256=VFwMiO9AFjj5rfLMJwN1ipLRASk9fJXB8tM6DNrpvPQ,11
-ex4nicegui-0.2.17.dist-info/RECORD,,
+ex4nicegui/utils/signals.py,sha256=S15wA6WPLBmohn1Z5EpFOxC1KvksOf5ir86PuhRM_Oc,5969
+ex4nicegui-0.3.0.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
+ex4nicegui-0.3.0.dist-info/METADATA,sha256=WfHwYH3zUfTli4m0P_D8wDRdls-AMIZqwwcoggnjBKw,533
+ex4nicegui-0.3.0.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+ex4nicegui-0.3.0.dist-info/top_level.txt,sha256=VFwMiO9AFjj5rfLMJwN1ipLRASk9fJXB8tM6DNrpvPQ,11
+ex4nicegui-0.3.0.dist-info/RECORD,,

{ex4nicegui-0.2.17.dist-info → ex4nicegui-0.3.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.37.1)
+Generator: bdist_wheel (0.40.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

ex4nicegui/layout/_gridbox.py

@@ -1,87 +0,0 @@
-from typing import List, Optional, Union, cast
-from nicegui.client import Client
-from nicegui.element import Element
-from ex4nicegui.reactive.officials.base import BindableUi
-
-
-def _areas_str2array(areas: str) -> List[List[str]]:
-    """
-    >>> input='''
-        sc1 sc2
-        sc3
-        table table table table
-    '''
-    >>> areas_str2array(input)
-    >>> [
-        ["sc1", "sc2"],
-        ["sc3"],
-        ["table", "table", "table", "table"]
-    ]
-    """
-    pass
-
-    lines = (line.strip() for line in areas.splitlines())
-    remove_empty_rows = (line for line in lines if len(line) > 0)
-    splie_space = (line.split() for line in remove_empty_rows)
-    return list(splie_space)
-
-
-def _areas_array2str(areas_array: List[List[str]]):
-    """
-    >>> input = [
-        ["sc1", "sc2"],
-        ["sc3"],
-        ["table"] * 4
-    ]
-    >>> areas_array2str(input)
-    >>> '"sc1 sc2 . ." "sc3 . . ." "table table table table"'
-    """
-    max_len = max(map(len, areas_array))
-
-    fix_empty = (
-        [*line, *(["."] * (max_len - len(line)))] if len(line) < max_len else line
-        for line in areas_array
-    )
-
-    line2str = (f'"{" ".join(line)}"' for line in fix_empty)
-    return " ".join(line2str)
-
-
-class grid_box(Element):
-    def __init__(
-        self,
-        areas_text: str,
-        template_columns: Optional[str] = None,
-        template_rows: Optional[str] = None,
-        *,
-        _client: Optional[Client] = None,
-    ) -> None:
-        super().__init__("div", _client=_client)
-
-        areas_list = _areas_str2array(areas_text)
-
-        areas = _areas_array2str(areas_list)
-
-        areas_cols_len = max(map(len, areas_list))
-        areas_rows_len = len(areas_list)
-
-        template_columns = template_columns or f"repeat({areas_cols_len}, 1fr)"
-        template_rows = template_rows or f"repeat({areas_rows_len}, 1fr)"
-
-        self.style(
-            f"""
-grid-template-areas: {areas};
-display: grid;
-grid-template-columns: {template_columns};
-grid-template-rows:{template_rows};"""
-        )
-
-    def areas_mark(self, element: Union[Element, BindableUi], mark: str):
-        if isinstance(element, BindableUi):
-            element = element.element
-        element = cast(Element, element)
-        element.style(self.mark_style(mark))
-        return element
-
-    def mark_style(self, mark: str):
-        return f"grid-area:{mark}"