mv functions from rest-responses to web-exceptions

Author: pcrespov

packages/service-library/src/servicelib/aiohttp/rest_responses.py

@@ -151,16 +151,3 @@ def _pred(obj) -> bool:
     assert len(http_statuses) == len(found), "No duplicates"  # nosec
 
     return http_statuses
-
-
-_STATUS_CODE_TO_HTTP_ERRORS: dict[int, type[HTTPError]] = _collect_http_exceptions(
-    HTTPError
-)
-
-
-def get_http_error(status_code: int) -> type[HTTPError] | None:
-    """Returns aiohttp error class corresponding to a 4XX or 5XX status code
-
-    NOTICE that any non-error code (i.e. 2XX, 3XX and 4XX) will return None
-    """
-    return _STATUS_CODE_TO_HTTP_ERRORS.get(status_code)

packages/service-library/src/servicelib/aiohttp/web_exceptions_extension.py

@@ -1,3 +1,7 @@
+""" Extends `aiohttp.web_exceptions` classes to match `status` codes
+    and adds helper functions.
+"""
+
 import inspect
 from typing import Any
 

packages/service-library/tests/aiohttp/test_rest_responses.py

@@ -16,11 +16,10 @@
     HTTPOk,
 )
 from servicelib.aiohttp import status
-from servicelib.aiohttp.rest_responses import (
+from servicelib.aiohttp.rest_responses import create_http_error, exception_to_response
+from servicelib.aiohttp.web_exceptions_extension import (
     _STATUS_CODE_TO_HTTP_ERRORS,
-    create_http_error,
-    exception_to_response,
-    get_http_error,
+    get_http_error_class_or_none,
 )
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 
@@ -36,17 +35,17 @@
 
 
 @pytest.mark.parametrize(
-    "http_exc", (HTTPBadRequest, HTTPGone, HTTPInternalServerError)
+    "http_exc", [HTTPBadRequest, HTTPGone, HTTPInternalServerError]
 )
 def test_get_http_exception_class_from_code(http_exc: HTTPException):
-    assert get_http_error(http_exc.status_code) == http_exc
+    assert get_http_error_class_or_none(http_exc.status_code) == http_exc
 
 
 @pytest.mark.parametrize(
     "status_code", itertools.chain(BELOW_1XX, NONE_ERRORS, ABOVE_599)
 )
 def test_get_none_for_invalid_or_not_errors_code(status_code):
-    assert get_http_error(status_code) is None
+    assert get_http_error_class_or_none(status_code) is None
 
 
 @pytest.mark.parametrize(

services/web/server/src/simcore_service_webserver/director_v2/_handlers.py

@@ -10,11 +10,8 @@
 from models_library.utils.json_serialization import json_dumps
 from pydantic import BaseModel, Field, ValidationError, parse_obj_as
 from pydantic.types import NonNegativeInt
-from servicelib.aiohttp.rest_responses import (
-    create_http_error,
-    exception_to_response,
-    get_http_error,
-)
+from servicelib.aiohttp.rest_responses import create_http_error, exception_to_response
+from servicelib.aiohttp.web_exceptions_extension import get_http_error_class_or_none
 from servicelib.common_headers import (
     UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE,
     X_SIMCORE_USER_AGENT,
@@ -170,7 +167,8 @@ async def start_computation(request: web.Request) -> web.Response:
             create_http_error(
                 exc,
                 reason=exc.reason,
-                http_error_cls=get_http_error(exc.status) or web.HTTPServiceUnavailable,
+                http_error_cls=get_http_error_class_or_none(exc.status)
+                or web.HTTPServiceUnavailable,
             )
         )
     except UserDefaultWalletNotFoundError as exc:
@@ -210,7 +208,8 @@ async def stop_computation(request: web.Request) -> web.Response:
         return create_http_error(
             exc,
             reason=exc.reason,
-            http_error_cls=get_http_error(exc.status) or web.HTTPServiceUnavailable,
+            http_error_cls=get_http_error_class_or_none(exc.status)
+            or web.HTTPServiceUnavailable,
         )
 
 
@@ -259,7 +258,8 @@ async def get_computation(request: web.Request) -> web.Response:
         return create_http_error(
             exc,
             reason=exc.reason,
-            http_error_cls=get_http_error(exc.status) or web.HTTPServiceUnavailable,
+            http_error_cls=get_http_error_class_or_none(exc.status)
+            or web.HTTPServiceUnavailable,
         )
     except ValidationError as exc:
         return create_http_error(exc, http_error_cls=web.HTTPInternalServerError)