Change request templates to remove warning

DiamondLightSource · Aug 27, 2024 · ca42347 · ca42347
1 parent 6a030ea
commit ca42347
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/src/murfey/server/__init__.py b/src/murfey/server/__init__.py
@@ -17,6 +17,7 @@
 import uvicorn
 import workflows
 import zocalo.configuration
+from fastapi import Request
 from fastapi.templating import Jinja2Templates
 from ispyb.sqlalchemy._auto_db_schema import (
     AutoProcProgram,
@@ -216,15 +217,19 @@ def get_tomo_preproc_params(dcg_id: int, *args) -> db.TomographyPreprocessingPar
     return results
 
 
-def respond_with_template(filename: str, parameters: dict[str, Any] | None = None):
+def respond_with_template(
+    request: Request, filename: str, parameters: dict[str, Any] | None = None
+):
     template_parameters = {
         "hostname": get_hostname(),
         "microscope": get_microscope(),
         "version": murfey.__version__,
     }
     if parameters:
         template_parameters.update(parameters)
-    return templates.TemplateResponse(filename, template_parameters)
+    return templates.TemplateResponse(
+        request=request, name=filename, context=template_parameters
+    )
 
 
 class LogFilter(logging.Filter):

diff --git a/src/murfey/server/api.py b/src/murfey/server/api.py
@@ -116,9 +116,9 @@
 @router.get("/", response_class=HTMLResponse)
 async def root(request: Request):
     return templates.TemplateResponse(
-        "home.html",
-        {
-            "request": request,
+        request=request,
+        name="home.html",
+        context={
             "hostname": get_hostname(),
             "microscope": get_microscope(),
             "version": murfey.__version__,
@@ -175,14 +175,16 @@ def all_visit_info(request: Request, db=murfey.server.ispyb.DB):
             f"{len(visits)} visits active for {microscope=}: {', '.join(v.name for v in visits)}"
         )
         return templates.TemplateResponse(
-            "activevisits.html",
-            {"request": request, "info": return_query, "microscope": microscope},
+            request=request,
+            name="activevisits.html",
+            context={"info": return_query, "microscope": microscope},
         )
     else:
         log.debug(f"No visits identified for {microscope=}")
         return templates.TemplateResponse(
-            "activevisits.html",
-            {"request": request, "info": [], "microscope": microscope},
+            request=request,
+            name="activevisits.html",
+            context={"info": [], "microscope": microscope},
         )
 
 
@@ -863,8 +865,9 @@ def visit_info(request: Request, visit_name: str, db=murfey.server.ispyb.DB):
             == visit_name
         ]  # "Proposal title": id.title
         return templates.TemplateResponse(
-            "visit.html",
-            {"request": request, "visit": return_query},
+            request=request,
+            name="visit.html",
+            context={"visit": return_query},
         )
     else:
         return None

diff --git a/src/murfey/server/bootstrap.py b/src/murfey/server/bootstrap.py
@@ -231,10 +231,8 @@ def get_bootstrap_instructions(request: Request):
     """
 
     return respond_with_template(
-        "bootstrap.html",
-        {
-            "request": request,
-        },
+        request=request,
+        filename="bootstrap.html",
     )
 
 

diff --git a/src/murfey/server/demo_api.py b/src/murfey/server/demo_api.py
@@ -118,9 +118,9 @@ class Settings(BaseSettings):
 @router.get("/", response_class=HTMLResponse)
 async def root(request: Request):
     return templates.TemplateResponse(
-        "home.html",
-        {
-            "request": request,
+        request=request,
+        name="home.html",
+        context={
             "hostname": get_hostname(),
             "microscope": get_microscope(),
             "version": murfey.__version__,
@@ -166,8 +166,9 @@ def all_visit_info(request: Request):
     ]  # "Proposal title": visit.proposal_title
 
     return templates.TemplateResponse(
-        "activevisits.html",
-        {"request": request, "info": return_query, "microscope": microscope},
+        request=request,
+        name="activevisits.html",
+        context={"info": return_query, "microscope": microscope},
     )
 
 
@@ -672,8 +673,9 @@ def visit_info(request: Request, visit_name: str):
         == visit_name
     ]  # "Proposal title": id.title
     return templates.TemplateResponse(
-        "visit.html",
-        {"request": request, "visit": return_query},
+        request=request,
+        name="visit.html",
+        context={"visit": return_query},
     )