uses json_resonpose with status

Author: pcrespov

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

@@ -4,11 +4,11 @@
 from aiohttp import web
 from models_library.utils.json_serialization import json_dumps
 from pydantic import BaseModel
+from servicelib.aiohttp import status
 
 from ...long_running_tasks._errors import TaskNotCompletedError, TaskNotFoundError
 from ...long_running_tasks._models import TaskGet, TaskId, TaskStatus
 from ...long_running_tasks._task import TrackedTask
-from ...mimetype_constants import MIMETYPE_APPLICATION_JSON
 from ..requests_validation import parse_request_path_parameters_as
 from ._dependencies import get_task_context, get_tasks_manager
 
@@ -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)
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 __all__: tuple[str, ...] = (

services/storage/src/simcore_service_storage/handlers_files.py

@@ -25,7 +25,6 @@
     parse_request_path_parameters_as,
     parse_request_query_parameters_as,
 )
-from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 
 from ._meta import API_VTAG
 from .dsm import get_dsm_provider
@@ -249,7 +248,7 @@ async def upload_file(request: web.Request) -> web.Response:
     f"/{API_VTAG}/locations/{{location_id}}/files/{{file_id}}:abort",
     name="abort_upload_file",
 )
-async def abort_upload_file(request: web.Request) -> NoReturn:
+async def abort_upload_file(request: web.Request) -> web.Response:
     query_params: StorageQueryParamsBase = parse_request_query_parameters_as(
         StorageQueryParamsBase, request
     )
@@ -261,7 +260,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)
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 @routes.post(
@@ -386,7 +385,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)
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 @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

@@ -1,12 +1,13 @@
 import logging
-from typing import NoReturn, cast
+from typing import cast
 
 from aiohttp import web
 from aiohttp.web import RouteTableDef
 from models_library.api_schemas_storage import FileMetaDataGet, FoldersBody
 from models_library.projects import ProjectID
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from models_library.utils.json_serialization import json_dumps
+from servicelib.aiohttp import status
 from servicelib.aiohttp.long_running_tasks.server import (
     TaskProgress,
     start_long_running_task,
@@ -106,7 +107,7 @@ async def copy_folders_from_project(request: web.Request) -> web.Response:
 @routes.delete(
     f"/{API_VTAG}/simcore-s3/folders/{{folder_id}}", name="delete_folders_of_project"
 )
-async def delete_folders_of_project(request: web.Request) -> NoReturn:
+async def delete_folders_of_project(request: web.Request) -> web.Response:
     query_params: DeleteFolderQueryParams = parse_request_query_parameters_as(
         DeleteFolderQueryParams, request
     )
@@ -126,7 +127,7 @@ async def delete_folders_of_project(request: web.Request) -> NoReturn:
         query_params.node_id,
     )
 
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 @routes.post(f"/{API_VTAG}/simcore-s3/files/metadata:search", name="search_files")

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

@@ -5,6 +5,7 @@
 from models_library.api_schemas_webserver.auth import ApiKeyCreate
 from models_library.users import UserID
 from pydantic import Field
+from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import RequestParams, parse_request_body_as
 from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from simcore_postgres_database.errors import DatabaseError
@@ -84,4 +85,4 @@ async def delete_api_key(request: web.Request):
             "Failed to delete API key %s. Ignoring error", name, exc_info=err
         )
 
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)

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

@@ -10,13 +10,13 @@
 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 import status
 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,
 )
-from servicelib.mimetype_constants import MIMETYPE_APPLICATION_JSON
 from servicelib.request_keys import RQT_USERID_KEY
 from simcore_postgres_database.utils_groups_extra_properties import (
     GroupExtraPropertiesRepo,
@@ -202,7 +202,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]
         )
-        return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+        return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
     except DirectorServiceError as exc:
         return create_http_error(

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

@@ -17,6 +17,7 @@
 from models_library.utils.common_validators import null_or_none_str_to_none_validator
 from models_library.workspaces import WorkspaceID
 from pydantic import Extra, Field, Json, parse_obj_as, validator
+from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
     RequestParams,
     StrictRequestParams,
@@ -246,4 +247,4 @@ async def delete_folder_group(request: web.Request):
         folder_id=path_params.folder_id,
         product_name=req_ctx.product_name,
     )
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)

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

@@ -13,6 +13,7 @@
 from models_library.users import GroupID, UserID
 from models_library.utils.json_serialization import json_dumps
 from pydantic import BaseModel, Extra, Field, parse_obj_as
+from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
     parse_request_path_parameters_as,
     parse_request_query_parameters_as,
@@ -169,7 +170,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)
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 @routes.get(f"/{API_VTAG}/groups/{{gid}}/users", name="get_group_users")
@@ -215,7 +216,7 @@ async def add_group_user(request: web.Request):
         new_user_id=new_user_id,
         new_user_email=new_user_email,
     )
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 class _GroupUserPathParams(BaseModel):
@@ -275,7 +276,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
     )
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 #

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

@@ -8,6 +8,7 @@
 )
 from models_library.users import UserID
 from pydantic import BaseModel, Field
+from servicelib.aiohttp import status
 from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
 from servicelib.aiohttp.requests_validation import parse_request_body_as
 from servicelib.logging_utils import get_log_record_extra, log_context
@@ -85,7 +86,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],
     )
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 class _AuthenticatedContext(BaseModel):

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

@@ -16,6 +16,7 @@
 )
 from models_library.rest_pagination_utils import paginate_data
 from pydantic import BaseModel, Extra, Field, NonNegativeInt
+from servicelib.aiohttp import status
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
     parse_request_path_parameters_as,
@@ -223,7 +224,7 @@ async def delete_project_comment(request: web.Request):
         request=request,
         comment_id=path_params.comment_id,
     )
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 @routes.get(

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

@@ -26,6 +26,7 @@
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from models_library.utils.json_serialization import json_dumps
 from pydantic import parse_obj_as
+from servicelib.aiohttp import status
 from servicelib.aiohttp.long_running_tasks.server import start_long_running_task
 from servicelib.aiohttp.requests_validation import (
     parse_request_body_as,
@@ -576,7 +577,7 @@ async def patch_project(request: web.Request):
         product_name=req_ctx.product_name,
     )
 
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 #
@@ -661,7 +662,7 @@ async def delete_project(request: web.Request):
     except ProjectDeleteError as err:
         raise web.HTTPConflict(reason=f"{err}") from err
 
-    return web.HTTPNoContent(content_type=MIMETYPE_APPLICATION_JSON)
+    return web.json_response(status=status.HTTP_204_NO_CONTENT)
 
 
 #