improved internal api to auto-update asyncs

nicegui/auto_context.py

@@ -45,8 +45,11 @@ class Context:
             self.child_count = len(self.view)
             create_task(self.view.update())
 
+    def watch_asyncs(self, coro: Coroutine):
+        return AutoUpdaterForAsyncs(coro, self)
 
-class update_before_await:
+
+class AutoUpdaterForAsyncs:
 
     def __init__(self, coro: Coroutine, context: Context) -> None:
         self.coro = coro

nicegui/events.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING, Any, Callable, List, Optional
 from starlette.websockets import WebSocket
 
 from . import globals
-from .auto_context import Context, update_before_await
+from .auto_context import Context
 from .helpers import is_coroutine
 from .lifecycle import on_startup
 from .task_logger import create_task
@@ -244,7 +244,7 @@ def handle_event(handler: Optional[Callable], arguments: EventArguments) -> Opti
         if is_coroutine(handler):
             async def wait_for_result():
                 with Context(arguments.sender.parent_view) as context:
-                    await update_before_await(result, context)
+                    await context.watch_asyncs(result)
             if globals.loop and globals.loop.is_running():
                 create_task(wait_for_result(), name=str(handler))
             else:

nicegui/page.py

@@ -17,7 +17,7 @@ from starlette.routing import Route, compile_path
 from starlette.websockets import WebSocket
 
 from . import globals
-from .auto_context import Context, get_view_stack, update_before_await
+from .auto_context import Context, get_view_stack
 from .events import PageEvent
 from .helpers import is_coroutine
 from .page_builder import PageBuilder
@@ -92,7 +92,7 @@ class Page(jp.QuasarPage):
             try:
                 if self.page_ready_generator is not None:
                     if isinstance(self.page_ready_generator, types.AsyncGeneratorType):
-                        await update_before_await(self.page_ready_generator.asend(PageEvent(msg.websocket)), context)
+                        await context.watch_asyncs(self.page_ready_generator.asend(PageEvent(msg.websocket)))
                     elif isinstance(self.page_ready_generator, types.GeneratorType):
                         self.page_ready_generator.send(PageEvent(msg.websocket))
             except (StopIteration, StopAsyncIteration):
@@ -110,7 +110,7 @@ class Page(jp.QuasarPage):
                     else:
                         raise ValueError(f'invalid number of arguments (0 or 1 allowed, got {arg_count})')
                     if is_coro:
-                        await update_before_await(result, context)
+                        await context.watch_asyncs(result)
             except:
                 globals.log.exception('Failed to execute page-ready')
         return False

nicegui/timer.py

@@ -7,7 +7,7 @@ from typing import Callable, List, Optional
 from starlette.websockets import WebSocket
 
 from . import globals
-from .auto_context import Context, update_before_await
+from .auto_context import Context
 from .binding import BindableProperty
 from .helpers import is_coroutine
 from .page import Page, find_parent_page, find_parent_view
@@ -45,7 +45,7 @@ class Timer:
                 with Context(self.parent_view) as context:
                     result = callback()
                     if is_coroutine(callback):
-                        await update_before_await(result, context)
+                        await context.watch_asyncs(result)
             except Exception:
                 traceback.print_exc()