fix openapi spec test

Author: bisgaard-itis

api/specs/web-server/_storage.py

@@ -5,12 +5,14 @@
 
 
 from typing import TypeAlias
+from uuid import UUID
 
 from fastapi import APIRouter, Query, status
 from models_library.generics import Envelope
 from models_library.projects_nodes_io import LocationID
 from models_library.storage_schemas import (
     AsyncJobGet,
+    AsyncJobResult,
     AsyncJobStatus,
     DataExportPost,
     FileLocation,
@@ -174,19 +176,36 @@ async def is_completed_upload_file(
 
 # data export
 @router.post(
-    "/storage/export-data",
+    "/storage/locations/{location_id}/export-data",
     response_model=Envelope[AsyncJobGet],
     name="storage_export_data",
     description="Export data",
 )
-async def export_data(data_export: DataExportPost):
+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/status",
+    "/storage/async-jobs/{job_id}/status",
     response_model=Envelope[AsyncJobStatus],
     name="storage_async_job_status",
 )
-async def get_async_job_status(task_id: AsyncJobGet):
+async def get_async_job_status(task_id: AsyncJobGet, job_id: UUID):
+    """Get async job status"""
+
+
+@router.post(
+    "/storage/async-jobs/{job_id}:abort",
+    name="abort_async_job",
+)
+async def abort_async_job(task_id: AsyncJobGet, job_id: UUID):
+    """Get async job status"""
+
+
+@router.get(
+    "/storage/async-jobs/{job_id}/result",
+    response_model=Envelope[AsyncJobResult],
+    name="get_async_job_result",
+)
+async def get_async_job_result(task_id: AsyncJobGet, job_id: UUID):
     """Get async job status"""

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

@@ -6351,46 +6351,116 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/Envelope_FileUploadCompleteFutureResponse_'
-  /v0/storage/export-data:
+  /v0/storage/locations/{location_id}/export-data:
     post:
       tags:
       - storage
       summary: Storage Export Data
       description: Export data
       operationId: export_data
+      parameters:
+      - name: location_id
+        in: path
+        required: true
+        schema:
+          type: integer
+          title: Location Id
       requestBody:
+        required: true
         content:
           application/json:
             schema:
               $ref: '#/components/schemas/DataExportPost'
-        required: true
       responses:
         '200':
           description: Successful Response
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/Envelope_AsyncJobGet_'
-  /v0/storage/async-jobs/status:
+  /v0/storage/async-jobs/{job_id}/status:
     get:
       tags:
       - storage
       summary: Storage Async Job Status
       description: Get async job status
       operationId: get_async_job_status
+      parameters:
+      - name: job_id
+        in: path
+        required: true
+        schema:
+          type: string
+          format: uuid
+          title: Job Id
       requestBody:
+        required: true
         content:
           application/json:
             schema:
               $ref: '#/components/schemas/AsyncJobGet'
-        required: true
       responses:
         '200':
           description: Successful Response
           content:
             application/json:
               schema:
                 $ref: '#/components/schemas/Envelope_AsyncJobStatus_'
+  /v0/storage/async-jobs/{job_id}:abort:
+    post:
+      tags:
+      - storage
+      summary: Abort Async Job
+      description: Get async job status
+      operationId: abort_async_job
+      parameters:
+      - name: job_id
+        in: path
+        required: true
+        schema:
+          type: string
+          format: uuid
+          title: Job Id
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/AsyncJobGet'
+      responses:
+        '200':
+          description: Successful Response
+          content:
+            application/json:
+              schema: {}
+  /v0/storage/async-jobs/{job_id}/result:
+    get:
+      tags:
+      - storage
+      summary: Get Async Job Result
+      description: Get async job status
+      operationId: get_async_job_result
+      parameters:
+      - name: job_id
+        in: path
+        required: true
+        schema:
+          type: string
+          format: uuid
+          title: Job Id
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/AsyncJobGet'
+      responses:
+        '200':
+          description: Successful Response
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Envelope_AsyncJobResult_'
   /v0/trash:empty:
     post:
       tags:
@@ -7681,6 +7751,23 @@ components:
       required:
       - job_id
       title: AsyncJobGet
+    AsyncJobResult:
+      properties:
+        result:
+          anyOf:
+          - {}
+          - type: 'null'
+          title: Result
+        error:
+          anyOf:
+          - {}
+          - type: 'null'
+          title: Error
+      type: object
+      required:
+      - result
+      - error
+      title: AsyncJobResult
     AsyncJobStatus:
       properties:
         job_id:
@@ -8503,6 +8590,19 @@ components:
           title: Error
       type: object
       title: Envelope[AsyncJobGet]
+    Envelope_AsyncJobResult_:
+      properties:
+        data:
+          anyOf:
+          - $ref: '#/components/schemas/AsyncJobResult'
+          - type: 'null'
+        error:
+          anyOf:
+          - {}
+          - type: 'null'
+          title: Error
+      type: object
+      title: Envelope[AsyncJobResult]
     Envelope_AsyncJobStatus_:
       properties:
         data:

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

@@ -380,8 +380,7 @@ class _PathParams(BaseModel):
 
 
 @routes.post(
-    _storage_locations_prefix + "/{location_id}/export-data",
-    name="storage_export_data",
+    _storage_locations_prefix + "/{location_id}/export-data", name="export_data"
 )
 @login_required
 @permission_required("storage.files.*")
@@ -413,7 +412,7 @@ class _PathParams(BaseModel):
 
 @routes.get(
     _storage_prefix + "/async-jobs/{job_id}/status",
-    name="storage_async_job_status",
+    name="get_async_job_status",
 )
 @login_required
 @permission_required("storage.files.*")
@@ -435,7 +434,7 @@ async def get_async_job_status(request: web.Request) -> web.Response:
 
 @routes.post(
     _storage_prefix + "/async-jobs/{job_id}:abort",
-    name="storage_async_job_abort",
+    name="abort_async_job",
 )
 @login_required
 @permission_required("storage.files.*")
@@ -457,7 +456,7 @@ async def abort_async_job(request: web.Request) -> web.Response:
 
 @routes.get(
     _storage_prefix + "/async-jobs/{job_id}/result",
-    name="storage_async_job_result",
+    name="get_async_job_result",
 )
 @login_required
 @permission_required("storage.files.*")