renamed cancellation to remove_task

Author: Andrei Neagu

api/specs/web-server/_long_running_tasks.py

@@ -53,8 +53,8 @@ def get_async_job_status(
 
 @router.delete(
     "/tasks/{task_id}",
-    name="cancel_and_delete_task",
-    description="Cancels and deletes a task",
+    name="remove_task",
+    description="Cancels and removes a task",
     responses=_export_data_responses,
     status_code=status.HTTP_204_NO_CONTENT,
 )

api/specs/web-server/_long_running_tasks_legacy.py

@@ -42,11 +42,11 @@ async def get_task_status(
 
 @router.delete(
     "/{task_id}",
-    name="cancel_and_delete_task",
-    description="Cancels and deletes a task",
+    name="remove_task",
+    description="Cancels and removes a task",
     status_code=status.HTTP_204_NO_CONTENT,
 )
-async def cancel_and_delete_task(
+async def remove_task(
     _path_params: Annotated[_PathParam, Depends()],
 ): ...
 

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

@@ -26,7 +26,7 @@ async def list_tasks(request: web.Request) -> web.Response:
                 task_id=t.task_id,
                 status_href=f"{request.app.router['get_task_status'].url_for(task_id=t.task_id)}",
                 result_href=f"{request.app.router['get_task_result'].url_for(task_id=t.task_id)}",
-                abort_href=f"{request.app.router['cancel_and_delete_task'].url_for(task_id=t.task_id)}",
+                abort_href=f"{request.app.router['remove_task'].url_for(task_id=t.task_id)}",
             )
             for t in await lrt_api.list_tasks(
                 long_running_manager,

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

@@ -81,7 +81,7 @@ async def start_long_running_task(
             f"http://{ip_addr}:{port}{request_.app.router['get_task_result'].url_for(task_id=task_id)}"  # NOSONAR
         )
         abort_url = TypeAdapter(AnyHttpUrl).validate_python(
-            f"http://{ip_addr}:{port}{request_.app.router['cancel_and_delete_task'].url_for(task_id=task_id)}"  # NOSONAR
+            f"http://{ip_addr}:{port}{request_.app.router['remove_task'].url_for(task_id=task_id)}"  # NOSONAR
         )
         task_get = TaskGet(
             task_id=task_id,

packages/service-library/src/servicelib/fastapi/long_running_tasks/_client.py

@@ -171,7 +171,7 @@ async def get_task_result(
         return result.json()
 
     @retry_on_http_errors
-    async def cancel_and_delete_task(
+    async def remove_task(
         self, task_id: TaskId, *, timeout: PositiveFloat | None = None  # noqa: ASYNC109
     ) -> None:
         timeout = timeout or self._client_configuration.default_timeout

packages/service-library/src/servicelib/fastapi/long_running_tasks/_context_manager.py

@@ -121,7 +121,7 @@ async def _wait_for_task_result() -> Any:
 
         yield result
     except TimeoutError as e:
-        await client.cancel_and_delete_task(task_id)
+        await client.remove_task(task_id)
         raise TaskClientTimeoutError(
             task_id=task_id,
             timeout=task_timeout,

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

@@ -25,9 +25,7 @@ async def list_tasks(
             task_id=t.task_id,
             status_href=str(request.url_for("get_task_status", task_id=t.task_id)),
             result_href=str(request.url_for("get_task_result", task_id=t.task_id)),
-            abort_href=str(
-                request.url_for("cancel_and_delete_task", task_id=t.task_id)
-            ),
+            abort_href=str(request.url_for("remove_task", task_id=t.task_id)),
         )
         for t in await lrt_api.list_tasks(long_running_manager, task_context={})
     ]