fix signatures

Author: bisgaard-itis

api/specs/web-server/_storage.py

@@ -5,9 +5,9 @@
 
 
 from typing import Annotated, TypeAlias
-from uuid import UUID
 
 from fastapi import APIRouter, Depends, Query, status
+from models_library.api_schemas_rpc_async_jobs.async_jobs import AsyncJobId
 from models_library.api_schemas_storage.storage_schemas import (
     FileLocation,
     FileMetaDataGet,
@@ -210,15 +210,15 @@ async def export_data(data_export: DataExportPost, location_id: LocationID):
     response_model=Envelope[StorageAsyncJobStatus],
     name="get_async_job_status",
 )
-async def get_async_job_status(storage_async_job_get: StorageAsyncJobGet, job_id: UUID):
+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",
 )
-async def abort_async_job(storage_async_job_get: StorageAsyncJobGet, job_id: UUID):
+async def abort_async_job(job_id: AsyncJobId):
     """aborts execution of an async job"""
 
 
@@ -227,7 +227,7 @@ async def abort_async_job(storage_async_job_get: StorageAsyncJobGet, job_id: UUI
     response_model=Envelope[StorageAsyncJobResult],
     name="get_async_job_result",
 )
-async def get_async_job_result(storage_async_job_get: StorageAsyncJobGet, job_id: UUID):
+async def get_async_job_result(job_id: AsyncJobId):
     """Get the result of the async job"""
 
 

packages/models-library/src/models_library/api_schemas_webserver/storage.py

@@ -65,6 +65,10 @@ def from_job_id(cls, app: web.Application, job_id: str) -> "AsyncJobLinks":
         )
 
 
+class StorageAsyncJobId(InputSchema):
+    job_id: AsyncJobId
+
+
 class StorageAsyncJobGet(OutputSchema):
     job_id: AsyncJobId
     links: AsyncJobLinks
@@ -73,10 +77,11 @@ class StorageAsyncJobGet(OutputSchema):
     def from_rpc_schema(
         cls, *, app: web.Application, async_job_rpc_get: AsyncJobGet
     ) -> "StorageAsyncJobGet":
-        job_id = f"{async_job_rpc_get.job_id}"
         return StorageAsyncJobGet(
             job_id=async_job_rpc_get.job_id,
-            links=AsyncJobLinks.from_job_id(app=app, job_id=job_id),
+            links=AsyncJobLinks.from_job_id(
+                app=app, job_id=f"{async_job_rpc_get.job_id}"
+            ),
         )
 
 

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

@@ -6427,12 +6427,6 @@ paths:
           type: string
           format: uuid
           title: Job Id
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/StorageAsyncJobGet'
       responses:
         '200':
           description: Successful Response
@@ -6455,12 +6449,6 @@ paths:
           type: string
           format: uuid
           title: Job Id
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/StorageAsyncJobGet'
       responses:
         '200':
           description: Successful Response
@@ -6482,12 +6470,6 @@ paths:
           type: string
           format: uuid
           title: Job Id
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/StorageAsyncJobGet'
       responses:
         '200':
           description: Successful Response
@@ -7798,6 +7780,23 @@ components:
       - app_name
       - version
       title: AppStatusCheck
+    AsyncJobLinks:
+      properties:
+        statusHref:
+          type: string
+          title: Statushref
+        abortHref:
+          type: string
+          title: Aborthref
+        resultHref:
+          type: string
+          title: Resulthref
+      type: object
+      required:
+      - statusHref
+      - abortHref
+      - resultHref
+      title: AsyncJobLinks
     Author:
       properties:
         name:
@@ -14891,9 +14890,12 @@ components:
           type: string
           format: uuid
           title: Jobid
+        links:
+          $ref: '#/components/schemas/AsyncJobLinks'
       type: object
       required:
       - jobId
+      - links
       title: StorageAsyncJobGet
     StorageAsyncJobResult:
       properties:
@@ -14933,13 +14935,16 @@ components:
             format: date-time
           - type: 'null'
           title: Stopped
+        links:
+          $ref: '#/components/schemas/AsyncJobLinks'
       type: object
       required:
       - jobId
       - progress
       - done
       - started
       - stopped
+      - links
       title: StorageAsyncJobStatus
     Structure:
       properties:

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

@@ -20,6 +20,7 @@
 from models_library.api_schemas_webserver.storage import (
     DataExportPost,
     StorageAsyncJobGet,
+    StorageAsyncJobId,
     StorageAsyncJobResult,
     StorageAsyncJobStatus,
 )
@@ -479,7 +480,7 @@ async def get_async_job_status(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(StorageAsyncJobGet, request)
+    async_job_get = parse_request_path_parameters_as(StorageAsyncJobId, request)
     async_job_rpc_status = await get_status(
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
@@ -507,7 +508,7 @@ async def abort_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(StorageAsyncJobGet, request)
+    async_job_get = parse_request_path_parameters_as(StorageAsyncJobId, request)
     async_job_rpc_abort = await abort(
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
@@ -536,7 +537,7 @@ async def get_async_job_result(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(StorageAsyncJobGet, request)
+    async_job_get = parse_request_path_parameters_as(StorageAsyncJobId, request)
     async_job_rpc_result = await get_result(
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,