add delete endpoint

Author: giancarloromeo

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/async_jobs/async_jobs.py

@@ -36,7 +36,7 @@
 _logger = logging.getLogger(__name__)
 
 
-async def cancel(
+async def abort(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
     rpc_namespace: RPCNamespace,
@@ -45,7 +45,23 @@ async def cancel(
 ) -> None:
     await rabbitmq_rpc_client.request(
         rpc_namespace,
-        TypeAdapter(RPCMethodName).validate_python("cancel"),
+        TypeAdapter(RPCMethodName).validate_python("abort"),
+        job_id=job_id,
+        job_id_data=job_id_data,
+        timeout_s=_DEFAULT_TIMEOUT_S,
+    )
+
+
+async def delete(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    rpc_namespace: RPCNamespace,
+    job_id: AsyncJobId,
+    job_id_data: AsyncJobNameData,
+) -> None:
+    await rabbitmq_rpc_client.request(
+        rpc_namespace,
+        TypeAdapter(RPCMethodName).validate_python("delete"),
         job_id=job_id,
         job_id_data=job_id_data,
         timeout_s=_DEFAULT_TIMEOUT_S,
@@ -222,7 +238,7 @@ async def wait_and_get_result(
             )
     except (TimeoutError, CancelledError) as error:
         try:
-            await cancel(
+            await abort(
                 rabbitmq_rpc_client,
                 rpc_namespace=rpc_namespace,
                 job_id=job_id,
@@ -254,7 +270,7 @@ async def submit_and_wait(
     except (TimeoutError, CancelledError) as error:
         if async_job_rpc_get is not None:
             try:
-                await cancel(
+                await abort(
                     rabbitmq_rpc_client,
                     rpc_namespace=rpc_namespace,
                     job_id=async_job_rpc_get.job_id,

services/storage/tests/unit/test_async_jobs.py

@@ -264,7 +264,7 @@ async def test_async_jobs_cancel(
         payload=60 * 10,  # test hangs if not cancelled properly
     )
 
-    await async_jobs.cancel(
+    await async_jobs.abort(
         storage_rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
         job_id=async_job_get.job_id,

services/web/server/src/simcore_service_webserver/tasks/_rest.py

@@ -136,6 +136,30 @@ async def get_async_job_status(request: web.Request) -> web.Response:
 
 @routes.delete(
     _task_prefix + "/{task_id}",
+    name="delete_async_job",
+)
+@login_required
+@permission_required("storage.files.*")
+@handle_export_data_exceptions
+async def delete_async_job(request: web.Request) -> web.Response:
+
+    _req_ctx = RequestContext.model_validate(request)
+
+    rabbitmq_rpc_client = get_rabbitmq_rpc_client(request.app)
+    async_job_get = parse_request_path_parameters_as(_StorageAsyncJobId, request)
+    await async_jobs.delete(
+        rabbitmq_rpc_client=rabbitmq_rpc_client,
+        rpc_namespace=STORAGE_RPC_NAMESPACE,
+        job_id=async_job_get.task_id,
+        job_id_data=AsyncJobNameData(
+            user_id=_req_ctx.user_id, product_name=_req_ctx.product_name
+        ),
+    )
+    return web.Response(status=status.HTTP_204_NO_CONTENT)
+
+
+@routes.post(
+    _task_prefix + "/{task_id}:abort",
     name="abort_async_job",
 )
 @login_required
@@ -147,7 +171,7 @@ async def abort_async_job(request: web.Request) -> web.Response:
 
     rabbitmq_rpc_client = get_rabbitmq_rpc_client(request.app)
     async_job_get = parse_request_path_parameters_as(_StorageAsyncJobId, request)
-    await async_jobs.cancel(
+    await async_jobs.abort(
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
         job_id=async_job_get.task_id,

services/web/server/tests/unit/with_dbs/01/storage/test_storage.py

@@ -550,7 +550,40 @@ async def test_abort_async_jobs(
     _job_id = AsyncJobId(faker.uuid4())
     create_storage_rpc_client_mock(
         "simcore_service_webserver.tasks._rest",
-        f"async_jobs.{async_jobs.cancel.__name__}",
+        f"async_jobs.{async_jobs.abort.__name__}",
+        backend_result_or_exception,
+    )
+
+    response = await client.post(f"/{API_VERSION}/tasks/{_job_id}:abort")
+    assert response.status == expected_status
+
+
+@pytest.mark.parametrize("user_role", _user_roles)
+@pytest.mark.parametrize(
+    "backend_result_or_exception, expected_status",
+    [
+        (
+            AsyncJobAbort(result=True, job_id=AsyncJobId(_faker.uuid4())),
+            status.HTTP_204_NO_CONTENT,
+        ),
+        (JobSchedulerError(exc=_faker.text()), status.HTTP_500_INTERNAL_SERVER_ERROR),
+        (JobMissingError(job_id=_faker.uuid4()), status.HTTP_404_NOT_FOUND),
+    ],
+    ids=lambda x: type(x).__name__,
+)
+async def test_delete_async_jobs(
+    user_role: UserRole,
+    logged_user: UserInfoDict,
+    client: TestClient,
+    create_storage_rpc_client_mock: Callable[[str, str, Any], None],
+    faker: Faker,
+    backend_result_or_exception: Any,
+    expected_status: int,
+):
+    _job_id = AsyncJobId(faker.uuid4())
+    create_storage_rpc_client_mock(
+        "simcore_service_webserver.tasks._rest",
+        f"async_jobs.{async_jobs.delete.__name__}",
         backend_result_or_exception,
     )
 
@@ -647,7 +680,7 @@ async def test_get_user_async_jobs(
         (
             "DELETE",
             "abort_href",
-            async_jobs.cancel.__name__,
+            async_jobs.abort.__name__,
             AsyncJobAbort(result=True, job_id=AsyncJobId(_faker.uuid4())),
             status.HTTP_204_NO_CONTENT,
             None,