ex4nicegui 0.8.10__tar.gz → 0.9.1__tar.gz

ex4nicegui-0.9.1/.gitignore

@@ -0,0 +1,165 @@
+
+.vscode
+temp
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/
+pyrightconfig.json

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/PKG-INFO

@@ -1,24 +1,15 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: ex4nicegui
-Version: 0.8.10
-Summary: Extension library based on nicegui, providing data responsive,BI functionality modules
-License: MIT
-Keywords: nicegui,ex4nicegui,webui
-Author: CrystalWindSnake
-Author-email: 568166495@qq.com
-Requires-Python: >=3.8,<4.0
-Classifier: License :: OSI Approved :: MIT 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
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: executing (>=2.0.1,<3.0.0)
-Requires-Dist: nicegui (>=2.21.1,<3.0.0)
-Requires-Dist: signe (>=0.4.22,<0.5.0)
-Project-URL: Repository, https://github.com/CrystalWindSnake/ex4nicegui
+Version: 0.9.1
+Summary: Extension library based on nicegui, providing data responsive,BI functionality modules.
+Author-email: CrystalWindSnake <568166495@qq.com>
+License-Expression: MIT
+License-File: LICENSE
+Keywords: ex4nicegui,gui,nicegui,ui,web,webui
+Requires-Python: >=3.9
+Requires-Dist: executing~=2.0.1
+Requires-Dist: nicegui~=3.5.0
+Requires-Dist: signe~=0.4.22
 Description-Content-Type: text/markdown
 
 # ex4nicegui
