add links also to status response

Author: bisgaard-itis

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

@@ -7,7 +7,7 @@
     DEFAULT_NUMBER_OF_PATHS_PER_PAGE,
     MAX_NUMBER_OF_PATHS_PER_PAGE,
 )
-from pydantic import BaseModel, Field, HttpUrl
+from pydantic import BaseModel, Field
 
 from ..api_schemas_rpc_async_jobs.async_jobs import (
     AsyncJobGet,
@@ -52,9 +52,17 @@ def to_rpc_schema(self, location_id: LocationID) -> DataExportTaskStartInput:
 
 
 class AsyncJobLinks(OutputSchema):
-    status_href: HttpUrl
-    abort_href: HttpUrl
-    result_href: HttpUrl
+    status_href: str
+    abort_href: str
+    result_href: str
+
+    @classmethod
+    def from_job_id(cls, app: web.Application, job_id: str) -> "AsyncJobLinks":
+        return AsyncJobLinks(
+            status_href=f"{app.router['get_async_job_status'].url_for(job_id=job_id)}",
+            abort_href=f"{app.router['abort_async_job'].url_for(job_id=job_id)}",
+            result_href=f"{app.router['get_async_job_result'].url_for(job_id=job_id)}",
+        )
 
 
 class StorageAsyncJobGet(OutputSchema):
@@ -63,21 +71,13 @@ class StorageAsyncJobGet(OutputSchema):
 
     @classmethod
     def from_rpc_schema(
-        cls, app: web.Application, async_job_rpc_get: AsyncJobGet
+        cls, *, app: web.Application, async_job_rpc_get: AsyncJobGet
     ) -> "StorageAsyncJobGet":
         job_id = f"{async_job_rpc_get.job_id}"
-        links = AsyncJobLinks(
-            status_href=HttpUrl(
-                f"{app.router['get_async_job_status'].url_for(job_id=job_id)}"
-            ),
-            abort_href=HttpUrl(
-                f"{app.router['abort_async_job'].url_for(job_id=job_id)}"
-            ),
-            result_href=HttpUrl(
-                f"{app.router['get_async_job_result'].url_for(job_id=job_id)}"
-            ),
+        return StorageAsyncJobGet(
+            job_id=async_job_rpc_get.job_id,
+            links=AsyncJobLinks.from_job_id(app=app, job_id=job_id),
         )
-        return StorageAsyncJobGet(job_id=async_job_rpc_get.job_id, links=links)
 
 
 class StorageAsyncJobStatus(OutputSchema):
@@ -86,17 +86,21 @@ class StorageAsyncJobStatus(OutputSchema):
     done: bool
     started: datetime
     stopped: datetime | None
+    links: AsyncJobLinks
 
     @classmethod
     def from_rpc_schema(
-        cls, async_job_rpc_status: AsyncJobStatus
+        cls, *, app: web.Application, async_job_rpc_status: AsyncJobStatus
     ) -> "StorageAsyncJobStatus":
         return StorageAsyncJobStatus(
             job_id=async_job_rpc_status.job_id,
             progress=async_job_rpc_status.progress,
             done=async_job_rpc_status.done,
             started=async_job_rpc_status.started,
             stopped=async_job_rpc_status.stopped,
+            links=AsyncJobLinks.from_job_id(
+                app=app, job_id=f"{async_job_rpc_status.job_id}"
+            ),
         )
 
 

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

@@ -432,7 +432,9 @@ class _PathParams(BaseModel):
         ),
     )
     return create_data_response(
-        StorageAsyncJobGet.from_rpc_schema(async_job_rpc_get),
+        StorageAsyncJobGet.from_rpc_schema(
+            app=request.app, async_job_rpc_get=async_job_rpc_get
+        ),
         status=status.HTTP_202_ACCEPTED,
     )
 
@@ -458,7 +460,10 @@ async def get_async_jobs(request: web.Request) -> web.Response:
         filter_="",
     )
     return create_data_response(
-        [StorageAsyncJobGet.from_rpc_schema(job) for job in user_async_jobs],
+        [
+            StorageAsyncJobGet.from_rpc_schema(app=request.app, async_job_rpc_get=job)
+            for job in user_async_jobs
+        ],
         status=status.HTTP_200_OK,
     )
 
@@ -484,7 +489,9 @@ async def get_async_job_status(request: web.Request) -> web.Response:
         ),
     )
     return create_data_response(
-        StorageAsyncJobStatus.from_rpc_schema(async_job_rpc_status),
+        StorageAsyncJobStatus.from_rpc_schema(
+            app=request.app, async_job_rpc_status=async_job_rpc_status
+        ),
         status=status.HTTP_200_OK,
     )
 
@@ -510,9 +517,11 @@ async def abort_async_job(request: web.Request) -> web.Response:
         ),
     )
     return web.Response(
-        status=status.HTTP_200_OK
-        if async_job_rpc_abort.result
-        else status.HTTP_500_INTERNAL_SERVER_ERROR
+        status=(
+            status.HTTP_200_OK
+            if async_job_rpc_abort.result
+            else status.HTTP_500_INTERNAL_SERVER_ERROR
+        )
     )