ex4nicegui 0.6.3__py3-none-any.whl → 0.6.5__py3-none-any.whl

ex4nicegui/__init__.py

@@ -45,4 +45,4 @@ __all__ = [
     "is_setter_ref",
 ]
 
-__version__ = "0.6.3"
+__version__ = "0.6.5"

ex4nicegui/bi/dataSource.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 from typing import Callable, Dict, List, Optional, Set, cast, TYPE_CHECKING
 from ex4nicegui import to_ref, ref_computed, on, batch, effect
-from nicegui import context as ng_context, Client, ui
+from nicegui import Client, ui
 
 from dataclasses import dataclass, field
 from . import types
@@ -149,7 +149,7 @@ class DataSource:
             self.__notify_update()
 
     def get_component_info_key(self, element_id: types._TElementID):
-        client_id = ng_context.get_client().id
+        client_id = ui.context.client.id
         return ComponentInfoKey(client_id, element_id)
 
     def get_filtered_data(self, element: ui.element):
@@ -175,7 +175,7 @@ class DataSource:
         update_callback: Optional[_TComponentUpdateCallback] = None,
         ui_result: Optional[UiResult] = None,
     ):
-        ng_client = ng_context.get_client()
+        ng_client = ui.context.client
         client_id = ng_client.id
 
         if not self._component_map.has_client_record(client_id):
@@ -198,7 +198,7 @@ class DataSource:
         filter: Optional[Filter],
         notify_update=True,
     ):
-        client_id = ng_context.get_client().id
+        client_id = ui.context.client.id
         key = ComponentInfoKey(client_id, element_id)
 
         if not self._component_map.has_record(key):
@@ -216,7 +216,7 @@ class DataSource:
         return self
 
     def notify_update(self, exclude: Optional[List[UiResult]] = None):
