fractal-server 2.9.0a4__tar.gz → 2.9.0a6__tar.gz

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fractal-server
-Version: 2.9.0a4
+Version: 2.9.0a6
 Summary: Server component of the Fractal analytics platform
 Home-page: https://github.com/fractal-analytics-platform/fractal-server
 License: BSD-3-Clause

fractal_server-2.9.0a6/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.9.0a6"

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/models/v2/task_group.py

@@ -1,4 +1,5 @@
 from datetime import datetime
+from datetime import timezone
 from typing import Optional
 
 from sqlalchemy import Column
@@ -48,9 +49,15 @@ class TaskGroupV2(SQLModel, table=True):
         default_factory=get_timestamp,
         sa_column=Column(DateTime(timezone=True), nullable=False),
     )
-    timestamp_last_used: Optional[datetime] = Field(
-        default=None,
-        sa_column=Column(DateTime(timezone=True), nullable=True),
+    timestamp_last_used: datetime = Field(
+        default_factory=get_timestamp,
+        sa_column=Column(
+            DateTime(timezone=True),
+            nullable=False,
+            server_default=(
+                datetime(2024, 11, 20, tzinfo=timezone.utc).isoformat()
+            ),
+        ),
     )
 
     @property

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/routes/admin/v1.py

@@ -33,7 +33,7 @@ from ..aux._job import _write_shutdown_file
 from ..aux._runner import _check_shutdown_is_supported
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_active_superuser
-from fractal_server.app.routes.aux._timestamp import _convert_to_db_timestamp
+from fractal_server.app.routes.aux import _raise_if_naive_datetime
 
 router_admin_v1 = APIRouter()
 
@@ -54,6 +54,7 @@ async def view_project(
         id: If not `None`, select a given `project.id`.
         user_id: If not `None`, select a given `project.user_id`.
     """
+    _raise_if_naive_datetime(timestamp_created_min, timestamp_created_max)
 
     stm = select(Project)
 
@@ -63,10 +64,8 @@ async def view_project(
     if user_id is not None:
         stm = stm.where(Project.user_list.any(UserOAuth.id == user_id))
     if timestamp_created_min is not None:
-        timestamp_created_min = _convert_to_db_timestamp(timestamp_created_min)
         stm = stm.where(Project.timestamp_created >= timestamp_created_min)
     if timestamp_created_max is not None:
-        timestamp_created_max = _convert_to_db_timestamp(timestamp_created_max)
         stm = stm.where(Project.timestamp_created <= timestamp_created_max)
 
     res = await db.execute(stm)
@@ -96,6 +95,8 @@ async def view_workflow(
         name_contains: If not `None`, select workflows such that their
             `name` attribute contains `name_contains` (case-insensitive).
     """
+    _raise_if_naive_datetime(timestamp_created_min, timestamp_created_max)
+
     stm = select(Workflow)
 
     if user_id is not None:
@@ -112,10 +113,8 @@ async def view_workflow(
             func.lower(Workflow.name).contains(name_contains.lower())
         )
     if timestamp_created_min is not None:
-        timestamp_created_min = _convert_to_db_timestamp(timestamp_created_min)
         stm = stm.where(Workflow.timestamp_created >= timestamp_created_min)
     if timestamp_created_max is not None:
-        timestamp_created_max = _convert_to_db_timestamp(timestamp_created_max)
         stm = stm.where(Workflow.timestamp_created <= timestamp_created_max)
 
     res = await db.execute(stm)
@@ -147,6 +146,8 @@ async def view_dataset(
             `name` attribute contains `name_contains` (case-insensitive).
         type: If not `None`, select a given `dataset.type`.
     """
+    _raise_if_naive_datetime(timestamp_created_min, timestamp_created_max)
+
     stm = select(Dataset)
 
     if user_id is not None:
@@ -165,10 +166,8 @@ async def view_dataset(
     if type is not None:
         stm = stm.where(Dataset.type == type)
     if timestamp_created_min is not None:
-        timestamp_created_min = _convert_to_db_timestamp(timestamp_created_min)
         stm = stm.where(Dataset.timestamp_created >= timestamp_created_min)
     if timestamp_created_max is not None:
-        timestamp_created_max = _convert_to_db_timestamp(timestamp_created_max)
         stm = stm.where(Dataset.timestamp_created <= timestamp_created_max)
 
     res = await db.execute(stm)
@@ -218,6 +217,13 @@ async def view_job(
         log: If `True`, include `job.log`, if `False`
             `job.log` is set to `None`.
     """
+    _raise_if_naive_datetime(
+        start_timestamp_min,
+        start_timestamp_max,
+        end_timestamp_min,
+        end_timestamp_max,
+    )
+
     stm = select(ApplyWorkflow)
 
     if id is not None:
@@ -237,16 +243,12 @@ async def view_job(
     if status is not None:
         stm = stm.where(ApplyWorkflow.status == status)
     if start_timestamp_min is not None:
-        start_timestamp_min = _convert_to_db_timestamp(start_timestamp_min)
         stm = stm.where(ApplyWorkflow.start_timestamp >= start_timestamp_min)
     if start_timestamp_max is not None:
-        start_timestamp_max = _convert_to_db_timestamp(start_timestamp_max)
         stm = stm.where(ApplyWorkflow.start_timestamp <= start_timestamp_max)
     if end_timestamp_min is not None:
-        end_timestamp_min = _convert_to_db_timestamp(end_timestamp_min)
         stm = stm.where(ApplyWorkflow.end_timestamp >= end_timestamp_min)
     if end_timestamp_max is not None:
-        end_timestamp_max = _convert_to_db_timestamp(end_timestamp_max)
         stm = stm.where(ApplyWorkflow.end_timestamp <= end_timestamp_max)
 
     res = await db.execute(stm)

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/routes/admin/v2/job.py

@@ -16,9 +16,9 @@ from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import ProjectV2
 from fractal_server.app.routes.auth import current_active_superuser
+from fractal_server.app.routes.aux import _raise_if_naive_datetime
 from fractal_server.app.routes.aux._job import _write_shutdown_file
 from fractal_server.app.routes.aux._runner import _check_shutdown_is_supported
-from fractal_server.app.routes.aux._timestamp import _convert_to_db_timestamp
 from fractal_server.app.runner.filenames import WORKFLOW_LOG_FILENAME
 from fractal_server.app.schemas.v2 import JobReadV2
 from fractal_server.app.schemas.v2 import JobStatusTypeV2
@@ -66,6 +66,14 @@ async def view_job(
         log: If `True`, include `job.log`, if `False`
             `job.log` is set to `None`.
     """
+
+    _raise_if_naive_datetime(
+        start_timestamp_min,
+        start_timestamp_max,
+        end_timestamp_min,
+        end_timestamp_max,
+    )
+
     stm = select(JobV2)
 
     if id is not None:
@@ -83,16 +91,16 @@ async def view_job(
     if status is not None:
         stm = stm.where(JobV2.status == status)
     if start_timestamp_min is not None:
-        start_timestamp_min = _convert_to_db_timestamp(start_timestamp_min)
+        start_timestamp_min = start_timestamp_min
         stm = stm.where(JobV2.start_timestamp >= start_timestamp_min)
     if start_timestamp_max is not None:
-        start_timestamp_max = _convert_to_db_timestamp(start_timestamp_max)
+        start_timestamp_max = start_timestamp_max
         stm = stm.where(JobV2.start_timestamp <= start_timestamp_max)
     if end_timestamp_min is not None:
-        end_timestamp_min = _convert_to_db_timestamp(end_timestamp_min)
+        end_timestamp_min = end_timestamp_min
         stm = stm.where(JobV2.end_timestamp >= end_timestamp_min)
     if end_timestamp_max is not None:
-        end_timestamp_max = _convert_to_db_timestamp(end_timestamp_max)
+        end_timestamp_max = end_timestamp_max
         stm = stm.where(JobV2.end_timestamp <= end_timestamp_max)
 
     res = await db.execute(stm)

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/routes/admin/v2/task_group.py

@@ -20,6 +20,7 @@ from fractal_server.app.routes.auth import current_active_superuser
 from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
+from fractal_server.app.routes.aux import _raise_if_naive_datetime
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
@@ -46,6 +47,8 @@ async def get_task_group_activity_list(
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupActivityV2Read]:
 
+    _raise_if_naive_datetime(timestamp_started_min)
+
     stm = select(TaskGroupActivityV2)
     if task_group_activity_id is not None:
         stm = stm.where(TaskGroupActivityV2.id == task_group_activity_id)
@@ -93,16 +96,26 @@ async def query_task_group_list(
     active: Optional[bool] = None,
     pkg_name: Optional[str] = None,
     origin: Optional[TaskGroupV2OriginEnum] = None,
+    timestamp_last_used_min: Optional[datetime] = None,
+    timestamp_last_used_max: Optional[datetime] = None,
     user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupReadV2]:
 
     stm = select(TaskGroupV2)
 
+    _raise_if_naive_datetime(
+        timestamp_last_used_max,
+        timestamp_last_used_min,
+    )
+
     if user_group_id is not None and private is True:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
-            detail=f"Cannot set `user_group_id` with {private=}",
+            detail=(
+                "Cannot get task groups with both "
+                f"{user_group_id=} and {private=}."
+            ),
         )
     if user_id is not None:
         stm = stm.where(TaskGroupV2.user_id == user_id)
@@ -122,6 +135,14 @@ async def query_task_group_list(
         stm = stm.where(TaskGroupV2.origin == origin)
     if pkg_name is not None:
         stm = stm.where(TaskGroupV2.pkg_name.icontains(pkg_name))
+    if timestamp_last_used_min is not None:
+        stm = stm.where(
+            TaskGroupV2.timestamp_last_used >= timestamp_last_used_min
+        )
+    if timestamp_last_used_max is not None:
+        stm = stm.where(
+            TaskGroupV2.timestamp_last_used <= timestamp_last_used_max
+        )
 
     res = await db.execute(stm)
     task_groups_list = res.scalars().all()

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/routes/admin/v2/task_group_lifecycle.py

@@ -13,6 +13,9 @@ from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.routes.api.v2._aux_functions_task_lifecycle import (
     check_no_ongoing_activity,
 )
+from fractal_server.app.routes.api.v2._aux_functions_task_lifecycle import (
+    check_no_submitted_job,
+)
 from fractal_server.app.routes.api.v2._aux_functions_tasks import (
     _get_task_group_or_404,
 )
@@ -58,9 +61,6 @@ async def deactivate_task_group(
         task_group_id=task_group_id, db=db
     )
 
-    # Check no other activity is ongoing
-    await check_no_ongoing_activity(task_group_id=task_group_id, db=db)
-
     # Check that task-group is active
     if not task_group.active:
         raise HTTPException(
@@ -70,6 +70,12 @@ async def deactivate_task_group(
             ),
         )
 
+    # Check no other activity is ongoing
+    await check_no_ongoing_activity(task_group_id=task_group_id, db=db)
+
+    # Check no submitted jobs use tasks from this 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:
         task_group.active = False
@@ -178,6 +184,9 @@ async def reactivate_task_group(
     # Check no other activity is ongoing
     await check_no_ongoing_activity(task_group_id=task_group_id, db=db)
 
+    # Check no submitted jobs use tasks from this 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:
         task_group.active = True

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/routes/api/v1/project.py

@@ -1,5 +1,5 @@
+import json
 import os
-from datetime import datetime
 from datetime import timedelta
 from datetime import timezone
 from typing import Optional
@@ -50,10 +50,6 @@ router = APIRouter()
 logger = set_logger(__name__)
 
 
-def _encode_as_utc(dt: datetime):
-    return dt.replace(tzinfo=timezone.utc).isoformat()
-
-
 @router.get("/", response_model=list[ProjectReadV1])
 async def get_list_project(
     user: UserOAuth = Depends(current_active_user),
@@ -393,33 +389,25 @@ async def apply_workflow(
         workflow_id=workflow_id,
         user_email=user.email,
         input_dataset_dump=dict(
-            **input_dataset.model_dump(
-                exclude={"resource_list", "history", "timestamp_created"}
+            **json.loads(
+                input_dataset.json(exclude={"resource_list", "history"})
             ),
-            timestamp_created=_encode_as_utc(input_dataset.timestamp_created),
             resource_list=[
                 resource.model_dump()
                 for resource in input_dataset.resource_list
             ],
         ),
         output_dataset_dump=dict(
-            **output_dataset.model_dump(
-                exclude={"resource_list", "history", "timestamp_created"}
+            **json.loads(
+                output_dataset.json(exclude={"resource_list", "history"})
             ),
-            timestamp_created=_encode_as_utc(output_dataset.timestamp_created),
             resource_list=[
                 resource.model_dump()
                 for resource in output_dataset.resource_list
             ],
         ),
-        workflow_dump=dict(
-            **workflow.model_dump(exclude={"task_list", "timestamp_created"}),
-            timestamp_created=_encode_as_utc(workflow.timestamp_created),
-        ),
-        project_dump=dict(
-            **project.model_dump(exclude={"user_list", "timestamp_created"}),
-            timestamp_created=_encode_as_utc(project.timestamp_created),
-        ),
+        workflow_dump=json.loads(workflow.json(exclude={"task_list"})),
+        project_dump=json.loads(project.json(exclude={"user_list"})),
         **apply_workflow.dict(),
     )
 

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py

@@ -4,10 +4,16 @@ from fastapi import HTTPException
 from fastapi import status
 from httpx import AsyncClient
 from httpx import TimeoutException
+from sqlmodel import func
 from sqlmodel import select
 
 from fractal_server.app.db import AsyncSession
+from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import TaskGroupActivityV2
+from fractal_server.app.models.v2 import TaskV2
+from fractal_server.app.models.v2 import WorkflowTaskV2
+from fractal_server.app.models.v2 import WorkflowV2
+from fractal_server.app.schemas.v2 import JobStatusTypeV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.logger import set_logger
 
@@ -165,3 +171,37 @@ async def check_no_ongoing_activity(
         status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
         detail=msg,
     )
+
+
+async def check_no_submitted_job(
+    *,
+    task_group_id: int,
+    db: AsyncSession,
+) -> None:
+    """
+    Find submitted jobs which include tasks from a given task group.
+
+    Arguments:
+        task_id_list: List of TaskV2 IDs
+        db: Database session
+    """
+    stm = (
+        select(func.count(JobV2.id))
+        .join(WorkflowV2, JobV2.workflow_id == WorkflowV2.id)
+        .join(WorkflowTaskV2, WorkflowTaskV2.workflow_id == WorkflowV2.id)
+        .join(TaskV2, WorkflowTaskV2.task_id == TaskV2.id)
+        .where(WorkflowTaskV2.order >= JobV2.first_task_index)
+        .where(WorkflowTaskV2.order <= JobV2.last_task_index)
+        .where(JobV2.status == JobStatusTypeV2.SUBMITTED)
+        .where(TaskV2.taskgroupv2_id == task_group_id)
+    )
+    res = await db.execute(stm)
+    num_submitted_jobs = res.scalar()
+    if num_submitted_jobs > 0:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            detail=(
+                f"Cannot act on task group because {num_submitted_jobs} "
+                "submitted jobs use its tasks."
+            ),
+        )

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/routes/api/v2/submit.py

@@ -1,6 +1,5 @@
+import json
 import os
-from datetime import datetime
-from datetime import timezone
 from pathlib import Path
 from typing import Optional
 
@@ -15,7 +14,6 @@ from sqlmodel import select
 from .....config import get_settings
 from .....logger import set_logger
 from .....syringe import Inject
-from .....utils import get_timestamp
 from ....db import AsyncSession
 from ....db import get_async_db
 from ....models.v2 import JobV2
@@ -38,10 +36,6 @@ from fractal_server.app.routes.api.v2._aux_functions_tasks import (
 from fractal_server.app.routes.auth import current_active_verified_user
 
 
-def _encode_as_utc(dt: datetime):
-    return dt.replace(tzinfo=timezone.utc).isoformat()
-
-
 router = APIRouter()
 logger = set_logger(__name__)
 
@@ -62,8 +56,6 @@ async def apply_workflow(
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[JobReadV2]:
 
-    now = get_timestamp()
-
     # Remove non-submitted V2 jobs from the app state when the list grows
     # beyond a threshold
     settings = Inject(get_settings)
@@ -167,20 +159,9 @@ async def apply_workflow(
         dataset_id=dataset_id,
         workflow_id=workflow_id,
         user_email=user.email,
-        dataset_dump=dict(
-            **dataset.model_dump(
-                exclude={"images", "history", "timestamp_created"}
-            ),
-            timestamp_created=_encode_as_utc(dataset.timestamp_created),
-        ),
-        workflow_dump=dict(
-            **workflow.model_dump(exclude={"task_list", "timestamp_created"}),
-            timestamp_created=_encode_as_utc(workflow.timestamp_created),
-        ),
-        project_dump=dict(
-            **project.model_dump(exclude={"user_list", "timestamp_created"}),
-            timestamp_created=_encode_as_utc(project.timestamp_created),
-        ),
+        dataset_dump=json.loads(dataset.json(exclude={"images", "history"})),
+        workflow_dump=json.loads(workflow.json(exclude={"task_list"})),
+        project_dump=json.loads(project.json(exclude={"user_list"})),
         **job_create.dict(),
     )
 
@@ -194,12 +175,12 @@ async def apply_workflow(
     )
     used_task_groups = res.scalars().all()
     for used_task_group in used_task_groups:
-        used_task_group.timestamp_last_used = now
+        used_task_group.timestamp_last_used = job.start_timestamp
         db.add(used_task_group)
     await db.commit()
 
     # Define server-side job directory
-    timestamp_string = now.strftime("%Y%m%d_%H%M%S")
+    timestamp_string = job.start_timestamp.strftime("%Y%m%d_%H%M%S")
     WORKFLOW_DIR_LOCAL = settings.FRACTAL_RUNNER_WORKING_BASE_DIR / (
         f"proj_v2_{project_id:07d}_wf_{workflow_id:07d}_job_{job.id:07d}"
         f"_{timestamp_string}"

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/routes/api/v2/task_collection.py

@@ -21,7 +21,7 @@ from ....models.v2 import TaskGroupV2
 from ....schemas.v2 import TaskCollectPipV2
 from ....schemas.v2 import TaskGroupActivityStatusV2
 from ....schemas.v2 import TaskGroupActivityV2Read
-from ....schemas.v2 import TaskGroupCreateV2
+from ....schemas.v2 import TaskGroupCreateV2Strict
 from ...aux.validate_user_settings import validate_user_settings
 from ._aux_functions_task_lifecycle import get_package_version_from_pypi
 from ._aux_functions_tasks import _get_valid_user_group_id
@@ -164,7 +164,7 @@ async def collect_tasks_pip(
 
     # Validate TaskGroupV2 attributes
     try:
-        TaskGroupCreateV2(**task_group_attrs)
+        TaskGroupCreateV2Strict(**task_group_attrs)
     except ValidationError as e:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/routes/api/v2/task_group.py

@@ -23,6 +23,7 @@ from fractal_server.app.routes.auth import current_active_user
 from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
+from fractal_server.app.routes.aux import _raise_if_naive_datetime
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
@@ -47,6 +48,8 @@ async def get_task_group_activity_list(
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupActivityV2Read]:
 
+    _raise_if_naive_datetime(timestamp_started_min)
+
     stm = select(TaskGroupActivityV2).where(
         TaskGroupActivityV2.user_id == user.id
     )

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/routes/api/v2/task_group_lifecycle.py

@@ -8,6 +8,7 @@ from fastapi import status
 
 from ...aux.validate_user_settings import validate_user_settings
 from ._aux_functions_task_lifecycle import check_no_ongoing_activity
+from ._aux_functions_task_lifecycle import check_no_submitted_job
 from ._aux_functions_tasks import _get_task_group_full_access
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
@@ -59,6 +60,9 @@ async def deactivate_task_group(
     # Check no other activity is ongoing
     await check_no_ongoing_activity(task_group_id=task_group_id, db=db)
 
+    # Check no submitted jobs use tasks from this task group
+    await check_no_submitted_job(task_group_id=task_group.id, db=db)
+
     # Check that task-group is active
     if not task_group.active:
         raise HTTPException(
@@ -181,6 +185,9 @@ async def reactivate_task_group(
     # Check no other activity is ongoing
     await check_no_ongoing_activity(task_group_id=task_group_id, db=db)
 
+    # Check no submitted jobs use tasks from this 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:
         task_group.active = True

fractal_server-2.9.0a6/fractal_server/app/routes/aux/__init__.py

@@ -0,0 +1,20 @@
+from datetime import datetime
+from typing import Optional
+
+from fastapi import HTTPException
+from fastapi import status
+
+
+def _raise_if_naive_datetime(*timestamps: tuple[Optional[datetime]]) -> None:
+    """
+    Raise 422 if any not-null argument is a naive `datetime` object:
+    https://docs.python.org/3/library/datetime.html#determining-if-an-object-is-aware-or-naive
+    """
+    for timestamp in filter(None, timestamps):
+        if (timestamp.tzinfo is None) or (
+            timestamp.tzinfo.utcoffset(timestamp) is None
+        ):
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                detail=f"{timestamp=} is naive. You must provide a timezone.",
+            )

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/runner/executors/slurm/ssh/executor.py

@@ -26,7 +26,6 @@ from typing import Sequence
 
 import cloudpickle
 from cfut import SlurmExecutor
-from paramiko.ssh_exception import NoValidConnectionsError
 
 from ....filenames import SHUTDOWN_FILENAME
 from ....task_files import get_task_file_paths
@@ -409,15 +408,7 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
             args=fun_args,
             kwargs=fun_kwargs,
         )
-        try:
-            self._put_subfolder_sftp(jobs=[job])
-        except NoValidConnectionsError as e:
-            logger.error("NoValidConnectionError")
-            logger.error(f"{str(e)=}")
-            logger.error(f"{e.errors=}")
-            for err in e.errors:
-                logger.error(f"{str(err)}")
-            raise e
+        self._put_subfolder_sftp(jobs=[job])
         future, job_id_str = self._submit_job(job)
         self.wait_thread.wait(job_id=job_id_str)
         return future
@@ -559,16 +550,7 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
             current_component_index += batch_size
         logger.debug("[map] Job preparation - END")
 
-        try:
-            self._put_subfolder_sftp(jobs=jobs_to_submit)
-        except NoValidConnectionsError as e:
-            logger.error("NoValidConnectionError")
-            logger.error(f"{str(e)=}")
-            logger.error(f"{e.errors=}")
-            for err in e.errors:
-                logger.error(f"{str(err)}")
-
-            raise e
+        self._put_subfolder_sftp(jobs=jobs_to_submit)
 
         # Construct list of futures (one per SLURM job, i.e. one per batch)
         # FIXME SSH: we may create a single `_submit_many_jobs` method to
@@ -1073,16 +1055,7 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
                     self.jobs_empty_cond.notify_all()
 
             # Fetch subfolder from remote host
-            try:
-                self._get_subfolder_sftp(jobs=jobs)
-            except NoValidConnectionsError as e:
-                logger.error("NoValidConnectionError")
-                logger.error(f"{str(e)=}")
-                logger.error(f"{e.errors=}")
-                for err in e.errors:
-                    logger.error(f"{str(err)}")
-
-                raise e
+            self._get_subfolder_sftp(jobs=jobs)
 
             # First round of checking whether all output files exist
             missing_out_paths = []
@@ -1527,7 +1500,11 @@ class FractalSlurmSSHExecutor(SlurmExecutor):
         logger.info("[FractalSlurmSSHExecutor.ssh_handshake] START")
         cmd = f"{self.python_remote} -m fractal_server.app.runner.versions"
         stdout = self.fractal_ssh.run_command(cmd=cmd)
-        remote_versions = json.loads(stdout.strip("\n"))
+        try:
+            remote_versions = json.loads(stdout.strip("\n"))
+        except json.decoder.JSONDecodeError as e:
+            logger.error("Fractal server versions not available")
+            raise e
 
         # Check compatibility with local versions
         local_versions = get_versions()

{fractal_server-2.9.0a4 → fractal_server-2.9.0a6}/fractal_server/app/schemas/v2/__init__.py

@@ -29,6 +29,7 @@ from .task_group import TaskGroupActivityActionV2  # noqa F401
 from .task_group import TaskGroupActivityStatusV2  # noqa F401
 from .task_group import TaskGroupActivityV2Read  # noqa F401
 from .task_group import TaskGroupCreateV2  # noqa F401
+from .task_group import TaskGroupCreateV2Strict  # noqa F401
 from .task_group import TaskGroupReadV2  # noqa F401
 from .task_group import TaskGroupUpdateV2  # noqa F401
 from .task_group import TaskGroupV2OriginEnum  # noqa F401