ex4nicegui 0.8.2__py3-none-any.whl → 0.8.3__py3-none-any.whl

ex4nicegui/reactive/officials/radio.py

@@ -62,6 +62,7 @@ class RadioBindableUi(BindableUi[ui.radio], ValueElementMixin[Any]):
     def bind_options(self, options: TGetterOrReadonlyRef):
         @self._ui_signal_on(options, deep=True)
         def _():
+            ParameterClassifier.mark_event_source_as_internal(self.element)
             self.element.set_options(to_value(options))
 
         return self

ex4nicegui/reactive/officials/select.py

@@ -93,6 +93,7 @@ class SelectBindableUi(BindableUi[ui.select]):
     def bind_value(self, value: TGetterOrReadonlyRef):
         @self._ui_signal_on(value, deep=True)
         def _():
+            ParameterClassifier.mark_event_source_as_internal(self.element)
             cast(ValueElement, self.element).set_value(to_raw(to_value(value)) or None)
 
         return self

ex4nicegui/reactive/officials/tab_panel.py

@@ -1,8 +1,10 @@
+import inspect
+from typing import Awaitable, Callable, Union
 from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
 from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
 )
-from nicegui import ui
+from nicegui import ui, background_tasks, core
 from .base import BindableUi
 
 
@@ -21,3 +23,52 @@ class TabPanelBindableUi(BindableUi[ui.tab_panel]):
 
         for key, value in pc.get_bindings().items():
             self.bind_prop(key, value)  # type: ignore
+
+
+class lazy_tab_panel(TabPanelBindableUi):
+    def __init__(self, name: str) -> None:
+        super().__init__(name)
+        self._build_fn = None
+
+    def try_run_build_fn(self):
+        if self._build_fn:
+            _helper.run_build_fn(self, self.element._props["name"])
+            self._build_fn = None
+
+    def build_fn(self, fn: Callable[..., Union[None, Awaitable]]):
+        self._build_fn = fn
+        return fn
+
+
+class _helper:
+    @staticmethod
+    def run_build_fn(panel: lazy_tab_panel, name: str) -> None:
+        """ """
+        fn = panel._build_fn
+        if fn is None:
+            return
+        try:
+            expects_arguments = any(
+                p.default is inspect.Parameter.empty
+                and p.kind is not inspect.Parameter.VAR_POSITIONAL
+                and p.kind is not inspect.Parameter.VAR_KEYWORD
+                for p in inspect.signature(fn).parameters.values()
+            )
+
+            with panel:
+                result = fn(name) if expects_arguments else fn()
+            if isinstance(result, Awaitable):
+                # NOTE: await an awaitable result even if the handler is not a coroutine (like a lambda statement)
+                async def wait_for_result():
+                    with panel:
+                        try:
+                            await result
+                        except Exception as e:
+                            core.app.handle_exception(e)
+
+                if core.loop and core.loop.is_running():
+                    background_tasks.create(wait_for_result(), name=str(fn))
+                else:
+                    core.app.on_startup(wait_for_result())
+        except Exception as e:
+            core.app.handle_exception(e)

ex4nicegui/reactive/officials/tab_panels.py

@@ -1,4 +1,3 @@
-import inspect
 from typing import Any, Awaitable, Callable, Optional, Union
 from weakref import WeakValueDictionary
 from ex4nicegui.reactive.services.reactive_service import ParameterClassifier
@@ -8,9 +7,10 @@ from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
 )
 from ex4nicegui.utils.scheduler import next_tick
-from nicegui import ui, background_tasks, core
+from nicegui import ui
 from .base import BindableUi
 from ex4nicegui.reactive.mixins.value_element import ValueElementMixin
+from .tab_panel import lazy_tab_panel
 
 
 class TabPanelsBindableUi(BindableUi[ui.tab_panels], ValueElementMixin[bool]):
@@ -57,21 +57,6 @@ class TabPanelsBindableUi(BindableUi[ui.tab_panels], ValueElementMixin[bool]):
         return super().bind_prop(prop, value)
 
 
-class lazy_tab_panel(ui.tab_panel):
-    def __init__(self, name: str) -> None:
-        super().__init__(name)
-        self._build_fn = None
-
-    def try_run_build_fn(self):
-        if self._build_fn:
-            _helper.run_build_fn(self, self._props["name"])
-            self._build_fn = None
-
-    def build_fn(self, fn: Callable[..., Union[None, Awaitable]]):
-        self._build_fn = fn
-        return fn
-
-
 class LazyTabPanelsBindableUi(TabPanelsBindableUi):
     def __init__(
         self,
@@ -96,26 +81,32 @@ class LazyTabPanelsBindableUi(TabPanelsBindableUi):
             value, on_change=on_change, animated=animated, keep_alive=keep_alive
         )
 
-        self.__panels: WeakValueDictionary[str, lazy_tab_panel] = WeakValueDictionary()
+        self._panels: WeakValueDictionary[str, lazy_tab_panel] = WeakValueDictionary()
 
         if value:
 
             @self._ui_effect
             def _():
                 current_value = to_value(value)
-                if current_value in self.__panels:
-                    panel = self.__panels[current_value]
+                if current_value in self._panels:
+                    panel = self._panels[current_value]
 
                     @next_tick
                     def _():
                         panel.try_run_build_fn()
 
     def add_tab_panel(self, name: str):
+        """Add a tab panel.
+
+        Args:
+            name (str):  The name of the tab panel.
+        """
+
         def decorator(fn: Callable[..., Union[None, Awaitable]]):
             with self:
                 panel = lazy_tab_panel(name)
-            str_name = panel._props["name"]
-            self.__panels[str_name] = panel
+            str_name = panel.element._props["name"]
+            self._panels[str_name] = panel
             panel.build_fn(fn)
 
             if self.value == name:
@@ -125,36 +116,11 @@ class LazyTabPanelsBindableUi(TabPanelsBindableUi):
 
         return decorator
 
+    def get_panel(self, name: str) -> lazy_tab_panel:
+        """Get a tab panel by name.
 
-class _helper:
-    @staticmethod
-    def run_build_fn(panel: lazy_tab_panel, name: str) -> None:
-        """ """
-        fn = panel._build_fn
-        if fn is None:
-            return
-        try:
-            expects_arguments = any(
-                p.default is inspect.Parameter.empty
-                and p.kind is not inspect.Parameter.VAR_POSITIONAL
-                and p.kind is not inspect.Parameter.VAR_KEYWORD
-                for p in inspect.signature(fn).parameters.values()
-            )
-
-            with panel:
-                result = fn(name) if expects_arguments else fn()
-            if isinstance(result, Awaitable):
-                # NOTE: await an awaitable result even if the handler is not a coroutine (like a lambda statement)
-                async def wait_for_result():
-                    with panel:
-                        try:
-                            await result
-                        except Exception as e:
-                            core.app.handle_exception(e)
-
-                if core.loop and core.loop.is_running():
-                    background_tasks.create(wait_for_result(), name=str(fn))
-                else:
-                    core.app.on_startup(wait_for_result())
-        except Exception as e:
-            core.app.handle_exception(e)
+        Args:
+            name (str):  The name of the tab panel.
+
+        """
+        return self._panels[name]

ex4nicegui/reactive/officials/toggle.py

@@ -83,6 +83,7 @@ class ToggleBindableUi(BindableUi[ui.toggle]):
     def bind_value(self, value: TGetterOrReadonlyRef):
         @self._ui_signal_on(value, deep=True)
         def _():
+            ParameterClassifier.mark_event_source_as_internal(self.element)
             self.element.set_value(to_raw(to_value(value)) or None)
 
         return self

ex4nicegui/reactive/services/reactive_service.py

