Skip to content

Commit cfc870e

Browse files
committed
Preliminary support for new task metadata
1 parent f57575c commit cfc870e

File tree

4 files changed

+26
-1
lines changed

4 files changed

+26
-1
lines changed

fractal_tasks_core/__FRACTAL_MANIFEST__.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
{
22
"manifest_version": "2",
3+
"authors": "Name FIXME, Name FIXME, Name FIXME",
34
"task_list": [
45
{
56
"name": "Convert Cellvoyager to OME-Zarr",
7+
"category": "Conversion",
8+
"modality": "HCS",
69
"executable_non_parallel": "tasks/cellvoyager_to_ome_zarr_init.py",
710
"executable_parallel": "tasks/cellvoyager_to_ome_zarr_compute.py",
811
"meta_non_parallel": {
@@ -265,6 +268,8 @@
265268
},
266269
{
267270
"name": "Convert Cellvoyager Multiplexing to OME-Zarr",
271+
"category": "Conversion",
272+
"modality": "HCS",
268273
"executable_non_parallel": "tasks/cellvoyager_to_ome_zarr_init_multiplex.py",
269274
"executable_parallel": "tasks/cellvoyager_to_ome_zarr_compute.py",
270275
"meta_non_parallel": {
@@ -736,6 +741,7 @@
736741
},
737742
{
738743
"name": "Cellpose Segmentation",
744+
"category": "Segmentation",
739745
"executable_parallel": "tasks/cellpose_segmentation.py",
740746
"meta_parallel": {
741747
"cpus_per_task": 4,
@@ -1030,6 +1036,7 @@
10301036
},
10311037
{
10321038
"name": "Calculate Registration (image-based)",
1039+
"category": "Registration",
10331040
"executable_non_parallel": "tasks/image_based_registration_hcs_init.py",
10341041
"executable_parallel": "tasks/calculate_registration_image_based.py",
10351042
"meta_non_parallel": {
@@ -1161,6 +1168,7 @@
11611168
},
11621169
{
11631170
"name": "Find Registration Consensus",
1171+
"category": "Registration",
11641172
"executable_non_parallel": "tasks/init_group_by_well_for_multiplexing.py",
11651173
"executable_parallel": "tasks/find_registration_consensus.py",
11661174
"meta_non_parallel": {
@@ -1263,6 +1271,7 @@
12631271
"output_types": {
12641272
"registered": true
12651273
},
1274+
"category": "Registration",
12661275
"executable_parallel": "tasks/apply_registration_to_image.py",
12671276
"meta_parallel": {
12681277
"cpus_per_task": 1,

fractal_tasks_core/dev/create_manifest.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
def create_manifest(
3434
package: str = "fractal_tasks_core",
35+
authors: Optional[str] = None,
3536
manifest_version: str = "2",
3637
has_args_schemas: bool = True,
3738
docs_link: Optional[str] = None,
@@ -71,6 +72,7 @@ def create_manifest(
7172
# Prepare an empty manifest
7273
manifest = dict(
7374
manifest_version=manifest_version,
75+
authors=authors,
7476
task_list=[],
7577
has_args_schemas=has_args_schemas,
7678
)
@@ -148,4 +150,6 @@ def create_manifest(
148150

149151

150152
if __name__ == "__main__":
151-
create_manifest()
153+
PACKAGE = "fractal_tasks_core"
154+
AUTHORS = "Name FIXME, Name FIXME, Name FIXME"
155+
create_manifest(package=PACKAGE, authors=AUTHORS)

fractal_tasks_core/dev/task_list.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,17 @@
2222
executable="tasks/cellvoyager_to_ome_zarr_compute.py",
2323
meta_init={"cpus_per_task": 1, "mem": 4000},
2424
meta={"cpus_per_task": 1, "mem": 4000},
25+
category="Conversion",
26+
modality="HCS",
2527
),
2628
CompoundTask(
2729
name="Convert Cellvoyager Multiplexing to OME-Zarr",
2830
executable_init="tasks/cellvoyager_to_ome_zarr_init_multiplex.py",
2931
executable="tasks/cellvoyager_to_ome_zarr_compute.py",
3032
meta_init={"cpus_per_task": 1, "mem": 4000},
3133
meta={"cpus_per_task": 1, "mem": 4000},
34+
category="Conversion",
35+
modality="HCS",
3236
),
3337
CompoundTask(
3438
name="Project Image (HCS Plate)",
@@ -50,27 +54,31 @@
5054
name="Cellpose Segmentation",
5155
executable="tasks/cellpose_segmentation.py",
5256
meta={"cpus_per_task": 4, "mem": 16000, "needs_gpu": True},
57+
category="Segmentation",
5358
),
5459
CompoundTask(
5560
name="Calculate Registration (image-based)",
5661
executable_init="tasks/image_based_registration_hcs_init.py",
5762
executable="tasks/calculate_registration_image_based.py",
5863
meta_init={"cpus_per_task": 1, "mem": 1000},
5964
meta={"cpus_per_task": 1, "mem": 8000},
65+
category="Registration",
6066
),
6167
CompoundTask(
6268
name="Find Registration Consensus",
6369
executable_init="tasks/init_group_by_well_for_multiplexing.py",
6470
executable="tasks/find_registration_consensus.py",
6571
meta_init={"cpus_per_task": 1, "mem": 1000},
6672
meta={"cpus_per_task": 1, "mem": 1000},
73+
category="Registration",
6774
),
6875
ParallelTask(
6976
name="Apply Registration to Image",
7077
input_types=dict(registered=False),
7178
executable="tasks/apply_registration_to_image.py",
7279
output_types=dict(registered=True),
7380
meta={"cpus_per_task": 1, "mem": 4000},
81+
category="Registration",
7482
),
7583
NonParallelTask(
7684
name="Import OME-Zarr",

fractal_tasks_core/dev/task_models.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from typing import Optional
2020

2121
from pydantic import BaseModel
22+
from pydantic import Field
2223

2324

2425
class _BaseTask(BaseModel):
@@ -31,6 +32,9 @@ class Config:
3132
meta: Optional[dict[str, Any]] = None
3233
input_types: Optional[dict[str, bool]] = None
3334
output_types: Optional[dict[str, bool]] = None
35+
category: Optional[str] = None
36+
modality: Optional[str] = None
37+
tags: list[str] = Field(default_factory=list)
3438

3539

3640
class CompoundTask(_BaseTask):

0 commit comments

Comments
 (0)