fix tests

Author: bisgaard-itis

api/specs/web-server/_long_running_tasks.py

@@ -4,13 +4,17 @@
 # pylint: disable=too-many-arguments
 
 
-from typing import Annotated
+from typing import Annotated, Any
 
 from fastapi import APIRouter, Depends, status
 from models_library.generics import Envelope
+from models_library.rest_error import EnvelopedError
 from servicelib.aiohttp.long_running_tasks._routes import _PathParam
 from servicelib.long_running_tasks._models import TaskGet, TaskStatus
 from simcore_service_webserver._meta import API_VTAG
+from simcore_service_webserver.tasks._exception_handlers import (
+    _TO_HTTP_ERROR_MAP as data_export_http_error_map,
+)
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",
@@ -19,37 +23,46 @@
     ],
 )
 
+_data_export_responses: dict[int | str, dict[str, Any]] = {
+    i.status_code: {"model": EnvelopedError}
+    for i in data_export_http_error_map.values()
+}
+
 
 @router.get(
     "/tasks",
     response_model=Envelope[list[TaskGet]],
+    name="get_async_jobs",
+    responses=_data_export_responses,
 )
-def list_tasks():
-    ...
+def list_tasks(): ...
 
 
 @router.get(
     "/tasks/{task_id}",
     response_model=Envelope[TaskStatus],
+    name="get_async_job_status",
+    responses=_data_export_responses,
 )
 def get_task_status(
     _path_params: Annotated[_PathParam, Depends()],
-):
-    ...
+): ...
 
 
 @router.delete(
     "/tasks/{task_id}",
+    name="abort_async_job",
+    responses=_data_export_responses,
     status_code=status.HTTP_204_NO_CONTENT,
 )
 def cancel_and_delete_task(
     _path_params: Annotated[_PathParam, Depends()],
-):
-    ...
+): ...
 
 
 @router.get("/tasks/{task_id}/result")
 def get_task_result(
     _path_params: Annotated[_PathParam, Depends()],
-):
-    ...
+    name="get_async_job_result",
+    responses=_data_export_responses,
+): ...

api/specs/web-server/_storage.py

@@ -9,10 +9,7 @@
 from fastapi import APIRouter, Depends, Query, status
 from models_library.api_schemas_long_running_tasks.tasks import (
     TaskGet,
-    TaskResult,
-    TaskStatus,
 )
-from models_library.api_schemas_rpc_async_jobs.async_jobs import AsyncJobId
 from models_library.api_schemas_storage.storage_schemas import (
     FileLocation,
     FileMetaDataGet,
@@ -226,43 +223,3 @@ async def is_completed_upload_file(
 )
 async def export_data(data_export: DataExportPost, location_id: LocationID):
     """Trigger data export. Returns async job id for getting status and results"""
-
-
-@router.get(
-    "/storage/async-jobs/{job_id}/status",
-    response_model=Envelope[TaskStatus],
-    name="get_async_job_status",
-    responses=_data_export_responses,
-)
-async def get_async_job_status(job_id: AsyncJobId):
-    """Get async job status"""
-
-
-@router.post(
-    "/storage/async-jobs/{job_id}:abort",
-    name="abort_async_job",
-    responses=_data_export_responses,
-    status_code=status.HTTP_204_NO_CONTENT,
-)
-async def abort_async_job(job_id: AsyncJobId):
-    """aborts execution of an async job"""
-
-
-@router.get(
-    "/storage/async-jobs/{job_id}/result",
-    response_model=Envelope[TaskResult],
-    name="get_async_job_result",
-    responses=_data_export_responses,
-)
-async def get_async_job_result(job_id: AsyncJobId):
-    """Get the result of the async job"""
-
-
-@router.get(
-    "/storage/async-jobs",
-    response_model=Envelope[list[TaskResult]],
-    name="get_async_jobs",
-    responses=_data_export_responses,
-)
-async def get_async_jobs():
-    """Returns the user's async jobs"""

api/specs/web-server/_tasks.py

@@ -139,8 +139,8 @@ async def get_async_job_status(request: web.Request) -> web.Response:
     )
 
 
-@routes.post(
-    _task_prefix + "/{task_id}:abort",
+@routes.delete(
+    _task_prefix + "/{task_id}",
     name="abort_async_job",
 )
 @login_required

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

@@ -182,15 +182,19 @@ async def test_abort_async_jobs(
     user_role: UserRole,
     logged_user: UserInfoDict,
     client: TestClient,
-    create_storage_rpc_client_mock: Callable[[str, Any], None],
+    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(abort.__name__, backend_result_or_exception)
+    create_storage_rpc_client_mock(
+        "simcore_service_webserver.tasks._rest",
+        abort.__name__,
+        backend_result_or_exception,
+    )
 
-    response = await client.post(f"/{API_VERSION}/storage/async-jobs/{_job_id}:abort")
+    response = await client.delete(f"/{API_VERSION}/tasks/{_job_id}")
     assert response.status == expected_status
 
 
@@ -284,7 +288,7 @@ async def test_get_user_async_jobs(
             TaskStatus,
         ),
         (
-            "POST",
+            "DELETE",
             "abort_href",
             abort.__name__,
             AsyncJobAbort(result=True, job_id=AsyncJobId(_faker.uuid4())),