ex4nicegui 0.6.3__tar.gz → 0.6.5__tar.gz

{ex4nicegui-0.6.3 → ex4nicegui-0.6.5}/PKG-INFO

@@ -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

{ex4nicegui-0.6.3 → ex4nicegui-0.6.5}/ex4nicegui/__init__.py

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

{ex4nicegui-0.6.3 → ex4nicegui-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-0.6.3 → ex4nicegui-0.6.5}/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-0.6.3 → ex4nicegui-0.6.5}/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-0.6.3 → ex4nicegui-0.6.5}/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-0.6.3 → ex4nicegui-0.6.5}/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-0.6.3 → ex4nicegui-0.6.5}/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-0.6.5/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-0.6.3 → ex4nicegui-0.6.5}/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-0.6.3 → ex4nicegui-0.6.5}/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 → ex4nicegui-0.6.5}/ex4nicegui.egg-info/PKG-INFO

@@ -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

{ex4nicegui-0.6.3 → ex4nicegui-0.6.5}/ex4nicegui.egg-info/SOURCES.txt

@@ -113,6 +113,7 @@ ex4nicegui/reactive/officials/column.py
 ex4nicegui/reactive/officials/date.py
 ex4nicegui/reactive/officials/drawer.py
 ex4nicegui/reactive/officials/echarts.py
+ex4nicegui/reactive/officials/element.py
 ex4nicegui/reactive/officials/expansion.py
 ex4nicegui/reactive/officials/grid.py
 ex4nicegui/reactive/officials/html.js

{ex4nicegui-0.6.3 → ex4nicegui-0.6.5}/ex4nicegui.egg-info/requires.txt

@@ -1,4 +1,4 @@
 signe>=0.4.14
-nicegui>=1.4.0
+nicegui>=1.4.23
 typing_extensions
 executing

{ex4nicegui-0.6.3 → ex4nicegui-0.6.5}/setup.py

@@ -21,7 +21,7 @@ def get_data_files(base):
 readme = Path("README.en.md").read_text("utf8")
 
 
-requirements = ["signe>=0.4.14", "nicegui>=1.4.0", "typing_extensions", "executing"]
+requirements = ["signe>=0.4.14", "nicegui>=1.4.23", "typing_extensions", "executing"]
 
 test_requirements = ["pytest>=3", "playwright", "pandas", "executing"]