Merge branch 'main' into leaflet

nicegui/client.py

@@ -12,9 +12,7 @@ from fastapi import Request
 from fastapi.responses import Response
 from fastapi.templating import Jinja2Templates
 
-from nicegui import json
-
-from . import background_tasks, binding, core, helpers, outbox
+from . import background_tasks, binding, core, helpers, json, outbox
 from .awaitable_response import AwaitableResponse
 from .dependencies import generate_resources
 from .element import Element

nicegui/functions/html.py

@@ -1,4 +1,5 @@
-from .. import Client, context
+from .. import context
+from ..client import Client
 
 
 def add_head_html(code: str, *, shared: bool = False) -> None: