fix tests

Author: bisgaard-itis

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

@@ -172,9 +172,11 @@ async def register_function_job(
     user_id: Annotated[UserID, Depends(get_current_user_id)],
     product_name: Annotated[ProductName, Depends(get_product_name)],
 ) -> RegisteredFunctionJob:
-    return await wb_api_rpc.register_function_job(
-        function_job=function_job, user_id=user_id, product_name=product_name
+    registered_jobs = await wb_api_rpc.register_function_job(
+        function_jobs=[function_job], user_id=user_id, product_name=product_name
     )
+    assert len(registered_jobs) == 1  # nosec
+    return registered_jobs[0]
 
 
 @function_job_router.get(

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

@@ -28,7 +28,7 @@
 from ..._service_functions import FunctionService
 from ...models.pagination import Page, PaginationParams
 from ...models.schemas.errors import ErrorGet
-from ...models.schemas.jobs import JobPricingSpecification
+from ...models.schemas.jobs import JobInputs, JobPricingSpecification
 from ...services_rpc.wb_api_server import WbApiRpcClient
 from ..dependencies.authentication import (
     Identity,
@@ -305,7 +305,7 @@ async def validate_function_inputs(
 ) -> tuple[bool, str]:
     return await function_job_service.validate_function_inputs(
         function=function,
-        inputs=inputs,
+        job_inputs=[JobInputs(values=inputs or {})],
     )
 
 

services/api-server/tests/unit/api_functions/test_api_routers_function_jobs.py

@@ -20,6 +20,7 @@
     RegisteredProjectFunctionJob,
 )
 from models_library.functions import (
+    FunctionJobList,
     FunctionJobStatus,
     RegisteredProjectFunction,
     RegisteredProjectFunctionJobWithStatus,
@@ -65,15 +66,23 @@ async def test_delete_function_job(
 
 async def test_register_function_job(
     client: AsyncClient,
-    mock_handler_in_functions_rpc_interface: Callable[[str, Any], None],
+    mock_handler_in_functions_rpc_interface: Callable,
     fake_project_function_job: ProjectFunctionJob,
     fake_registered_project_function_job: RegisteredProjectFunctionJob,
     auth: httpx.BasicAuth,
 ) -> None:
     """Test the register_function_job endpoint."""
 
+    async def _register_function_job_side_effect(
+        user_id: UserID,
+        function_jobs: FunctionJobList,
+        product_name: ProductName,
+    ):
+        assert len(function_jobs) == 1
+        return [fake_registered_project_function_job]
+
     mock_handler_in_functions_rpc_interface(
-        "register_function_job", fake_registered_project_function_job
+        "register_function_job", side_effect=_register_function_job_side_effect
     )
 
     response = await client.post(

services/api-server/tests/unit/api_functions/test_api_routers_functions.py

@@ -19,18 +19,22 @@
 from httpx import AsyncClient
 from models_library.api_schemas_long_running_tasks.tasks import TaskGet
 from models_library.functions import (
+    FunctionJobList,
     FunctionUserAccessRights,
     FunctionUserApiAccessRights,
     ProjectFunction,
     RegisteredFunction,
     RegisteredFunctionJob,
     RegisteredProjectFunction,
     RegisteredProjectFunctionJob,
+    RegisteredProjectFunctionJobPatchInputList,
+    RegisteredSolverFunctionJobPatchInputList,
 )
 from models_library.functions_errors import (
     FunctionIDNotFoundError,
     FunctionReadAccessDeniedError,
 )
+from models_library.products import ProductName
 from models_library.rest_pagination import PageMetaInfoLimitOffset
 from models_library.users import UserID
 from pydantic import EmailStr
@@ -471,8 +475,16 @@ def _default_side_effect(
         "get_function", fake_registered_project_function
     )
     mock_handler_in_functions_rpc_interface("find_cached_function_jobs", [])
+
+    async def _register_function_job_side_effect(
+        user_id: UserID,
+        function_jobs: FunctionJobList,
+        product_name: ProductName,
+    ):
+        return [fake_registered_project_function_job] * len(function_jobs)
+
     mock_handler_in_functions_rpc_interface(
-        "register_function_job", fake_registered_project_function_job
+        "register_function_job", side_effect=_register_function_job_side_effect
     )
     mock_handler_in_functions_rpc_interface(
         "get_functions_user_api_access_rights",
@@ -483,8 +495,28 @@ def _default_side_effect(
             read_functions=True,
         ),
     )
+
+    async def _patch_registered_function_job_side_effect(
+        product_name: ProductName,
+        user_id: UserID,
+        registered_function_job_patch_inputs: (
+            RegisteredProjectFunctionJobPatchInputList
+            | RegisteredSolverFunctionJobPatchInputList
+        ),
+    ):
+        return [
+            fake_registered_project_function_job.model_copy(
+                update={
+                    "job_creation_task_id": patch.patch.job_creation_task_id,
+                    "uid": patch.uid,
+                }
+            )
+            for patch in registered_function_job_patch_inputs
+        ]
+
     mock_handler_in_functions_rpc_interface(
-        "patch_registered_function_job", fake_registered_project_function_job
+        "patch_registered_function_job",
+        side_effect=_patch_registered_function_job_side_effect,
     )
 
     pre_registered_function_job_data = PreRegisteredFunctionJobData(