add test for checking function job patch method

bisgaard-itis · bisgaard-itis · commit b306b1929ae9 · 2025-08-26T14:43:51.000+02:00
diff --git a/services/web/server/src/simcore_service_webserver/functions/_controller/_functions_rpc.py b/services/web/server/src/simcore_service_webserver/functions/_controller/_functions_rpc.py
@@ -88,6 +88,27 @@ async def register_function_job(
     )
 
 
+@router.expose(
+    reraise_if_error_type=(
+        UnsupportedFunctionJobClassError,
+        FunctionJobsWriteApiAccessDeniedError,
+    )
+)
+async def patch_registered_function_job(
+    app: web.Application,
+    *,
+    user_id: UserID,
+    product_name: ProductName,
+    registered_function_job: RegisteredFunctionJob,
+) -> RegisteredFunctionJob:
+    return await _functions_service.patch_registered_function_job(
+        app=app,
+        user_id=user_id,
+        product_name=product_name,
+        registered_function_job=registered_function_job,
+    )
+
+
 @router.expose(reraise_if_error_type=(FunctionJobCollectionsWriteApiAccessDeniedError,))
 async def register_function_job_collection(
     app: web.Application,
diff --git a/services/web/server/src/simcore_service_webserver/functions/_functions_service.py b/services/web/server/src/simcore_service_webserver/functions/_functions_service.py
@@ -95,6 +95,17 @@ async def register_function_job(
     return _decode_functionjob(created_function_job_db)
 
 
+async def patch_registered_function_job(
+    app: web.Application,
+    *,
+    user_id: UserID,
+    product_name: ProductName,
+    registered_function_job: RegisteredFunctionJob,
+) -> RegisteredFunctionJob:
+    encoded_function_job = _encode_functionjob(registered_function_job)
+    return registered_function_job
+
+
 async def register_function_job_collection(
     app: web.Application,
     *,
@@ -675,13 +686,31 @@ def _encode_functionjob(
     if functionjob.function_class == FunctionClass.PROJECT:
         class_specific_data = FunctionJobClassSpecificData(
             {
-                "project_job_id": str(functionjob.project_job_id),
+                "project_job_id": (
+                    str(functionjob.project_job_id)
+                    if functionjob.project_job_id
+                    else None
+                ),
+                "job_creation_task_id": (
+                    str(functionjob.job_creation_task_id)
+                    if functionjob.job_creation_task_id
+                    else None
+                ),
             }
         )
     elif functionjob.function_class == FunctionClass.SOLVER:
         class_specific_data = FunctionJobClassSpecificData(
             {
-                "solver_job_id": str(functionjob.solver_job_id),
+                "solver_job_id": (
+                    str(functionjob.solver_job_id)
+                    if functionjob.solver_job_id
+                    else None
+                ),
+                "job_creation_task_id": (
+                    str(functionjob.job_creation_task_id)
+                    if functionjob.job_creation_task_id
+                    else None
+                ),
             }
         )
     else:
@@ -711,6 +740,9 @@ def _decode_functionjob(
             inputs=functionjob_db.inputs,
             outputs=functionjob_db.outputs,
             project_job_id=functionjob_db.class_specific_data["project_job_id"],
+            job_creation_task_id=functionjob_db.class_specific_data[
+                "job_creation_task_id"
+            ],
             created_at=functionjob_db.created,
         )
 
@@ -723,6 +755,9 @@ def _decode_functionjob(
             inputs=functionjob_db.inputs,
             outputs=functionjob_db.outputs,
             solver_job_id=functionjob_db.class_specific_data["solver_job_id"],
+            job_creation_task_id=functionjob_db.class_specific_data[
+                "job_creation_task_id"
+            ],
             created_at=functionjob_db.created,
         )
 
diff --git a/services/web/server/tests/unit/with_dbs/04/functions/test_function_job_collections_controller_rpc.py b/services/web/server/tests/unit/with_dbs/04/functions/test_function_job_collections_controller_rpc.py
@@ -60,6 +60,7 @@ async def test_function_job_collection(
         project_job_id=uuid4(),
         inputs={"input1": "value1"},
         outputs={"output1": "result1"},
+        job_creation_task_id=None,
     )
     # Register the function job
     function_job_ids = []
@@ -71,6 +72,7 @@ async def test_function_job_collection(
             project_job_id=uuid4(),
             inputs={"input1": "value1"},
             outputs={"output1": "result1"},
+            job_creation_task_id=None,
         )
         # Register the function job
         registered_job = await functions_rpc.register_function_job(
@@ -210,6 +212,7 @@ async def test_list_function_job_collections(
             project_job_id=uuid4(),
             inputs={"input1": "value1"},
             outputs={"output1": "result1"},
+            job_creation_task_id=None,
         )
         # Register the function job
         registered_job = await functions_rpc.register_function_job(
@@ -308,6 +311,7 @@ async def test_list_function_job_collections_filtered_function_id(
                 project_job_id=uuid4(),
                 inputs={"input1": "value1"},
                 outputs={"output1": "result1"},
+                job_creation_task_id=None,
             )
             # Register the function job
             registered_job = await functions_rpc.register_function_job(
diff --git a/services/web/server/tests/unit/with_dbs/04/functions/test_function_jobs_controller_rpc.py b/services/web/server/tests/unit/with_dbs/04/functions/test_function_jobs_controller_rpc.py
@@ -2,16 +2,22 @@
 # pylint: disable=unused-argument
 
 import datetime
-from uuid import uuid4
+from uuid import UUID, uuid4
 
 import pytest
 from aiohttp.test_utils import TestClient
 from common_library.users_enums import UserRole
+from faker import Faker
 from models_library.api_schemas_webserver.functions import (
     ProjectFunction,
     ProjectFunctionJob,
 )
-from models_library.functions import FunctionJobCollection, FunctionJobStatus
+from models_library.functions import (
+    FunctionClass,
+    FunctionJobCollection,
+    FunctionJobStatus,
+    RegisteredProjectFunctionJob,
+)
 from models_library.functions_errors import (
     FunctionJobIDNotFoundError,
     FunctionJobReadAccessDeniedError,
@@ -28,6 +34,9 @@
 pytest_simcore_core_services_selection = ["rabbit"]
 
 
+_faker = Faker()
+
+
 @pytest.mark.parametrize(
     "user_role",
     [UserRole.USER],
@@ -57,6 +66,7 @@ async def test_register_get_delete_function_job(
         project_job_id=uuid4(),
         inputs={"input1": "value1"},
         outputs={"output1": "result1"},
+        job_creation_task_id=None,
     )
 
     # Register the function job
@@ -183,6 +193,7 @@ async def test_list_function_jobs(
         project_job_id=uuid4(),
         inputs={"input1": "value1"},
         outputs={"output1": "result1"},
+        job_creation_task_id=None,
     )
 
     # Register the function job
@@ -244,6 +255,7 @@ async def test_list_function_jobs_filtering(
                 project_job_id=uuid4(),
                 inputs={"input1": "value1"},
                 outputs={"output1": "result1"},
+                job_creation_task_id=None,
             )
             # Register the function job
             first_registered_function_jobs.append(
@@ -262,6 +274,7 @@ async def test_list_function_jobs_filtering(
                 project_job_id=uuid4(),
                 inputs={"input1": "value1"},
                 outputs={"output1": "result1"},
+                job_creation_task_id=None,
             )
             # Register the function job
             second_registered_function_jobs.append(
@@ -381,6 +394,7 @@ async def test_find_cached_function_jobs(
             project_job_id=uuid4(),
             inputs={"input1": value if value < 4 else 1},
             outputs={"output1": "result1"},
+            job_creation_task_id=None,
         )
 
         # Register the function job
@@ -421,6 +435,70 @@ async def test_find_cached_function_jobs(
     assert cached_jobs is None
 
 
+@pytest.mark.parametrize(
+    "user_role",
+    [UserRole.USER],
+)
+async def test_patch_registered_function_jobs(
+    client: TestClient,
+    rpc_client: RabbitMQRPCClient,
+    add_user_function_api_access_rights: None,
+    logged_user: UserInfoDict,
+    other_logged_user: UserInfoDict,
+    osparc_product_name: ProductName,
+    mock_function: ProjectFunction,
+    clean_functions: None,
+):
+
+    registered_function = await functions_rpc.register_function(
+        rabbitmq_rpc_client=rpc_client,
+        function=mock_function,
+        user_id=logged_user["id"],
+        product_name=osparc_product_name,
+    )
+
+    function_job = ProjectFunctionJob(
+        function_uid=registered_function.uid,
+        title="Test Function Job",
+        description="A test function job",
+        project_job_id=None,
+        inputs={"input1": _faker.pyint(min_value=0, max_value=1000)},
+        outputs={"output1": "result1"},
+        job_creation_task_id=None,
+    )
+
+    # Register the function job
+    registered_job = await functions_rpc.register_function_job(
+        rabbitmq_rpc_client=rpc_client,
+        function_job=function_job,
+        user_id=logged_user["id"],
+        product_name=osparc_product_name,
+    )
+
+    added_data = {"job_creation_task_id": f"{uuid4()}"}
+    registered_job_dict = registered_job.model_dump()
+    registered_job_dict.update(**added_data)
+    registered_job = RegisteredProjectFunctionJob.model_validate(registered_job_dict)
+
+    registered_job = await functions_rpc.patch_registered_function_job(
+        rabbitmq_rpc_client=rpc_client,
+        user_id=logged_user["id"],
+        product_name=osparc_product_name,
+        registered_function_job=registered_job,
+    )
+    assert registered_job.function_class == FunctionClass.PROJECT
+    assert registered_job.job_creation_task_id == added_data["job_creation_task_id"]
+
+    added_data.update(project_job_id=f"{uuid4()}")
+
+    registered_job_dict = registered_job.model_dump()
+    registered_job_dict.update(**added_data)
+    registered_job = RegisteredProjectFunctionJob.model_validate(registered_job_dict)
+    assert registered_job.function_class == FunctionClass.PROJECT
+    assert registered_job.job_creation_task_id == added_data["job_creation_task_id"]
+    assert registered_job.project_job_id == UUID(added_data["project_job_id"])
+
+
 @pytest.mark.parametrize(
     "user_role",
     [UserRole.USER],
@@ -448,6 +526,7 @@ async def test_update_function_job_status(
         project_job_id=uuid4(),
         inputs={"input1": "value1"},
         outputs={"output1": "result1"},
+        job_creation_task_id=None,
     )
 
     # Register the function job
@@ -507,6 +586,7 @@ async def test_update_function_job_outputs(
         project_job_id=uuid4(),
         inputs={"input1": "value1"},
         outputs=None,
+        job_creation_task_id=None,
     )
 
     # Register the function job
