convert to OwnerMetadata baseclass before submitting rpc requests

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/services_rpc/storage.py

@@ -7,6 +7,7 @@
 from models_library.api_schemas_webserver.storage import PathToExport
 from models_library.products import ProductName
 from models_library.users import UserID
+from servicelib.celery.models import OwnerMetadata
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.storage import simcore_s3 as storage_rpc
 
@@ -33,8 +34,10 @@ async def start_data_export(
             self._rpc_client,
             paths_to_export=paths_to_export,
             export_as="download_link",
-            owner_metadata=ApiServerOwnerMetadata(
-                user_id=self._user_id, product_name=self._product_name
+            owner_metadata=OwnerMetadata.model_validate(
+                ApiServerOwnerMetadata(
+                    user_id=self._user_id, product_name=self._product_name
+                ).model_dump()
             ),
             user_id=self._user_id,
         )

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

@@ -27,6 +27,7 @@
     parse_request_path_parameters_as,
 )
 from servicelib.aiohttp.rest_responses import create_data_response
+from servicelib.celery.models import OwnerMetadata
 from servicelib.long_running_tasks import lrt_api
 from servicelib.rabbitmq.rpc_interfaces.async_jobs import async_jobs
 
@@ -69,9 +70,11 @@ async def get_async_jobs(request: web.Request) -> web.Response:
     user_async_jobs = await async_jobs.list_jobs(
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
-        owner_metadata=WebServerOwnerMetadata(
-            user_id=_req_ctx.user_id,
-            product_name=_req_ctx.product_name,
+        owner_metadata=OwnerMetadata.model_validate(
+            WebServerOwnerMetadata(
+                user_id=_req_ctx.user_id,
+                product_name=_req_ctx.product_name,
+            ).model_dump()
         ),
     )
     return create_data_response(
@@ -118,9 +121,11 @@ async def get_async_job_status(request: web.Request) -> web.Response:
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
         job_id=async_job_get.task_id,
-        owner_metadata=WebServerOwnerMetadata(
-            user_id=_req_ctx.user_id,
-            product_name=_req_ctx.product_name,
+        owner_metadata=OwnerMetadata.model_validate(
+            WebServerOwnerMetadata(
+                user_id=_req_ctx.user_id,
+                product_name=_req_ctx.product_name,
+            ).model_dump()
         ),
     )
     _task_id = f"{async_job_rpc_status.job_id}"
@@ -154,9 +159,11 @@ async def cancel_async_job(request: web.Request) -> web.Response:
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
         job_id=async_job_get.task_id,
-        owner_metadata=WebServerOwnerMetadata(
-            user_id=_req_ctx.user_id,
-            product_name=_req_ctx.product_name,
+        owner_metadata=OwnerMetadata.model_validate(
+            WebServerOwnerMetadata(
+                user_id=_req_ctx.user_id,
+                product_name=_req_ctx.product_name,
+            ).model_dump()
         ),
     )
 
@@ -182,9 +189,11 @@ class _PathParams(BaseModel):
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
         job_id=async_job_get.task_id,
-        owner_metadata=WebServerOwnerMetadata(
-            user_id=_req_ctx.user_id,
-            product_name=_req_ctx.product_name,
+        owner_metadata=OwnerMetadata.model_validate(
+            WebServerOwnerMetadata(
+                user_id=_req_ctx.user_id,
+                product_name=_req_ctx.product_name,
+            ).model_dump()
         ),
     )