cleanup task submit in webserver

Author: bisgaard-itis

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

@@ -57,7 +57,7 @@
 from ..rabbitmq import get_rabbitmq_rpc_client
 from ..security.decorators import permission_required
 from ..tasks._exception_handlers import handle_export_data_exceptions
-from ..utils import get_owner_metadata
+from ..utils import WebServerOwnerMetadata
 from .schemas import StorageFileIDStr
 from .settings import StorageSettings, get_plugin_settings
 
@@ -211,7 +211,7 @@ async def compute_path_size(request: web.Request) -> web.Response:
         rabbitmq_rpc_client,
         location_id=path_params.location_id,
         path=path_params.path,
-        owner_metadata=get_owner_metadata(
+        owner_metadata=WebServerOwnerMetadata(
             user_id=req_ctx.user_id,
             product_name=req_ctx.product_name,
         ),
@@ -236,7 +236,7 @@ async def batch_delete_paths(request: web.Request):
         rabbitmq_rpc_client,
         location_id=path_params.location_id,
         paths=body.paths,
-        owner_metadata=get_owner_metadata(
+        owner_metadata=WebServerOwnerMetadata(
             user_id=req_ctx.user_id,
             product_name=req_ctx.product_name,
         ),
@@ -503,7 +503,7 @@ def allow_only_simcore(cls, v: int) -> int:
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         paths_to_export=export_data_post.paths,
         export_as="path",
-        owner_metadata=get_owner_metadata(
+        owner_metadata=WebServerOwnerMetadata(
             user_id=_req_ctx.user_id,
             product_name=_req_ctx.product_name,
         ),

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

@@ -33,7 +33,7 @@
 from ..projects.models import ProjectDict
 from ..projects.utils import NodesMap
 from ..rabbitmq import get_rabbitmq_rpc_client
-from ..utils import get_owner_metadata
+from ..utils import WebServerOwnerMetadata
 from .settings import StorageSettings, get_plugin_settings
 
 _logger = logging.getLogger(__name__)
@@ -119,7 +119,7 @@ async def copy_data_folders_from_project(
             rabbitmq_client,
             method_name="copy_folders_from_project",
             rpc_namespace=STORAGE_RPC_NAMESPACE,
-            job_filter=get_owner_metadata(
+            owner_metadata=WebServerOwnerMetadata(
                 user_id=user_id,
                 product_name=product_name,
             ),

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

@@ -29,14 +29,14 @@
 from servicelib.aiohttp.rest_responses import create_data_response
 from servicelib.long_running_tasks import lrt_api
 from servicelib.rabbitmq.rpc_interfaces.async_jobs import async_jobs
+from simcore_service_webserver.utils import WebServerOwnerMetadata
 
 from .._meta import API_VTAG
 from ..login.decorators import login_required
 from ..long_running_tasks.plugin import webserver_request_context_decorator
 from ..models import AuthenticatedRequestContext
 from ..rabbitmq import get_rabbitmq_rpc_client
 from ..security.decorators import permission_required
-from ..utils import get_owner_metadata
 from ._exception_handlers import handle_export_data_exceptions
 
 log = logging.getLogger(__name__)
@@ -70,7 +70,7 @@ 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,
-        job_filter=get_owner_metadata(
+        owner_metadata=WebServerOwnerMetadata(
             user_id=_req_ctx.user_id,
             product_name=_req_ctx.product_name,
         ),
@@ -119,7 +119,7 @@ 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,
-        job_filter=get_owner_metadata(
+        owner_metadata=WebServerOwnerMetadata(
             user_id=_req_ctx.user_id,
             product_name=_req_ctx.product_name,
         ),
@@ -155,7 +155,7 @@ 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=get_owner_metadata(
+        owner_metadata=WebServerOwnerMetadata(
             user_id=_req_ctx.user_id,
             product_name=_req_ctx.product_name,
         ),
@@ -183,7 +183,7 @@ class _PathParams(BaseModel):
         rabbitmq_rpc_client=rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
         job_id=async_job_get.task_id,
-        job_filter=get_owner_metadata(
+        owner_metadata=WebServerOwnerMetadata(
             user_id=_req_ctx.user_id,
             product_name=_req_ctx.product_name,
         ),

services/web/server/src/simcore_service_webserver/utils.py

@@ -7,11 +7,15 @@
 import os
 import tracemalloc
 from datetime import datetime
+from typing import Annotated
 
 from common_library.error_codes import ErrorCodeStr
+from conftest import product_name
 from models_library.products import ProductName
 from models_library.users import UserID
+from pydantic import Field, StringConstraints
 from servicelib.celery.models import OwnerMetadata
+from test_models_api_keys import user_id
 from typing_extensions import (  # https://docs.pydantic.dev/latest/api/standard_library_types/#typeddict
     TypedDict,
 )
@@ -127,5 +131,9 @@ def compose_support_error_msg(
     return ". ".join(sentences)
 
 
-def get_owner_metadata(*, user_id: UserID, product_name: ProductName) -> OwnerMetadata:
-    return OwnerMetadata(user_id=user_id, product_name=product_name, owner=APP_NAME)
+class WebServerOwnerMetadata(OwnerMetadata):
+    user_id: UserID
+    product_name: ProductName
+    owner: Annotated[
+        str, StringConstraints(pattern=rf"^{APP_NAME}$"), Field(frozen=True)
+    ] = APP_NAME