-        client_id = ng_context.get_client().id
+        client_id = ui.context.client.id
         exclude_infos = [
             self._component_map.get_info(ComponentInfoKey(client_id, ur.id))
             for ur in (exclude or [])

ex4nicegui/gsap/gsap.py

@@ -2,7 +2,7 @@ import os
 from pathlib import Path
 from typing import Dict, Optional, Union
 from nicegui.element import Element
-from nicegui import context as ng_context
+from nicegui import ui
 from weakref import WeakKeyDictionary
 
 
@@ -45,7 +45,7 @@ class Gsap(
         def fn():
             self.run_method("runScript", script)
 
-        if ng_context.get_client().has_socket_connection:
+        if ui.context.client.has_socket_connection:
             fn()
         else:
             tasks = self._props["scriptTasks"]
@@ -55,7 +55,7 @@ class Gsap(
         def fn():
             self.run_method(name, targets, vars)
 
-        if ng_context.get_client().has_socket_connection:
+        if ui.context.client.has_socket_connection:
             fn()
         else:
             tasks = self._props["tasks"]
@@ -66,7 +66,7 @@ __instance_map = WeakKeyDictionary()
 
 
 def _get_instance():
-    current_client = ng_context.get_client()
+    current_client = ui.context.client
     ins = __instance_map.get(current_client)
 
     if not ins:

ex4nicegui/gsap/timeline.py

@@ -2,7 +2,7 @@ import os
 from pathlib import Path
 from typing import Dict, Optional, Union
 from nicegui.element import Element
-from nicegui import context as ng_context
+from nicegui import ui
 
 
 class Timeline(
@@ -40,7 +40,7 @@ class Timeline(
         def fn():
             self.run_method("runScript", script)
 
-        if ng_context.get_client().has_socket_connection:
+        if ui.context.client.has_socket_connection:
             fn()
         else:
             tasks = self._props["scriptTasks"]
@@ -52,7 +52,7 @@ class Timeline(
         def fn():
             self.run_method(name, targets, vars)
 
-        if ng_context.get_client().has_socket_connection:
+        if ui.context.client.has_socket_connection:
             fn()
         else:
             tasks = self._props["tasks"]

ex4nicegui/reactive/EChartsComponent/ECharts.py

@@ -16,7 +16,7 @@ from nicegui.events import (
 )
 from nicegui.element import Element
 from nicegui.awaitable_response import AwaitableResponse
-from nicegui import context as ng_context
+from nicegui import ui
 from pathlib import Path
 import nicegui
 import uuid
@@ -102,7 +102,7 @@ class echarts(Element, component="ECharts.js", libraries=libraries):  # type: ig
 
             client.connect_handlers.remove(on_client_connect)  # type: ignore
 
-        ng_context.get_client().on_connect(on_client_connect)
+        ui.context.client.on_connect(on_client_connect)
 
         def echartsOn_handler(e):
             callbackId = e.args["callbackId"]
@@ -176,7 +176,7 @@ class echarts(Element, component="ECharts.js", libraries=libraries):  # type: ig
         handler: _T_echats_on_callback,
         query: Optional[Union[str, Dict]] = None,
     ):
-        if not ng_context.get_client().has_socket_connection:
+        if not ui.context.client.has_socket_connection:
 
             def task_func():
                 self.echarts_on(event_name, handler, query)

ex4nicegui/reactive/__init__.py

@@ -50,6 +50,7 @@ from .officials.tabs import TabsBindableUi as tabs
 from .officials.tab import TabBindableUi as tab
 from .officials.tab_panels import TabPanelsBindableUi as tab_panels
 from .officials.tab_panel import TabPanelBindableUi as tab_panel
+from .officials.element import ElementBindableUi as element
 from .q_pagination import PaginationBindableUi as q_pagination
 
 from .local_file_picker import local_file_picker
@@ -67,6 +68,7 @@ pagination = q_pagination
 
 
 __all__ = [
+    "element",
     "tab_panels",
     "tab_panel",
     "tabs",

ex4nicegui/reactive/officials/echarts.py

@@ -2,7 +2,7 @@ from pathlib import Path
 from typing import Any, Callable, Dict, List, Union, cast, Optional
 from typing_extensions import Literal
 from ex4nicegui.reactive.utils import ParameterClassifier
-from ex4nicegui.utils.apiEffect import ui_effect
+from ex4nicegui.utils.signals import on
 
 from ex4nicegui.utils.signals import (
     ReadonlyRef,
@@ -10,6 +10,7 @@ from ex4nicegui.utils.signals import (
     ref_computed,
     _TMaybeRef as TMaybeRef,
     to_value,
+    to_raw,
 )
 from .base import BindableUi
 from ex4nicegui.reactive.EChartsComponent.ECharts import (
@@ -136,10 +137,10 @@ class EChartsBindableUi(BindableUi[echarts]):
         return super().bind_prop(prop, ref_ui)
 
     def bind_options(self, ref_ui: ReadonlyRef[Dict]):
-        @ui_effect
+        @on(ref_ui)
         def _():
             ele = self.element
-            ele.update_options(to_value(ref_ui), self.__update_setting)
+            ele.update_options(to_raw(to_value(ref_ui)), self.__update_setting)
             ele.update()
 
         return self

ex4nicegui/reactive/officials/element.py

@@ -0,0 +1,19 @@
+from typing import (
+    Any,
+)
+from nicegui import ui
+from .base import BindableUi
+
+
+class ElementBindableUi(BindableUi[ui.element]):
+    def __init__(self, tag: str) -> None:
+        element = ui.element(tag)
+
+        super().__init__(element)
+
+    def __enter__(self):
+        self.element.__enter__()
+        return self
+
+    def __exit__(self, *_: Any):
+        self.element.__exit__(*_)

ex4nicegui/reactive/vfor.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 from nicegui.element import Element
-from nicegui import context
+from nicegui import ui
 from ex4nicegui.utils.clientScope import _CLIENT_SCOPE_MANAGER
 from ex4nicegui.utils.signals import (
     TReadonlyRef,
@@ -158,7 +158,7 @@ class vfor(Generic[_T]):
             key, element, store, scope = build_element(idx, value)
             self._store_map[key] = StoreItem(store, element.id, scope)
 
-        ng_client = context.get_client()
+        ng_client = ui.context.client
 
         @on(self._data, deep=True)
         def _():

ex4nicegui/utils/clientScope.py

@@ -1,6 +1,6 @@
 from typing import Dict
 from signe.core.scope import ScopeSuite
-from nicegui import Client, context as ng_context
+from nicegui import Client, ui
 
 
 _TClientID = str
@@ -24,18 +24,19 @@ class NgClientScopeManager:
         # if len(ng_context.get_slot_stack()) <= 0:
         #     return
 
-        client = ng_context.get_client()
-        # if client.shared:
-        #     return
+        client = ui.context.client
 
         if client.id not in self._client_scope_map:
             self._client_scope_map[client.id] = NgScopeSuite()
 
-            @client.on_disconnect
-            def _(e: Client):
-                if e.id in self._client_scope_map:
-                    self._client_scope_map[e.id]._top_scope.dispose()
-                    del self._client_scope_map[e.id]
+            # shared clients always not dispose their scope
+            if not client.shared:
+
+                @client.on_disconnect
+                def _(e: Client):
+                    if e.id in self._client_scope_map:
+                        self._client_scope_map[e.id]._top_scope.dispose()
+                        del self._client_scope_map[e.id]
 
         return self._client_scope_map[client.id]
 

{ex4nicegui-0.6.3.dist-info → ex4nicegui-0.6.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ex4nicegui
-Version: 0.6.3
+Version: 0.6.5
 Summary: Extension library based on nicegui, providing data responsive,BI functionality modules
 Home-page: 
 Author: carson_jia
@@ -15,7 +15,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: signe (>=0.4.14)
-Requires-Dist: nicegui (>=1.4.0)
+Requires-Dist: nicegui (>=1.4.23)
 Requires-Dist: typing-extensions
 Requires-Dist: executing
 

{ex4nicegui-0.6.3.dist-info → ex4nicegui-0.6.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
-ex4nicegui/__init__.py,sha256=4qmuKMR7xYKdce4byUKEYP8jNnl6o_n-rxHZwFvCYCo,818
+ex4nicegui/__init__.py,sha256=-00dmxm2M188iPRftlKHd-mU6A-FbezqyyvVluNDaD8,818
 ex4nicegui/bi/__init__.py,sha256=eu-2CuzzrcHCyKQOfoo87v6C9nSwFDdeLhjY0cRV13M,315
-ex4nicegui/bi/dataSource.py,sha256=sQzuQvNWBf20n9cz--1OX5gxT6RUAhwrq_xTQEpSa0o,7691
+ex4nicegui/bi/dataSource.py,sha256=hOOUN4PpSfPx4Vp1sg9Sfxi5K-wROw9C22Z-mmNXs6w,7644
 ex4nicegui/bi/dataSourceFacade.py,sha256=6NuAyrTIk_L2Tz9IRFpuHKRQY_OwJINDzxoM6JYOc14,8186
 ex4nicegui/bi/index.py,sha256=ZuwFxUD1KcxBpKvTLO7CGQQ5gN7FDpaHo9tfAS3UpQ4,2067
 ex4nicegui/bi/protocols.py,sha256=SjwYrS21L6dcNfYrLvh5pESya0NIa6ihQ6URMU6z-6Q,4529
@@ -23,9 +23,9 @@ ex4nicegui/experimental_/__init__.py,sha256=HODL0f70HUzVrfRwUzdCwxTp_9mYr4D1nnzd
 ex4nicegui/experimental_/gridLayout/__init__.py,sha256=c9k-zykhKW3Ol6QECUoKqJW9QEuhA9xPi8s4Dm4m7SU,125
 ex4nicegui/experimental_/gridLayout/index.py,sha256=zFXuvFroo5EC1CFjt-b4hMiEy67hGP5J1GYTKH6kpUU,4737
 ex4nicegui/gsap/__init__.py,sha256=xBApQlq9st9exhgcSkqCzWeS6bc1eKiPJfYP25MSInw,218
-ex4nicegui/gsap/gsap.py,sha256=-1sncG2_37LYN6RosnHZAgYSI899HMj9FB6MQWUj8yw,4675
+ex4nicegui/gsap/gsap.py,sha256=JM3xM9OjjmUMSV-be5-H-geiw61xDU3ZljDyl8yyZAU,4638
 ex4nicegui/gsap/timeline.js,sha256=CB300drH7UUSfy_WDeuWHSNh3WX-vwbRtKBLL1Ak43o,1241
-ex4nicegui/gsap/timeline.py,sha256=B3CvN83CzJMMFMVdZZC2UHR0l_I90amRQ0Sf-P623zo,2421
+ex4nicegui/gsap/timeline.py,sha256=EfJ3Iom3EbJMML8PnRDAO_nn58j2bone3uWrd3UubeU,2390
 ex4nicegui/gsap/wrapGsap.js,sha256=0Iz7qh8aA-h3svV7fW4U5k_pX7zXCcIdHDaG7NNvgLU,1045
 ex4nicegui/layout/__init__.py,sha256=YT76Ec7p4aFOGms6wc19207flBeyI6jrq7Kg_FQ2wnQ,278
 ex4nicegui/layout/gridFlex/GridFlex.js,sha256=ljkxGFucBUIPksMAT5w_35sxGogC7OzxzXnOw21Z3_k,4468
@@ -66,7 +66,7 @@ ex4nicegui/libs/gsap/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJ
 ex4nicegui/libs/gsap/utils/matrix.js,sha256=77scrxbQZXx4ex5HkvnT9IkhMG1rQoDNp4TSYgUeYVk,15235
 ex4nicegui/libs/gsap/utils/paths.js,sha256=2SPaRHQ7zgba9cH8hGhkTYPCZdrrEhE2qhh6ECAEvSA,49314
 ex4nicegui/libs/gsap/utils/strings.js,sha256=47G9slz5ltG9mDSwrfQDtWzzdV5QJ-AIMLRMNK0VSiM,10472
-ex4nicegui/reactive/__init__.py,sha256=PxPRQonNUdgz6Kp6eP0QaYp09tM_zN-S0V9LncYrXS4,3637
+ex4nicegui/reactive/__init__.py,sha256=-FC9JUa7bMqozkbbKlpWJB7WY8HuojAINgAD8ZcxHdY,3714
 ex4nicegui/reactive/empty.js,sha256=Y-caS4CN8jUq59LgGgcvgfkndze-RgWF_ZMmAcxOrbw,50
 ex4nicegui/reactive/empty.py,sha256=kB851B12V1_VCNsFKW6OmjcdIiuZqGEGjLgA6k6yug8,132
 ex4nicegui/reactive/fileWatcher.py,sha256=gjeZhgar02f-qGQa47Tj5SMaCP_ftRtSU898XUmXl1U,1472
@@ -78,10 +78,10 @@ ex4nicegui/reactive/transitionGroup.py,sha256=VWyYL3QUfX6YQXuxwBFF4sJ4P5VP1S-bCj
 ex4nicegui/reactive/usePagination.py,sha256=Gop9KV780DcQK5bH4zQZ5sRpV3jOD2sRX_Bpmb1LTFI,2598
 ex4nicegui/reactive/utils.py,sha256=DZ77y0qQAeHUb52yyCKlLE5_3MQlE_OAUH_M1s31_Qg,4360
 ex4nicegui/reactive/vfor.js,sha256=xtKVUPSN0BP99H0BO6LRUYFqxqTGIRttQh5UjoUTwBc,282
-ex4nicegui/reactive/vfor.py,sha256=MirlPrwDSy0YR85i4wcGGGX4QjuN5iek3fIxhIpFbGo,5786
+ex4nicegui/reactive/vfor.py,sha256=LntYIilx3JoeGjplRKLgW9cxzX9uRw27n6YRF9ROxN8,5778
 ex4nicegui/reactive/vmodel.py,sha256=SgmchPVfM6uQAH60VlVyNobfuTg3ScuxlXNFJLRD-r8,5091
 ex4nicegui/reactive/EChartsComponent/ECharts.js,sha256=HMmgXlDl548H4JpozDSbLWv-opvPi3OdJz_XY_MHbnY,3326
-ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=hoUZ7h-KOUKNd-1BybSX4xxv33gYuTkky70yEzv-oIA,6344
+ex4nicegui/reactive/EChartsComponent/ECharts.py,sha256=PbRChy9bgJndizyahDUxaV8LYN7sGH_A8licXA2DAC8,6313
 ex4nicegui/reactive/EChartsComponent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ex4nicegui/reactive/UseDraggable/UseDraggable.js,sha256=xZm_g_L2lamxAjiAeGPDR0CNmjlvgzuiJ6gH77pNrg4,5473
 ex4nicegui/reactive/UseDraggable/UseDraggable.py,sha256=Zh6NfQPSf3nMvCL8wDA4tjhyH7jfqt9cnbJ7L4cI-SU,3929
@@ -103,7 +103,8 @@ ex4nicegui/reactive/officials/color_picker.py,sha256=fSRICdzdH16w3BIGyAk3CtaauYq
 ex4nicegui/reactive/officials/column.py,sha256=CfoJigEdpRoGaJTY_O7wbK8cp8ufX8mYUKNRUnPWUr0,1040
 ex4nicegui/reactive/officials/date.py,sha256=jp75WgZaICnCHLS_wpF3uJI2kaGeNqmRLj3qpn5IIyg,2681
 ex4nicegui/reactive/officials/drawer.py,sha256=y9_gbDDy_6Y7mRfSB8BGawM-_g6kECM1ieZXMX2YCQo,2370
-ex4nicegui/reactive/officials/echarts.py,sha256=rBYHL6K_uAp4A4r_qacXt_bFukOMPWxdN_9xjEXG4RY,9683
+ex4nicegui/reactive/officials/echarts.py,sha256=btLYAqYuWv_zlX3KJH-L_rofx8HblYbscnVDf-bz23w,9696
+ex4nicegui/reactive/officials/element.py,sha256=-qsHcxfF3fMfU0sJlKtTksX_wYPMIPJ_AgFcZbbI754,412
 ex4nicegui/reactive/officials/expansion.py,sha256=pAFGaj_N88KLNPw2476lthyZbCOa3APlMtHsgRT9rWI,1873
 ex4nicegui/reactive/officials/grid.py,sha256=z3mdvDnpxKECtvioTgGXROc1kcAugNCBOvwZ7NCpQHI,865
 ex4nicegui/reactive/officials/html.js,sha256=lyvRAdMKZGOc7MPEapeU6WbOzq_MVzqzUJEhKuC8zWc,119
@@ -136,13 +137,13 @@ ex4nicegui/tools/debug.py,sha256=h9iYHxw7jWWvmiExSpGi2hQl1PfhPZgC2KNS_GTuHSw,486
 ex4nicegui/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ex4nicegui/utils/apiEffect.py,sha256=tAvQ-6sbSbZBZ1bibdAdQNb_BjrUF1uALwOkAdV_Y8M,2527
 ex4nicegui/utils/asyncComputed.py,sha256=-v19ic20URewLkjbms5Teco1k8LPRnpP7usjrgo1pRU,1505
-ex4nicegui/utils/clientScope.py,sha256=-KJnrZGqdAQUNNbQbqMAqNzWHCVon-lC3aaQGuaTdxI,1225
+ex4nicegui/utils/clientScope.py,sha256=ekS3thfir7iQ1L3wHbe4gJ3FhQjRcM3PLn6QCJ8wDNw,1267
 ex4nicegui/utils/common.py,sha256=7P0vboDadLun6EMxNi3br9rKJgKt0QT4sy_66cHEwb4,994
 ex4nicegui/utils/effect.py,sha256=MgvWuAP3OFs2bR4ef6uXPwGCkKORUK-4hmx1oSwl04Y,2310
 ex4nicegui/utils/scheduler.py,sha256=Wa963Df3UDvWHjXXoVYGIBevIILzCFoz-yAWjvxeyfQ,1218
 ex4nicegui/utils/signals.py,sha256=-80iaAzIyUDR_7LBr8TfOY59Fj4dSq92klWXoRy538g,11346
-ex4nicegui-0.6.3.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
-ex4nicegui-0.6.3.dist-info/METADATA,sha256=wmIPVn_YKEZWuMghpS4n3k86j___PqFROxrmOR9CQrc,27618
-ex4nicegui-0.6.3.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-ex4nicegui-0.6.3.dist-info/top_level.txt,sha256=VFwMiO9AFjj5rfLMJwN1ipLRASk9fJXB8tM6DNrpvPQ,11
-ex4nicegui-0.6.3.dist-info/RECORD,,
+ex4nicegui-0.6.5.dist-info/LICENSE,sha256=0KDDElS2dl-HIsWvbpy8ywbLzJMBFzXLev57LnMIZXs,1094
+ex4nicegui-0.6.5.dist-info/METADATA,sha256=jhr7cj9AuuCJdsuZZRSoHb7Fw9vgbYLAMivi7kNHYzs,27619
+ex4nicegui-0.6.5.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
+ex4nicegui-0.6.5.dist-info/top_level.txt,sha256=VFwMiO9AFjj5rfLMJwN1ipLRASk9fJXB8tM6DNrpvPQ,11
+ex4nicegui-0.6.5.dist-info/RECORD,,