foixed exceptions

Author: Andrei Neagu

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/exceptions/handlers/_http_error.py

@@ -2,10 +2,11 @@
 from collections.abc import Callable
 from typing import Awaitable
 
-from fastapi import HTTPException, Request, status
+from fastapi import HTTPException, status
 from fastapi.encoders import jsonable_encoder
 from servicelib.logging_errors import create_troubleshotting_log_kwargs
 from servicelib.status_codes_utils import is_5xx_server_error
+from starlette.requests import Request
 from starlette.responses import JSONResponse
 
 from ...exceptions.errors import RutNotFoundError
@@ -34,8 +35,9 @@ async def http_error_handler(request: Request, exc: Exception) -> JSONResponse:
 
 def http404_error_handler(
     _: Request,  # pylint: disable=unused-argument
-    exc: RutNotFoundError,
+    exc: Exception,
 ) -> JSONResponse:
+    assert isinstance(exc, RutNotFoundError)  # nose
     return JSONResponse(
         status_code=status.HTTP_404_NOT_FOUND,
         content={"message": f"{exc.msg_template}"},
@@ -44,15 +46,15 @@ def http404_error_handler(
 
 def make_http_error_handler_for_exception(
     status_code: int, exception_cls: type[BaseException]
-) -> Callable[[Request, type[BaseException]], Awaitable[JSONResponse]]:
+) -> Callable[[Request, Exception], Awaitable[JSONResponse]]:
     """
     Produces a handler for BaseException-type exceptions which converts them
     into an error JSON response with a given status code
 
     SEE https://docs.python.org/3/library/exceptions.html#concrete-exceptions
     """
 
-    async def _http_error_handler(_: Request, exc: type[BaseException]) -> JSONResponse:
+    async def _http_error_handler(_: Request, exc: Exception) -> JSONResponse:
         assert isinstance(exc, exception_cls)  # nosec
         return JSONResponse(
             content=jsonable_encoder({"errors": [str(exc)]}), status_code=status_code

services/resource-usage-tracker/tests/unit/with_dbs/test_api_resource_tracker_service_runs__export.py

@@ -9,7 +9,7 @@
 import pytest
 import sqlalchemy as sa
 from moto.server import ThreadedMotoServer
-from pydantic import AnyUrl
+from pydantic import AnyUrl, TypeAdapter
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.rabbitmq import RabbitMQRPCClient
@@ -30,20 +30,17 @@
 
 @pytest.fixture
 async def mocked_export(mocker: MockerFixture):
-    mock_export = mocker.patch(
+    mocker.patch(
         "simcore_service_resource_usage_tracker.services.service_runs.ResourceTrackerRepository.export_service_runs_table_to_s3",
         autospec=True,
     )
 
 
 @pytest.fixture
 async def mocked_presigned_link(mocker: MockerFixture):
-    mock_presigned_link = mocker.patch(
+    mocker.patch(
         "simcore_service_resource_usage_tracker.services.service_runs.SimcoreS3API.create_single_presigned_download_link",
-        return_value=parse_obj_as(
-            AnyUrl,
-            "https://www.testing.com/",
-        ),
+        return_value=TypeAdapter(AnyUrl).validate_python("https://www.testing.com/"),
     )