fixed mypy

Author: sanderegg

services/datcore-adapter/src/simcore_service_datcore_adapter/api/errors/http_error.py

@@ -1,12 +1,13 @@
-from typing import Callable, Optional
+from typing import Callable
 
 from fastapi import HTTPException
 from fastapi.encoders import jsonable_encoder
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 
 
-async def http_error_handler(_: Request, exc: HTTPException) -> JSONResponse:
+async def http_error_handler(_: Request, exc: Exception) -> JSONResponse:
+    assert isinstance(exc, HTTPException)  # nosec
     return JSONResponse(
         content=jsonable_encoder({"errors": [exc.detail]}), status_code=exc.status_code
     )
@@ -16,7 +17,7 @@ def make_http_error_handler_for_exception(
     status_code: int,
     exception_cls: type[BaseException],
     *,
-    override_detail_message: Optional[str] = None,
+    override_detail_message: str | None = None,
 ) -> Callable:
     """
     Produces a handler for BaseException-type exceptions which converts them

services/datcore-adapter/src/simcore_service_datcore_adapter/api/errors/pennsieve_error.py

@@ -7,8 +7,11 @@
 
 async def botocore_exceptions_handler(
     _: Request,
-    exc: ClientError,
+    exc: Exception,
 ) -> JSONResponse:
+    assert isinstance(exc, ClientError)  # nosec
+    assert "Error" in exc.response  # nosec
+    assert "Code" in exc.response["Error"]  # nosec
     if exc.response["Error"]["Code"] == "NotAuthorizedException":
         return JSONResponse(
             content=jsonable_encoder({"errors": exc.response["Error"]}),

services/datcore-adapter/src/simcore_service_datcore_adapter/api/errors/validation_error.py

@@ -1,5 +1,3 @@
-from typing import Union
-
 from fastapi.encoders import jsonable_encoder
 from fastapi.exceptions import RequestValidationError
 from fastapi.openapi.constants import REF_PREFIX
@@ -12,8 +10,9 @@
 
 async def http422_error_handler(
     _: Request,
-    exc: Union[RequestValidationError, ValidationError],
+    exc: Exception,
 ) -> JSONResponse:
+    assert isinstance(exc, RequestValidationError | ValidationError)  # nosec
     return JSONResponse(
         content=jsonable_encoder({"errors": exc.errors()}),
         status_code=HTTP_422_UNPROCESSABLE_ENTITY,