Stop the machines complaining

Author: tpoliaw

src/blueapi/service/authorization.py

@@ -42,9 +42,7 @@ async def check(self, endpoint: str, data: Mapping[str, Any]):
             raise
 
     async def require_tiled_service_account(self, token: str):
-        await self.check(
-            self._conf.tiled_service_account_check, {"token": token}
-        )
+        await self.check(self._conf.tiled_service_account_check, {"token": token})
 
     async def submit_plan_check(self, token: str, instrument_session: str):
         if not (match := INSTRUMENT_SESSION_RE.match(instrument_session)):

src/blueapi/service/main.py

@@ -4,7 +4,6 @@
 from contextlib import asynccontextmanager
 from typing import Annotated, Any, cast
 
-from fastapi.security.utils import get_authorization_scheme_param
 import jwt
 from fastapi import (
     APIRouter,
@@ -20,7 +19,7 @@
 from fastapi.datastructures import Address
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import RedirectResponse, StreamingResponse
-from fastapi.security import OAuth2AuthorizationCodeBearer
+from fastapi.security.utils import get_authorization_scheme_param
 from observability_utils.tracing import (
     add_span_attributes,
     get_tracer,
@@ -42,6 +41,7 @@
 from blueapi.worker import TrackableTask, WorkerState
 from blueapi.worker.event import TaskStatusEnum
 
+from .authorization import OpaClient, OpaUserClient
 from .model import (
     DeviceModel,
     DeviceResponse,
@@ -58,7 +58,6 @@
     TasksListResponse,
     WorkerTask,
 )
-from .authorization import OpaClient, OpaUserClient
 from .runner import WorkerDispatcher
 
 RUNNER: WorkerDispatcher | None = None
@@ -181,8 +180,10 @@ def inner(request: Request, access_token: Annotated[str, Depends(bearer_token)])
 async def opa(
     request: Request, token: Annotated[str, Depends(bearer_token)]
 ) -> OpaUserClient | None:
-    if client := cast(OpaClient | None, getattr(request.app.state, "authz", None)):
+    if client := cast(OpaClient, getattr(request.app.state, "authz", None)):
         return client.for_token(token)
+    return None
+
 
 async def submit_permission(
     task_request: Annotated[TaskRequest, Body()],