fractal-server 2.16.3__tar.gz → 2.16.4a0__tar.gz

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fractal-server
-Version: 2.16.3
+Version: 2.16.4a0
 Summary: Backend component of the Fractal analytics platform
 License: BSD-3-Clause
 Author: Tommaso Comparin
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: alembic (>=1.13.1,<2.0.0)
 Requires-Dist: cryptography (>=46.0.0,<47.0.0)
 Requires-Dist: fabric (>=3.2.2,<3.3.0)
-Requires-Dist: fastapi (>=0.116.0,<0.117.0)
+Requires-Dist: fastapi (>=0.117.0,<0.118.0)
 Requires-Dist: fastapi-users[oauth] (>=14,<15)
 Requires-Dist: gunicorn (>=23.0,<24.0)
 Requires-Dist: packaging (>=25.0.0,<26.0.0)
@@ -23,10 +23,10 @@ Requires-Dist: pydantic (>=2.11.0,<2.12.0)
 Requires-Dist: pydantic-settings (>=2.7.0)
 Requires-Dist: python-dotenv (>=1.1.0,<1.2.0)
 Requires-Dist: sqlalchemy[asyncio] (>=2.0.23,<2.1)
-Requires-Dist: sqlmodel (==0.0.24)
+Requires-Dist: sqlmodel (==0.0.25)
 Requires-Dist: tomli_w (>=1.2.0,<1.3.0)
-Requires-Dist: uvicorn (>=0.29.0,<0.35.0)
-Requires-Dist: uvicorn-worker (==0.3.0)
+Requires-Dist: uvicorn (>=0.29.0,<=0.36.0)
+Requires-Dist: uvicorn-worker (==0.4.0)
 Project-URL: Documentation, https://fractal-analytics-platform.github.io/fractal-server
 Project-URL: Homepage, https://github.com/fractal-analytics-platform/fractal-server
 Project-URL: Repository, https://github.com/fractal-analytics-platform/fractal-server

fractal_server-2.16.4a0/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.16.4a0"

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/admin/v2/job.py

@@ -19,11 +19,11 @@ from fractal_server.app.models.v2 import ProjectV2
 from fractal_server.app.routes.auth import current_active_superuser
 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.runner.filenames import WORKFLOW_LOG_FILENAME
 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.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
 
@@ -153,13 +153,13 @@ async def update_job(
         )
     if job.status != JobStatusTypeV2.SUBMITTED:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Job {job_id} has status {job.status=} != 'submitted'.",
         )
 
     if job_update.status != JobStatusTypeV2.FAILED:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Cannot set job status to {job_update.status}",
         )
 

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/admin/v2/task.py

@@ -99,7 +99,7 @@ async def query_tasks(
     if len(task_list) > max_number_of_results:
         await db.close()
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Too many Tasks ({len(task_list)} > {max_number_of_results})."
                 " Please add more query filters."

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/admin/v2/task_group.py

@@ -96,7 +96,7 @@ async def query_task_group_list(
 
     if user_group_id is not None and private is True:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot get task groups with both "
                 f"{user_group_id=} and {private=}."

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/admin/v2/task_group_lifecycle.py

@@ -67,7 +67,7 @@ async def deactivate_task_group(
     # Check that task-group is active
     if not task_group.active:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot deactivate a task group with {task_group.active=}."
             ),
@@ -173,7 +173,7 @@ async def reactivate_task_group(
     # Check that task-group is not active
     if task_group.active:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot reactivate a task group with {task_group.active=}."
             ),
@@ -210,7 +210,7 @@ async def reactivate_task_group(
 
     if task_group.env_info is None:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot reactivate a task group with "
                 f"{task_group.env_info=}."

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/_aux_functions.py

@@ -105,7 +105,7 @@ async def _get_workflow_check_owner(
         )
     if workflow.project_id != project.id:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(f"Invalid {project_id=} for {workflow_id=}."),
         )
 
@@ -159,7 +159,7 @@ async def _get_workflow_task_check_owner(
     # If WorkflowTask is not part of the expected Workflow, exit
     if workflow_id != workflow_task.workflow_id:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Invalid {workflow_id=} for {workflow_task_id=}",
         )
 
@@ -192,7 +192,7 @@ async def _check_workflow_exists(
     res = await db.execute(stm)
     if res.scalars().all():
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Workflow with {name=} and {project_id=} already exists.",
         )
 
@@ -224,7 +224,7 @@ async def _check_project_exists(
     res = await db.execute(stm)
     if res.scalars().all():
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Project name ({project_name}) already in use",
         )
 
@@ -268,7 +268,7 @@ async def _get_dataset_check_owner(
         )
     if dataset.project_id != project_id:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Invalid {project_id=} for {dataset_id=}",
         )
 
@@ -313,7 +313,7 @@ async def _get_job_check_owner(
         )
     if job.project_id != project_id:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Invalid {project_id=} for {job_id=}",
         )
     return dict(job=job, project=project)
