fractal-server 2.18.0a4__py3-none-any.whl → 2.18.0a5__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.18.0a4"
+__VERSION__ = "2.18.0a5"

fractal_server/app/models/v2/job.py

@@ -6,9 +6,11 @@ from sqlalchemy import Column
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.types import DateTime
 from sqlmodel import Field
+from sqlmodel import Index
 from sqlmodel import SQLModel
+from sqlmodel import text
 
-from fractal_server.app.schemas.v2 import JobStatusTypeV2
+from fractal_server.app.schemas.v2 import JobStatusType
 from fractal_server.utils import get_timestamp
 
 
@@ -56,7 +58,7 @@ class JobV2(SQLModel, table=True):
     end_timestamp: datetime | None = Field(
         default=None, sa_column=Column(DateTime(timezone=True))
     )
-    status: str = JobStatusTypeV2.SUBMITTED
+    status: str = JobStatusType.SUBMITTED
     log: str | None = None
     executor_error_log: str | None = None
 
@@ -66,3 +68,12 @@ class JobV2(SQLModel, table=True):
     type_filters: dict[str, bool] = Field(
         sa_column=Column(JSONB, nullable=False, server_default="{}")
     )
+
+    __table_args__ = (
+        Index(
+            "ix_jobv2_one_submitted_job_per_dataset",
+            "dataset_id",
+            unique=True,
+            postgresql_where=text(f"status = '{JobStatusType.SUBMITTED}'"),
+        ),
+    )

fractal_server/app/models/v2/resource.py

@@ -5,6 +5,7 @@ from typing import Self
 from sqlalchemy import Column
 from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.types import DateTime
+from sqlmodel import BOOLEAN
 from sqlmodel import CheckConstraint
 from sqlmodel import Field
 from sqlmodel import SQLModel
@@ -43,6 +44,18 @@ class Resource(SQLModel, table=True):
     Address for ssh connections, when `type="slurm_ssh"`.
     """
 
+    prevent_new_submissions: bool = Field(
+        sa_column=Column(
+            BOOLEAN,
+            server_default="false",
+            nullable=False,
+        ),
+    )
+    """
+    When set to true: Prevent new job submissions and stop execution of
+    ongoing jobs as soon as the current task is complete.
+    """
+
     jobs_local_dir: str
     """
     Base local folder for job subfolders (containing artifacts and logs).

fractal_server/app/routes/admin/v2/__init__.py

@@ -14,16 +14,14 @@ from .task import router as task_router
 from .task_group import router as task_group_router
 from .task_group_lifecycle import router as task_group_lifecycle_router
 
-router_admin_v2 = APIRouter()
+router_admin = APIRouter()
 
-router_admin_v2.include_router(accounting_router, prefix="/accounting")
-router_admin_v2.include_router(job_router, prefix="/job")
-router_admin_v2.include_router(task_router, prefix="/task")
-router_admin_v2.include_router(task_group_router, prefix="/task-group")
-router_admin_v2.include_router(
-    task_group_lifecycle_router, prefix="/task-group"
-)
-router_admin_v2.include_router(impersonate_router, prefix="/impersonate")
-router_admin_v2.include_router(resource_router, prefix="/resource")
-router_admin_v2.include_router(profile_router, prefix="/profile")
-router_admin_v2.include_router(sharing_router, prefix="/linkuserproject")
+router_admin.include_router(accounting_router, prefix="/accounting")
+router_admin.include_router(job_router, prefix="/job")
+router_admin.include_router(task_router, prefix="/task")
+router_admin.include_router(task_group_router, prefix="/task-group")
+router_admin.include_router(task_group_lifecycle_router, prefix="/task-group")
+router_admin.include_router(impersonate_router, prefix="/impersonate")
+router_admin.include_router(resource_router, prefix="/resource")
+router_admin.include_router(profile_router, prefix="/profile")
+router_admin.include_router(sharing_router, prefix="/linkuserproject")

fractal_server/app/routes/admin/v2/job.py

@@ -24,9 +24,9 @@ from fractal_server.app.routes.pagination import PaginationRequest
 from fractal_server.app.routes.pagination import PaginationResponse
 from fractal_server.app.routes.pagination import get_pagination_params
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
-from fractal_server.app.schemas.v2 import JobReadV2
-from fractal_server.app.schemas.v2 import JobStatusTypeV2
-from fractal_server.app.schemas.v2 import JobUpdateV2
+from fractal_server.app.schemas.v2 import JobRead
+from fractal_server.app.schemas.v2 import JobStatusType
+from fractal_server.app.schemas.v2 import JobUpdate
 from fractal_server.runner.filenames import WORKFLOW_LOG_FILENAME
 from fractal_server.utils import get_timestamp
 from fractal_server.zip_tools import _zip_folder_to_byte_stream_iterator
