fractal-server 2.7.0a6__py3-none-any.whl → 2.7.0a7__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- fractal_server/__init__.py +1 -1
- fractal_server/app/routes/api/v2/_aux_functions_tasks.py +3 -3
- fractal_server/app/routes/api/v2/workflow_import.py +4 -2
- {fractal_server-2.7.0a6.dist-info → fractal_server-2.7.0a7.dist-info}/METADATA +1 -1
- {fractal_server-2.7.0a6.dist-info → fractal_server-2.7.0a7.dist-info}/RECORD +8 -8
- {fractal_server-2.7.0a6.dist-info → fractal_server-2.7.0a7.dist-info}/LICENSE +0 -0
- {fractal_server-2.7.0a6.dist-info → fractal_server-2.7.0a7.dist-info}/WHEEL +0 -0
- {fractal_server-2.7.0a6.dist-info → fractal_server-2.7.0a7.dist-info}/entry_points.txt +0 -0
fractal_server/__init__.py
CHANGED
@@ -1 +1 @@
|
|
1
|
-
__VERSION__ = "2.7.
|
1
|
+
__VERSION__ = "2.7.0a7"
|
@@ -237,9 +237,9 @@ async def _get_collection_status_message(
|
|
237
237
|
)
|
238
238
|
elif len(states) == 1:
|
239
239
|
msg = (
|
240
|
-
f"\nThere exists a task
|
241
|
-
f"
|
242
|
-
f"{states[0].data.get('status')}."
|
240
|
+
f"\nThere exists a task-collection state (ID={states[0].id}) for "
|
241
|
+
f"such task group (ID={task_group.id}), with status "
|
242
|
+
f"'{states[0].data.get('status')}'."
|
243
243
|
)
|
244
244
|
else:
|
245
245
|
msg = ""
|
@@ -298,6 +298,7 @@ async def import_workflow(
|
|
298
298
|
default_group_id = await _get_default_usergroup_id(db)
|
299
299
|
|
300
300
|
list_wf_tasks = []
|
301
|
+
list_task_ids = []
|
301
302
|
for wf_task in workflow_import.task_list:
|
302
303
|
task_import = wf_task.task
|
303
304
|
if isinstance(task_import, TaskImportV2Legacy):
|
@@ -322,6 +323,7 @@ async def import_workflow(
|
|
322
323
|
**wf_task.dict(exclude_none=True, exclude={"task"})
|
323
324
|
)
|
324
325
|
list_wf_tasks.append(new_wf_task)
|
326
|
+
list_task_ids.append(task_id)
|
325
327
|
|
326
328
|
# Create new Workflow
|
327
329
|
db_workflow = WorkflowV2(
|
@@ -333,11 +335,11 @@ async def import_workflow(
|
|
333
335
|
await db.refresh(db_workflow)
|
334
336
|
|
335
337
|
# Insert task into the workflow
|
336
|
-
for new_wf_task in list_wf_tasks:
|
338
|
+
for ind, new_wf_task in enumerate(list_wf_tasks):
|
337
339
|
await _workflow_insert_task(
|
338
340
|
**new_wf_task.dict(),
|
339
341
|
workflow_id=db_workflow.id,
|
340
|
-
task_id=
|
342
|
+
task_id=list_task_ids[ind],
|
341
343
|
db=db,
|
342
344
|
)
|
343
345
|
|
@@ -1,4 +1,4 @@
|
|
1
|
-
fractal_server/__init__.py,sha256=
|
1
|
+
fractal_server/__init__.py,sha256=qb0d5KhPMIrdMhNLuCkWNA8JPWuC8eSdJQbmF0UTepA,24
|
2
2
|
fractal_server/__main__.py,sha256=dEkCfzLLQrIlxsGC-HBfoR-RBMWnJDgNrxYTyzmE9c0,6146
|
3
3
|
fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
|
4
4
|
fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
@@ -43,7 +43,7 @@ fractal_server/app/routes/api/v1/workflow.py,sha256=2T93DuEnSshaDCue-JPmjuvGCtbk
|
|
43
43
|
fractal_server/app/routes/api/v1/workflowtask.py,sha256=OYYConwJbmNULDw5I3T-UbSJKrbbBiAHbbBeVcpoFKQ,5785
|
44
44
|
fractal_server/app/routes/api/v2/__init__.py,sha256=jybEV-vrknPoQvbgKJl0QQvHDPHOJXbDUG5vatHeis4,1963
|
45
45
|
fractal_server/app/routes/api/v2/_aux_functions.py,sha256=mb4R_qqFxeW0LAis2QJIIfVx8Sydv1jTYaRIMsMxnIk,11720
|
46
|
-
fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=
|
46
|
+
fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=3OB5bz2pzI8nDZDf3RZsU37hdZV1se4XEjpDpjbnhQg,10561
|
47
47
|
fractal_server/app/routes/api/v2/dataset.py,sha256=Eilf_BAGjicIhqUiVwI86jlW45ineA5sVzxXW4b2GoQ,8329
|
48
48
|
fractal_server/app/routes/api/v2/images.py,sha256=JR1rR6qEs81nacjriOXAOBQjAbCXF4Ew7M7mkWdxBU0,7920
|
49
49
|
fractal_server/app/routes/api/v2/job.py,sha256=Bga2Kz1OjvDIdxZObWaaXVhNIhC_5JKhKRjEH2_ayEE,5157
|
@@ -55,7 +55,7 @@ fractal_server/app/routes/api/v2/task_collection.py,sha256=gCxOwigT_tfs8lCDNoE7n
|
|
55
55
|
fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=9T0U_4gqrQbJCy6uFDCMSZ-b1sfNIzyz_qm4P41W2Gs,6133
|
56
56
|
fractal_server/app/routes/api/v2/task_group.py,sha256=wOLoqBnoeOIefRN5juhrjm2luGK6E_sF79umKirwWu8,5313
|
57
57
|
fractal_server/app/routes/api/v2/workflow.py,sha256=PyvkrUHHzFGUGZE5X0VW5u3DPQA7wtXXNcEpG7-N66I,8687
|
58
|
-
fractal_server/app/routes/api/v2/workflow_import.py,sha256=
|
58
|
+
fractal_server/app/routes/api/v2/workflow_import.py,sha256=3qX3iHnLJb62TQFLQKakcC_mYh-tWXkYL-4PuyEkwRs,10895
|
59
59
|
fractal_server/app/routes/api/v2/workflowtask.py,sha256=ciHTwXXFiFnMF7ZpJ3Xs0q6YfuZrFvIjqndlzAEdZpo,6969
|
60
60
|
fractal_server/app/routes/auth/__init__.py,sha256=fao6CS0WiAjHDTvBzgBVV_bSXFpEAeDBF6Z6q7rRkPc,1658
|
61
61
|
fractal_server/app/routes/auth/_aux_auth.py,sha256=ifkNocTYatBSMYGwiR14qohmvR9SfMldceiEj6uJBrU,4783
|
@@ -223,8 +223,8 @@ fractal_server/tasks/v2/utils.py,sha256=MnY6MhcxDRo4rPuXo2tQ252eWEPZF3OlCGe-p5Mr
|
|
223
223
|
fractal_server/urls.py,sha256=5o_qq7PzKKbwq12NHSQZDmDitn5RAOeQ4xufu-2v9Zk,448
|
224
224
|
fractal_server/utils.py,sha256=jrlCBPmC7F0ptBVcDac-EbZNsdYTLbHfX9oxkXthS5Q,2193
|
225
225
|
fractal_server/zip_tools.py,sha256=xYpzBshysD2nmxkD5WLYqMzPYUcCRM3kYy-7n9bJL-U,4426
|
226
|
-
fractal_server-2.7.
|
227
|
-
fractal_server-2.7.
|
228
|
-
fractal_server-2.7.
|
229
|
-
fractal_server-2.7.
|
230
|
-
fractal_server-2.7.
|
226
|
+
fractal_server-2.7.0a7.dist-info/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
|
227
|
+
fractal_server-2.7.0a7.dist-info/METADATA,sha256=6chShCqesJ4MnkCnJPb38-RdhMfwfNZekkVSkejj3dg,4630
|
228
|
+
fractal_server-2.7.0a7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
|
229
|
+
fractal_server-2.7.0a7.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
|
230
|
+
fractal_server-2.7.0a7.dist-info/RECORD,,
|
File without changes
|
File without changes
|
File without changes
|