@@ -535,6 +535,6 @@ async def _get_submitted_job_or_none(
         )
         logger.error(f"{error_msg} Original error: {str(e)}.")
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=error_msg,
         )

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/_aux_functions_history.py

@@ -119,7 +119,7 @@ async def _verify_workflow_and_dataset_access(
     )
     if workflow.project_id != project_id:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail="Workflow does not belong to expected project.",
         )
     dataset = await _get_dataset_or_404(
@@ -128,7 +128,7 @@ async def _verify_workflow_and_dataset_access(
     )
     if dataset.project_id != project_id:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail="Dataset does not belong to expected project.",
         )
 

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py

@@ -2,6 +2,8 @@ from fastapi import HTTPException
 from fastapi import status
 from httpx import AsyncClient
 from httpx import TimeoutException
+from packaging.version import InvalidVersion
+from packaging.version import Version
 from sqlmodel import func
 from sqlmodel import select
 
@@ -15,11 +17,33 @@ 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
+from fractal_server.tasks.v2.utils_package_names import normalize_package_name
+
+# See https://packaging.python.org/en/latest/specifications/simple-repository-api/#content-types  # noqa
+PYPI_JSON_HEADERS = {"Accept": "application/vnd.pypi.simple.v1+json"}
 
 
 logger = set_logger(__name__)
 
 
