Skip to content

Commit 7ac36bb

Browse files
authored
Merge branch 'master' into feature/delete-functions
2 parents 91c6780 + 50c2568 commit 7ac36bb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

services/web/server/src/simcore_service_webserver/functions/_controller/_functions_rest_schemas.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class FunctionDeleteQueryParams(BaseModel):
8383
force: Annotated[
8484
bool,
8585
Field(
86-
description="If true, deletes the function even if it has associated jobs.",
86+
description="If true, deletes the function even if it has associated jobs; otherwise, returns HTTP_409_CONFLICT if jobs exist.",
8787
),
8888
] = False
8989

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -861,9 +861,9 @@ def _decode_functionjob(
861861
inputs=functionjob_db.inputs,
862862
outputs=functionjob_db.outputs,
863863
project_job_id=functionjob_db.class_specific_data["project_job_id"],
864-
job_creation_task_id=functionjob_db.class_specific_data[
864+
job_creation_task_id=functionjob_db.class_specific_data.get(
865865
"job_creation_task_id"
866-
],
866+
),
867867
created_at=functionjob_db.created,
868868
)
869869

@@ -876,9 +876,9 @@ def _decode_functionjob(
876876
inputs=functionjob_db.inputs,
877877
outputs=functionjob_db.outputs,
878878
solver_job_id=functionjob_db.class_specific_data["solver_job_id"],
879-
job_creation_task_id=functionjob_db.class_specific_data[
879+
job_creation_task_id=functionjob_db.class_specific_data.get(
880880
"job_creation_task_id"
881-
],
881+
),
882882
created_at=functionjob_db.created,
883883
)
884884

0 commit comments

Comments
 (0)