missing files

Author: bisgaard-itis

packages/models-library/src/models_library/functions.py

@@ -13,6 +13,7 @@
 from models_library.users import UserID
 from models_library.utils.enums import StrAutoEnum
 from pydantic import BaseModel, ConfigDict, Field
+from servicelib.celery.models import TaskID
 
 from .projects import ProjectID
 from .utils.change_case import snake_to_camel
@@ -166,22 +167,40 @@ class RegisteredFunctionJobBase(FunctionJobBase):
 
 class ProjectFunctionJob(FunctionJobBase):
     function_class: Literal[FunctionClass.PROJECT] = FunctionClass.PROJECT
-    project_job_id: ProjectID
+    project_job_id: ProjectID | None
+    job_creation_task_id: TaskID | None
 
 
 class RegisteredProjectFunctionJob(ProjectFunctionJob, RegisteredFunctionJobBase):
     pass
 
 
+class RegisteredProjectFunctionJobPatch(BaseModel):
+    function_class: FunctionClass
+    title: str | None
+    description: str | None
+    project_job_id: ProjectID | None
+    job_creation_task_id: TaskID | None
+
+
 class SolverFunctionJob(FunctionJobBase):
     function_class: Literal[FunctionClass.SOLVER] = FunctionClass.SOLVER
-    solver_job_id: ProjectID
+    solver_job_id: ProjectID | None
+    job_creation_task_id: TaskID | None
 
 
 class RegisteredSolverFunctionJob(SolverFunctionJob, RegisteredFunctionJobBase):
     pass
 
 
+class RegisteredSolverFunctionJobPatch(BaseModel):
+    function_class: FunctionClass
+    title: str | None
+    description: str | None
+    solver_job_id: ProjectID | None
+    job_creation_task_id: TaskID | None
+
+
 class PythonCodeFunctionJob(FunctionJobBase):
     function_class: Literal[FunctionClass.PYTHON_CODE] = FunctionClass.PYTHON_CODE
 
@@ -190,6 +209,12 @@ class RegisteredPythonCodeFunctionJob(PythonCodeFunctionJob, RegisteredFunctionJ
     pass
 
 
+class RegisteredPythonCodeFunctionJobPatch(BaseModel):
+    function_class: FunctionClass
+    title: str | None
+    description: str | None
+
+
 FunctionJob: TypeAlias = Annotated[
     ProjectFunctionJob | PythonCodeFunctionJob | SolverFunctionJob,
     Field(discriminator="function_class"),
@@ -202,6 +227,13 @@ class RegisteredPythonCodeFunctionJob(PythonCodeFunctionJob, RegisteredFunctionJ
     Field(discriminator="function_class"),
 ]
 
+RegisteredFunctionJobPatch = Annotated[
+    RegisteredProjectFunctionJobPatch
+    | RegisteredPythonCodeFunctionJobPatch
+    | RegisteredSolverFunctionJobPatch,
+    Field(discriminator="function_class"),
+]
+
 
 class FunctionJobStatus(BaseModel):
     status: str

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/functions/functions_rpc_interface.py

@@ -22,6 +22,7 @@
     FunctionOutputs,
     FunctionUserAccessRights,
     FunctionUserApiAccessRights,
+    RegisteredFunctionJobPatch,
 )
 from models_library.products import ProductName
 from models_library.rabbitmq_basic_types import RPCMethodName
@@ -297,6 +298,28 @@ async def register_function_job(
     )  # Validates the result as a RegisteredFunctionJob
 
 
+@log_decorator(_logger, level=logging.DEBUG)
+async def patch_registered_function_job(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    user_id: UserID,
+    product_name: ProductName,
+    function_job_uuid: FunctionJobID,
+    registered_function_job_patch: RegisteredFunctionJobPatch,
+) -> RegisteredFunctionJob:
+    result = await rabbitmq_rpc_client.request(
+        WEBSERVER_RPC_NAMESPACE,
+        TypeAdapter(RPCMethodName).validate_python("patch_registered_function_job"),
+        user_id=user_id,
+        product_name=product_name,
+        function_job_uuid=function_job_uuid,
+        registered_function_job_patch=registered_function_job_patch,
+    )
+    return TypeAdapter(RegisteredFunctionJob).validate_python(
+        result
+    )  # Validates the result as a RegisteredFunctionJob
+
+
 @log_decorator(_logger, level=logging.DEBUG)
 async def get_function_job(
     rabbitmq_rpc_client: RabbitMQRPCClient,

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

@@ -242,6 +242,7 @@ async def run_function(
                     inputs=joined_inputs,
                     outputs=None,
                     project_job_id=study_job.id,
+                    job_creation_task_id=None,
                 ),
                 user_id=self.user_id,
                 product_name=self.product_name,
@@ -271,6 +272,7 @@ async def run_function(
                     inputs=joined_inputs,
                     outputs=None,
                     solver_job_id=solver_job.id,
+                    job_creation_task_id=None,
                 ),
                 user_id=self.user_id,
                 product_name=self.product_name,

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

@@ -180,6 +180,7 @@ def mock_project_function_job(
         "outputs": None,
         "project_job_id": f"{uuid4()}",
         "function_class": FunctionClass.PROJECT,
+        "job_creation_task_id": None,
     }
     return ProjectFunctionJob(**mock_function_job)
 
@@ -209,6 +210,7 @@ def mock_solver_function_job(
         outputs=None,
         function_class=FunctionClass.SOLVER,
         solver_job_id=ProjectID(f"{uuid4()}"),
+        job_creation_task_id=None,
     )