code review

nicegui/middlewares.py

@@ -1,8 +1,11 @@
-from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
+from starlette.requests import Request
+from starlette.responses import Response
 
 
 class RedirectWithPrefixMiddleware(BaseHTTPMiddleware):
-    async def dispatch(self, request, call_next):
+
+    async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -> Response:
         prefix = request.headers.get('X-Forwarded-Prefix', '')
         response = await call_next(request)
         if 'Location' in response.headers:

nicegui/nicegui.py

@@ -10,19 +10,17 @@ from fastapi.responses import FileResponse, Response
 from fastapi.staticfiles import StaticFiles
 from fastapi_socketio import SocketManager
 
-from nicegui import json
-from nicegui.json import NiceGUIJSONResponse
-
-from . import (__version__, background_tasks, binding, favicon, globals, outbox,  # pylint: disable=redefined-builtin
-               welcome)
+from . import (__version__, background_tasks, binding, favicon, globals, json,  # pylint: disable=redefined-builtin
+               outbox, welcome)
 from .app import App
 from .client import Client
 from .dependencies import js_components, libraries
 from .element import Element
 from .error import error_content
 from .helpers import is_file, safe_invoke
-from .page import page
+from .json import NiceGUIJSONResponse
 from .middlewares import RedirectWithPrefixMiddleware
+from .page import page
 
 globals.app = app = App(default_response_class=NiceGUIJSONResponse)
 # NOTE we use custom json module which wraps orjson

nicegui/storage.py

@@ -6,8 +6,8 @@ from pathlib import Path
 from typing import Any, Dict, Iterator, Optional, Union
 
 import aiofiles
-from fastapi import Request
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
+from starlette.requests import Request
 from starlette.responses import Response
 
 from . import background_tasks, globals, observables  # pylint: disable=redefined-builtin