@@ -34,14 +34,14 @@ from fractal_server.zip_tools import _zip_folder_to_byte_stream_iterator
 router = APIRouter()
 
 
-@router.get("/", response_model=PaginationResponse[JobReadV2])
+@router.get("/", response_model=PaginationResponse[JobRead])
 async def view_job(
     id: int | None = None,
     user_id: int | None = None,
     project_id: int | None = None,
     dataset_id: int | None = None,
     workflow_id: int | None = None,
-    status: JobStatusTypeV2 | None = None,
+    status: JobStatusType | None = None,
     start_timestamp_min: AwareDatetime | None = None,
     start_timestamp_max: AwareDatetime | None = None,
     end_timestamp_min: AwareDatetime | None = None,
@@ -50,7 +50,7 @@ async def view_job(
     pagination: PaginationRequest = Depends(get_pagination_params),
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> PaginationResponse[JobReadV2]:
+) -> PaginationResponse[JobRead]:
     """
     Query `JobV2` table.
 
@@ -154,13 +154,13 @@ async def view_job(
     )
 
 
-@router.get("/{job_id}/", response_model=JobReadV2)
+@router.get("/{job_id}/", response_model=JobRead)
 async def view_single_job(
     job_id: int,
     show_tmp_logs: bool = False,
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> JobReadV2:
+) -> JobRead:
     job = await db.get(JobV2, job_id)
     if not job:
         raise HTTPException(
@@ -169,7 +169,7 @@ async def view_single_job(
         )
     await db.close()
 
-    if show_tmp_logs and (job.status == JobStatusTypeV2.SUBMITTED):
+    if show_tmp_logs and (job.status == JobStatusType.SUBMITTED):
         try:
             with open(f"{job.working_dir}/{WORKFLOW_LOG_FILENAME}") as f:
                 job.log = f.read()
@@ -179,13 +179,13 @@ async def view_single_job(
     return job
 
 
-@router.patch("/{job_id}/", response_model=JobReadV2)
+@router.patch("/{job_id}/", response_model=JobRead)
 async def update_job(
-    job_update: JobUpdateV2,
+    job_update: JobUpdate,
     job_id: int,
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> JobReadV2 | None:
+) -> JobRead | None:
     """
     Change the status of an existing job.
 
@@ -198,13 +198,13 @@ async def update_job(
             status_code=status.HTTP_404_NOT_FOUND,
             detail=f"Job {job_id} not found",
         )
-    if job.status != JobStatusTypeV2.SUBMITTED:
+    if job.status != JobStatusType.SUBMITTED:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Job {job_id} has status {job.status=} != 'submitted'.",
         )
 