+def _find_latest_version_or_422(versions: list[str]) -> str:
+    """
+    > For PEP 440 versions, this is easy enough for the client to do (using
+    > the `packaging` library [...]. For non-standard versions, there is no
+    > well-defined ordering, and clients will need to decide on what rule is
+    > appropriate for their needs.
+    (https://peps.python.org/pep-0700/#why-not-provide-a-latest-version-value)
+    """
+    try:
+        latest = max(versions, key=lambda v_str: Version(v_str))
+        return latest
+    except InvalidVersion as e:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+            detail=f"Cannot find latest version (original error: {str(e)}).",
+        )
+
+
 async def get_package_version_from_pypi(
     name: str,
     version: str | None = None,
@@ -41,14 +65,14 @@ async def get_package_version_from_pypi(
             Could be a correct version (`1.3.0`), an incomplete one
             (`1.3`) or `None`.
     """
-
-    url = f"https://pypi.org/pypi/{name}/json"
+    normalized_name = normalize_package_name(name)
+    url = f"https://pypi.org/simple/{normalized_name}/"
     hint = f"Hint: specify the required version for '{name}'."
 
     # Make request to PyPI
     try:
         async with AsyncClient(timeout=5.0) as client:
-            res = await client.get(url)
+            res = await client.get(url, headers=PYPI_JSON_HEADERS)
     except TimeoutException as e:
         error_msg = (
             f"A TimeoutException occurred while getting {url}.\n"
@@ -56,7 +80,7 @@ async def get_package_version_from_pypi(
         )
         logger.warning(error_msg)
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=error_msg,
         )
     except BaseException as e:
@@ -66,14 +90,14 @@ async def get_package_version_from_pypi(
         )
         logger.warning(error_msg)
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=error_msg,
         )
 
     # Parse response
     if res.status_code != 200:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Could not get {url} (status_code {res.status_code})."
                 f"\n{hint}"
@@ -81,15 +105,15 @@ async def get_package_version_from_pypi(
         )
     try:
         response_data = res.json()
-        latest_version = response_data["info"]["version"]
-        available_releases = response_data["releases"].keys()
+        available_releases = response_data["versions"]
+        latest_version = _find_latest_version_or_422(available_releases)
     except KeyError as e:
         logger.warning(
             f"A KeyError occurred while getting {url}. "
             f"Original error: {str(e)}."
         )
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"A KeyError error occurred while getting {url}.\n{hint}",
         )
 
@@ -118,7 +142,7 @@ async def get_package_version_from_pypi(
             if len(matching_versions) == 0:
                 logger.info(f"No version starting with {version} found.")
                 raise HTTPException(
-                    status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                    status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                     detail=(
                         f"No version starting with {version} found.\n"
                         f"{hint}"
@@ -167,7 +191,7 @@ async def check_no_ongoing_activity(
             f"timestamp_started={activity.timestamp_started}."
         )
     raise HTTPException(
-        status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+        status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
         detail=msg,
     )
 
@@ -198,7 +222,7 @@ async def check_no_submitted_job(
     num_submitted_jobs = res.scalar()
     if num_submitted_jobs > 0:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot act on task group because {num_submitted_jobs} "
                 "submitted jobs use its tasks."
@@ -222,6 +246,6 @@ async def check_no_related_workflowtask(
     bad_wftask = res.scalars().first()
     if bad_wftask is not None:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"TaskV2 {bad_wftask.task_id} is still in use",
         )

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/_aux_functions_tasks.py

@@ -182,7 +182,7 @@ async def _get_task_read_access(
     if require_active:
         if not task_group.active:
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=f"Error: task {task_id} ({task.name}) is not active.",
             )
     return task
@@ -206,7 +206,7 @@ async def _get_valid_user_group_id(
     """
     if (user_group_id is not None) and (private is True):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Cannot set both {user_group_id=} and {private=}",
         )
     elif private is True:
@@ -278,7 +278,7 @@ async def _verify_non_duplication_user_constraint(
             )
             logger.error(f"UnreachableBranchError: {error_msg}")
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     f"Invalid state: {error_msg}\n"
                     "This should have not happened: please contact an admin."
@@ -288,7 +288,7 @@ async def _verify_non_duplication_user_constraint(
             duplicate[0].id, db
         )
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"User '{user.email}' already owns a task group "
                 f"with name='{pkg_name}' and {version=}.{state_msg}"
@@ -323,7 +323,7 @@ async def _verify_non_duplication_group_constraint(
             )
             logger.error(error_msg)
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     f"Invalid state:\n{error_msg}"
                     "This should have not happened: please contact an admin."
@@ -333,7 +333,7 @@ async def _verify_non_duplication_group_constraint(
             duplicate[0].id, db
         )
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"UserGroup {user_group.name} already owns a task group "
                 f"with {pkg_name=} and {version=}.{state_msg}"
@@ -355,7 +355,7 @@ async def _verify_non_duplication_group_path(
     duplicate_ids = res.scalars().all()
     if duplicate_ids:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Other TaskGroups already have {path=}: "
                 f"{sorted(duplicate_ids)}."
@@ -398,6 +398,6 @@ def _check_type_filters_compatibility(
         )
     except ValueError as e:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Incompatible type filters.\nOriginal error: {str(e)}",
         )

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/dataset.py

@@ -47,7 +47,7 @@ async def create_dataset(
     if dataset.zarr_dir is None:
         if user.settings.project_dir is None:
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     "Both 'dataset.zarr_dir' and 'user.settings.project_dir' "
                     "are null"
@@ -158,7 +158,7 @@ async def update_dataset(
 
     if (dataset_update.zarr_dir is not None) and (len(db_dataset.images) != 0):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot modify `zarr_dir` because the dataset has a non-empty "
                 "image list."
@@ -203,7 +203,7 @@ async def delete_dataset(
     if jobs:
         string_ids = str([job.id for job in jobs])[1:-1]
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot delete dataset {dataset.id} because it "
                 f"is linked to active job(s) {string_ids}."
@@ -287,7 +287,7 @@ async def import_dataset(
     for image in dataset.images:
         if not image.zarr_url.startswith(dataset.zarr_dir):
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     f"Cannot import dataset: zarr_url {image.zarr_url} is not "
                     f"relative to zarr_dir={dataset.zarr_dir}."

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/history.py

@@ -51,7 +51,7 @@ def check_historyrun_related_to_dataset_and_wftask(
         or history_run.workflowtask_id != workflowtask_id
     ):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Invalid query parameters: HistoryRun[{history_run.id}] is "
                 f"not related to {dataset_id=} and {workflowtask_id=}."
@@ -480,7 +480,7 @@ async def get_history_unit_log(
 
     if history_unit.history_run_id != history_run_id:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Invalid query parameters: HistoryUnit[{history_unit_id}] "
                 f"is not related to HistoryRun[{history_run_id}]"

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/images.py

@@ -70,7 +70,7 @@ async def post_new_image(
 
     if not new_image.zarr_url.startswith(dataset.zarr_dir):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot create image with zarr_url which is not relative to "
                 f"{dataset.zarr_dir}."
@@ -78,7 +78,7 @@ async def post_new_image(
         )
     elif new_image.zarr_url == dataset.zarr_dir:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "`SingleImage.zarr_url` cannot be equal to `Dataset.zarr_dir`:"
                 f" {dataset.zarr_dir}"
@@ -87,7 +87,7 @@ async def post_new_image(
 
     if new_image.zarr_url in dataset.image_zarr_urls:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Image with zarr_url '{new_image.zarr_url}' "
                 f"already in DatasetV2 {dataset_id}",

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/job.py

@@ -15,7 +15,6 @@ from ....db import AsyncSession
 from ....db import get_async_db
 from ....models.v2 import JobV2
 from ....models.v2 import ProjectV2
-from ....runner.filenames import WORKFLOW_LOG_FILENAME
 from ....schemas.v2 import JobReadV2
 from ....schemas.v2 import JobStatusTypeV2
 from ...aux._job import _write_shutdown_file
@@ -25,6 +24,7 @@ from ._aux_functions import _get_project_check_owner
 from ._aux_functions import _get_workflow_check_owner
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_active_user
+from fractal_server.runner.filenames import WORKFLOW_LOG_FILENAME
 
 
 # https://docs.python.org/3/library/asyncio-task.html#asyncio.to_thread

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/project.py

@@ -134,7 +134,7 @@ async def delete_project(
     if jobs:
         string_ids = str([job.id for job in jobs])[1:-1]
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot delete project {project.id} because it "
                 f"is linked to active job(s) {string_ids}."

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/status_legacy.py

@@ -72,7 +72,7 @@ async def get_workflowtask_status(
     else:
         string_ids = str([job.id for job in running_jobs])[1:-1]
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot get WorkflowTaskV2 statuses as DatasetV2 {dataset.id}"
                 f" is linked to multiple active jobs: {string_ids}."

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/submit.py

@@ -26,15 +26,15 @@ from fractal_server.app.routes.auth import current_active_verified_user
 from fractal_server.app.routes.aux.validate_user_settings import (
     validate_user_settings,
 )
-from fractal_server.app.runner.set_start_and_last_task_index import (
-    set_start_and_last_task_index,
-)
-from fractal_server.app.runner.v2.submit_workflow import submit_workflow
 from fractal_server.app.schemas.v2 import JobCreateV2
 from fractal_server.app.schemas.v2 import JobReadV2
 from fractal_server.app.schemas.v2 import JobStatusTypeV2
 from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
+from fractal_server.runner.set_start_and_last_task_index import (
+    set_start_and_last_task_index,
+)
+from fractal_server.runner.v2.submit_workflow import submit_workflow
 from fractal_server.syringe import Inject
 
 
@@ -84,7 +84,7 @@ async def apply_workflow(
     num_tasks = len(workflow.task_list)
     if num_tasks == 0:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Workflow {workflow_id} has empty task list",
         )
 
@@ -99,7 +99,7 @@ async def apply_workflow(
         job_create.last_task_index = last_task_index
     except ValueError as e:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Invalid values for first_task_index or last_task_index "
                 f"(with {num_tasks=}).\n"
@@ -136,7 +136,7 @@ async def apply_workflow(
     res = await db.execute(stm)
     if res.scalars().all():
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Dataset {dataset_id} is already in use "
                 "in submitted job(s)."
@@ -146,7 +146,7 @@ async def apply_workflow(
     if job_create.slurm_account is not None:
         if job_create.slurm_account not in user_settings.slurm_accounts:
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     f"SLURM account '{job_create.slurm_account}' is not "
                     "among those available to the current user"
@@ -172,7 +172,7 @@ async def apply_workflow(
                 f"Original error: '{str(e)}'."
             )
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail="Error in setting up the SSH connection.",
             )
     else:

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/task.py

@@ -112,12 +112,12 @@ async def patch_task(
     # Forbid changes that set a previously unset command
     if db_task.type == TaskType.NON_PARALLEL and "command_parallel" in update:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail="Cannot set an unset `command_parallel`.",
         )
     if db_task.type == TaskType.PARALLEL and "command_non_parallel" in update:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail="Cannot set an unset `command_non_parallel`.",
         )
 
@@ -157,7 +157,7 @@ async def create_task(
         or task.meta_non_parallel is not None
     ):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot set `TaskV2.args_schema_non_parallel` or "
                 "`TaskV2.args_schema_non_parallel` if TaskV2 is parallel"
@@ -167,7 +167,7 @@ async def create_task(
         task.args_schema_parallel is not None or task.meta_parallel is not None
     ):
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot set `TaskV2.args_schema_parallel` or "
                 "`TaskV2.args_schema_parallel` if TaskV2 is non_parallel"

{fractal_server-2.16.3 → fractal_server-2.16.4a0}/fractal_server/app/routes/api/v2/task_collection.py

@@ -145,7 +145,7 @@ def parse_request_data(
 
     except (ValidationError, json.JSONDecodeError) as e:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Invalid request-body\n{str(e)}",
         )
 
@@ -193,7 +193,7 @@ async def collect_tasks_pip(
         )
     except ValueError:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Python version {task_group_attrs['python_version']} is "
                 "not available for Fractal task collection."
@@ -229,7 +229,7 @@ async def collect_tasks_pip(
             )
         except ValueError as e:
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
                     f"Invalid wheel-file name {wheel_filename}. "
                     f"Original error: {str(e)}",
@@ -283,7 +283,7 @@ async def collect_tasks_pip(
         TaskGroupCreateV2Strict(**task_group_attrs)
     except ValidationError as e:
         raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=f"Invalid task-group object. Original error: {e}",
         )
 
@@ -313,7 +313,7 @@ async def collect_tasks_pip(
         # Verify that folder does not exist (for local collection)
         if Path(task_group_path).exists():
             raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=f"{task_group_path} already exists.",
             )