updates signature

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_rpc_server.py

@@ -5,18 +5,23 @@
 # pylint: disable=unused-variable
 
 
+from models_library.products import ProductName
 from models_library.projects import ProjectID
-from pydantic import TypeAdapter
+from models_library.users import UserID
+from pydantic import TypeAdapter, validate_call
 from servicelib.rabbitmq._client_rpc import RabbitMQRPCClient
 
 
 class WebserverRpcSideEffects:
     # pylint: disable=no-self-use
 
+    @validate_call(config=dict(arbitrary_types_allowed=True))
     async def mark_project_as_job(
         self,
         rpc_client: RabbitMQRPCClient,
         *,
+        product_name: ProductName,
+        user_id: UserID,
         project_uuid: ProjectID,
         job_parent_resource_name: str,
     ) -> None:
@@ -26,4 +31,7 @@ async def mark_project_as_job(
         assert "/" in job_parent_resource_name  # nosec
         assert not job_parent_resource_name.endswith("/")  # nosec
 
+        assert product_name
+        assert user_id
+
         TypeAdapter(ProjectID).validate_python(project_uuid)

services/api-server/src/simcore_service_api_server/api/routes/solvers_jobs.py

@@ -146,7 +146,10 @@ async def create_job(
     assert job.name == _compose_job_resource_name(solver_key, version, job.id)  # nosec
 
     await wb_api_rpc.mark_project_as_job(
-        project_uuid=new_project.uuid, job_parent_resource_name=job.runner_name
+        product_name=product_name,
+        user_id=user_id,
+        project_uuid=new_project.uuid,
+        job_parent_resource_name=job.runner_name,
     )
 
     return job

services/api-server/src/simcore_service_api_server/api/routes/studies_jobs.py

@@ -46,7 +46,7 @@
 from ...services_http.webserver import AuthSession
 from ...services_rpc.wb_api_server import WbApiRpcClient
 from ..dependencies.application import get_reverse_url_mapper
-from ..dependencies.authentication import get_current_user_id
+from ..dependencies.authentication import get_current_user_id, get_product_name
 from ..dependencies.services import get_api_client
 from ..dependencies.webserver_http import get_webserver_session
 from ..dependencies.webserver_rpc import (
@@ -92,6 +92,8 @@ async def create_study_job(
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
     wb_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
+    user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
+    product_name: Annotated[str, Depends(get_product_name)],
     hidden: Annotated[bool, Query()] = True,
     x_simcore_parent_project_uuid: ProjectID | None = Header(default=None),
     x_simcore_parent_node_id: NodeID | None = Header(default=None),
@@ -126,7 +128,10 @@ async def create_study_job(
     )
 
     await wb_api_rpc.mark_project_as_job(
-        project_uuid=job.id, job_parent_resource_name=job.runner_name
+        product_name=product_name,
+        user_id=user_id,
+        project_uuid=job.id,
+        job_parent_resource_name=job.runner_name,
     )
 
     project_inputs = await webserver_api.get_project_inputs(project_id=project.uuid)

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

@@ -6,6 +6,7 @@
 from fastapi_pagination import create_page
 from models_library.api_schemas_webserver.licensed_items import LicensedItemRpcGetPage
 from models_library.licenses import LicensedItemID
+from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.resource_tracker_licensed_items_checkouts import (
     LicensedItemCheckoutID,
@@ -96,7 +97,7 @@ class WbApiRpcClient(SingletonInAppStateMixin):
 
     @_exception_mapper(rpc_exception_map={})
     async def get_licensed_items(
-        self, *, product_name: str, page_params: PaginationParams
+        self, *, product_name: ProductName, page_params: PaginationParams
     ) -> Page[LicensedItemGet]:
         licensed_items_page = await _get_licensed_items(
             rabbitmq_rpc_client=self._client,
@@ -112,7 +113,7 @@ async def get_licensed_items(
     async def get_available_licensed_items_for_wallet(
         self,
         *,
-        product_name: str,
+        product_name: ProductName,
         wallet_id: WalletID,
         user_id: UserID,
         page_params: PaginationParams,
@@ -140,7 +141,7 @@ async def get_available_licensed_items_for_wallet(
     async def checkout_licensed_item_for_wallet(
         self,
         *,
-        product_name: str,
+        product_name: ProductName,
         user_id: UserID,
         wallet_id: WalletID,
         licensed_item_id: LicensedItemID,
@@ -177,7 +178,7 @@ async def checkout_licensed_item_for_wallet(
     async def release_licensed_item_for_wallet(
         self,
         *,
-        product_name: str,
+        product_name: ProductName,
         user_id: UserID,
         licensed_item_checkout_id: LicensedItemCheckoutID,
     ) -> LicensedItemCheckoutGet:
@@ -204,16 +205,16 @@ async def ping(self) -> str:
         return await _ping(self._client)
 
     async def mark_project_as_job(
-        self, project_uuid: ProjectID, job_parent_resource_name: RelativeResourceName
+        self,
+        product_name: ProductName,
+        user_id: UserID,
+        project_uuid: ProjectID,
+        job_parent_resource_name: RelativeResourceName,
     ):
-        assert not job_parent_resource_name.startswith("/")  # nosec
-        assert "/" in job_parent_resource_name  # nosec
-        assert not job_parent_resource_name.endswith("/")  # nosec
-
-        assert project_uuid
-
         await projects_rpc.mark_project_as_job(
             rpc_client=self._client,
+            product_name=product_name,
+            user_id=user_id,
             project_uuid=project_uuid,
             job_parent_resource_name=job_parent_resource_name,
         )