correct wrong usage of client_app_name

Author: bisgaard-itis

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage/_utils.py

@@ -5,26 +5,21 @@
     AsyncJobGet,
 )
 from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
-from models_library.products import ProductName
 from models_library.projects_nodes_io import LocationID
 from models_library.rabbitmq_basic_types import RPCMethodName
-from models_library.users import UserID
 from pydantic import TypeAdapter
 
 from ..._client_rpc import RabbitMQRPCClient
 from ..async_jobs.async_jobs import submit
-from ._utils import get_async_job_filter
 
 
 async def compute_path_size(
     client: RabbitMQRPCClient,
     *,
-    user_id: UserID,
-    product_name: ProductName,
     location_id: LocationID,
     path: Path,
+    job_filter: AsyncJobFilter,
 ) -> tuple[AsyncJobGet, AsyncJobFilter]:
-    job_filter = get_async_job_filter(user_id=user_id, product_name=product_name)
     async_job_rpc_get = await submit(
         rabbitmq_rpc_client=client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
@@ -39,12 +34,10 @@ async def compute_path_size(
 async def delete_paths(
     client: RabbitMQRPCClient,
     *,
-    user_id: UserID,
-    product_name: ProductName,
     location_id: LocationID,
     paths: set[Path],
+    job_filter: AsyncJobFilter,
 ) -> tuple[AsyncJobGet, AsyncJobFilter]:
-    job_filter = get_async_job_filter(user_id=user_id, product_name=product_name)
     async_job_rpc_get = await submit(
         rabbitmq_rpc_client=client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage/paths.py

@@ -7,24 +7,16 @@
 from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
 from models_library.api_schemas_storage.storage_schemas import FoldersBody
 from models_library.api_schemas_webserver.storage import PathToExport
-from models_library.products import ProductName
 from models_library.rabbitmq_basic_types import RPCMethodName
-from models_library.users import UserID
 from pydantic import TypeAdapter
 
 from ... import RabbitMQRPCClient
 from ..async_jobs.async_jobs import submit
-from ._utils import get_async_job_filter
 
 
 async def copy_folders_from_project(
-    client: RabbitMQRPCClient,
-    *,
-    user_id: UserID,
-    product_name: ProductName,
-    body: FoldersBody,
+    client: RabbitMQRPCClient, *, body: FoldersBody, job_filter: AsyncJobFilter
 ) -> tuple[AsyncJobGet, AsyncJobFilter]:
-    job_filter = get_async_job_filter(user_id=user_id, product_name=product_name)
     async_job_rpc_get = await submit(
         rabbitmq_rpc_client=client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,
@@ -40,12 +32,10 @@ async def copy_folders_from_project(
 async def start_export_data(
     rabbitmq_rpc_client: RabbitMQRPCClient,
     *,
-    user_id: UserID,
-    product_name: ProductName,
     paths_to_export: list[PathToExport],
     export_as: Literal["path", "download_link"],
+    job_filter: AsyncJobFilter
 ) -> tuple[AsyncJobGet, AsyncJobFilter]:
-    job_filter = get_async_job_filter(user_id=user_id, product_name=product_name)
     async_job_rpc_get = await submit(
         rabbitmq_rpc_client,
         rpc_namespace=STORAGE_RPC_NAMESPACE,

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/storage/simcore_s3.py

@@ -1,13 +1,17 @@
 from dataclasses import dataclass
 from functools import partial
 
-from models_library.api_schemas_rpc_async_jobs.async_jobs import AsyncJobGet
+from models_library.api_schemas_rpc_async_jobs.async_jobs import (
+    AsyncJobFilter,
+    AsyncJobGet,
+)
 from models_library.api_schemas_webserver.storage import PathToExport
 from models_library.products import ProductName
 from models_library.users import UserID
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.storage import simcore_s3 as storage_rpc
 
+from ..api.dependencies.celery import ASYNC_JOB_CLIENT_NAME
 from ..exceptions.service_errors_utils import service_exception_mapper
 
 _exception_mapper = partial(service_exception_mapper, service_name="Storage")
@@ -26,9 +30,12 @@ async def start_data_export(
     ) -> AsyncJobGet:
         async_job_get, _ = await storage_rpc.start_export_data(
             self._rpc_client,
-            user_id=self._user_id,
-            product_name=self._product_name,
             paths_to_export=paths_to_export,
             export_as="download_link",
+            job_filter=AsyncJobFilter(
+                user_id=self._user_id,
+                product_name=self._product_name,
+                client_name=ASYNC_JOB_CLIENT_NAME,
+            ),
         )
         return async_job_get

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

@@ -71,10 +71,11 @@ async def _assert_compute_path_size(
 ) -> ByteSize:
     async_job, async_job_name = await compute_path_size(
         storage_rpc_client,
-        product_name=product_name,
-        user_id=user_id,
         location_id=location_id,
         path=path,
+        job_filter=AsyncJobFilter(
+            user_id=user_id, product_name=product_name, client_name="PYTEST_CLIENT_NAME"
+        ),
     )
     async for job_composed_result in wait_and_get_result(
         storage_rpc_client,
@@ -107,10 +108,11 @@ async def _assert_delete_paths(
 ) -> None:
     async_job, async_job_name = await delete_paths(
         storage_rpc_client,
-        product_name=product_name,
-        user_id=user_id,
         location_id=location_id,
         paths=paths,
+        job_filter=AsyncJobFilter(
+            user_id=user_id, product_name=product_name, client_name="PYTEST_CLIENT_NAME"
+        ),
     )
     async for job_composed_result in wait_and_get_result(
         storage_rpc_client,

services/storage/tests/unit/test_rpc_handlers_paths.py

@@ -24,7 +24,10 @@
 from faker import Faker
 from fastapi import FastAPI
 from fastapi.encoders import jsonable_encoder
-from models_library.api_schemas_rpc_async_jobs.async_jobs import AsyncJobResult
+from models_library.api_schemas_rpc_async_jobs.async_jobs import (
+    AsyncJobFilter,
+    AsyncJobResult,
+)
 from models_library.api_schemas_rpc_async_jobs.exceptions import JobError
 from models_library.api_schemas_storage import STORAGE_RPC_NAMESPACE
 from models_library.api_schemas_storage.storage_schemas import (
@@ -84,11 +87,14 @@ async def _request_copy_folders(
     ) as ctx:
         async_job_get, async_job_name = await copy_folders_from_project(
             rpc_client,
-            user_id=user_id,
-            product_name=product_name,
             body=FoldersBody(
                 source=source_project, destination=dst_project, nodes_map=nodes_map
             ),
+            job_filter=AsyncJobFilter(
+                user_id=user_id,
+                product_name=product_name,
+                client_name="PYTEST_CLIENT_NAME",
+            ),
         )
 
         async for async_job_result in wait_and_get_result(
@@ -526,10 +532,13 @@ async def _request_start_export_data(
     ) as ctx:
         async_job_get, async_job_name = await start_export_data(
             rpc_client,
-            user_id=user_id,
-            product_name=product_name,
             paths_to_export=paths_to_export,
             export_as=export_as,
+            job_filter=AsyncJobFilter(
+                user_id=user_id,
+                product_name=product_name,
+                client_name="PYTEST_CLIENT_NAME",
+            ),
         )
 
         async for async_job_result in wait_and_get_result(

services/storage/tests/unit/test_rpc_handlers_simcore_s3.py

@@ -12,7 +12,10 @@
 from models_library.api_schemas_long_running_tasks.tasks import (
     TaskGet,
 )
-from models_library.api_schemas_rpc_async_jobs.async_jobs import AsyncJobGet
+from models_library.api_schemas_rpc_async_jobs.async_jobs import (
+    AsyncJobFilter,
+    AsyncJobGet,
+)
 from models_library.api_schemas_storage.storage_schemas import (
     FileUploadCompleteResponse,
     FileUploadCompletionBody,
@@ -47,6 +50,7 @@
 from servicelib.rabbitmq.rpc_interfaces.storage.simcore_s3 import start_export_data
 from servicelib.request_keys import RQT_USERID_KEY
 from servicelib.rest_responses import unwrap_envelope
+from simcore_service_webserver.constants import ASYNC_JOB_CLIENT_NAME
 from yarl import URL
 
 from .._meta import API_VTAG
@@ -206,10 +210,13 @@ async def compute_path_size(request: web.Request) -> web.Response:
     rabbitmq_rpc_client = get_rabbitmq_rpc_client(request.app)
     async_job, _ = await remote_compute_path_size(
         rabbitmq_rpc_client,
-        user_id=req_ctx.user_id,
-        product_name=req_ctx.product_name,
         location_id=path_params.location_id,
         path=path_params.path,
+        job_filter=AsyncJobFilter(
+            user_id=req_ctx.user_id,
+            product_name=req_ctx.product_name,
+            client_name=ASYNC_JOB_CLIENT_NAME,
+        ),
     )
 
     return _create_data_response_from_async_job(request, async_job)
@@ -229,10 +236,13 @@ async def batch_delete_paths(request: web.Request):
     rabbitmq_rpc_client = get_rabbitmq_rpc_client(request.app)
     async_job, _ = await remote_delete_paths(
         rabbitmq_rpc_client,
-        user_id=req_ctx.user_id,
-        product_name=req_ctx.product_name,
         location_id=path_params.location_id,
         paths=body.paths,
+        job_filter=AsyncJobFilter(
+            user_id=req_ctx.user_id,
+            product_name=req_ctx.product_name,
+            client_name=ASYNC_JOB_CLIENT_NAME,
+        ),
     )
     return _create_data_response_from_async_job(request, async_job)
 
@@ -494,10 +504,13 @@ def allow_only_simcore(cls, v: int) -> int:
     )
     async_job_rpc_get, _ = await start_export_data(
         rabbitmq_rpc_client=rabbitmq_rpc_client,
-        user_id=_req_ctx.user_id,
-        product_name=_req_ctx.product_name,
         paths_to_export=export_data_post.paths,
         export_as="path",
+        job_filter=AsyncJobFilter(
+            user_id=_req_ctx.user_id,
+            product_name=_req_ctx.product_name,
+            client_name=ASYNC_JOB_CLIENT_NAME,
+        ),
     )
     _job_id = f"{async_job_rpc_get.job_id}"
     return create_data_response(