implement db query to patch registered function jobs

Author: bisgaard-itis

services/web/server/src/simcore_service_webserver/functions/_functions_exceptions.py

@@ -7,3 +7,9 @@ class FunctionGroupAccessRightsNotFoundError(WebServerBaseError, RuntimeError):
     msg_template = user_message(
         "Group access rights could not be found for Function '{function_id}' in product '{product_name}'."
     )
+
+
+class IncompatiblePatchModelError(WebServerBaseError, ValueError):
+    msg_template = user_message(
+        "Incompatible patch model for Function '{function_id}' in product '{product_name}'."
+    )

services/web/server/src/simcore_service_webserver/functions/_functions_repository.py

@@ -240,18 +240,9 @@ async def patch_function_job(  # noqa: PLR0913
     *,
     user_id: UserID,
     product_name: ProductName,
-    function_job_uuid: FunctionJobID,
-    title: str | None,
-    description: str | None,
-    **class_specific_data: FunctionJobClassSpecificData | None,
+    registered_function_job_db: RegisteredFunctionJobDB,
 ) -> RegisteredFunctionJobDB:
 
-    update_params = {
-        "title": title,
-        "description": description,
-        "class_specific_data": class_specific_data,
-    }
-
     async with transaction_context(get_asyncpg_engine(app), connection) as transaction:
         await check_user_api_access_rights(
             app,
@@ -264,10 +255,15 @@ async def patch_function_job(  # noqa: PLR0913
         )
         result = await transaction.execute(
             function_jobs_table.update()
-            .where(function_jobs_table.c.uuid == function_job_uuid)
+            .where(function_jobs_table.c.uuid == registered_function_job_db.uuid)
             .values(
+                inputs=registered_function_job_db.inputs,
+                outputs=registered_function_job_db.outputs,
+                function_class=registered_function_job_db.function_class,
+                class_specific_data=registered_function_job_db.class_specific_data,
+                title=registered_function_job_db.title,
+                description=registered_function_job_db.description,
                 status="created",
-                **{k: v for k, v in update_params.items() if v is not None},
             )
             .returning(*_FUNCTION_JOBS_TABLE_COLS)
         )

services/web/server/src/simcore_service_webserver/functions/_functions_service.py

@@ -45,7 +45,10 @@
 from servicelib.rabbitmq import RPCRouter
 
 from . import _functions_repository
-from ._functions_exceptions import FunctionGroupAccessRightsNotFoundError
+from ._functions_exceptions import (
+    FunctionGroupAccessRightsNotFoundError,
+    IncompatiblePatchModelError,
+)
 
 router = RPCRouter()
 
@@ -110,6 +113,13 @@ async def patch_registered_function_job(
         product_name=product_name,
         function_job_id=function_job_uuid,
     )
+    if job.function_class != registered_function_job_patch.function_class:
+        raise IncompatiblePatchModelError(
+            function_id=job.function_uuid,
+            product_name=product_name,
+        )
+
+    patched_job = _patch_functionjob(job, registered_function_job_patch)
 
     await _functions_repository.patch_function_job(
         app=app,
@@ -781,3 +791,62 @@ def _decode_functionjob(
     raise UnsupportedFunctionJobClassError(
         function_job_class=functionjob_db.function_class
     )
+
+
+def _patch_functionjob(
+    function_job_db: RegisteredFunctionJobDB,
+    patch: RegisteredFunctionJobPatch,
+) -> RegisteredFunctionJobDB:
+    if function_job_db.function_class == FunctionClass.PROJECT:
+        assert patch.function_class == FunctionClass.PROJECT  # nosec
+        return RegisteredFunctionJobDB(
+            function_class=FunctionClass.PROJECT,
+            function_uuid=function_job_db.function_uuid,
+            title=patch.title or function_job_db.title,
+            uuid=function_job_db.uuid,
+            description=patch.description or function_job_db.description,
+            inputs=function_job_db.inputs,
+            outputs=function_job_db.outputs,
+            created=function_job_db.created,
+            class_specific_data=FunctionClassSpecificData(
+                project_job_id=patch.project_job_id
+                or function_job_db.class_specific_data.get("project_job_id"),
+                job_creation_task_id=patch.job_creation_task_id
+                or function_job_db.class_specific_data.get("job_creation_task_id"),
+            ),
+        )
+    elif function_job_db.function_class == FunctionClass.SOLVER:
+        assert patch.function_class == FunctionClass.SOLVER  # nosec
+        return RegisteredFunctionJobDB(
+            function_class=FunctionClass.SOLVER,
+            function_uuid=function_job_db.function_uuid,
+            title=patch.title or function_job_db.title,
+            uuid=function_job_db.uuid,
+            description=patch.description or function_job_db.description,
+            inputs=function_job_db.inputs,
+            outputs=function_job_db.outputs,
+            created=function_job_db.created,
+            class_specific_data=FunctionClassSpecificData(
+                solver_job_id=patch.solver_job_id
+                or function_job_db.class_specific_data.get("solver_job_id"),
+                job_creation_task_id=patch.job_creation_task_id
+                or function_job_db.class_specific_data.get("job_creation_task_id"),
+            ),
+        )
+    elif function_job_db.function_class == FunctionClass.PYTHON_CODE:
+        assert patch.function_class == FunctionClass.PYTHON_CODE  # nosec
+        return RegisteredFunctionJobDB(
+            function_class=FunctionClass.PYTHON_CODE,
+            function_uuid=function_job_db.function_uuid,
+            title=patch.title or function_job_db.title,
+            uuid=function_job_db.uuid,
+            description=patch.description or function_job_db.description,
+            inputs=function_job_db.inputs,
+            outputs=function_job_db.outputs,
+            created=function_job_db.created,
+            class_specific_data=function_job_db.class_specific_data,
+        )
+    else:
+        raise UnsupportedFunctionJobClassError(
+            function_job_class=function_job_db.function_class
+        )