start fixing tests

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/_service_function_jobs.py

@@ -15,7 +15,9 @@
     RegisteredFunction,
     RegisteredFunctionJob,
     RegisteredProjectFunctionJobPatch,
+    RegisteredProjectFunctionJobPatchInput,
     RegisteredSolverFunctionJobPatch,
+    RegisteredSolverFunctionJobPatchInput,
     SolverFunctionJob,
 )
 from models_library.functions_errors import (
@@ -215,24 +217,30 @@ async def patch_registered_function_job(
         for patch in patches:
             if patch.function_class == FunctionClass.PROJECT:
                 patch_inputs.append(
-                    RegisteredProjectFunctionJobPatch(
-                        title=None,
-                        description=None,
-                        inputs=None,
-                        outputs=None,
-                        job_creation_task_id=patch.job_creation_task_id,
-                        project_job_id=patch.project_job_id,
+                    RegisteredProjectFunctionJobPatchInput(
+                        uid=patch.function_job_id,
+                        patch=RegisteredProjectFunctionJobPatch(
+                            title=None,
+                            description=None,
+                            inputs=None,
+                            outputs=None,
+                            job_creation_task_id=patch.job_creation_task_id,
+                            project_job_id=patch.project_job_id,
+                        ),
                     )
                 )
             elif patch.function_class == FunctionClass.SOLVER:
                 patch_inputs.append(
-                    RegisteredSolverFunctionJobPatch(
-                        title=None,
-                        description=None,
-                        inputs=None,
-                        outputs=None,
-                        job_creation_task_id=patch.job_creation_task_id,
-                        solver_job_id=patch.solver_job_id,
+                    RegisteredSolverFunctionJobPatchInput(
+                        uid=patch.function_job_id,
+                        patch=RegisteredSolverFunctionJobPatch(
+                            title=None,
+                            description=None,
+                            inputs=None,
+                            outputs=None,
+                            job_creation_task_id=patch.job_creation_task_id,
+                            solver_job_id=patch.solver_job_id,
+                        ),
                     )
                 )
             else:

services/api-server/src/simcore_service_api_server/_service_function_jobs_task_client.py

@@ -317,7 +317,9 @@ async def create_function_job_creation_tasks(
             user_id=user_identity.user_id,
             product_name=user_identity.product_name,
             function_id=function.uid,
-            inputs=TypeAdapter(FunctionInputsList).validate_python(inputs),
+            inputs=TypeAdapter(FunctionInputsList).validate_python(
+                [input_.values for input_ in inputs]
+            ),
             status_filter=[FunctionJobStatus(status=RunningState.SUCCESS)],
         )
 

services/api-server/tests/unit/api_functions/celery/test_functions_celery.py

@@ -26,17 +26,22 @@
 from models_library.functions import (
     FunctionClass,
     FunctionID,
+    FunctionInputsList,
     FunctionJobCollection,
     FunctionJobID,
+    FunctionJobList,
+    FunctionJobStatus,
     FunctionUserAccessRights,
     FunctionUserApiAccessRights,
     RegisteredFunction,
     RegisteredFunctionJob,
     RegisteredFunctionJobCollection,
     RegisteredProjectFunction,
     RegisteredProjectFunctionJob,
-    RegisteredProjectFunctionJobPatch,
+    RegisteredProjectFunctionJobPatchInputList,
+    RegisteredSolverFunctionJobPatchInputList,
 )
+from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.users import UserID
 from pytest_mock import MockType
@@ -151,15 +156,48 @@ def _(celery_app: Celery) -> None:
 
 
 async def _patch_registered_function_job_side_effect(
-    mock_registered_project_function_job: RegisteredFunctionJob, *args, **kwargs
+    mock_registered_project_function_job: RegisteredFunctionJob,
+    product_name: ProductName,
+    user_id: UserID,
+    registered_function_job_patch_inputs: (
+        RegisteredProjectFunctionJobPatchInputList
+        | RegisteredSolverFunctionJobPatchInputList
+    ),
 ):
-    registered_function_job_patch = kwargs["registered_function_job_patch"]
-    assert isinstance(registered_function_job_patch, RegisteredProjectFunctionJobPatch)
-    job_creation_task_id = registered_function_job_patch.job_creation_task_id
-    uid = kwargs["function_job_uuid"]
-    return mock_registered_project_function_job.model_copy(
-        update={"job_creation_task_id": job_creation_task_id, "uid": uid}
-    )
+    return [
+        mock_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
+    ]
+
+
+async def _find_cached_function_jobs_side_effect(
+    *,
+    user_id: UserID,
+    product_name: ProductName,
+    function_id: FunctionID,
+    inputs: FunctionInputsList,
+    status_filter: list[FunctionJobStatus] | None,
+):
+    return [None] * len(inputs)
+
+
+async def _register_function_job_side_effect(
+    registered_function_job: RegisteredFunctionJob,
+    user_id: UserID,
+    function_jobs: FunctionJobList,
+    product_name: ProductName,
+):
+    return [
+        registered_function_job.model_copy(
+            update={"uid": FunctionJobID(_faker.uuid4())}
+        )
+        for _ in function_jobs
+    ]
 
 
 @pytest.mark.parametrize("register_celery_tasks", [_register_fake_run_function_task()])
@@ -216,10 +254,14 @@ async def test_with_fake_run_function(
         "get_function", return_value=fake_registered_project_function
     )
     mock_handler_in_functions_rpc_interface(
-        "find_cached_function_jobs", return_value=[]
+        "find_cached_function_jobs", side_effect=_find_cached_function_jobs_side_effect
     )
     mock_handler_in_functions_rpc_interface(
-        "register_function_job", return_value=fake_registered_project_function_job
+        "register_function_job",
+        side_effect=partial(
+            _register_function_job_side_effect,
+            fake_registered_project_function_job,
+        ),
     )
 
     mock_handler_in_functions_rpc_interface(