returns instead of raise

Author: pcrespov

packages/service-library/src/servicelib/aiohttp/long_running_tasks/_routes.py

@@ -89,7 +89,7 @@ async def cancel_and_delete_task(request: web.Request) -> web.Response:
     tasks_manager = get_tasks_manager(request.app)
     task_context = get_task_context(request)
     await tasks_manager.remove_task(path_params.task_id, with_task_context=task_context)
-    raise web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
 
 __all__: tuple[str, ...] = (

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

@@ -0,0 +1,7 @@
+from aiohttp import web
+from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
+
+
+def test_http_errors():
+
+    err = web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)

services/storage/src/simcore_service_storage/handlers_files.py

@@ -261,7 +261,7 @@ async def abort_upload_file(request: web.Request) -> NoReturn:
 
     dsm = get_dsm_provider(request.app).get(path_params.location_id)
     await dsm.abort_file_upload(query_params.user_id, path_params.file_id)
-    raise web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
 
 @routes.post(
@@ -386,7 +386,7 @@ async def delete_file(request: web.Request) -> NoReturn:
 
     dsm = get_dsm_provider(request.app).get(path_params.location_id)
     await dsm.delete_file(query_params.user_id, path_params.file_id)
-    raise web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
 
 @routes.post(f"/{API_VTAG}/files/{{file_id}}:soft-copy", name="copy_as_soft_link")

services/storage/src/simcore_service_storage/handlers_simcore_s3.py

@@ -126,7 +126,7 @@ async def delete_folders_of_project(request: web.Request) -> NoReturn:
         query_params.node_id,
     )
 
-    raise web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
 
 @routes.post(f"/{API_VTAG}/simcore-s3/files/metadata:search", name="search_files")

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

@@ -84,4 +84,4 @@ async def delete_api_key(request: web.Request):
             "Failed to delete API key %s. Ignoring error", name, exc_info=err
         )
 
-    raise web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)

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

@@ -204,13 +204,7 @@ async def stop_computation(request: web.Request) -> web.Response:
         await asyncio.gather(
             *[computations.stop(pid, req_ctx.user_id) for pid in project_ids]
         )
-
-        # NOTE: our middleware has this issue
-        #
-        #  if 'return web.HTTPNoContent()' then 'await response.json()' raises ContentTypeError
-        #  if 'raise web.HTTPNoContent()' then 'await response.json() == None'
-        #
-        raise web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+        return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
     except DirectorServiceError as exc:
         return create_http_error(

services/web/server/src/simcore_service_webserver/folders/_folders_handlers.py

@@ -246,4 +246,4 @@ async def delete_folder_group(request: web.Request):
         folder_id=path_params.folder_id,
         product_name=req_ctx.product_name,
     )
-    raise web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)

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

@@ -169,7 +169,7 @@ async def delete_group(request: web.Request):
     path_params = parse_request_path_parameters_as(_GroupPathParams, request)
 
     await api.delete_user_group(request.app, req_ctx.user_id, path_params.gid)
-    raise web.HTTPNoContent
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
 
 @routes.get(f"/{API_VTAG}/groups/{{gid}}/users", name="get_group_users")
@@ -215,7 +215,7 @@ async def add_group_user(request: web.Request):
         new_user_id=new_user_id,
         new_user_email=new_user_email,
     )
-    raise web.HTTPNoContent
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
 
 class _GroupUserPathParams(BaseModel):
@@ -275,7 +275,7 @@ async def delete_group_user(request: web.Request):
     await api.delete_user_in_group(
         request.app, req_ctx.user_id, path_params.gid, path_params.uid
     )
-    raise web.HTTPNoContent
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
 
 #

services/web/server/src/simcore_service_webserver/login/_registration_handlers.py

@@ -85,7 +85,7 @@ async def request_product_account(request: web.Request):
         task_suffix_name=f"{__name__}.request_product_account.send_account_request_email_to_support",
         fire_and_forget_tasks_collection=request.app[APP_FIRE_AND_FORGET_TASKS_KEY],
     )
-    raise web.HTTPNoContent
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
 
 class _AuthenticatedContext(BaseModel):

services/web/server/src/simcore_service_webserver/projects/_comments_handlers.py

@@ -223,7 +223,7 @@ async def delete_project_comment(request: web.Request):
         request=request,
         comment_id=path_params.comment_id,
     )
-    raise web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
 
 
 @routes.get(