@@ -462,6 +453,7 @@ class MyApp(rxui.ViewModel):
       - [tab\_panels](#tab_panels)
       - [lazy\_tab\_panels](#lazy_tab_panels)
       - [scoped\_style](#scoped_style)
+      - [PageState](#pagestate)
     - [BI 模块](#bi-模块)
       - [`bi.data_source`](#bidata_source)
       - [ui\_select](#ui_select)
@@ -1483,6 +1475,56 @@ with rxui.row().scoped_style(":self:hover *", "outline: 1px solid red;") as row:
     ui.label("World")
 ```
 
+---
+
+#### PageState
+
+复杂的页面，可能需要在不同模块的函数中传递状态。`PageState` 类可以更方便管理页面范围的共享状态。
+
+在 state.py 中定义页面状态
+```python
+from ex4nicegui import PageState, to_ref, on
+
+class CounterState(PageState):
+
+    def __init__(self):
+        self.count = to_ref(0)
+
+        @on(self.a)
+        def on_a_change(a):
+            print(f"a changed to {a}")
+
+```
+
+在 view.py 中封装各种视图
+```python
+from ex4nicegui import rxui
+from state import CounterState
+
+def view1():
+    state = CounterState.get()  # 与 view2 函数的状态是共享的 
+    ui.label(f"count: {state.count.value} in view1")
+
+def view2():
+    state = CounterState.get()
+    ui.label(f"count: {state.count.value} in view2")
+
+```
+
+在 `main.py` 中正常导入并调用视图函数即可
+```python
+from ex4nicegui import ui
+from view import view1, view2
+
+@ui.page("/")
+def index():
+    view1()
+    view2()
+
+ui.run()
+
+```
+
 
 ---
 
@@ -1915,4 +1957,3 @@ rxui.input(value=text)
 rxui.image(qr_code.code).classes("w-20 h-20").props("no-transition")
 ```
 
-

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/README.md

@@ -439,6 +439,7 @@ class MyApp(rxui.ViewModel):
       - [tab\_panels](#tab_panels)
       - [lazy\_tab\_panels](#lazy_tab_panels)
       - [scoped\_style](#scoped_style)
+      - [PageState](#pagestate)
     - [BI 模块](#bi-模块)
       - [`bi.data_source`](#bidata_source)
       - [ui\_select](#ui_select)
@@ -1460,6 +1461,56 @@ with rxui.row().scoped_style(":self:hover *", "outline: 1px solid red;") as row:
     ui.label("World")
 ```
 
+---
+
+#### PageState
+
+复杂的页面，可能需要在不同模块的函数中传递状态。`PageState` 类可以更方便管理页面范围的共享状态。
+
+在 state.py 中定义页面状态
+```python
+from ex4nicegui import PageState, to_ref, on
+
+class CounterState(PageState):
+
+    def __init__(self):
+        self.count = to_ref(0)
+
+        @on(self.a)
+        def on_a_change(a):
+            print(f"a changed to {a}")
+
+```
+
+在 view.py 中封装各种视图
+```python
+from ex4nicegui import rxui
+from state import CounterState
+
+def view1():
+    state = CounterState.get()  # 与 view2 函数的状态是共享的 
+    ui.label(f"count: {state.count.value} in view1")
+
+def view2():
+    state = CounterState.get()
+    ui.label(f"count: {state.count.value} in view2")
+
+```
+
+在 `main.py` 中正常导入并调用视图函数即可
+```python
+from ex4nicegui import ui
+from view import view1, view2
+
+@ui.page("/")
+def index():
+    view1()
+    view2()
+
+ui.run()
+
+```
+
 
 ---
 

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/ex4nicegui/__init__.py

@@ -8,8 +8,6 @@ from ex4nicegui.utils.types import (
 )
 from ex4nicegui.utils.scheduler import next_tick
 from ex4nicegui.utils.signals import (
-    effect,
-    effect_refreshable,
     to_raw,
     is_ref,
     to_ref,
@@ -23,9 +21,11 @@ from ex4nicegui.utils.signals import (
     batch,
     is_reactive,
 )
+from ex4nicegui.utils.refreshable import effect, effect_refreshable
 from ex4nicegui.utils.asyncComputed import async_computed
 from ex4nicegui.utils.clientScope import new_scope
 from ex4nicegui.reactive.EChartsComponent.ECharts import reset_echarts_dependencies
+from ex4nicegui.utils.page_state import PageState
 from .version import __version__
 
 __all__ = [
@@ -53,5 +53,6 @@ __all__ = [
     "new_scope",
     "next_tick",
     "reset_echarts_dependencies",
+    "PageState",
     "__version__",
 ]

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/ex4nicegui/bi/dataSource.py

@@ -182,8 +182,7 @@ class DataSource:
 
             @ng_client.on_disconnect
             def _(e: Client):
-                if not e.shared:
-                    self._component_map.remove_client(e.id)
+                self._component_map.remove_client(e.id)
 
         info = ComponentInfo(
             ComponentInfoKey(client_id, element_id), update_callback, uiResult=ui_result

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/ex4nicegui/bi/elements/ui_aggrid.py

@@ -57,8 +57,7 @@ def ui_aggrid(
         data = self._dataSource.get_filtered_data(cp)
         new_opts = self._dataSource._idataSource.get_aggrid_options(data)
         options = _merge_options(fixed_options, new_opts)
-        cp._props["options"] = options
-        cp.update()
+        cp.options = {**options, "theme": kwargs.get("theme", "quartz")}
 
     self._dataSource._register_component(cp.id, on_source_update)
 

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/ex4nicegui/bi/protocols.py

@@ -9,14 +9,11 @@ from ex4nicegui.utils import common as utils_common
 
 
 class IDataSourceAble(Protocol):
-    def get_data(self) -> Any:
-        ...
+    def get_data(self) -> Any: ...
 
-    def reload(self, data) -> None:
-        ...
+    def reload(self, data) -> None: ...
 
-    def apply_filters(self, data, filters: List[_TFilterCallback]) -> Any:
-        ...
+    def apply_filters(self, data, filters: List[_TFilterCallback]) -> Any: ...
 
     def duplicates_column_values(
         self,
@@ -25,30 +22,23 @@ class IDataSourceAble(Protocol):
         *,
         exclude_null_value=True,
         sort_options: Optional[_TDuplicates_column_values_sort_options] = None,
-    ) -> List:
-        ...
+    ) -> List: ...
 
-    def get_aggrid_options(self, data) -> Dict:
-        ...
+    def get_aggrid_options(self, data) -> Dict: ...
 
-    def get_table_options(self, data) -> Dict:
-        ...
+    def get_table_options(self, data) -> Dict: ...
 
-    def slider_check(self, data, column_name: str) -> None:
-        ...
+    def slider_check(self, data, column_name: str) -> None: ...
 
     def slider_min_max(
         self, data, column_name: str
-    ) -> Tuple[Optional[float], Optional[float]]:
-        ...
+    ) -> Tuple[Optional[float], Optional[float]]: ...
 
-    def range_check(self, data, column_name: str) -> None:
-        ...
+    def range_check(self, data, column_name: str) -> None: ...
 
     def range_min_max(
         self, data, column_name: str
-    ) -> Tuple[Optional[float], Optional[float]]:
-        ...
+    ) -> Tuple[Optional[float], Optional[float]]: ...
 
 
 class CallableDataSourceAble(IDataSourceAble):

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/ex4nicegui/layout/rxFlex/index.py

@@ -53,7 +53,6 @@ class rx_column(ui.column, rx_flex_box):
         vertical: TColumn_Vertical = "top",
     ) -> None:
         super().__init__()
-        self.tailwind.align_items
         self.horizontal(horizontal)
         self.vertical(vertical)
 

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/ex4nicegui/reactive/EChartsComponent/ECharts.js

@@ -1,4 +1,4 @@
-import 'echarts'
+import { echarts } from "nicegui-echart";
 import { convertDynamicProperties } from "../../static/utils/dynamic_properties.js";
 
 const registerThemeTask = Promise.all(

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/ex4nicegui/reactive/EChartsComponent/ECharts.py

@@ -11,18 +11,14 @@ from nicegui.events import handle_event, UiEventArguments, GenericEventArguments
 from nicegui.element import Element
 from nicegui.awaitable_response import AwaitableResponse
 from pathlib import Path
-import nicegui
 
 from .types import (
     _T_event_name,
 )
 from .utils import get_bound_event_args, create_event_handler_args
 
-NG_ROOT = Path(nicegui.__file__).parent / "elements"
-libraries = [NG_ROOT / "lib/echarts/echarts.min.js"]
 
-
-class echarts(Element, component="ECharts.js", dependencies=libraries):  # type: ignore
+class echarts(Element, component="ECharts.js"):
     def __init__(
         self,
         options: Optional[dict] = None,

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/ex4nicegui/reactive/UseDraggable/UseDraggable.py

@@ -125,9 +125,9 @@ class UseDraggable(Element, component="UseDraggable.js"):
         self.on("update", inner_handler, args=_Update_Args)
 
     def apply(self, target: Element):
-        assert (
-            self.__target_id is None
-        ), "draggable can only be applied to one current element"
+        assert self.__target_id is None, (
+            "draggable can only be applied to one current element"
+        )
         self.__target_id = target.id
         self._props["elementId"] = self.__target_id
         # self.run_method("applyTargetId", str(self.__target_id))

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/ex4nicegui/reactive/__init__.py

@@ -63,7 +63,7 @@ from .officials.range import LazyRangeBindableUi as lazy_range
 from .officials.tree import TreeBindableUi as tree
 from .officials.spinner import SpinnerBindableUi as spinner
 
-from .local_file_picker import local_file_picker
+
 from .UseDraggable.UseDraggable import use_draggable
 from .useMouse.UseMouse import use_mouse
 
@@ -73,7 +73,7 @@ from .fileWatcher import FilesWatcher
 from .mermaid.mermaid import Mermaid as mermaid
 from .officials.dialog import DialogBindableUi as dialog
 from .vfor import vfor, VforStore
-from .vmodel import vmodel
+from ._vmodel import vmodel
 from .view_model import ViewModel, var, cached_var, list_var, dict_var
 
 pagination = q_pagination
@@ -89,7 +89,6 @@ __all__ = [
     "circular_progress",
     "knob",
     "UploadResult",
-    "local_file_picker",
     "use_draggable",
     "use_mouse",
     "use_pagination",

ex4nicegui-0.9.1/ex4nicegui/reactive/_vmodel.py

@@ -0,0 +1,150 @@
+from __future__ import annotations
+import warnings
+from ex4nicegui.utils.signals import (
+    RefWrapper,
+    TRef,
+    to_raw,
+    to_ref_wrapper,
+    to_value,
+    is_reactive,
+    is_ref,
+)
+from typing import (
+    Any,
+    Union,
+    cast,
+    Tuple,
+)
+
+from ex4nicegui.reactive.systems.object_system import get_attribute, set_attribute
+from ex4nicegui.utils.types import _TMaybeRef as TMaybeRef, Ref
+
+
+def create_writeable_wrapper(ref_obj: TRef, attrs: Tuple[Union[str, int], ...]):
+    if not attrs:
+
+        def maybe_ref_getter():
+            return to_value(ref_obj)
+
+        def reactive_getter():
+            return to_raw(ref_obj)
+
+        def setter(value):
+            pass
+
+        wrapper = to_ref_wrapper(
+            reactive_getter if is_reactive(ref_obj) else maybe_ref_getter,
+            setter,
+        )
+        wrapper._is_readonly = False
+        return wrapper
+
+    def getter():
+        obj = get_attribute(to_value(ref_obj), attrs[0])
+        for attr in attrs[1:]:
+            obj = get_attribute(obj, attr)
+
+        return obj
+
+    def setter(value):
+        obj = to_value(ref_obj)
+
+        for attr in attrs[:-1]:
+            obj = get_attribute(obj, attr)
+
+        set_attribute(obj, attrs[-1], value)
+
+    wrapper = to_ref_wrapper(
+        getter,
+        setter,
+    )
+    wrapper._is_readonly = False
+    return wrapper
+
+
+def vmodel(ref_obj: Union[TRef[Any], Any], *attrs: Union[str, int]) -> Any:
+    """Create a two-way binding on a form input element or a component.
+
+    @see - https://github.com/CrystalWindSnake/ex4nicegui/blob/main/README.en.md#vmodel
+    @中文文档 - https://gitee.com/carson_add/ex4nicegui/tree/main/#vmodel
+
+    Args:
+        expr (Any): _description_
+
+    ## Examples
+
+    .. code-block:: python
+        from ex4nicegui.reactive import rxui
+        from ex4nicegui import deep_ref
+
+        data = deep_ref({"a": 1, "b": [1, 2, 3, 4]})
+
+        rxui.label(lambda: f"{data.value=!s}")
+
+        # No binding effect
+        rxui.input(value=data.value["a"])
+
+        # readonly binding
+        rxui.input(value=lambda: data.value["a"])
+
+        # two-way binding
+        rxui.input(value=rxui.vmodel(data.value,'a'))
+
+
+    """
+
+    if not is_ref(ref_obj):
+        result = cast(Any, ref_obj)
+        for attr in attrs:
+            result = result[attr]
+
+        return result
+
+    if isinstance(ref_obj, RefWrapper):
+        ref_obj._is_readonly = False
+
+    if attrs:
+        wrapper = create_writeable_wrapper(ref_obj, attrs)
+
+        return cast(
+            TRef,
+            wrapper,
+        )
+    else:
+        warnings.warn(
+            """Maybe you don't need to use vmodel""",
+            stacklevel=2,
+        )
+
+    return cast(
+        TRef,
+        ref_obj,
+    )
+
+
+def vmodel_with_index(ref: Ref, index: TMaybeRef[int], *keys: Union[str, int]) -> Ref:
+    proxy = ref.value
+
+    def getter():
+        item = proxy[to_value(index)]
+        result = item
+
+        for k in keys:
+            result = get_attribute(result, k)
+        return result
+
+    def setter(value):
+        item = proxy[to_value(index)]
+
+        if len(keys) == 1:
+            set_attribute(item, keys[0], value)
+            return
+
+        obj = get_attribute(item, keys[0])
+
+        for k in keys[1:-1]:
+            set_attribute(obj, k, get_attribute(obj, k))
+
+        set_attribute(obj, keys[-1], value)
+
+    return RefWrapper(getter, setter)  # type: ignore

{ex4nicegui-0.8.10 → ex4nicegui-0.9.1}/ex4nicegui/reactive/base.py

@@ -25,7 +25,7 @@ from ex4nicegui.utils.signals import (
 )
 from ex4nicegui.utils.clientScope import new_scope
 from ex4nicegui.utils.types import _TMaybeRef as TMaybeRef
-from nicegui import Tailwind, ui
+from nicegui import ui
 from nicegui.elements.mixins.text_element import TextElement
 from nicegui.elements.mixins.value_element import ValueElement
 from ex4nicegui.reactive.services.reactive_service import inject_handle_delete
@@ -58,7 +58,6 @@ class BindableUi(Generic[TWidget]):
     def __init__(self, element: TWidget) -> None:
         self._element = element
         inject_handle_delete(self.element, self._on_element_delete)
-        self.tailwind = Tailwind(cast(ui.element, self._element))
         self._effect_scope = new_scope()
         self.__used_scope_style = False
 
@@ -185,7 +184,7 @@ class BindableUi(Generic[TWidget]):
 
             def props_str():
                 props_dict = (
-                    f"""{name if isinstance(raw_value,bool) else f"{name}='{raw_value}'"}"""
+                    f"""{name if isinstance(raw_value, bool) else f"{name}='{raw_value}'"}"""
                     for name, value in props.items()
                     if (raw_value := to_value(value))
                 )