fractal-server 1.4.10__py3-none-any.whl → 2.0.0a1__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/models/__init__.py +3 -7
- fractal_server/app/models/linkuserproject.py +9 -0
- fractal_server/app/models/security.py +6 -0
- fractal_server/app/models/state.py +1 -1
- fractal_server/app/models/v1/__init__.py +11 -0
- fractal_server/app/models/{dataset.py → v1/dataset.py} +5 -5
- fractal_server/app/models/{job.py → v1/job.py} +5 -5
- fractal_server/app/models/{project.py → v1/project.py} +5 -5
- fractal_server/app/models/{task.py → v1/task.py} +7 -2
- fractal_server/app/models/{workflow.py → v1/workflow.py} +5 -5
- fractal_server/app/models/v2/__init__.py +20 -0
- fractal_server/app/models/v2/dataset.py +55 -0
- fractal_server/app/models/v2/job.py +51 -0
- fractal_server/app/models/v2/project.py +31 -0
- fractal_server/app/models/v2/task.py +93 -0
- fractal_server/app/models/v2/workflow.py +43 -0
- fractal_server/app/models/v2/workflowtask.py +90 -0
- fractal_server/app/routes/{admin.py → admin/v1.py} +42 -42
- fractal_server/app/routes/admin/v2.py +274 -0
- fractal_server/app/routes/api/v1/__init__.py +7 -7
- fractal_server/app/routes/api/v1/_aux_functions.py +2 -2
- fractal_server/app/routes/api/v1/dataset.py +37 -37
- fractal_server/app/routes/api/v1/job.py +14 -14
- fractal_server/app/routes/api/v1/project.py +23 -21
- fractal_server/app/routes/api/v1/task.py +24 -14
- fractal_server/app/routes/api/v1/task_collection.py +16 -14
- fractal_server/app/routes/api/v1/workflow.py +24 -24
- fractal_server/app/routes/api/v1/workflowtask.py +10 -10
- fractal_server/app/routes/api/v2/__init__.py +28 -0
- fractal_server/app/routes/api/v2/_aux_functions.py +497 -0
- fractal_server/app/routes/api/v2/dataset.py +309 -0
- fractal_server/app/routes/api/v2/images.py +207 -0
- fractal_server/app/routes/api/v2/job.py +200 -0
- fractal_server/app/routes/api/v2/project.py +202 -0
- fractal_server/app/routes/api/v2/submit.py +220 -0
- fractal_server/app/routes/api/v2/task.py +222 -0
- fractal_server/app/routes/api/v2/task_collection.py +229 -0
- fractal_server/app/routes/api/v2/workflow.py +397 -0
- fractal_server/app/routes/api/v2/workflowtask.py +269 -0
- fractal_server/app/routes/aux/_job.py +1 -1
- fractal_server/app/runner/async_wrap.py +27 -0
- fractal_server/app/runner/components.py +5 -0
- fractal_server/app/runner/exceptions.py +129 -0
- fractal_server/app/runner/executors/slurm/__init__.py +3 -0
- fractal_server/app/runner/{_slurm → executors/slurm}/_batching.py +1 -1
- fractal_server/app/runner/{_slurm → executors/slurm}/_check_jobs_status.py +1 -1
- fractal_server/app/runner/{_slurm → executors/slurm}/_executor_wait_thread.py +1 -1
- fractal_server/app/runner/{_slurm → executors/slurm}/_slurm_config.py +3 -152
- fractal_server/app/runner/{_slurm → executors/slurm}/_subprocess_run_as_user.py +1 -1
- fractal_server/app/runner/{_slurm → executors/slurm}/executor.py +32 -19
- fractal_server/app/runner/filenames.py +6 -0
- fractal_server/app/runner/set_start_and_last_task_index.py +39 -0
- fractal_server/app/runner/task_files.py +103 -0
- fractal_server/app/runner/{__init__.py → v1/__init__.py} +22 -20
- fractal_server/app/runner/{_common.py → v1/_common.py} +13 -120
- fractal_server/app/runner/{_local → v1/_local}/__init__.py +5 -5
- fractal_server/app/runner/{_local → v1/_local}/_local_config.py +6 -7
- fractal_server/app/runner/{_local → v1/_local}/_submit_setup.py +1 -5
- fractal_server/app/runner/v1/_slurm/__init__.py +310 -0
- fractal_server/app/runner/{_slurm → v1/_slurm}/_submit_setup.py +3 -9
- fractal_server/app/runner/v1/_slurm/get_slurm_config.py +163 -0
- fractal_server/app/runner/v1/common.py +117 -0
- fractal_server/app/runner/{handle_failed_job.py → v1/handle_failed_job.py} +8 -8
- fractal_server/app/runner/v2/__init__.py +336 -0
- fractal_server/app/runner/v2/_local/__init__.py +167 -0
- fractal_server/app/runner/v2/_local/_local_config.py +118 -0
- fractal_server/app/runner/v2/_local/_submit_setup.py +52 -0
- fractal_server/app/runner/v2/_local/executor.py +100 -0
- fractal_server/app/runner/{_slurm → v2/_slurm}/__init__.py +34 -45
- fractal_server/app/runner/v2/_slurm/_submit_setup.py +83 -0
- fractal_server/app/runner/v2/_slurm/get_slurm_config.py +179 -0
- fractal_server/app/runner/v2/deduplicate_list.py +22 -0
- fractal_server/app/runner/v2/handle_failed_job.py +156 -0
- fractal_server/app/runner/v2/merge_outputs.py +38 -0
- fractal_server/app/runner/v2/runner.py +267 -0
- fractal_server/app/runner/v2/runner_functions.py +341 -0
- fractal_server/app/runner/v2/runner_functions_low_level.py +134 -0
- fractal_server/app/runner/v2/task_interface.py +43 -0
- fractal_server/app/runner/v2/v1_compat.py +21 -0
- fractal_server/app/schemas/__init__.py +4 -42
- fractal_server/app/schemas/v1/__init__.py +42 -0
- fractal_server/app/schemas/{applyworkflow.py → v1/applyworkflow.py} +18 -18
- fractal_server/app/schemas/{dataset.py → v1/dataset.py} +30 -30
- fractal_server/app/schemas/{dumps.py → v1/dumps.py} +8 -8
- fractal_server/app/schemas/{manifest.py → v1/manifest.py} +5 -5
- fractal_server/app/schemas/{project.py → v1/project.py} +9 -9
- fractal_server/app/schemas/{task.py → v1/task.py} +12 -12
- fractal_server/app/schemas/{task_collection.py → v1/task_collection.py} +7 -7
- fractal_server/app/schemas/{workflow.py → v1/workflow.py} +38 -38
- fractal_server/app/schemas/v2/__init__.py +34 -0
- fractal_server/app/schemas/v2/dataset.py +89 -0
- fractal_server/app/schemas/v2/dumps.py +87 -0
- fractal_server/app/schemas/v2/job.py +114 -0
- fractal_server/app/schemas/v2/manifest.py +159 -0
- fractal_server/app/schemas/v2/project.py +37 -0
- fractal_server/app/schemas/v2/task.py +120 -0
- fractal_server/app/schemas/v2/task_collection.py +105 -0
- fractal_server/app/schemas/v2/workflow.py +79 -0
- fractal_server/app/schemas/v2/workflowtask.py +119 -0
- fractal_server/config.py +5 -4
- fractal_server/images/__init__.py +2 -0
- fractal_server/images/models.py +50 -0
- fractal_server/images/tools.py +85 -0
- fractal_server/main.py +11 -3
- fractal_server/migrations/env.py +0 -2
- fractal_server/migrations/versions/d71e732236cd_v2.py +239 -0
- fractal_server/tasks/__init__.py +0 -5
- fractal_server/tasks/endpoint_operations.py +13 -19
- fractal_server/tasks/utils.py +35 -0
- fractal_server/tasks/{_TaskCollectPip.py → v1/_TaskCollectPip.py} +3 -3
- fractal_server/tasks/{background_operations.py → v1/background_operations.py} +18 -50
- fractal_server/tasks/v1/get_collection_data.py +14 -0
- fractal_server/tasks/v2/_TaskCollectPip.py +103 -0
- fractal_server/tasks/v2/background_operations.py +381 -0
- fractal_server/tasks/v2/get_collection_data.py +14 -0
- {fractal_server-1.4.10.dist-info → fractal_server-2.0.0a1.dist-info}/METADATA +1 -1
- fractal_server-2.0.0a1.dist-info/RECORD +160 -0
- fractal_server/app/runner/_slurm/.gitignore +0 -2
- fractal_server/app/runner/common.py +0 -311
- fractal_server-1.4.10.dist-info/RECORD +0 -98
- /fractal_server/app/runner/{_slurm → executors/slurm}/remote.py +0 -0
- /fractal_server/app/runner/{_local → v1/_local}/executor.py +0 -0
- {fractal_server-1.4.10.dist-info → fractal_server-2.0.0a1.dist-info}/LICENSE +0 -0
- {fractal_server-1.4.10.dist-info → fractal_server-2.0.0a1.dist-info}/WHEEL +0 -0
- {fractal_server-1.4.10.dist-info → fractal_server-2.0.0a1.dist-info}/entry_points.txt +0 -0
@@ -0,0 +1,202 @@
|
|
1
|
+
from typing import Optional
|
2
|
+
|
3
|
+
from fastapi import APIRouter
|
4
|
+
from fastapi import Depends
|
5
|
+
from fastapi import HTTPException
|
6
|
+
from fastapi import Response
|
7
|
+
from fastapi import status
|
8
|
+
from sqlalchemy.exc import IntegrityError
|
9
|
+
from sqlmodel import select
|
10
|
+
|
11
|
+
from .....logger import close_logger
|
12
|
+
from .....logger import set_logger
|
13
|
+
from ....db import AsyncSession
|
14
|
+
from ....db import get_async_db
|
15
|
+
from ....models.v2 import DatasetV2
|
16
|
+
from ....models.v2 import JobV2
|
17
|
+
from ....models.v2 import LinkUserProjectV2
|
18
|
+
from ....models.v2 import ProjectV2
|
19
|
+
from ....models.v2 import WorkflowV2
|
20
|
+
from ....schemas.v2 import ProjectCreateV2
|
21
|
+
from ....schemas.v2 import ProjectReadV2
|
22
|
+
from ....schemas.v2 import ProjectUpdateV2
|
23
|
+
from ....security import current_active_user
|
24
|
+
from ....security import User
|
25
|
+
from ._aux_functions import _check_project_exists
|
26
|
+
from ._aux_functions import _get_project_check_owner
|
27
|
+
from ._aux_functions import _get_submitted_jobs_statement
|
28
|
+
|
29
|
+
router = APIRouter()
|
30
|
+
|
31
|
+
|
32
|
+
@router.get("/project/", response_model=list[ProjectReadV2])
|
33
|
+
async def get_list_project(
|
34
|
+
user: User = Depends(current_active_user),
|
35
|
+
db: AsyncSession = Depends(get_async_db),
|
36
|
+
) -> list[ProjectV2]:
|
37
|
+
"""
|
38
|
+
Return list of projects user is member of
|
39
|
+
"""
|
40
|
+
stm = (
|
41
|
+
select(ProjectV2)
|
42
|
+
.join(LinkUserProjectV2)
|
43
|
+
.where(LinkUserProjectV2.user_id == user.id)
|
44
|
+
)
|
45
|
+
res = await db.execute(stm)
|
46
|
+
project_list = res.scalars().all()
|
47
|
+
await db.close()
|
48
|
+
return project_list
|
49
|
+
|
50
|
+
|
51
|
+
@router.post("/project/", response_model=ProjectReadV2, status_code=201)
|
52
|
+
async def create_project(
|
53
|
+
project: ProjectCreateV2,
|
54
|
+
user: User = Depends(current_active_user),
|
55
|
+
db: AsyncSession = Depends(get_async_db),
|
56
|
+
) -> Optional[ProjectReadV2]:
|
57
|
+
"""
|
58
|
+
Create new poject
|
59
|
+
"""
|
60
|
+
|
61
|
+
# Check that there is no project with the same user and name
|
62
|
+
await _check_project_exists(
|
63
|
+
project_name=project.name, user_id=user.id, db=db
|
64
|
+
)
|
65
|
+
|
66
|
+
db_project = ProjectV2(**project.dict())
|
67
|
+
db_project.user_list.append(user)
|
68
|
+
try:
|
69
|
+
db.add(db_project)
|
70
|
+
await db.commit()
|
71
|
+
await db.refresh(db_project)
|
72
|
+
await db.close()
|
73
|
+
except IntegrityError as e:
|
74
|
+
await db.rollback()
|
75
|
+
logger = set_logger("create_project")
|
76
|
+
logger.error(str(e))
|
77
|
+
close_logger(logger)
|
78
|
+
raise HTTPException(
|
79
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
80
|
+
detail=str(e),
|
81
|
+
)
|
82
|
+
|
83
|
+
return db_project
|
84
|
+
|
85
|
+
|
86
|
+
@router.get("/project/{project_id}/", response_model=ProjectReadV2)
|
87
|
+
async def read_project(
|
88
|
+
project_id: int,
|
89
|
+
user: User = Depends(current_active_user),
|
90
|
+
db: AsyncSession = Depends(get_async_db),
|
91
|
+
) -> Optional[ProjectReadV2]:
|
92
|
+
"""
|
93
|
+
Return info on an existing project
|
94
|
+
"""
|
95
|
+
project = await _get_project_check_owner(
|
96
|
+
project_id=project_id, user_id=user.id, db=db
|
97
|
+
)
|
98
|
+
await db.close()
|
99
|
+
return project
|
100
|
+
|
101
|
+
|
102
|
+
@router.patch("/project/{project_id}/", response_model=ProjectReadV2)
|
103
|
+
async def update_project(
|
104
|
+
project_id: int,
|
105
|
+
project_update: ProjectUpdateV2,
|
106
|
+
user: User = Depends(current_active_user),
|
107
|
+
db: AsyncSession = Depends(get_async_db),
|
108
|
+
):
|
109
|
+
project = await _get_project_check_owner(
|
110
|
+
project_id=project_id, user_id=user.id, db=db
|
111
|
+
)
|
112
|
+
|
113
|
+
# Check that there is no project with the same user and name
|
114
|
+
if project_update.name is not None:
|
115
|
+
await _check_project_exists(
|
116
|
+
project_name=project_update.name, user_id=user.id, db=db
|
117
|
+
)
|
118
|
+
|
119
|
+
for key, value in project_update.dict(exclude_unset=True).items():
|
120
|
+
setattr(project, key, value)
|
121
|
+
|
122
|
+
await db.commit()
|
123
|
+
await db.refresh(project)
|
124
|
+
await db.close()
|
125
|
+
return project
|
126
|
+
|
127
|
+
|
128
|
+
@router.delete("/project/{project_id}/", status_code=204)
|
129
|
+
async def delete_project(
|
130
|
+
project_id: int,
|
131
|
+
user: User = Depends(current_active_user),
|
132
|
+
db: AsyncSession = Depends(get_async_db),
|
133
|
+
) -> Response:
|
134
|
+
"""
|
135
|
+
Delete project
|
136
|
+
"""
|
137
|
+
project = await _get_project_check_owner(
|
138
|
+
project_id=project_id, user_id=user.id, db=db
|
139
|
+
)
|
140
|
+
|
141
|
+
# Fail if there exist jobs that are submitted and in relation with the
|
142
|
+
# current project.
|
143
|
+
stm = _get_submitted_jobs_statement().where(JobV2.project_id == project_id)
|
144
|
+
res = await db.execute(stm)
|
145
|
+
jobs = res.scalars().all()
|
146
|
+
if jobs:
|
147
|
+
string_ids = str([job.id for job in jobs])[1:-1]
|
148
|
+
raise HTTPException(
|
149
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
150
|
+
detail=(
|
151
|
+
f"Cannot delete project {project.id} because it "
|
152
|
+
f"is linked to active job(s) {string_ids}."
|
153
|
+
),
|
154
|
+
)
|
155
|
+
|
156
|
+
# Cascade operations
|
157
|
+
|
158
|
+
# Workflows
|
159
|
+
stm = select(WorkflowV2).where(WorkflowV2.project_id == project_id)
|
160
|
+
res = await db.execute(stm)
|
161
|
+
workflows = res.scalars().all()
|
162
|
+
for wf in workflows:
|
163
|
+
# Cascade operations: set foreign-keys to null for jobs which are in
|
164
|
+
# relationship with the current workflow
|
165
|
+
stm = select(JobV2).where(JobV2.workflow_id == wf.id)
|
166
|
+
res = await db.execute(stm)
|
167
|
+
jobs = res.scalars().all()
|
168
|
+
for job in jobs:
|
169
|
+
job.workflow_id = None
|
170
|
+
# Delete workflow
|
171
|
+
await db.delete(wf)
|
172
|
+
await db.commit()
|
173
|
+
|
174
|
+
# Dataset
|
175
|
+
stm = select(DatasetV2).where(DatasetV2.project_id == project_id)
|
176
|
+
res = await db.execute(stm)
|
177
|
+
datasets = res.scalars().all()
|
178
|
+
for ds in datasets:
|
179
|
+
# Cascade operations: set foreign-keys to null for jobs which are in
|
180
|
+
# relationship with the current dataset
|
181
|
+
stm = select(JobV2).where(JobV2.dataset_id == ds.id)
|
182
|
+
res = await db.execute(stm)
|
183
|
+
jobs = res.scalars().all()
|
184
|
+
for job in jobs:
|
185
|
+
job.dataset_id = None
|
186
|
+
# Delete dataset
|
187
|
+
await db.delete(ds)
|
188
|
+
await db.commit()
|
189
|
+
|
190
|
+
# Job
|
191
|
+
stm = select(JobV2).where(JobV2.project_id == project_id)
|
192
|
+
res = await db.execute(stm)
|
193
|
+
jobs = res.scalars().all()
|
194
|
+
for job in jobs:
|
195
|
+
job.project_id = None
|
196
|
+
|
197
|
+
await db.commit()
|
198
|
+
|
199
|
+
await db.delete(project)
|
200
|
+
await db.commit()
|
201
|
+
|
202
|
+
return Response(status_code=status.HTTP_204_NO_CONTENT)
|
@@ -0,0 +1,220 @@
|
|
1
|
+
from datetime import datetime
|
2
|
+
from datetime import timedelta
|
3
|
+
from datetime import timezone
|
4
|
+
from typing import Optional
|
5
|
+
|
6
|
+
from fastapi import APIRouter
|
7
|
+
from fastapi import BackgroundTasks
|
8
|
+
from fastapi import Depends
|
9
|
+
from fastapi import HTTPException
|
10
|
+
from fastapi import status
|
11
|
+
from sqlmodel import select
|
12
|
+
|
13
|
+
from .....config import get_settings
|
14
|
+
from .....syringe import Inject
|
15
|
+
from ....db import AsyncSession
|
16
|
+
from ....db import get_async_db
|
17
|
+
from ....models.v2 import JobV2
|
18
|
+
from ....runner.set_start_and_last_task_index import (
|
19
|
+
set_start_and_last_task_index,
|
20
|
+
) # FIXME V2
|
21
|
+
from ....runner.v2 import submit_workflow
|
22
|
+
from ....schemas.v2 import JobCreateV2
|
23
|
+
from ....schemas.v2 import JobReadV2
|
24
|
+
from ....schemas.v2 import JobStatusTypeV2
|
25
|
+
from ....security import current_active_verified_user
|
26
|
+
from ....security import User
|
27
|
+
from ._aux_functions import _get_dataset_check_owner
|
28
|
+
from ._aux_functions import _get_workflow_check_owner
|
29
|
+
|
30
|
+
|
31
|
+
def _encode_as_utc(dt: datetime):
|
32
|
+
return dt.replace(tzinfo=timezone.utc).isoformat()
|
33
|
+
|
34
|
+
|
35
|
+
router = APIRouter()
|
36
|
+
|
37
|
+
|
38
|
+
@router.post(
|
39
|
+
"/project/{project_id}/job/submit/",
|
40
|
+
status_code=status.HTTP_202_ACCEPTED,
|
41
|
+
response_model=JobReadV2,
|
42
|
+
)
|
43
|
+
async def apply_workflow(
|
44
|
+
project_id: int,
|
45
|
+
workflow_id: int,
|
46
|
+
dataset_id: int,
|
47
|
+
job_create: JobCreateV2,
|
48
|
+
background_tasks: BackgroundTasks,
|
49
|
+
user: User = Depends(current_active_verified_user),
|
50
|
+
db: AsyncSession = Depends(get_async_db),
|
51
|
+
) -> Optional[JobReadV2]:
|
52
|
+
|
53
|
+
output = await _get_dataset_check_owner(
|
54
|
+
project_id=project_id,
|
55
|
+
dataset_id=dataset_id,
|
56
|
+
user_id=user.id,
|
57
|
+
db=db,
|
58
|
+
)
|
59
|
+
project = output["project"]
|
60
|
+
dataset = output["dataset"]
|
61
|
+
|
62
|
+
if dataset.read_only:
|
63
|
+
raise HTTPException(
|
64
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
65
|
+
detail=(
|
66
|
+
"Cannot apply workflow because dataset "
|
67
|
+
f"({dataset_id=}) is read_only."
|
68
|
+
),
|
69
|
+
)
|
70
|
+
|
71
|
+
workflow = await _get_workflow_check_owner(
|
72
|
+
project_id=project_id, workflow_id=workflow_id, user_id=user.id, db=db
|
73
|
+
)
|
74
|
+
|
75
|
+
if not workflow.task_list:
|
76
|
+
raise HTTPException(
|
77
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
78
|
+
detail=f"Workflow {workflow_id} has empty task list",
|
79
|
+
)
|
80
|
+
|
81
|
+
# Set values of first_task_index and last_task_index
|
82
|
+
num_tasks = len(workflow.task_list)
|
83
|
+
try:
|
84
|
+
first_task_index, last_task_index = set_start_and_last_task_index(
|
85
|
+
num_tasks,
|
86
|
+
first_task_index=job_create.first_task_index,
|
87
|
+
last_task_index=job_create.last_task_index,
|
88
|
+
)
|
89
|
+
job_create.first_task_index = first_task_index
|
90
|
+
job_create.last_task_index = last_task_index
|
91
|
+
except ValueError as e:
|
92
|
+
raise HTTPException(
|
93
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
94
|
+
detail=(
|
95
|
+
"Invalid values for first_task_index or last_task_index "
|
96
|
+
f"(with {num_tasks=}).\n"
|
97
|
+
f"Original error: {str(e)}"
|
98
|
+
),
|
99
|
+
)
|
100
|
+
|
101
|
+
# If backend is SLURM, check that the user has required attributes
|
102
|
+
settings = Inject(get_settings)
|
103
|
+
backend = settings.FRACTAL_RUNNER_BACKEND
|
104
|
+
if backend == "slurm":
|
105
|
+
if not user.slurm_user:
|
106
|
+
raise HTTPException(
|
107
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
108
|
+
detail=(
|
109
|
+
f"FRACTAL_RUNNER_BACKEND={backend}, "
|
110
|
+
f"but {user.slurm_user=}."
|
111
|
+
),
|
112
|
+
)
|
113
|
+
if not user.cache_dir:
|
114
|
+
raise HTTPException(
|
115
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
116
|
+
detail=(
|
117
|
+
f"FRACTAL_RUNNER_BACKEND={backend}, "
|
118
|
+
f"but {user.cache_dir=}."
|
119
|
+
),
|
120
|
+
)
|
121
|
+
|
122
|
+
# Check that no other job with the same dataset_id is SUBMITTED
|
123
|
+
stm = (
|
124
|
+
select(JobV2)
|
125
|
+
.where(JobV2.dataset_id == dataset_id)
|
126
|
+
.where(JobV2.status == JobStatusTypeV2.SUBMITTED)
|
127
|
+
)
|
128
|
+
res = await db.execute(stm)
|
129
|
+
if res.scalars().all():
|
130
|
+
raise HTTPException(
|
131
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
132
|
+
detail=(
|
133
|
+
f"Dataset {dataset_id} is already in use "
|
134
|
+
"in submitted job(s)."
|
135
|
+
),
|
136
|
+
)
|
137
|
+
|
138
|
+
if job_create.slurm_account is not None:
|
139
|
+
if job_create.slurm_account not in user.slurm_accounts:
|
140
|
+
raise HTTPException(
|
141
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
142
|
+
detail=(
|
143
|
+
f"SLURM account '{job_create.slurm_account}' is not "
|
144
|
+
"among those available to the current user"
|
145
|
+
),
|
146
|
+
)
|
147
|
+
else:
|
148
|
+
if len(user.slurm_accounts) > 0:
|
149
|
+
job_create.slurm_account = user.slurm_accounts[0]
|
150
|
+
|
151
|
+
# Add new ApplyWorkflow object to DB
|
152
|
+
job = JobV2(
|
153
|
+
project_id=project_id,
|
154
|
+
dataset_id=dataset_id,
|
155
|
+
workflow_id=workflow_id,
|
156
|
+
user_email=user.email,
|
157
|
+
dataset_dump=dict(
|
158
|
+
**dataset.model_dump(exclude={"timestamp_created"}),
|
159
|
+
timestamp_created=_encode_as_utc(dataset.timestamp_created),
|
160
|
+
),
|
161
|
+
workflow_dump=dict(
|
162
|
+
**workflow.model_dump(exclude={"task_list", "timestamp_created"}),
|
163
|
+
timestamp_created=_encode_as_utc(workflow.timestamp_created),
|
164
|
+
),
|
165
|
+
project_dump=dict(
|
166
|
+
**project.model_dump(exclude={"user_list", "timestamp_created"}),
|
167
|
+
timestamp_created=_encode_as_utc(project.timestamp_created),
|
168
|
+
),
|
169
|
+
**job_create.dict(),
|
170
|
+
)
|
171
|
+
|
172
|
+
# Rate Limiting:
|
173
|
+
# raise `429 TOO MANY REQUESTS` if this endpoint has been called with the
|
174
|
+
# same database keys (Project, Workflow and Datasets) during the last
|
175
|
+
# `settings.FRACTAL_API_SUBMIT_RATE_LIMIT` seconds.
|
176
|
+
stm = (
|
177
|
+
select(JobV2)
|
178
|
+
.where(JobV2.project_id == project_id)
|
179
|
+
.where(JobV2.workflow_id == workflow_id)
|
180
|
+
.where(JobV2.dataset_id == dataset_id)
|
181
|
+
)
|
182
|
+
res = await db.execute(stm)
|
183
|
+
db_jobs = res.scalars().all()
|
184
|
+
if db_jobs and any(
|
185
|
+
abs(
|
186
|
+
job.start_timestamp
|
187
|
+
- db_job.start_timestamp.replace(tzinfo=timezone.utc)
|
188
|
+
)
|
189
|
+
< timedelta(seconds=settings.FRACTAL_API_SUBMIT_RATE_LIMIT)
|
190
|
+
for db_job in db_jobs
|
191
|
+
):
|
192
|
+
raise HTTPException(
|
193
|
+
status_code=status.HTTP_429_TOO_MANY_REQUESTS,
|
194
|
+
detail=(
|
195
|
+
f"The endpoint 'POST /api/v2/project/{project_id}/workflow/"
|
196
|
+
f"{workflow_id}/apply/' "
|
197
|
+
"was called several times within an interval of less "
|
198
|
+
f"than {settings.FRACTAL_API_SUBMIT_RATE_LIMIT} seconds, using"
|
199
|
+
" the same foreign keys. If it was intentional, please wait "
|
200
|
+
"and try again."
|
201
|
+
),
|
202
|
+
)
|
203
|
+
|
204
|
+
db.add(job)
|
205
|
+
await db.commit()
|
206
|
+
await db.refresh(job)
|
207
|
+
|
208
|
+
background_tasks.add_task(
|
209
|
+
submit_workflow,
|
210
|
+
workflow_id=workflow.id,
|
211
|
+
dataset_id=dataset.id,
|
212
|
+
job_id=job.id,
|
213
|
+
worker_init=job.worker_init,
|
214
|
+
slurm_user=user.slurm_user,
|
215
|
+
user_cache_dir=user.cache_dir,
|
216
|
+
)
|
217
|
+
|
218
|
+
await db.close()
|
219
|
+
|
220
|
+
return job
|
@@ -0,0 +1,222 @@
|
|
1
|
+
from copy import deepcopy # noqa
|
2
|
+
from typing import Optional
|
3
|
+
|
4
|
+
from fastapi import APIRouter
|
5
|
+
from fastapi import Depends
|
6
|
+
from fastapi import HTTPException
|
7
|
+
from fastapi import Response
|
8
|
+
from fastapi import status
|
9
|
+
from sqlmodel import select
|
10
|
+
|
11
|
+
from .....logger import set_logger
|
12
|
+
from ....db import AsyncSession
|
13
|
+
from ....db import get_async_db
|
14
|
+
from ....models.v1 import Task as TaskV1
|
15
|
+
from ....models.v2 import TaskV2
|
16
|
+
from ....models.v2 import WorkflowTaskV2
|
17
|
+
from ....schemas.v2 import TaskCreateV2
|
18
|
+
from ....schemas.v2 import TaskReadV2
|
19
|
+
from ....schemas.v2 import TaskUpdateV2
|
20
|
+
from ....security import current_active_user
|
21
|
+
from ....security import current_active_verified_user
|
22
|
+
from ....security import User
|
23
|
+
from ._aux_functions import _get_task_check_owner
|
24
|
+
|
25
|
+
router = APIRouter()
|
26
|
+
|
27
|
+
logger = set_logger(__name__)
|
28
|
+
|
29
|
+
|
30
|
+
@router.get("/", response_model=list[TaskReadV2])
|
31
|
+
async def get_list_task(
|
32
|
+
args_schema_parallel: bool = True,
|
33
|
+
args_schema_non_parallel: bool = True,
|
34
|
+
user: User = Depends(current_active_user),
|
35
|
+
db: AsyncSession = Depends(get_async_db),
|
36
|
+
) -> list[TaskReadV2]:
|
37
|
+
"""
|
38
|
+
Get list of available tasks
|
39
|
+
"""
|
40
|
+
stm = select(TaskV2)
|
41
|
+
res = await db.execute(stm)
|
42
|
+
task_list = res.scalars().all()
|
43
|
+
await db.close()
|
44
|
+
if args_schema_parallel is False:
|
45
|
+
for task in task_list:
|
46
|
+
setattr(task, "args_schema_parallel", None)
|
47
|
+
if args_schema_non_parallel is False:
|
48
|
+
for task in task_list:
|
49
|
+
setattr(task, "args_schema_non_parallel", None)
|
50
|
+
|
51
|
+
return task_list
|
52
|
+
|
53
|
+
|
54
|
+
@router.get("/{task_id}/", response_model=TaskReadV2)
|
55
|
+
async def get_task(
|
56
|
+
task_id: int,
|
57
|
+
user: User = Depends(current_active_user),
|
58
|
+
db: AsyncSession = Depends(get_async_db),
|
59
|
+
) -> TaskReadV2:
|
60
|
+
"""
|
61
|
+
Get info on a specific task
|
62
|
+
"""
|
63
|
+
task = await db.get(TaskV2, task_id)
|
64
|
+
await db.close()
|
65
|
+
if not task:
|
66
|
+
raise HTTPException(
|
67
|
+
status_code=status.HTTP_404_NOT_FOUND, detail="TaskV2 not found"
|
68
|
+
)
|
69
|
+
return task
|
70
|
+
|
71
|
+
|
72
|
+
@router.patch("/{task_id}/", response_model=TaskReadV2)
|
73
|
+
async def patch_task(
|
74
|
+
task_id: int,
|
75
|
+
task_update: TaskUpdateV2,
|
76
|
+
user: User = Depends(current_active_verified_user),
|
77
|
+
db: AsyncSession = Depends(get_async_db),
|
78
|
+
) -> Optional[TaskReadV2]:
|
79
|
+
"""
|
80
|
+
Edit a specific task (restricted to superusers and task owner)
|
81
|
+
"""
|
82
|
+
|
83
|
+
# Retrieve task from database
|
84
|
+
db_task = await _get_task_check_owner(task_id=task_id, user=user, db=db)
|
85
|
+
update = task_update.dict(exclude_unset=True)
|
86
|
+
|
87
|
+
# Forbid changes that set a previously unset command
|
88
|
+
if db_task.type == "non_parallel" and "command_parallel" in update:
|
89
|
+
raise HTTPException(
|
90
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
91
|
+
detail="Cannot set an unset `command_parallel`.",
|
92
|
+
)
|
93
|
+
if db_task.type == "parallel" and "command_non_parallel" in update:
|
94
|
+
raise HTTPException(
|
95
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
96
|
+
detail="Cannot set an unset `command_non_parallel`.",
|
97
|
+
)
|
98
|
+
|
99
|
+
for key, value in update.items():
|
100
|
+
setattr(db_task, key, value)
|
101
|
+
|
102
|
+
await db.commit()
|
103
|
+
await db.refresh(db_task)
|
104
|
+
await db.close()
|
105
|
+
return db_task
|
106
|
+
|
107
|
+
|
108
|
+
@router.post(
|
109
|
+
"/", response_model=TaskReadV2, status_code=status.HTTP_201_CREATED
|
110
|
+
)
|
111
|
+
async def create_task(
|
112
|
+
task: TaskCreateV2,
|
113
|
+
user: User = Depends(current_active_verified_user),
|
114
|
+
db: AsyncSession = Depends(get_async_db),
|
115
|
+
) -> Optional[TaskReadV2]:
|
116
|
+
"""
|
117
|
+
Create a new task
|
118
|
+
"""
|
119
|
+
|
120
|
+
if task.command_non_parallel is None:
|
121
|
+
task_type = "parallel"
|
122
|
+
elif task.command_parallel is None:
|
123
|
+
task_type = "non_parallel"
|
124
|
+
else:
|
125
|
+
task_type = "compound"
|
126
|
+
|
127
|
+
if task_type == "parallel" and (
|
128
|
+
task.args_schema_non_parallel is not None
|
129
|
+
or task.meta_non_parallel is not None
|
130
|
+
):
|
131
|
+
raise HTTPException(
|
132
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
133
|
+
detail=(
|
134
|
+
"Cannot set `TaskV2.args_schema_non_parallel` or "
|
135
|
+
"`TaskV2.args_schema_non_parallel` if TaskV2 is parallel"
|
136
|
+
),
|
137
|
+
)
|
138
|
+
elif task_type == "non_parallel" and (
|
139
|
+
task.args_schema_parallel is not None or task.meta_parallel is not None
|
140
|
+
):
|
141
|
+
raise HTTPException(
|
142
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
143
|
+
detail=(
|
144
|
+
"Cannot set `TaskV2.args_schema_parallel` or "
|
145
|
+
"`TaskV2.args_schema_parallel` if TaskV2 is non_parallel"
|
146
|
+
),
|
147
|
+
)
|
148
|
+
|
149
|
+
# Set task.owner attribute
|
150
|
+
if user.username:
|
151
|
+
owner = user.username
|
152
|
+
elif user.slurm_user:
|
153
|
+
owner = user.slurm_user
|
154
|
+
else:
|
155
|
+
raise HTTPException(
|
156
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
157
|
+
detail=(
|
158
|
+
"Cannot add a new task because current user does not "
|
159
|
+
"have `username` or `slurm_user` attributes."
|
160
|
+
),
|
161
|
+
)
|
162
|
+
|
163
|
+
# Prepend owner to task.source
|
164
|
+
task.source = f"{owner}:{task.source}"
|
165
|
+
|
166
|
+
# Verify that source is not already in use (note: this check is only useful
|
167
|
+
# to provide a user-friendly error message, but `task.source` uniqueness is
|
168
|
+
# already guaranteed by a constraint in the table definition).
|
169
|
+
stm = select(TaskV2).where(TaskV2.source == task.source)
|
170
|
+
res = await db.execute(stm)
|
171
|
+
if res.scalars().all():
|
172
|
+
raise HTTPException(
|
173
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
174
|
+
detail=f"Source '{task.source}' already used by some TaskV2",
|
175
|
+
)
|
176
|
+
stm = select(TaskV1).where(TaskV1.source == task.source)
|
177
|
+
res = await db.execute(stm)
|
178
|
+
if res.scalars().all():
|
179
|
+
raise HTTPException(
|
180
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
181
|
+
detail=f"Source '{task.source}' already used by some TaskV1",
|
182
|
+
)
|
183
|
+
# Add task
|
184
|
+
db_task = TaskV2(**task.dict(), owner=owner, type=task_type)
|
185
|
+
db.add(db_task)
|
186
|
+
await db.commit()
|
187
|
+
await db.refresh(db_task)
|
188
|
+
await db.close()
|
189
|
+
return db_task
|
190
|
+
|
191
|
+
|
192
|
+
@router.delete("/{task_id}/", status_code=204)
|
193
|
+
async def delete_task(
|
194
|
+
task_id: int,
|
195
|
+
user: User = Depends(current_active_user),
|
196
|
+
db: AsyncSession = Depends(get_async_db),
|
197
|
+
) -> Response:
|
198
|
+
"""
|
199
|
+
Delete a task
|
200
|
+
"""
|
201
|
+
|
202
|
+
db_task = await _get_task_check_owner(task_id=task_id, user=user, db=db)
|
203
|
+
|
204
|
+
# Check that the TaskV2 is not in relationship with some WorkflowTaskV2
|
205
|
+
stm = select(WorkflowTaskV2).filter(WorkflowTaskV2.task_id == task_id)
|
206
|
+
res = await db.execute(stm)
|
207
|
+
workflowtask_list = res.scalars().all()
|
208
|
+
if workflowtask_list:
|
209
|
+
raise HTTPException(
|
210
|
+
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
211
|
+
detail=(
|
212
|
+
f"Cannot remove TaskV2 {task_id} because it is currently "
|
213
|
+
"imported in WorkflowsV2 "
|
214
|
+
f"{[x.workflow_id for x in workflowtask_list]}. "
|
215
|
+
"If you want to remove this task, then you should first remove"
|
216
|
+
" the workflows.",
|
217
|
+
),
|
218
|
+
)
|
219
|
+
|
220
|
+
await db.delete(db_task)
|
221
|
+
await db.commit()
|
222
|
+
return Response(status_code=status.HTTP_204_NO_CONTENT)
|