rename

Author: giancarloromeo

api/specs/web-server/_long_running_tasks.py

@@ -70,7 +70,7 @@ def delete_async_job(
     responses=_export_data_responses,
     status_code=status.HTTP_204_NO_CONTENT,
 )
-def abort_async_job(
+def cancel_async_job(
     _path_params: Annotated[_PathParam, Depends()],
 ): ...
 

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -3170,7 +3170,7 @@ paths:
       - long-running-tasks
       summary: Cancel Task
       description: Cancels a task
-      operationId: abort_async_job
+      operationId: cancel_async_job
       parameters:
       - name: task_id
         in: path

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

@@ -185,7 +185,7 @@ def _create_data_response_from_async_job(
             task_id=async_job_id,
             task_name=async_job_id,
             status_href=f"{request.url.with_path(str(request.app.router['get_async_job_status'].url_for(task_id=async_job_id)))}",
-            abort_href=f"{request.url.with_path(str(request.app.router['abort_async_job'].url_for(task_id=async_job_id)))}",
+            abort_href=f"{request.url.with_path(str(request.app.router['cancel_async_job'].url_for(task_id=async_job_id)))}",
             result_href=f"{request.url.with_path(str(request.app.router['get_async_job_result'].url_for(task_id=async_job_id)))}",
         ),
         status=status.HTTP_202_ACCEPTED,
@@ -505,7 +505,7 @@ def allow_only_simcore(cls, v: int) -> int:
             task_id=_job_id,
             task_name=_job_id,
             status_href=f"{request.url.with_path(str(request.app.router['get_async_job_status'].url_for(task_id=_job_id)))}",
-            abort_href=f"{request.url.with_path(str(request.app.router['abort_async_job'].url_for(task_id=_job_id)))}",
+            abort_href=f"{request.url.with_path(str(request.app.router['cancel_async_job'].url_for(task_id=_job_id)))}",
             result_href=f"{request.url.with_path(str(request.app.router['get_async_job_result'].url_for(task_id=_job_id)))}",
         ),
         status=status.HTTP_202_ACCEPTED,

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

@@ -87,7 +87,7 @@ async def get_async_jobs(request: web.Request) -> web.Response:
                 task_id=f"{job.job_id}",
                 task_name=job.job_name,
                 status_href=f"{request.url.with_path(str(request.app.router['get_async_job_status'].url_for(task_id=str(job.job_id))))}",
-                abort_href=f"{request.url.with_path(str(request.app.router['abort_async_job'].url_for(task_id=str(job.job_id))))}",
+                abort_href=f"{request.url.with_path(str(request.app.router['cancel_async_job'].url_for(task_id=str(job.job_id))))}",
                 result_href=f"{request.url.with_path(str(request.app.router['get_async_job_result'].url_for(task_id=str(job.job_id))))}",
             )
             for job in user_async_jobs
@@ -160,12 +160,12 @@ async def delete_async_job(request: web.Request) -> web.Response:
 
 @routes.post(
     _task_prefix + "/{task_id}:cancel",
-    name="abort_async_job",
+    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)
 

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

@@ -538,7 +538,7 @@ async def test_get_async_jobs_status(
     ],
     ids=lambda x: type(x).__name__,
 )
-async def test_abort_async_jobs(
+async def test_cancel_async_jobs(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,