wip

Author: HansKallekleiv

backend_py/primary/primary/main.py

@@ -113,14 +113,12 @@ def custom_generate_unique_id(route: APIRoute) -> str:
 
 session_store = RedisStore(config.REDIS_USER_SESSION_URL, prefix="user-auth:")
 app.add_middleware(SessionMiddleware, store=session_store)
-
+app.add_middleware(BrowserCacheMiddleware)
 app.add_middleware(ProxyHeadersMiddleware, trusted_hosts="*")
 
 # This middleware instance measures execution time of the endpoints, including the cost of other middleware
 app.add_middleware(AddProcessTimeToServerTimingMiddleware, metric_name="total")
 
-app.add_middleware(BrowserCacheMiddleware)
-
 
 @app.get("/")
 async def root() -> str:

backend_py/primary/primary/middleware/browser_cache.py

@@ -1,15 +1,18 @@
 from functools import wraps
+from fastapi.responses import Response, JSONResponse
+from fastapi.encoders import jsonable_encoder
 from starlette.middleware.base import BaseHTTPMiddleware, RequestResponseEndpoint
 from starlette.requests import Request
-from starlette.responses import Response
 
 
-def browser_cache(max_age: int):
+def custom_browser_cache_time(max_age: int):
     def decorator(func):
         @wraps(func)
-        async def wrapper(request: Request, call_next: RequestResponseEndpoint):
-            response = await func(request, call_next)
-            response.headers["Cache-Control"] = f"max-age={max_age}"
+        async def wrapper(*args, **kwargs):
+            response = await func(*args, **kwargs)
+            if not isinstance(response, Response):
+                response = JSONResponse(jsonable_encoder(response))
+            response.headers["cache-control"] = f"max-age={max_age}"
             return response
 
         return wrapper
@@ -19,14 +22,9 @@ async def wrapper(request: Request, call_next: RequestResponseEndpoint):
 
 class BrowserCacheMiddleware(BaseHTTPMiddleware):
     async def dispatch(self, request: Request, call_next: RequestResponseEndpoint) -> Response:
-        # response = await call_next(request)
-        # handler = request.scope.get("endpoint")
-        # if hasattr(handler, "Cache-Control"):
-        #     max_age = response.headers["Cache-Control"]
-        #     response.headers["Cache-Control"] = f"max-age={max_age}"
-
-        # elif request.method == "GET":
-        #     response.headers["Cache-Control"] = "max-age=3600"
-        # return response
         response = await call_next(request)
+
+        if response.headers.get("cache-control") is None and request.method == "GET":
+            response.headers["cache-control"] = "max-age=3600"
+
         return response

backend_py/primary/primary/routers/well/router.py

@@ -1,7 +1,7 @@
 import logging
 from typing import List, Union
 
-from fastapi import APIRouter, Depends, Query
+from fastapi import APIRouter, Depends, Query, Request
 
 from primary.services.smda_access.drogon import DrogonSmdaAccess
 from primary.services.smda_access import SmdaAccess
@@ -11,6 +11,8 @@
 
 from primary.services.ssdl_access.well_access import WellAccess as SsdlWellAccess
 
+from primary.middleware.browser_cache import custom_browser_cache_time
+
 from . import schemas
 from . import converters
 
@@ -40,6 +42,7 @@ async def get_drilled_wellbore_headers(
 
 
 @router.get("/well_trajectories/")
+@custom_browser_cache_time(max_age=10)
 async def get_well_trajectories(
     # fmt:off
     authenticated_user: AuthenticatedUser = Depends(AuthHelper.get_authenticated_user),