Skip to content

Commit 52288be

Browse files
committed
propagate pre_registered_function_job_id properly
1 parent e18088a commit 52288be

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ async def run_function(
368368
*,
369369
job_creation_task_id: TaskID | None,
370370
function: RegisteredFunction,
371+
pre_registered_function_job_id: FunctionJobID,
371372
job_inputs: JobInputs,
372373
pricing_spec: JobPricingSpecification | None,
373374
job_links: JobLinks,
@@ -393,7 +394,7 @@ async def run_function(
393394
return await self.patch_registered_function_job(
394395
user_id=self.user_id,
395396
product_name=self.product_name,
396-
function_job_id=study_job.id,
397+
function_job_id=pre_registered_function_job_id,
397398
function_class=FunctionClass.PROJECT,
398399
job_creation_task_id=job_creation_task_id,
399400
project_job_id=study_job.id,
@@ -418,7 +419,7 @@ async def run_function(
418419
return await self.patch_registered_function_job(
419420
user_id=self.user_id,
420421
product_name=self.product_name,
421-
function_job_id=solver_job.id,
422+
function_job_id=pre_registered_function_job_id,
422423
function_class=FunctionClass.SOLVER,
423424
job_creation_task_id=job_creation_task_id,
424425
solver_job_id=solver_job.id,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ async def run_function( # noqa: PLR0913
387387
task_filter=task_filter,
388388
user_identity=user_identity,
389389
function=to_run_function,
390+
pre_registered_function_job_id=pre_registered_function_job_id,
390391
job_inputs=job_inputs,
391392
pricing_spec=pricing_spec,
392393
job_links=job_links,

services/api-server/src/simcore_service_api_server/celery/worker_tasks/functions_tasks.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
)
44
from celery_library.utils import get_app_server # pylint: disable=no-name-in-module
55
from fastapi import FastAPI
6-
from models_library.functions import RegisteredFunction
6+
from models_library.functions import FunctionJobID, RegisteredFunction
77
from models_library.projects_nodes_io import NodeID
88
from servicelib.celery.models import TaskID
99
from simcore_service_api_server._service_function_jobs import FunctionJobService
@@ -94,6 +94,7 @@ async def run_function(
9494
*,
9595
user_identity: Identity,
9696
function: RegisteredFunction,
97+
pre_registered_function_job_id: FunctionJobID,
9798
job_inputs: JobInputs,
9899
pricing_spec: JobPricingSpecification | None,
99100
job_links: JobLinks,
@@ -109,6 +110,7 @@ async def run_function(
109110
return await function_job_service.run_function(
110111
job_creation_task_id=task_id,
111112
function=function,
113+
pre_registered_function_job_id=pre_registered_function_job_id,
112114
job_inputs=job_inputs,
113115
pricing_spec=pricing_spec,
114116
job_links=job_links,

0 commit comments

Comments
 (0)