-    if job_update.status != JobStatusTypeV2.FAILED:
+    if job_update.status != JobStatusType.FAILED:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Cannot set job status to {job_update.status}",
@@ -217,7 +217,7 @@ async def update_job(
         job,
         "log",
         f"{job.log or ''}\nThis job was manually marked as "
-        f"'{JobStatusTypeV2.FAILED}' by an admin ({timestamp.isoformat()}).",
+        f"'{JobStatusType.FAILED}' by an admin ({timestamp.isoformat()}).",
     )
 
     res = await db.execute(

fractal_server/app/routes/admin/v2/task.py

@@ -23,7 +23,7 @@ from fractal_server.app.schemas.v2.task import TaskType
 router = APIRouter()
 
 
-class TaskV2Minimal(BaseModel):
+class TaskMinimal(BaseModel):
     id: int
     name: str
     type: str
@@ -39,7 +39,7 @@ class ProjectUser(BaseModel):
     email: EmailStr
 
 
-class TaskV2Relationship(BaseModel):
+class TaskRelationship(BaseModel):
     workflow_id: int
     workflow_name: str
     project_id: int
@@ -47,12 +47,12 @@ class TaskV2Relationship(BaseModel):
     project_users: list[ProjectUser] = Field(default_factory=list)
 
 
-class TaskV2Info(BaseModel):
-    task: TaskV2Minimal
-    relationships: list[TaskV2Relationship]
+class TaskInfo(BaseModel):
+    task: TaskMinimal
+    relationships: list[TaskRelationship]
 
 
-@router.get("/", response_model=PaginationResponse[TaskV2Info])
+@router.get("/", response_model=PaginationResponse[TaskInfo])
 async def query_tasks(
     id: int | None = None,
     source: str | None = None,
@@ -66,7 +66,7 @@ async def query_tasks(
     pagination: PaginationRequest = Depends(get_pagination_params),
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> PaginationResponse[TaskV2Info]:
+) -> PaginationResponse[TaskInfo]:
     """
     Query `TaskV2` and get information about related workflows and projects.
     """

fractal_server/app/routes/admin/v2/task_group.py

@@ -20,12 +20,12 @@ from fractal_server.app.routes.auth._aux_auth import (
 from fractal_server.app.routes.pagination import PaginationRequest
 from fractal_server.app.routes.pagination import PaginationResponse
 from fractal_server.app.routes.pagination import get_pagination_params
-from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
+from fractal_server.app.schemas.v2 import TaskGroupActivityAction
+from fractal_server.app.schemas.v2 import TaskGroupActivityRead
+from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
+from fractal_server.app.schemas.v2 import TaskGroupOriginEnum
 from fractal_server.app.schemas.v2 import TaskGroupReadSuperuser
-from fractal_server.app.schemas.v2 import TaskGroupUpdateV2
-from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
+from fractal_server.app.schemas.v2 import TaskGroupUpdate
 from fractal_server.logger import set_logger
 
 router = APIRouter()
@@ -34,20 +34,20 @@ logger = set_logger(__name__)
 
 
 @router.get(
-    "/activity/", response_model=PaginationResponse[TaskGroupActivityV2Read]
+    "/activity/", response_model=PaginationResponse[TaskGroupActivityRead]
 )
 async def get_task_group_activity_list(
     task_group_activity_id: int | None = None,
     user_id: int | None = None,
     taskgroupv2_id: int | None = None,
     pkg_name: str | None = None,
-    status: TaskGroupActivityStatusV2 | None = None,
-    action: TaskGroupActivityActionV2 | None = None,
+    status: TaskGroupActivityStatus | None = None,
+    action: TaskGroupActivityAction | None = None,
     timestamp_started_min: AwareDatetime | None = None,
     pagination: PaginationRequest = Depends(get_pagination_params),
     superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> PaginationResponse[TaskGroupActivityV2Read]:
+) -> PaginationResponse[TaskGroupActivityRead]:
     # Assign pagination parameters
     page = pagination.page
     page_size = pagination.page_size
@@ -127,7 +127,7 @@ async def query_task_group_list(
     private: bool | None = None,
     active: bool | None = None,
     pkg_name: str | None = None,
-    origin: TaskGroupV2OriginEnum | None = None,
+    origin: TaskGroupOriginEnum | None = None,
     timestamp_last_used_min: AwareDatetime | None = None,
     timestamp_last_used_max: AwareDatetime | None = None,
     resource_id: int | None = None,
@@ -217,7 +217,7 @@ async def query_task_group_list(
 @router.patch("/{task_group_id}/", response_model=TaskGroupReadSuperuser)
 async def patch_task_group(
     task_group_id: int,
-    task_group_update: TaskGroupUpdateV2,
+    task_group_update: TaskGroupUpdate,
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupReadSuperuser]:

fractal_server/app/routes/admin/v2/task_group_lifecycle.py

@@ -26,10 +26,10 @@ from fractal_server.app.routes.aux.validate_user_profile import (
     validate_user_profile,
 )
 from fractal_server.app.schemas.v2 import ResourceType
-from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
-from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
-from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
+from fractal_server.app.schemas.v2 import TaskGroupActivityAction
+from fractal_server.app.schemas.v2 import TaskGroupActivityRead
+from fractal_server.app.schemas.v2 import TaskGroupActivityStatus
+from fractal_server.app.schemas.v2 import TaskGroupOriginEnum
 from fractal_server.logger import set_logger
 from fractal_server.tasks.v2.local import deactivate_local
 from fractal_server.tasks.v2.local import delete_local
@@ -46,7 +46,7 @@ logger = set_logger(__name__)
 
 @router.post(
     "/{task_group_id}/deactivate/",
-    response_model=TaskGroupActivityV2Read,
+    response_model=TaskGroupActivityRead,
 )
 async def deactivate_task_group(
     task_group_id: int,
@@ -54,7 +54,7 @@ async def deactivate_task_group(
     response: Response,
     superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupActivityV2Read:
+) -> TaskGroupActivityRead:
     """
     Deactivate task-group venv
     """
@@ -78,13 +78,13 @@ async def deactivate_task_group(
     await check_no_submitted_job(task_group_id=task_group.id, db=db)
 
     # Shortcut for task-group with origin="other"
-    if task_group.origin == TaskGroupV2OriginEnum.OTHER:
+    if task_group.origin == TaskGroupOriginEnum.OTHER:
         task_group.active = False
         task_group_activity = TaskGroupActivityV2(
             user_id=task_group.user_id,
             taskgroupv2_id=task_group.id,
-            status=TaskGroupActivityStatusV2.OK,
-            action=TaskGroupActivityActionV2.DEACTIVATE,
+            status=TaskGroupActivityStatus.OK,
+            action=TaskGroupActivityAction.DEACTIVATE,
             pkg_name=task_group.pkg_name,
             version=(task_group.version or "N/A"),
             log=(
@@ -103,8 +103,8 @@ async def deactivate_task_group(
     task_group_activity = TaskGroupActivityV2(
         user_id=task_group.user_id,
         taskgroupv2_id=task_group.id,
-        status=TaskGroupActivityStatusV2.PENDING,
-        action=TaskGroupActivityActionV2.DEACTIVATE,
+        status=TaskGroupActivityStatus.PENDING,
+        action=TaskGroupActivityAction.DEACTIVATE,
         pkg_name=task_group.pkg_name,
         version=task_group.version,
         timestamp_started=get_timestamp(),
@@ -140,7 +140,7 @@ async def deactivate_task_group(
 
 @router.post(
     "/{task_group_id}/reactivate/",
-    response_model=TaskGroupActivityV2Read,
+    response_model=TaskGroupActivityRead,
 )
 async def reactivate_task_group(
     task_group_id: int,
@@ -148,7 +148,7 @@ async def reactivate_task_group(
     response: Response,
     superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupActivityV2Read:
+) -> TaskGroupActivityRead:
     """
     Deactivate task-group venv
     """
@@ -173,13 +173,13 @@ async def reactivate_task_group(
     await check_no_submitted_job(task_group_id=task_group.id, db=db)
 
     # Shortcut for task-group with origin="other"
-    if task_group.origin == TaskGroupV2OriginEnum.OTHER:
+    if task_group.origin == TaskGroupOriginEnum.OTHER:
         task_group.active = True
         task_group_activity = TaskGroupActivityV2(
             user_id=task_group.user_id,
             taskgroupv2_id=task_group.id,
-            status=TaskGroupActivityStatusV2.OK,
-            action=TaskGroupActivityActionV2.REACTIVATE,
+            status=TaskGroupActivityStatus.OK,
+            action=TaskGroupActivityAction.REACTIVATE,
             pkg_name=task_group.pkg_name,
             version=(task_group.version or "N/A"),
             log=(
@@ -206,8 +206,8 @@ async def reactivate_task_group(
     task_group_activity = TaskGroupActivityV2(
         user_id=task_group.user_id,
         taskgroupv2_id=task_group.id,
-        status=TaskGroupActivityStatusV2.PENDING,
-        action=TaskGroupActivityActionV2.REACTIVATE,
+        status=TaskGroupActivityStatus.PENDING,
+        action=TaskGroupActivityAction.REACTIVATE,
         pkg_name=task_group.pkg_name,
         version=task_group.version,
         timestamp_started=get_timestamp(),
@@ -259,8 +259,8 @@ async def delete_task_group(
     task_group_activity = TaskGroupActivityV2(
         user_id=task_group.user_id,
         taskgroupv2_id=task_group.id,
-        status=TaskGroupActivityStatusV2.PENDING,
-        action=TaskGroupActivityActionV2.DELETE,
+        status=TaskGroupActivityStatus.PENDING,
+        action=TaskGroupActivityAction.DELETE,
         pkg_name=task_group.pkg_name,
         version=(task_group.version or "N/A"),
         timestamp_started=get_timestamp(),

fractal_server/app/routes/api/v2/__init__.py

@@ -7,68 +7,66 @@ from fastapi import APIRouter
 from fractal_server.config import get_settings
 from fractal_server.syringe import Inject
 
-from .dataset import router as dataset_router_v2
-from .history import router as history_router_v2
-from .images import router as images_routes_v2
-from .job import router as job_router_v2
+from .dataset import router as dataset_router
+from .history import router as history_router
+from .images import router as images_routes
+from .job import router as job_router
 from .pre_submission_checks import router as pre_submission_checks_router
-from .project import router as project_router_v2
-from .sharing import router as sharing_router_v2
-from .status_legacy import router as status_legacy_router_v2
-from .submit import router as submit_job_router_v2
-from .task import router as task_router_v2
-from .task_collection import router as task_collection_router_v2
-from .task_collection_custom import router as task_collection_router_v2_custom
-from .task_collection_pixi import router as task_collection_pixi_router_v2
-from .task_group import router as task_group_router_v2
-from .task_group_lifecycle import router as task_group_lifecycle_router_v2
-from .task_version_update import router as task_version_update_router_v2
-from .workflow import router as workflow_router_v2
-from .workflow_import import router as workflow_import_router_v2
-from .workflowtask import router as workflowtask_router_v2
+from .project import router as project_router
+from .sharing import router as sharing_router
+from .status_legacy import router as status_legacy_router
+from .submit import router as submit_job_router
+from .task import router as task_router
+from .task_collection import router as task_collection_router
+from .task_collection_custom import router as task_collection_router_custom
+from .task_collection_pixi import router as task_collection_pixi_router
+from .task_group import router as task_group_router
+from .task_group_lifecycle import router as task_group_lifecycle_router
+from .task_version_update import router as task_version_update_router
+from .workflow import router as workflow_router
+from .workflow_import import router as workflow_import_router
+from .workflowtask import router as workflowtask_router
 
-router_api_v2 = APIRouter()
+router_api = APIRouter()
 
-router_api_v2.include_router(dataset_router_v2, tags=["V2 Dataset"])
-router_api_v2.include_router(pre_submission_checks_router, tags=["V2 Job"])
-router_api_v2.include_router(job_router_v2, tags=["V2 Job"])
-router_api_v2.include_router(images_routes_v2, tags=["V2 Images"])
-router_api_v2.include_router(sharing_router_v2, tags=["Project Sharing"])
-router_api_v2.include_router(project_router_v2, tags=["V2 Project"])
-router_api_v2.include_router(submit_job_router_v2, tags=["V2 Job"])
-router_api_v2.include_router(history_router_v2, tags=["V2 History"])
-router_api_v2.include_router(status_legacy_router_v2, tags=["V2 Status Legacy"])
+router_api.include_router(dataset_router, tags=["Dataset"])
+router_api.include_router(pre_submission_checks_router, tags=["Job"])
+router_api.include_router(job_router, tags=["Job"])
+router_api.include_router(images_routes, tags=["Images"])
+router_api.include_router(sharing_router, tags=["Project Sharing"])
+router_api.include_router(project_router, tags=["Project"])
+router_api.include_router(submit_job_router, tags=["Job"])
+router_api.include_router(history_router, tags=["History"])
+router_api.include_router(status_legacy_router, tags=["Status Legacy"])
 
 
 settings = Inject(get_settings)
-router_api_v2.include_router(
-    task_collection_router_v2,
+router_api.include_router(
+    task_collection_router,
     prefix="/task",
-    tags=["V2 Task Lifecycle"],
+    tags=["Task Lifecycle"],
 )
-router_api_v2.include_router(
-    task_collection_router_v2_custom,
+router_api.include_router(
+    task_collection_router_custom,
     prefix="/task",
-    tags=["V2 Task Lifecycle"],
+    tags=["Task Lifecycle"],
 )
-router_api_v2.include_router(
-    task_collection_pixi_router_v2,
+router_api.include_router(
+    task_collection_pixi_router,
     prefix="/task",
-    tags=["V2 Task Lifecycle"],
+    tags=["Task Lifecycle"],
 )
-router_api_v2.include_router(
-    task_group_lifecycle_router_v2,
+router_api.include_router(
+    task_group_lifecycle_router,
     prefix="/task-group",
-    tags=["V2 Task Lifecycle"],
+    tags=["Task Lifecycle"],
 )
 
-router_api_v2.include_router(task_router_v2, prefix="/task", tags=["V2 Task"])
-router_api_v2.include_router(task_version_update_router_v2, tags=["V2 Task"])
-router_api_v2.include_router(
-    task_group_router_v2, prefix="/task-group", tags=["V2 TaskGroup"]
+router_api.include_router(task_router, prefix="/task", tags=["Task"])
+router_api.include_router(task_version_update_router, tags=["Task"])
+router_api.include_router(
+    task_group_router, prefix="/task-group", tags=["TaskGroup"]
 )
-router_api_v2.include_router(workflow_router_v2, tags=["V2 Workflow"])
-router_api_v2.include_router(
-    workflow_import_router_v2, tags=["V2 Workflow Import"]
-)
-router_api_v2.include_router(workflowtask_router_v2, tags=["V2 WorkflowTask"])
+router_api.include_router(workflow_router, tags=["Workflow"])
+router_api.include_router(workflow_import_router, tags=["Workflow Import"])
+router_api.include_router(workflowtask_router, tags=["WorkflowTask"])