Startsida Utforska Hjälp
Registrera dig Logga in
root
/
nicegui
spegling av https://github.com/zauberzeug/nicegui.git
1
0
Fork 0
Filer Ärenden 0 Wiki
Bläddra i källkod

Add request object to the client (#3286)

* make client.ip available even before client.connected
(part of #1727)

* pass request object in Client constructor

* add ip test and fixed "reset_globals"

* code review

* revert changes to `client.ip`

---------

Co-authored-by: Rodja Trappe <rodja@zauberzeug.com>
Falko Schindler 10 månader sedan
förälder
b2c321667a
incheckning
9c54fbe004
5 ändrade filer med 10 tillägg och 9 borttagningar
Unifierad Vy Visa Diff Statistik
  1. 3 2
      nicegui/client.py
  2. 3 3
      nicegui/nicegui.py
  3. 1 1
      nicegui/page.py
  4. 1 1
      nicegui/testing/conftest.py
  5. 2 2
      website/documentation/content/section_configuration_deployment.py

+ 3 - 2
nicegui/client.py
Visa fil 

@@ -46,7 +46,8 @@ class Client:
 
     shared_body_html = ''
 
     shared_body_html = ''
 
     """HTML to be inserted in the <body> of every page template."""
 
     """HTML to be inserted in the <body> of every page template."""
 
 
 
-    def __init__(self, page: page, *, shared: bool = False) -> None:
 
+    def __init__(self, page: page, *, request: Optional[Request]) -> None:
 
+        self.request: Optional[Request] = request
 
         self.id = str(uuid.uuid4())
 
         self.id = str(uuid.uuid4())
 
         self.created = time.time()
 
         self.created = time.time()
 
         self.instances[self.id] = self
 
         self.instances[self.id] = self
 
@@ -56,7 +57,7 @@ class Client:
 
         self.is_waiting_for_connection: bool = False
 
         self.is_waiting_for_connection: bool = False
 
         self.is_waiting_for_disconnect: bool = False
 
         self.is_waiting_for_disconnect: bool = False
 
         self.environ: Optional[Dict[str, Any]] = None
 
         self.environ: Optional[Dict[str, Any]] = None
 
-        self.shared = shared
 
+        self.shared = request is None
 
         self.on_air = False
 
         self.on_air = False
 
         self._disconnect_task: Optional[asyncio.Task] = None
 
         self._disconnect_task: Optional[asyncio.Task] = None
 
         self._deleted = False
 
         self._deleted = False

+ 3 - 3
nicegui/nicegui.py
Visa fil 

@@ -62,7 +62,7 @@ static_files = StaticFiles(
 
 )
 
 )
 
 app.mount(f'/_nicegui/{__version__}/static', static_files, name='static')
 
 app.mount(f'/_nicegui/{__version__}/static', static_files, name='static')
 
 
 
-Client.auto_index_client = Client(page('/'), shared=True).__enter__()  # pylint: disable=unnecessary-dunder-call
 
+Client.auto_index_client = Client(page('/'), request=None).__enter__()  # pylint: disable=unnecessary-dunder-call
 
 
 
 
 
 @app.get('/')
 
 @app.get('/')
 
@@ -149,7 +149,7 @@ async def _shutdown() -> None:
 
 @app.exception_handler(404)
 
 @app.exception_handler(404)
 
 async def _exception_handler_404(request: Request, exception: Exception) -> Response:
 
 async def _exception_handler_404(request: Request, exception: Exception) -> Response:
 
     log.warning(f'{request.url} not found')
 
     log.warning(f'{request.url} not found')
 
-    with Client(page('')) as client:
 
+    with Client(page(''), request=request) as client:
 
         error_content(404, exception)
 
         error_content(404, exception)
 
     return client.build_response(request, 404)
 
     return client.build_response(request, 404)
 
 
 
@@ -157,7 +157,7 @@ async def _exception_handler_404(request: Request, exception: Exception) -> Resp
 
 @app.exception_handler(Exception)
 
 @app.exception_handler(Exception)
 
 async def _exception_handler_500(request: Request, exception: Exception) -> Response:
 
 async def _exception_handler_500(request: Request, exception: Exception) -> Response:
 
     log.exception(exception)
 
     log.exception(exception)
 
-    with Client(page('')) as client:
 
+    with Client(page(''), request=request) as client:
 
         error_content(500, exception)
 
         error_content(500, exception)
 
     return client.build_response(request, 500)
 
     return client.build_response(request, 500)

+ 1 - 1
nicegui/page.py
Visa fil 

@@ -102,7 +102,7 @@ class page:
 
             request = dec_kwargs['request']
 
             request = dec_kwargs['request']
 
             # NOTE cleaning up the keyword args so the signature is consistent with "func" again
 
             # NOTE cleaning up the keyword args so the signature is consistent with "func" again
 
             dec_kwargs = {k: v for k, v in dec_kwargs.items() if k in parameters_of_decorated_func}
 
             dec_kwargs = {k: v for k, v in dec_kwargs.items() if k in parameters_of_decorated_func}
 
-            with Client(self) as client:
 
+            with Client(self, request=request) as client:
 
                 if any(p.name == 'client' for p in inspect.signature(func).parameters.values()):
 
                 if any(p.name == 'client' for p in inspect.signature(func).parameters.values()):
 
                     dec_kwargs['client'] = client
 
                     dec_kwargs['client'] = client
 
                 result = func(*dec_args, **dec_kwargs)
 
                 result = func(*dec_args, **dec_kwargs)

+ 1 - 1
nicegui/testing/conftest.py
Visa fil 

@@ -70,7 +70,7 @@ def reset_globals() -> Generator[None, None, None]:
 
     Client.instances.clear()
 
     Client.instances.clear()
 
     Client.page_routes.clear()
 
     Client.page_routes.clear()
 
     app.reset()
 
     app.reset()
 
-    Client.auto_index_client = Client(page('/'), shared=True).__enter__()  # pylint: disable=unnecessary-dunder-call
 
+    Client.auto_index_client = Client(page('/'), request=None).__enter__()  # pylint: disable=unnecessary-dunder-call
 
     # NOTE we need to re-add the auto index route because we removed all routes above
 
     # NOTE we need to re-add the auto index route because we removed all routes above
 
     app.get('/')(Client.auto_index_client.build_response)
 
     app.get('/')(Client.auto_index_client.build_response)
 
     binding.reset()
 
     binding.reset()

+ 2 - 2
website/documentation/content/section_configuration_deployment.py
Visa fil 

@@ -148,8 +148,8 @@ def uvicorn_ssl():
 
             from nicegui import ui
 
             from nicegui import ui
 
 
 
             ui.run(
 
             ui.run(
 
-                port=443, 
-                ssl_certfile="<path_to_certfile>", 
+                port=443,
 
+                ssl_certfile="<path_to_certfile>",
 
                 ssl_keyfile="<path_to_keyfile>",
 
                 ssl_keyfile="<path_to_keyfile>",
 
             )
 
             )
 
             ```
 
             ```