ex4nicegui 0.8.7__tar.gz → 0.8.9__tar.gz

{ex4nicegui-0.8.7 → ex4nicegui-0.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ex4nicegui
-Version: 0.8.7
+Version: 0.8.9
 Summary: Extension library based on nicegui, providing data responsive,BI functionality modules
 License: MIT
 Keywords: nicegui,ex4nicegui,webui
@@ -16,7 +16,7 @@ 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.0.0,<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
 Description-Content-Type: text/markdown

{ex4nicegui-0.8.7 → ex4nicegui-0.8.9}/ex4nicegui/reactive/__init__.py

@@ -74,7 +74,7 @@ from .mermaid.mermaid import Mermaid as mermaid
 from .officials.dialog import DialogBindableUi as dialog
 from .vfor import vfor, VforStore
 from .vmodel import vmodel
-from .view_model import ViewModel, var, cached_var, list_var
+from .view_model import ViewModel, var, cached_var, list_var, dict_var
 
 pagination = q_pagination
 
@@ -102,6 +102,7 @@ __all__ = [
     "var",
     "cached_var",
     "list_var",
+    "dict_var",
     "html",
     "aggrid",
     "button",

{ex4nicegui-0.8.7 → ex4nicegui-0.8.9}/ex4nicegui/reactive/officials/drawer.py

@@ -11,7 +11,7 @@ from ex4nicegui.utils.signals import (
     _TMaybeRef as TMaybeRef,
 )
 from nicegui import ui
-from nicegui.page_layout import Drawer
+from nicegui.elements.drawer import Drawer
 from .base import BindableUi
 
 _TDrawerSide = Literal["left", "right"]

{ex4nicegui-0.8.7 → ex4nicegui-0.8.9}/ex4nicegui/reactive/view_model.py

@@ -1,5 +1,5 @@
 from __future__ import annotations
-from typing import Any, Callable, List, Optional, Union, Type, TypeVar, overload
+from typing import Any, Callable, Dict, List, Optional, Union, Type, TypeVar, overload
 from ex4nicegui.utils.signals import (
     deep_ref,
     is_ref,
@@ -23,6 +23,7 @@ from ex4nicegui.utils.proxy.descriptor import ProxyDescriptor
 
 _CACHED_VARS_FLAG = "__vm_cached__"
 _LIST_VAR_FLAG = "__vm_list_var__"
+_DICT_VAR_FLAG = "__vm_dict_var__"
 
 _T = TypeVar("_T")
 
@@ -72,7 +73,8 @@ class ViewModel(NoProxy):
             if callable(value) and hasattr(value, _CACHED_VARS_FLAG):
                 setattr(self, name, computed(partial(value, self)))
 
-    def __init_subclass__(cls) -> None:
+    def __init_subclass__(cls, **kwargs) -> None:
+        super().__init_subclass__(**kwargs)
         need_vars = (
             (name, value)
             for name, value in vars(cls).items()
@@ -80,7 +82,7 @@ class ViewModel(NoProxy):
         )
 
         for name, value in need_vars:
-            class_var_setter(cls, name, value, _LIST_VAR_FLAG)
+            class_var_setter(cls, name, value, _LIST_VAR_FLAG, _DICT_VAR_FLAG)
 
     @overload
     @staticmethod
@@ -280,6 +282,34 @@ def list_var(factory: Callable[[], List[_T_Var_Value]]) -> List[_T_Var_Value]:
     return factory  # type: ignore
 
 
+def dict_var(factory: Callable[[], Dict]) -> Dict:
+    """Create implicitly proxied reactive variables for dictionaries. Use them just like ordinary dictionaries while maintaining reactivity. Only use within rxui.ViewModel.
+
+    Args:
+        factory (Callable[[], Dict]): A factory function that returns a new dictionary.
+
+    Example:
+    .. code-block:: python
+        from ex4nicegui import rxui
+        class State(rxui.ViewModel):
+            data = rxui.dict_var(lambda: {"a": 1, "b": 2, "c": 3})
+
+            def update_data(self):
+                self.data["d"] = len(self.data) + 1
+
+            def display_data(self):
+                return ",".join(f"{k}:{v}" for k, v in self.data.items())
+
+        state = State()
+        ui.button("Update", on_click=state.update_data)
+        rxui.label(state.display_data)
+
+    """
+    assert callable(factory), "factory must be a callable"
+    setattr(factory, _DICT_VAR_FLAG, None)
+    return factory  # type: ignore
+
+
 def cached_var(func: Callable[..., _T]) -> ReadonlyRef[_T]:
     """A decorator to cache the result of a function. Only use within rxui.ViewModel.
 

{ex4nicegui-0.8.7 → ex4nicegui-0.8.9}/ex4nicegui/utils/proxy/descriptor.py

@@ -8,6 +8,7 @@ from .float import FloatProxy
 from .bool import BoolProxy
 from .date import DateProxy
 from .dict import DictProxy
+from ex4nicegui.utils.signals import deep_ref
 import datetime
 import warnings
 from . import to_value_if_base_type_proxy
@@ -61,9 +62,34 @@ class ListDescriptor(ProxyDescriptor[Callable[[], List]]):
         super().__init__(name, value, lambda x: ListProxy(x() if callable(x) else x))
 
 
-class DictDescriptor(ProxyDescriptor[Dict]):
-    def __init__(self, name: str, value: Dict) -> None:
-        super().__init__(name, value, DictProxy)
+class DictDescriptor:
+    def __init__(
+        self,
+        name: str,
+        factory: Callable[[], Dict],
+    ) -> None:
+        self.name = name
+        self._ref_builder = lambda: deep_ref(factory())
+
+    def __get__(self, instance: object, owner: Any):
+        if instance is None:
+            return self
+
+        proxy = instance.__dict__.get(self.name, None)
+        if proxy is None:
+            proxy = self._ref_builder()
+            instance.__dict__[self.name] = proxy
+
+        return proxy.value
+
+    def __set__(self, instance: object, value: T) -> None:
+        value = to_value_if_base_type_proxy(value)
+        proxy = instance.__dict__.get(self.name, None)
+        if proxy is None:
+            proxy = self._ref_builder()
+            instance.__dict__[self.name] = proxy
+
+        proxy.value = value  # type: ignore
 
 
 class StringDescriptor(ProxyDescriptor[str]):
@@ -91,7 +117,9 @@ class DateDescriptor(ProxyDescriptor[datetime.date]):
         super().__init__(name, value, lambda x: DateProxy(x.year, x.month, x.day))
 
 
-def class_var_setter(cls: Type, name: str, value, list_var_flat: str) -> None:
+def class_var_setter(
+    cls: Type, name: str, value, list_var_flat: str, dict_var_flat: str
+) -> None:
     if value is None or isinstance(value, str):
         setattr(cls, name, StringDescriptor(name, value))
     elif isinstance(value, bool):
@@ -111,9 +139,8 @@ def class_var_setter(cls: Type, name: str, value, list_var_flat: str) -> None:
                 )
         setattr(cls, name, ListDescriptor(name, lambda: []))
 
-    elif isinstance(value, dict):
-        pass  # TODO
-        # setattr(cls, name, DictDescriptor(name, value))
+    elif callable(value) and hasattr(value, dict_var_flat):
+        setattr(cls, name, DictDescriptor(name, value))
     elif isinstance(value, float):
         setattr(cls, name, FloatDescriptor(name, value))
     elif isinstance(value, datetime.date):

{ex4nicegui-0.8.7 → ex4nicegui-0.8.9}/ex4nicegui/utils/signals.py

@@ -1,4 +1,5 @@
 from datetime import date, datetime
+import inspect
 import signe
 from signe.core.scope import Scope
 from .clientScope import _CLIENT_SCOPE_MANAGER
@@ -13,6 +14,7 @@ from typing import (
     Sequence,
 )
 from nicegui import ui
+from nicegui.functions.refreshable import RefreshableContainer
 from .effect import effect
 from .scheduler import get_uiScheduler
 from .types import (
@@ -168,6 +170,9 @@ class effect_refreshable:
         def warp(
             fn: Callable,
         ):
+            if inspect.iscoroutinefunction(fn):
+                return async_effect_refreshable(refs)(fn)
+
             return effect_refreshable(fn, refs)
 
         return warp
@@ -194,6 +199,27 @@ class effect_refreshable:
         return runner
 
 
+def async_effect_refreshable(source: _T_effect_refreshable_refs):
+    def wrapper(fn: Callable[[], Any]):
+        @on(source, onchanges=False)
+        async def on_source_changed():
+            with temp_box:
+                await fn()
+
+            container.clear()
+
+            for child in list(temp_box):
+                child.move(container)
+
+            temp_box.clear()
+
+        # 临时容器做中转，避免异步等待时，页面内容空白的问题
+        temp_box = RefreshableContainer()
+        container = RefreshableContainer()
+
+    return wrapper
+
+
 def on(
     refs: Union[TGetterOrReadonlyRef, RefWrapper, Sequence[TGetterOrReadonlyRef], Any],
     onchanges=False,

{ex4nicegui-0.8.7 → ex4nicegui-0.8.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ex4nicegui"
-version = "0.8.7"
+version = "0.8.9"
 description = "Extension library based on nicegui, providing data responsive,BI functionality modules"
 authors = ["CrystalWindSnake <568166495@qq.com>"]
 license = "MIT"
@@ -10,7 +10,7 @@ keywords = ["nicegui", "ex4nicegui", "webui"]
 
 [tool.poetry.dependencies]
 python = "^3.8"
-nicegui = "^2.0.0"
+nicegui = "^2.21.1"
 signe = "^0.4.22"
 executing = "^2.0.1"
 
@@ -27,9 +27,10 @@ numpy = [
     {version = "^1.26.0", python = ">=3.9,<3.13"}
 ]
 pyecharts = "^2.0.5"
-pytest-playwright = "^0.5.0"
-playwright = "^1.43.0"
+pytest-playwright = "<0.7.0"
+playwright = "<1.52.0"
 pytest-asyncio = "^0.24.0"
+pywebview = ">=5.4"
 
 [build-system]
 requires = ["poetry-core"]