rename

Author: giancarloromeo

api/specs/web-server/_long_running_tasks.py

@@ -64,9 +64,9 @@ def delete_async_job(
 
 
 @router.post(
-    "/tasks/{task_id}:abort",
-    name="abort_task",
-    description="Aborts a task",
+    "/tasks/{task_id}:cancel",
+    name="cancel_task",
+    description="Cancels a task",
     responses=_export_data_responses,
     status_code=status.HTTP_204_NO_CONTENT,
 )

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

@@ -36,7 +36,7 @@
 _logger = logging.getLogger(__name__)
 
 
-async def abort(
+async def cancel(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
     rpc_namespace: RPCNamespace,
@@ -45,7 +45,7 @@ async def abort(
 ) -> None:
     await rabbitmq_rpc_client.request(
         rpc_namespace,
-        TypeAdapter(RPCMethodName).validate_python("abort"),
+        TypeAdapter(RPCMethodName).validate_python("cancel"),
         job_id=job_id,
         job_id_data=job_id_data,
         timeout_s=_DEFAULT_TIMEOUT_S,

services/storage/src/simcore_service_storage/api/rpc/_async_jobs.py

@@ -32,7 +32,7 @@
 
 
 @router.expose(reraise_if_error_type=(JobSchedulerError,))
-async def abort(app: FastAPI, job_id: AsyncJobId, job_id_data: AsyncJobNameData):
+async def cancel(app: FastAPI, job_id: AsyncJobId, job_id_data: AsyncJobNameData):
     assert app  # nosec
     assert job_id_data  # nosec
     try:

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.abort(
+    await async_jobs.cancel(
         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

@@ -159,19 +159,19 @@ async def delete_async_job(request: web.Request) -> web.Response:
 
 
 @routes.post(
-    _task_prefix + "/{task_id}:abort",
-    name="abort_async_job",
+    _task_prefix + "/{task_id}:cancel",
+    name="cancel_async_job",
 )
 @login_required
 @permission_required("storage.files.*")
 @handle_export_data_exceptions
-async def abort_async_job(request: web.Request) -> web.Response:
+async def cancel_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.abort(
+    await async_jobs.cancel(
         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,11 +550,11 @@ 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.abort.__name__}",
+        f"async_jobs.{async_jobs.cancel.__name__}",
         backend_result_or_exception,
     )
 
-    response = await client.post(f"/{API_VERSION}/tasks/{_job_id}:abort")
+    response = await client.post(f"/{API_VERSION}/tasks/{_job_id}:cancel")
     assert response.status == expected_status