Small fix for starlette 1.0 release

csp_gateway/server/middleware/api_key.py

@@ -96,13 +96,14 @@ async def get_login_page(token: str = "", request: Request = None):
                 if token != "":
                     return RedirectResponse(url=f"{app.settings.API_STR}/auth/login?token={token}")
             return app.templates.TemplateResponse(
+                request,
                 "login.html.j2",
-                {"request": request, "api_key_name": self.api_key_name},
+                context={"api_key_name": self.api_key_name},
             )
 
         @public_router.get("/logout", response_class=HTMLResponse, include_in_schema=False)
         async def get_logout_page(request: Request = None):
-            return app.templates.TemplateResponse("logout.html.j2", {"request": request})
+            return app.templates.TemplateResponse(request, "logout.html.j2")
 
         # add auth to all other routes
         app.add_middleware(Depends(self.get_check_dependency()))
@@ -119,9 +120,9 @@ async def custom_403_handler(request: Request = None, *args):
                     status_code=403,
                 )
             return app.templates.TemplateResponse(
+                request,
                 "login.html.j2",
-                {
-                    "request": request,
+                context={
                     "api_key_name": self.api_key_name,
                     "status_code": 403,
                     "detail": self.unauthorized_status_message,

csp_gateway/server/middleware/auth_filter.py

@@ -425,7 +425,7 @@ async def _handle_filtered_next(
                     return Response(
                         content=json.dumps(filtered),
                         status_code=200,
-                        headers=dict(response.headers),
+                        headers=dict(response.headers.items()),
                         media_type="application/json",
                     )
 
@@ -437,7 +437,7 @@ async def _handle_filtered_next(
                 return Response(
                     content=body,
                     status_code=response.status_code,
-                    headers=dict(response.headers),
+                    headers=dict(response.headers.items()),
                 )
 
     def _find_auth_middlewares(self, app: GatewayWebApp) -> List[IdentityAwareMiddlewareMixin]:
@@ -636,15 +636,15 @@ async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -
                         return Response(
                             content=filtered_body,
                             status_code=response.status_code,
-                            headers=dict(response.headers),
+                            headers=dict(response.headers.items()),
                             media_type="application/json",
                         )
                     except (json.JSONDecodeError, UnicodeDecodeError):
                         # If we can't parse JSON, return original response body
                         return Response(
                             content=body,
                             status_code=response.status_code,
-                            headers=dict(response.headers),
+                            headers=dict(response.headers.items()),
                         )
 
                 return response

csp_gateway/server/middleware/simple.py

@@ -367,9 +367,9 @@ def rest(self, app: GatewayWebApp) -> None:
             async def get_login_page(request: Request, error: str = ""):
                 """Render login form."""
                 return app.templates.TemplateResponse(
+                    request,
                     "login.html.j2",
-                    {
-                        "request": request,
+                    context={
                         "api_key_name": "credentials",
                         "error": error,
                     },
@@ -436,7 +436,7 @@ async def whoami(session_uuid: str = Depends(check)):
 
         @public_router.get("/logout", response_class=HTMLResponse, include_in_schema=False)
         async def get_logout_page(request: Request):
-            return app.templates.TemplateResponse("logout.html.j2", {"request": request})
+            return app.templates.TemplateResponse(request, "logout.html.j2")
 
         # Add auth middleware to all routes
         app.add_middleware(Depends(check))

csp_gateway/server/modules/web/channels_graph.py

@@ -53,6 +53,7 @@ def browse_channels_graph(request: Request):
             """
             channels_graph = request.app.gateway.channels.graph()
             return app.templates.TemplateResponse(
+                request,
                 "channels_graph.html.j2",
-                {"request": request, "channels_graph": dumps(channels_graph)},
+                context={"channels_graph": dumps(channels_graph)},
             )

csp_gateway/server/modules/web/outputs.py

@@ -50,7 +50,7 @@ def browse_logs(full_path: str, request: Request):
                     query_suffix = f"?{request.url.query}" if request.url.query else ""
                     files_paths = sorted([f"{base_path}/{f}{query_suffix}".replace("outputs//", "outputs/") for f in files])
                     return app.templates.TemplateResponse(
-                        "files.html.j2", {"request": request, "files": files_paths, "pid": os.getpid()}, media_type="text/html"
+                        request, "files.html.j2", context={"files": files_paths, "pid": os.getpid()}, media_type="text/html"
                     )
 
                 def iterfile():  #

csp_gateway/server/web/app.py

@@ -86,7 +86,6 @@ def __init__(
         )
         self.templates = Jinja2Templates(
             directory=os.path.join(os.path.dirname(__file__), "templates"),
-            autoescape=True,
         )
 
         # Attach gateway