@@ -18,6 +18,9 @@ from ex4nicegui.reactive.systems.reactive_system import (
 from ex4nicegui.utils.proxy import is_base_type_proxy
 
 
+_EVENT_SOURCE_INTERNAL_FLAG = "__ex4ng_set_value_from_signal_"
+
+
 class ParameterClassifier:
     def __init__(
         self,
@@ -71,7 +74,14 @@ class ParameterClassifier:
             if is_setter_ref(model_value):
 
                 def inject_on_change(e):
-                    model_value.value = self.v_model_arg_getter(e)  # type: ignore
+                    change_from_inner_signal = (
+                        ParameterClassifier.get_event_source_internal_flag(e.sender)
+                    )
+
+                    if not change_from_inner_signal:
+                        model_value.value = self.v_model_arg_getter(e)  # type: ignore
+
+                    ParameterClassifier.remove_event_source_internal_flag(e.sender)
                     handle_event(event, e)
 
                 value_kws.update({event_name: inject_on_change})
@@ -85,6 +95,18 @@ class ParameterClassifier:
             if (k in self.maybeRefs and (is_ref(v) or isinstance(v, Callable)))
         }
 
+    @staticmethod
+    def mark_event_source_as_internal(element: ui.element):
+        element.__dict__[_EVENT_SOURCE_INTERNAL_FLAG] = True
+
+    @staticmethod
+    def get_event_source_internal_flag(element: ui.element):
+        return element.__dict__.get(_EVENT_SOURCE_INTERNAL_FLAG, False)
+
+    @staticmethod
+    def remove_event_source_internal_flag(element: ui.element):
+        element.__dict__.pop(_EVENT_SOURCE_INTERNAL_FLAG, None)
+
 
 def inject_handle_delete(element: ui.element, on_delete: Callable[[], None]):
     inject_method(element, "_handle_delete", on_delete)

{ex4nicegui-0.8.2.dist-info → ex4nicegui-0.8.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ex4nicegui
-Version: 0.8.2
+Version: 0.8.3
 Summary: Extension library based on nicegui, providing data responsive,BI functionality modules
 Home-page: https://github.com/CrystalWindSnake/ex4nicegui
 License: MIT
@@ -358,6 +358,71 @@ def _():
 
 > 建议总是通过 `.on` 指定依赖关系，避免预料之外的刷新
 
+---
+
+### 数据持久化
+
+`ViewModel` 使用代理对象创建响应式数据，当需要保存数据时，可以使用 `rxui.ViewModel.to_value` 转换成普通数据.
+
+下面的例子，点击按钮将显示 my_app 的状态数据字典。
+```python
+from nicegui import ui
+from ex4nicegui import rxui
+
+
+class MyApp(rxui.ViewModel):
+    a = 0
+    sign = "+"
+    b = 0
+
+    def show_data(self):
+        # >> {"a": 0, "sign": '+, "b": 0}
+        return rxui.ViewModel.to_value(self)
+
+    def show_a(self):
+        # >> 0
+        return rxui.ViewModel.to_value(self.a)
+
+my_app = MyApp()
+
+rxui.number(value=my_app.a, min=0, max=10)
+rxui.radio(["+", "-", "*", "/"], value=my_app.sign)
+rxui.number(value=my_app.b, min=0, max=10)
+
+ui.button("show data", on_click=lambda: ui.notify(my_app.show_data()))
+
+```
+
+结合 `rxui.ViewModel.on_refs_changed` ，可以在数据变化时，自动保存数据到本地。
+
+```python
+from nicegui import ui
+from ex4nicegui import rxui
+from pathlib import Path
+import json
+
+
+class MyApp(rxui.ViewModel):
+    a = 0
+    sign = "+"
+    b = 0
+
+    _json_path = Path(__file__).parent / "data.json"
+
+    def __init__(self):
+        super().__init__()
+
+        @rxui.ViewModel.on_refs_changed(self)
+        def _():
+            # a, sign, b 任意一个值变化时，自动保存到本地
+            self._json_path.write_text(json.dumps(self.show_data()))
+
+    def show_data(self):
+        return rxui.ViewModel.to_value(self)
+...
+
+```
+
 
 ---
 
@@ -371,6 +436,7 @@ def _():
     - [二次计算缓存](#二次计算缓存)
     - [列表](#列表)
     - [列表循环](#列表循环)
+    - [数据持久化](#数据持久化)
   - [apis](#apis)
     - [ViewModel](#viewmodel)
       - [使用列表](#使用列表)
@@ -1339,11 +1405,16 @@ with rxui.lazy_tab_panels(current_tab) as panels:
 
     @panels.add_tab_panel("t1")
     def _():
+        # 通过 `panels.get_panel` 获取当前激活的 panel 组件
+        panels.get_panel("t1").classes("bg-green")
         ui.notify("Hello from t1")
+        ui.label("This is t1")
 
     @panels.add_tab_panel("t2")
     def _():
+        panels.get_panel("t2").style("background-color : red")
         ui.notify("Hello from t2")
+        ui.label("This is t2")
 
 ```
 

{ex4nicegui-0.8.2.dist-info → ex4nicegui-0.8.3.dist-info}/RECORD

@@ -118,18 +118,18 @@ ex4nicegui/reactive/officials/knob.py,sha256=TPKrquOBD9fBI9aBipE0qYy22dQJCcX9wNZ
 ex4nicegui/reactive/officials/label.py,sha256=kCair4NpFB7bvsPukMFcDBqDXk2BxOLzBQXSNx5EWuw,1428
 ex4nicegui/reactive/officials/linear_progress.py,sha256=T-z8_68FxSwdFH0hBFMA2X0JEeLoVFpJyya5RHlf7U8,2045
 ex4nicegui/reactive/officials/number.py,sha256=L_uMY-t5SONENI3b44DjSi7JwcdfYAldGZCvqX1h6Dw,2796
-ex4nicegui/reactive/officials/radio.py,sha256=G94-H7bVN7mqw5tywy80fK53BEmTpr9m2l0kg_c4YE0,1812
+ex4nicegui/reactive/officials/radio.py,sha256=l_PnmnirZ1_CYA0_jxbDfSVgM7m4NHzNOnCrNRyAmfI,1889
 ex4nicegui/reactive/officials/row.py,sha256=ZWJnb6nC9XMfmRmzeVKnHwUnxrCpbxaEBJ3lSVj5m5s,1384
-ex4nicegui/reactive/officials/select.py,sha256=zA9OG6Sll0g6yC15-YtOO5mGioua60yQIQvb2TfgSKM,3053
+ex4nicegui/reactive/officials/select.py,sha256=pS9feUPcePIMxOTw4cZSKEIPAHf8G_CrkfNVSLkYY-Q,3130
 ex4nicegui/reactive/officials/slider.py,sha256=9pA7CHlfkKY-kLQGWn4VOnMa2-tXHI04R1YA4xENIWI,2871
 ex4nicegui/reactive/officials/switch.py,sha256=XMUdOVP357gGVNU_tjrBtxw5Xuk5MyhLhHI-6sTtCcc,1456
 ex4nicegui/reactive/officials/tab.py,sha256=nyB7Ksc_tWG-RaAXiu3TTIJvkNeSa9AZdwHXuL2SsOE,1433
-ex4nicegui/reactive/officials/tab_panel.py,sha256=Y05XTIOE6qXYZjcCoVIPm9lruyR7av58McRLmPc2yxg,650
-ex4nicegui/reactive/officials/tab_panels.py,sha256=Y97OYyHfxHYnlOJeSXAiaBCff6-mfCWqHanFLXC8um8,6011
+ex4nicegui/reactive/officials/tab_panel.py,sha256=yRgQBSCbrkcw59M8HlIWc2GaXhqC4awRQlYug0AkBtE,2501
+ex4nicegui/reactive/officials/tab_panels.py,sha256=dN5anN03DlpDvkUP_QiY047i4mO7KQP3KUHAmMMVnOY,4592
 ex4nicegui/reactive/officials/table.py,sha256=B_nX19UxwyxGKsxLuu2x4UNwxsapjTBw70RMBWDI8w0,6206
 ex4nicegui/reactive/officials/tabs.py,sha256=kvAXeZkgi8USCyxislvjPmmWofZ31DMfiHqEObANpYU,1247
 ex4nicegui/reactive/officials/textarea.py,sha256=_N6eDW_Cbn4Z4OEcjC4koHt0kEEaFEjDrLZ9Ju2NpsQ,3000
-ex4nicegui/reactive/officials/toggle.py,sha256=H0NLosMcKbTkH94yV4h4b_WOuCStZpOJMlkYgOqpyYY,2663
+ex4nicegui/reactive/officials/toggle.py,sha256=7Dc6IIYzgsTwThE0pZegOaVe9x_GgL7a2E6Hsiuc1lg,2740
 ex4nicegui/reactive/officials/tooltip.py,sha256=lkDOf5Z6vpDsO9Y-nsRRwdhmYVFb9YrWv7lQUNY4_Ho,1136
 ex4nicegui/reactive/officials/upload.py,sha256=5SX2CFkf3s_4bPcnx0bmKRA4eYVlm0S8RBeQ7qHnqck,2395
 ex4nicegui/reactive/q_pagination.py,sha256=nUszZ4fvCf4leQ1DpS70laCDf40RprbOex7SISbAEek,1555
@@ -137,7 +137,7 @@ ex4nicegui/reactive/rxui.py,sha256=gZ8ZEjGuJFKcedEZhcm4PIZguNkY-Wv5yQx80QnsBKI,3
 ex4nicegui/reactive/scopedStyle.js,sha256=RtpfUwkpjMv_cbplkr2UtydKAxB5Dz7Sm6jRgPHRhow,1569
 ex4nicegui/reactive/scopedStyle.py,sha256=aYP4sIFzAmPaLyZV8m9jqyuGmOcJnC-5s07UQnoNSag,738
 ex4nicegui/reactive/services/pandas_service.py,sha256=XOoy6tZr4TpTyhewAH59eiSwVFxqwOipdM_j-mkGpdM,1043
-ex4nicegui/reactive/services/reactive_service.py,sha256=pZ5IzhEIK0MX2JnVvNuIjyiVjnNRljsLT72GQKbtB2A,2834
+ex4nicegui/reactive/services/reactive_service.py,sha256=FT8tWCC_aMD1YK6V4jQreyGmQAbcWzKbaGGZ4ME-bKw,3659
 ex4nicegui/reactive/systems/color_system.py,sha256=qXRTczxfILduHAVlNJqLSed-0x-LN6TyBSegYwW9vfk,4352
 ex4nicegui/reactive/systems/object_system.py,sha256=bja9YNb4v5fVZl5gJvVA4HbwRssRp-2yFy3JBzNeKxA,752
 ex4nicegui/reactive/systems/reactive_system.py,sha256=wyCSPdGuH1jOOkb2mXWRYVpdebjSm0qi9fuiVAkw5tA,701
@@ -177,7 +177,7 @@ ex4nicegui/utils/scheduler.py,sha256=1gyq7Y2BkbwmPK_Q9kpRpc1MOC9H7xcpxuix-RZhN9k
 ex4nicegui/utils/signals.py,sha256=Jz0jKFPrJIRV0Gye62Bgk2kGgod1KBvDhnF-W3lRm04,7373
 ex4nicegui/utils/types.py,sha256=pE5WOSbcTHxaAhnT24FaZEd1B2Z_lTcsd46w0OKiMyc,359
 ex4nicegui/version.py,sha256=NE7u1piESstg3xCtf5hhV4iedGs2qJQw9SiC3ZSpiio,90
-ex4nicegui-0.8.2.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
-ex4nicegui-0.8.2.dist-info/METADATA,sha256=U0v4tjvnuTjqwgnb9sMNV-hLpvuyW7yYEgopZcEMxas,42343
-ex4nicegui-0.8.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-ex4nicegui-0.8.2.dist-info/RECORD,,
+ex4nicegui-0.8.3.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
+ex4nicegui-0.8.3.dist-info/METADATA,sha256=7Za7-7oAslhffh2RB0-PCPzxhsjCxLx_hA8c0uFgbws,44094
+ex4nicegui-0.8.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+ex4nicegui-0.8.3.dist-info/RECORD,,