nicegui 2.0.0__tar.gz → 2.1.0__tar.gz

{nicegui-2.0.0 → nicegui-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nicegui
-Version: 2.0.0
+Version: 2.1.0
 Summary: Create web-based user interfaces with Python. The nice way.
 Home-page: https://github.com/zauberzeug/nicegui
 License: MIT
@@ -33,7 +33,7 @@ Requires-Dist: jinja2 (>=3.1.4,<4.0.0)
 Requires-Dist: libsass (>=0.23.0,<0.24.0) ; extra == "sass"
 Requires-Dist: markdown2 (>=2.4.7,!=2.4.11)
 Requires-Dist: matplotlib (>=3.5.0,<4.0.0) ; extra == "matplotlib"
-Requires-Dist: nicegui-highcharts (>=1.0.1,<2.0.0) ; extra == "highcharts"
+Requires-Dist: nicegui-highcharts (>=2.0.2,<3.0.0) ; extra == "highcharts"
 Requires-Dist: orjson (>=3.9.15) ; platform_machine != "i386" and platform_machine != "i686"
 Requires-Dist: plotly (>=5.13.0,<6.0.0) ; extra == "plotly"
 Requires-Dist: python-multipart (>=0.0.7)

{nicegui-2.0.0 → nicegui-2.1.0}/nicegui/air.py

@@ -3,6 +3,7 @@ from __future__ import annotations
 import asyncio
 import gzip
 import json
+import logging
 import re
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Any, AsyncIterator, Dict, Optional
@@ -34,6 +35,7 @@ class Air:
     def __init__(self, token: str) -> None:
         import httpx  # pylint: disable=import-outside-toplevel
 
+        self.log = logging.getLogger('nicegui.air')
         self.token = token
         self.relay = socketio.AsyncClient()
         self.client = httpx.AsyncClient(app=core.app)
@@ -172,28 +174,35 @@ class Air:
 
     async def connect(self) -> None:
         """Connect to the NiceGUI On Air server."""
-        if self.connecting or self.relay.connected:
+        if self.connecting:
+            self.log.debug('Already connecting.')
             return
+        if self.relay.connected:
+            return
+        self.log.debug('Going to connect...')
         self.connecting = True
         backoff_time = 1
         try:
             while True:
                 try:
                     if self.relay.connected:
-                        await self.relay.disconnect()
+                        await asyncio.wait_for(self.disconnect(), timeout=5)
+                    self.log.debug('Connecting...')
                     await self.relay.connect(
                         f'{RELAY_HOST}?device_token={self.token}',
                         socketio_path='/on_air/socket.io',
                         transports=['websocket', 'polling'],  # favor websocket over polling
                     )
+                    self.log.debug('Connected.')
                     break
                 except socketio.exceptions.ConnectionError:
-                    pass
+                    self.log.debug('Connection error.', stack_info=True)
                 except ValueError:  # NOTE this sometimes happens when the internal socketio client is not yet ready
-                    pass
+                    self.log.debug('ValueError while connecting.', stack_info=True)
                 except Exception:
                     log.exception('Could not connect to NiceGUI On Air server.')
 
+                self.log.debug(f'Retrying in {backoff_time} seconds...')
                 await asyncio.sleep(backoff_time)
                 backoff_time = min(backoff_time * 2, 32)
         finally:
@@ -201,11 +210,13 @@ class Air:
 
     async def disconnect(self) -> None:
         """Disconnect from the NiceGUI On Air server."""
+        self.log.debug('Disconnecting...')
         if self.relay.connected:
             await self.relay.disconnect()
         for stream in self.streams.values():
             await stream.response.aclose()
         self.streams.clear()
+        self.log.debug('Disconnected.')
 
     async def emit(self, message_type: str, data: Dict[str, Any], room: str) -> None:
         """Emit a message to the NiceGUI On Air server."""

{nicegui-2.0.0 → nicegui-2.1.0}/nicegui/elements/lib/three/modules/DragControls.js

@@ -334,7 +334,7 @@ function onPointerDown( event ) {
 
 			// look for the outermost group in the object's upper hierarchy
 
-			_selected = findGroup( _intersections[ 0 ].object );
+			_selected = findGroup( _intersections[ 0 ].object ) || _intersections[ 0 ].object;
 
 		} else {
 

{nicegui-2.0.0 → nicegui-2.1.0}/nicegui/elements/notification.py

@@ -196,3 +196,6 @@ class Notification(Element, component='notification.js'):
     def dismiss(self) -> None:
         """Dismiss the notification."""
         self.run_method('dismiss')
+
+    def set_visibility(self, visible: bool) -> None:
+        raise NotImplementedError('Use `dismiss()` to remove the notification. See #3670 for more information.')

{nicegui-2.0.0 → nicegui-2.1.0}/nicegui/elements/scene.js

@@ -145,6 +145,7 @@ export default {
     }
     this.controls = new OrbitControls(this.camera, this.renderer.domElement);
     this.drag_controls = new DragControls(this.draggable_objects, this.camera, this.renderer.domElement);
+    this.drag_controls.transformGroup = true;
     const applyConstraint = (constraint, position) => {
       if (!constraint) return;
       const [variable, expression] = constraint.split("=").map((s) => s.trim());

{nicegui-2.0.0 → nicegui-2.1.0}/nicegui/elements/timer.py

@@ -125,6 +125,9 @@ class Timer(Element, component='timer.js'):
 
     def _cleanup(self) -> None:
         self.callback = None
-        if not self.client._deleted:  # pylint: disable=protected-access
+        if not self._deleted:
             assert self.parent_slot
             self.parent_slot.parent.remove(self)
+
+    def set_visibility(self, visible: bool) -> None:
+        raise NotImplementedError('Use `activate()`, `deactivate()` or `cancel()`. See #3670 for more information.')

{nicegui-2.0.0 → nicegui-2.1.0}/nicegui/page_layout.py

@@ -265,18 +265,26 @@ class Footer(ValueElement):
 
 class PageSticky(Element):
 
-    def __init__(self, position: PageStickyPositions = 'bottom-right', x_offset: float = 0, y_offset: float = 0) -> None:
+    def __init__(self,
+                 position: PageStickyPositions = 'bottom-right',
+                 x_offset: float = 0,
+                 y_offset: float = 0,
+                 *,
+                 expand: bool = False) -> None:
         """Page sticky
 
-        A sticky element that is always visible at the bottom of the page.
+        This element is based on Quasar's `QPageSticky <https://quasar.dev/layout/page-sticky>`_ component.
 
-        :param position: position of the sticky element (default: `'bottom-right'`)
-        :param x_offset: horizontal offset of the sticky element (default: `0`)
-        :param y_offset: vertical offset of the sticky element (default: `0`)
+        :param position: position on the screen (default: "bottom-right")
+        :param x_offset: horizontal offset (default: 0)
+        :param y_offset: vertical offset (default: 0)
+        :param expand: whether to fully expand instead of shrinking to fit the content (default: ``False``)
         """
         super().__init__('q-page-sticky')
         self._props['position'] = position
         self._props['offset'] = [x_offset, y_offset]
+        if expand:
+            self._props['expand'] = True
 
 
 def _check_current_slot(element: Element) -> None:

{nicegui-2.0.0 → nicegui-2.1.0}/nicegui/storage.py

@@ -212,3 +212,5 @@ class Storage:
         self._tabs.clear()
         for filepath in self.path.glob('storage-*.json'):
             filepath.unlink()
+        if self.path.exists():
+            self.path.rmdir()

{nicegui-2.0.0 → nicegui-2.1.0}/nicegui/testing/general_fixtures.py

@@ -52,6 +52,7 @@ def nicegui_reset_globals() -> Generator[None, None, None]:
     app.get('/')(Client.auto_index_client.build_response)
     binding.reset()
     yield
+    app.reset()
 
 
 def prepare_simulation(request: pytest.FixtureRequest) -> None:

{nicegui-2.0.0 → nicegui-2.1.0}/nicegui/testing/user.py

@@ -12,6 +12,7 @@ from nicegui import Client, ElementFilter, ui
 from nicegui.element import Element
 from nicegui.nicegui import _on_handshake
 
+from .user_download import UserDownload
 from .user_interaction import UserInteraction
 from .user_navigate import UserNavigate
 from .user_notify import UserNotify
@@ -33,14 +34,16 @@ class User:
         self.forward_history: List[str] = []
         self.navigate = UserNavigate(self)
         self.notify = UserNotify()
+        self.download = UserDownload(self)
 
     def __getattribute__(self, name: str) -> Any:
-        if name not in {'notify', 'navigate'}:  # NOTE: avoid infinite recursion
+        if name not in {'notify', 'navigate', 'download'}:  # NOTE: avoid infinite recursion
             ui.navigate = self.navigate
             ui.notify = self.notify
+            ui.download = self.download
         return super().__getattribute__(name)
 
-    async def open(self, path: str, *, clear_forward_history: bool = True) -> None:
+    async def open(self, path: str, *, clear_forward_history: bool = True) -> Client:
         """Open the given path."""
         response = await self.http_client.get(path, follow_redirects=True)
         assert response.status_code == 200, f'Expected status code 200, got {response.status_code}'
@@ -56,6 +59,7 @@ class User:
         self.back_history.append(path)
         if clear_forward_history:
             self.forward_history.clear()
+        return self.client
 
     @overload
     async def should_see(self,

nicegui-2.1.0/nicegui/testing/user_download.py

@@ -0,0 +1,46 @@
+from __future__ import annotations
+
+import asyncio
+import time
+from pathlib import Path
+from typing import TYPE_CHECKING, Any, List, Optional, Union
+
+import httpx
+
+from .. import background_tasks
+
+if TYPE_CHECKING:
+    from .user import User
+
+
+class UserDownload:
+
+    def __init__(self, user: User) -> None:
+        self.http_responses: List[httpx.Response] = []
+        self.user = user
+
+    def __call__(self, src: Union[str, Path, bytes], filename: Optional[str] = None, media_type: str = '') -> Any:
+        background_tasks.create(self._get(src))
+
+    async def _get(self,  src: Union[str, Path, bytes]) -> None:
+        if isinstance(src, bytes):
+            await asyncio.sleep(0)
+            response = httpx.Response(httpx.codes.OK, content=src)
+        else:
+            response = await self.user.http_client.get(str(src))
+        self.http_responses.append(response)
+
+    async def next(self, *, timeout: float = 1.0) -> httpx.Response:
+        """Wait for a new download to happen.
+
+        :param timeout: the maximum time to wait (default: 1.0)
+        :returns: the HTTP response
+        """
+        assert self.user.client
+        downloads = len(self.http_responses)
+        deadline = time.time() + timeout
+        while len(self.http_responses) < downloads + 1:
+            await asyncio.sleep(0.1)
+            if time.time() > deadline:
+                raise TimeoutError('Download did not happen')
+        return self.http_responses[-1]

{nicegui-2.0.0 → nicegui-2.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nicegui"
-version = "v2.0.0"
+version = "v2.1.0"
 description = "Create web-based user interfaces with Python. The nice way."
 authors = ["Zauberzeug GmbH <info@zauberzeug.com>"]
 license = "MIT"
@@ -27,7 +27,7 @@ pywebview = { version = "^5.0.1", optional = true }
 plotly = { version = "^5.13.0", optional = true }
 matplotlib = { version = "^3.5.0", optional = true }
 httpx = ">=0.24.0"
-nicegui-highcharts = { version = "^1.0.1", optional = true }
+nicegui-highcharts = { version = "^2.0.2", optional = true }
 ifaddr = ">=0.2.0"
 aiohttp = ">=3.10.2" # https://github.com/zauberzeug/nicegui/security/dependabot/36
 libsass = { version = "^0.23.0", optional = true }
@@ -56,7 +56,7 @@ secure = ">=0.3.0"
 webdriver-manager = ">=3.8.6,<5.0.0"
 numpy = [
     {version = "^1.24.0", python = "~3.8"},
-    {version = "^1.26.0", python = ">=3.9,<3.13"}
+    {version = ">=1.26.0", python = ">=3.9,<3.13"}
 ]
 selenium = "^4.11.2"
 pyecharts = "^2.0.4"