fractal-server 2.17.1a0__py3-none-any.whl → 2.17.2__py3-none-any.whl

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

@@ -6,40 +6,42 @@ from fastapi.responses import JSONResponse
 from sqlmodel import func
 from sqlmodel import select
 
-from ._aux_functions import _get_dataset_check_owner
-from ._aux_functions import _get_submitted_job_or_none
-from ._aux_functions import _get_workflow_check_owner
-from ._aux_functions_history import _verify_workflow_and_dataset_access
-from ._aux_functions_history import get_history_run_or_404
-from ._aux_functions_history import get_history_unit_or_404
-from ._aux_functions_history import get_wftask_check_owner
-from ._aux_functions_history import read_log_file
-from .images import ImagePage
-from .images import ImageQuery
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import HistoryImageCache
 from fractal_server.app.models.v2 import HistoryRun
 from fractal_server.app.models.v2 import HistoryUnit
+from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import TaskV2
 from fractal_server.app.routes.auth import current_user_act_ver_prof
-from fractal_server.app.routes.pagination import get_pagination_params
 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 HistoryRunRead
 from fractal_server.app.schemas.v2 import HistoryRunReadAggregated
 from fractal_server.app.schemas.v2 import HistoryUnitRead
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import HistoryUnitStatusWithUnset
 from fractal_server.app.schemas.v2 import ImageLogsRequest
-from fractal_server.images.status_tools import enrich_images_unsorted_async
 from fractal_server.images.status_tools import IMAGE_STATUS_KEY
+from fractal_server.images.status_tools import enrich_images_unsorted_async
 from fractal_server.images.tools import aggregate_attributes
 from fractal_server.images.tools import aggregate_types
 from fractal_server.images.tools import filter_image_list
 from fractal_server.logger import set_logger
 
+from ._aux_functions import _get_dataset_check_owner
+from ._aux_functions import _get_submitted_job_or_none
+from ._aux_functions import _get_workflow_check_owner
+from ._aux_functions_history import _verify_workflow_and_dataset_access
+from ._aux_functions_history import get_history_run_or_404
+from ._aux_functions_history import get_history_unit_or_404
+from ._aux_functions_history import get_wftask_check_owner
+from ._aux_functions_history import read_log_file
+from .images import ImagePage
+from .images import ImageQuery
+
 
 def check_historyrun_related_to_dataset_and_wftask(
     history_run: HistoryRun,
@@ -135,19 +137,19 @@ async def get_workflow_tasks_statuses(
                 logger.debug(f"C1: {wftask.id=} not in {running_wftask_ids=}.")
                 response[wftask.id] = dict(status=latest_run.status)
 
-        response[wftask.id][
-            "num_available_images"
-        ] = latest_run.num_available_images
+        response[wftask.id]["num_available_images"] = (
+            latest_run.num_available_images
+        )
 
         for target_status in HistoryUnitStatus:
             stm = (
                 select(func.count(HistoryImageCache.zarr_url))
-                .join(HistoryUnit)
+                .join(
+                    HistoryUnit,
+                    HistoryImageCache.latest_history_unit_id == HistoryUnit.id,
+                )
                 .where(HistoryImageCache.dataset_id == dataset_id)
                 .where(HistoryImageCache.workflowtask_id == wftask.id)
-                .where(
-                    HistoryImageCache.latest_history_unit_id == HistoryUnit.id
-                )
                 .where(HistoryUnit.status == target_status)
             )
             res = await db.execute(stm)
@@ -444,11 +446,20 @@ async def get_image_log(
         db=db,
     )
 
+    # Get job.working_dir
+    res = await db.execute(
+        select(JobV2.working_dir)
+        .join(HistoryRun, HistoryRun.job_id == JobV2.id)
+        .where(HistoryRun.id == history_unit.history_run_id)
+    )
+    job_working_dir = res.scalar_one_or_none()
+
     # Get log or placeholder text
     log = read_log_file(
         logfile=history_unit.logfile,
-        wftask=wftask,
+        task_name=wftask.task.name,
         dataset_id=request_data.dataset_id,
+        job_working_dir=job_working_dir,
     )
     return JSONResponse(content=log)
 
@@ -495,11 +506,14 @@ async def get_history_unit_log(
         workflowtask_id=workflowtask_id,
     )
 
+    job = await db.get(JobV2, history_run.job_id)
+
     # Get log or placeholder text
     log = read_log_file(
         logfile=history_unit.logfile,
-        wftask=wftask,
+        task_name=wftask.task.name,
         dataset_id=dataset_id,
+        job_working_dir=job.working_dir,
     )
     return JSONResponse(content=log)
 

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

@@ -8,15 +8,14 @@ from pydantic import Field
 from sqlalchemy.orm.attributes import flag_modified
 from sqlmodel import delete
 
-from ._aux_functions import _get_dataset_check_owner
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import HistoryImageCache
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_user_act_ver_prof
-from fractal_server.app.routes.pagination import get_pagination_params
 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.images import SingleImage
 from fractal_server.images import SingleImageUpdate
 from fractal_server.images.tools import aggregate_attributes
@@ -27,6 +26,8 @@ from fractal_server.types import AttributeFilters
 from fractal_server.types import ImageAttributeValue
 from fractal_server.types import TypeFilters
 
+from ._aux_functions import _get_dataset_check_owner
+
 router = APIRouter()
 
 

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

@@ -10,21 +10,22 @@ from fastapi import status
 from fastapi.responses import StreamingResponse
 from sqlmodel import select
 
-from .....zip_tools import _zip_folder_to_byte_stream_iterator
-from ....db import AsyncSession
-from ....db import get_async_db
-from ....models.v2 import JobV2
-from ....models.v2 import ProjectV2
-from ....schemas.v2 import JobReadV2
-from ....schemas.v2 import JobStatusTypeV2
-from ...aux._job import _write_shutdown_file
-from ...aux._runner import _check_shutdown_is_supported
-from ._aux_functions import _get_job_check_owner
-from ._aux_functions import _get_project_check_owner
-from ._aux_functions import _get_workflow_check_owner
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
+from fractal_server.app.models.v2 import JobV2
+from fractal_server.app.models.v2 import LinkUserProjectV2
 from fractal_server.app.routes.auth import current_user_act_ver_prof
+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.schemas.v2 import JobReadV2
+from fractal_server.app.schemas.v2 import JobStatusTypeV2
 from fractal_server.runner.filenames import WORKFLOW_LOG_FILENAME
+from fractal_server.zip_tools import _zip_folder_to_byte_stream_iterator
+
+from ._aux_functions import _get_job_check_owner
+from ._aux_functions import _get_project_check_owner
+from ._aux_functions import _get_workflow_check_owner
 
 
 # https://docs.python.org/3/library/asyncio-task.html#asyncio.to_thread
@@ -48,8 +49,10 @@ async def get_user_jobs(
     """
     stm = (
         select(JobV2)
-        .join(ProjectV2)
-        .where(ProjectV2.user_list.any(UserOAuth.id == user.id))
+        .join(
+            LinkUserProjectV2, LinkUserProjectV2.project_id == JobV2.project_id
+        )
+        .where(LinkUserProjectV2.user_id == user.id)
     )
     res = await db.execute(stm)
     job_list = res.scalars().all()

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

@@ -5,21 +5,22 @@ from fastapi.responses import JSONResponse
 from pydantic import BaseModel
 from pydantic import Field
 
-from ._aux_functions import _get_dataset_check_owner
-from ._aux_functions import _get_workflow_task_check_owner
-from .images import ImageQuery
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import TaskType
-from fractal_server.images.status_tools import enrich_images_unsorted_async
 from fractal_server.images.status_tools import IMAGE_STATUS_KEY
+from fractal_server.images.status_tools import enrich_images_unsorted_async
 from fractal_server.images.tools import aggregate_types
 from fractal_server.images.tools import filter_image_list
 from fractal_server.types import AttributeFilters
 
+from ._aux_functions import _get_dataset_check_owner
+from ._aux_functions import _get_workflow_task_check_owner
+from .images import ImageQuery
+
 router = APIRouter()
 
 

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

@@ -5,22 +5,25 @@ from fastapi import Response
 from fastapi import status
 from sqlmodel import select
 
-from .....logger import reset_logger_handlers
-from .....logger import set_logger
-from ....db import AsyncSession
-from ....db import get_async_db
-from ....models.v2 import JobV2
-from ....models.v2 import LinkUserProjectV2
-from ....models.v2 import ProjectV2
-from ....schemas.v2 import ProjectCreateV2
-from ....schemas.v2 import ProjectReadV2
-from ....schemas.v2 import ProjectUpdateV2
-from ...aux.validate_user_profile import validate_user_profile
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.models.v2 import JobV2
+from fractal_server.app.models.v2 import LinkUserProjectV2
+from fractal_server.app.models.v2 import ProjectV2
+from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.aux.validate_user_profile import (
+    validate_user_profile,
+)
+from fractal_server.app.schemas.v2 import ProjectCreateV2
+from fractal_server.app.schemas.v2 import ProjectReadV2
+from fractal_server.app.schemas.v2 import ProjectUpdateV2
+from fractal_server.logger import reset_logger_handlers
+from fractal_server.logger import set_logger
+
 from ._aux_functions import _check_project_exists
 from ._aux_functions import _get_project_check_owner
 from ._aux_functions import _get_submitted_jobs_statement
-from fractal_server.app.models import UserOAuth
-from fractal_server.app.routes.auth import current_user_act_ver_prof
 
 router = APIRouter()
 
@@ -35,7 +38,7 @@ async def get_list_project(
     """
     stm = (
         select(ProjectV2)
-        .join(LinkUserProjectV2)
+        .join(LinkUserProjectV2, LinkUserProjectV2.project_id == ProjectV2.id)
         .where(LinkUserProjectV2.user_id == user.id)
     )
     res = await db.execute(stm)
@@ -67,12 +70,14 @@ async def create_project(
     )
 
     db_project = ProjectV2(**project.model_dump(), resource_id=resource_id)
-    db_project.user_list.append(user)
-
     db.add(db_project)
+    await db.flush()
+
+    link = LinkUserProjectV2(project_id=db_project.id, user_id=user.id)
+    db.add(link)
+
     await db.commit()
     await db.refresh(db_project)
-    await db.close()
 
     return db_project
 

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

@@ -3,17 +3,18 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import status
 
-from .....logger import set_logger
-from ....db import AsyncSession
-from ....db import get_async_db
-from ....models.v2 import JobV2
-from ....schemas.v2.status_legacy import LegacyStatusReadV2
-from ....schemas.v2.status_legacy import WorkflowTaskStatusTypeV2
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.models.v2 import JobV2
+from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.schemas.v2.status_legacy import LegacyStatusReadV2
+from fractal_server.app.schemas.v2.status_legacy import WorkflowTaskStatusTypeV2
+from fractal_server.logger import set_logger
+
 from ._aux_functions import _get_dataset_check_owner
 from ._aux_functions import _get_submitted_jobs_statement
 from ._aux_functions import _get_workflow_check_owner
-from fractal_server.app.models import UserOAuth
-from fractal_server.app.routes.auth import current_user_act_ver_prof
 
 router = APIRouter()
 
@@ -122,9 +123,9 @@ async def get_workflowtask_status(
             first_submitted_index = 0
 
         for wftask in running_job_wftasks[first_submitted_index:]:
-            workflow_tasks_status_dict[
-                wftask.id
-            ] = WorkflowTaskStatusTypeV2.SUBMITTED
+            workflow_tasks_status_dict[wftask.id] = (
+                WorkflowTaskStatusTypeV2.SUBMITTED
+            )
 
         # The last workflow task that is included in the submitted job is also
         # the positional-last workflow task to be included in the response.

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

@@ -10,11 +10,6 @@ from fastapi import Request
 from fastapi import status
 from sqlmodel import select
 
-from ...aux.validate_user_profile import validate_user_profile
-from ._aux_functions import _get_dataset_check_owner
-from ._aux_functions import _get_workflow_check_owner
-from ._aux_functions import clean_app_job_list_v2
-from ._aux_functions_tasks import _check_type_filters_compatibility
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import Profile
@@ -25,6 +20,9 @@ from fractal_server.app.routes.api.v2._aux_functions_tasks import (
     _get_task_read_access,
 )
 from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.aux.validate_user_profile import (
+    validate_user_profile,
+)
 from fractal_server.app.schemas.v2 import JobCreateV2
 from fractal_server.app.schemas.v2 import JobReadV2
 from fractal_server.app.schemas.v2 import JobStatusTypeV2
@@ -37,6 +35,11 @@ from fractal_server.runner.set_start_and_last_task_index import (
 from fractal_server.runner.v2.submit_workflow import submit_workflow
 from fractal_server.syringe import Inject
 
+from ._aux_functions import _get_dataset_check_owner
+from ._aux_functions import _get_workflow_check_owner
+from ._aux_functions import clean_app_job_list_v2
+from ._aux_functions_tasks import _check_type_filters_compatibility
+
 FRACTAL_CACHE_DIR = ".fractal_cache"
 router = APIRouter()
 logger = set_logger(__name__)
@@ -63,10 +66,7 @@ async def apply_workflow(
     # requests take place at the same time and `clean_app_job_list_v2` is
     # somewhat slow.
     settings = Inject(get_settings)
-    if (
-        len(request.app.state.jobsV2)
-        > settings.FRACTAL_API_MAX_JOB_LIST_LENGTH
-    ):
+    if len(request.app.state.jobsV2) > settings.FRACTAL_API_MAX_JOB_LIST_LENGTH:
         new_jobs_list = await clean_app_job_list_v2(
             db, request.app.state.jobsV2
         )
@@ -153,8 +153,7 @@ async def apply_workflow(
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
-                f"Dataset {dataset_id} is already in use "
-                "in submitted job(s)."
+                f"Dataset {dataset_id} is already in use in submitted job(s)."
             ),
         )
 
@@ -206,7 +205,7 @@ async def apply_workflow(
             workflow.model_dump_json(exclude={"task_list"})
         ),
         project_dump=json.loads(
-            project.model_dump_json(exclude={"user_list", "resource_id"})
+            project.model_dump_json(exclude={"resource_id"})
         ),
         **job_create.model_dump(),
     )

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

@@ -9,7 +9,9 @@ from sqlmodel import func
 from sqlmodel import or_
 from sqlmodel import select
 
-from ...aux.validate_user_profile import validate_user_profile
+from fractal_server.app.routes.aux.validate_user_profile import (
+    validate_user_profile,
+)
 from ._aux_functions import _get_user_resource_id
 from ._aux_functions_tasks import _get_task_full_access
 from ._aux_functions_tasks import _get_task_read_access
@@ -52,8 +54,7 @@ async def get_list_task(
 
     stm = (
         select(TaskV2)
-        .join(TaskGroupV2)
-        .where(TaskGroupV2.id == TaskV2.taskgroupv2_id)
+        .join(TaskGroupV2, TaskGroupV2.id == TaskV2.taskgroupv2_id)
         .where(TaskGroupV2.resource_id == user_resource_id)
         .where(
             or_(

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

@@ -8,39 +8,32 @@ from fastapi import File
 from fastapi import Form
 from fastapi import HTTPException
 from fastapi import Response
-from fastapi import status
 from fastapi import UploadFile
+from fastapi import status
 from pydantic import BaseModel
-from pydantic import model_validator
 from pydantic import ValidationError
+from pydantic import model_validator
 
-from .....logger import reset_logger_handlers
-from .....logger import set_logger
-from ....db import AsyncSession
-from ....db import get_async_db
-from ....models.v2 import TaskGroupV2
-from ....schemas.v2 import FractalUploadedFile
-from ....schemas.v2 import TaskCollectPipV2
-from ....schemas.v2 import TaskGroupActivityStatusV2
-from ....schemas.v2 import TaskGroupActivityV2Read
-from ....schemas.v2 import TaskGroupCreateV2Strict
-from ...aux.validate_user_profile import validate_user_profile
-from ._aux_functions_task_lifecycle import get_package_version_from_pypi
-from ._aux_functions_tasks import _get_valid_user_group_id
-from ._aux_functions_tasks import _verify_non_duplication_group_constraint
-from ._aux_functions_tasks import _verify_non_duplication_group_path
-from ._aux_functions_tasks import _verify_non_duplication_user_constraint
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupActivityV2
+from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.routes.auth import current_user_act_ver_prof
-from fractal_server.app.schemas.v2 import ResourceType
-from fractal_server.app.schemas.v2 import (
-    TaskGroupActivityActionV2,
+from fractal_server.app.routes.aux.validate_user_profile import (
+    validate_user_profile,
 )
+from fractal_server.app.schemas.v2 import FractalUploadedFile
+from fractal_server.app.schemas.v2 import ResourceType
+from fractal_server.app.schemas.v2 import TaskCollectPipV2
+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 TaskGroupCreateV2Strict
 from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
-from fractal_server.tasks.v2.local.collect import (
-    collect_local,
-)
+from fractal_server.logger import reset_logger_handlers
+from fractal_server.logger import set_logger
+from fractal_server.tasks.v2.local.collect import collect_local
 from fractal_server.tasks.v2.ssh import collect_ssh
 from fractal_server.tasks.v2.utils_package_names import _parse_wheel_filename
 from fractal_server.tasks.v2.utils_package_names import normalize_package_name
@@ -48,6 +41,11 @@ from fractal_server.tasks.v2.utils_python_interpreter import (
     get_python_interpreter,
 )
 
+from ._aux_functions_task_lifecycle import get_package_version_from_pypi
+from ._aux_functions_tasks import _get_valid_user_group_id
+from ._aux_functions_tasks import _verify_non_duplication_group_constraint
+from ._aux_functions_tasks import _verify_non_duplication_group_path
+from ._aux_functions_tasks import _verify_non_duplication_user_constraint
 
 router = APIRouter()
 
@@ -211,13 +209,13 @@ async def collect_tasks_pip(
 
     # Set pinned_package_versions
     if task_collect.pinned_package_versions_pre is not None:
-        task_group_attrs[
-            "pinned_package_versions_pre"
-        ] = task_collect.pinned_package_versions_pre
+        task_group_attrs["pinned_package_versions_pre"] = (
+            task_collect.pinned_package_versions_pre
+        )
     if task_collect.pinned_package_versions_post is not None:
-        task_group_attrs[
-            "pinned_package_versions_post"
-        ] = task_collect.pinned_package_versions_post
+        task_group_attrs["pinned_package_versions_post"] = (
+            task_collect.pinned_package_versions_post
+        )
 
     # Initialize wheel_file_content as None
     wheel_file = None

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

@@ -9,14 +9,13 @@ from fastapi import HTTPException
 from fastapi import status
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from ...aux.validate_user_profile import validate_user_profile
-from ._aux_functions_tasks import _get_valid_user_group_id
-from ._aux_functions_tasks import _verify_non_duplication_group_constraint
-from ._aux_functions_tasks import _verify_non_duplication_user_constraint
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.routes.auth import current_user_act_ver_prof
+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 TaskCollectCustomV2
 from fractal_server.app.schemas.v2 import TaskCreateV2
@@ -25,13 +24,15 @@ from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
 from fractal_server.app.schemas.v2 import TaskReadV2
 from fractal_server.logger import set_logger
 from fractal_server.string_tools import validate_cmd
-from fractal_server.tasks.v2.utils_background import (
-    prepare_tasks_metadata,
-)
+from fractal_server.tasks.v2.utils_background import prepare_tasks_metadata
 from fractal_server.tasks.v2.utils_database import (
     create_db_tasks_and_update_task_group_async,
 )
 
+from ._aux_functions_tasks import _get_valid_user_group_id
+from ._aux_functions_tasks import _verify_non_duplication_group_constraint
+from ._aux_functions_tasks import _verify_non_duplication_user_constraint
+
 router = APIRouter()
 
 logger = set_logger(__name__)

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

@@ -7,8 +7,8 @@ from fastapi import Depends
 from fastapi import Form
 from fastapi import HTTPException
 from fastapi import Response
-from fastapi import status
 from fastapi import UploadFile
+from fastapi import status
 
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
@@ -43,7 +43,6 @@ from fractal_server.tasks.v2.ssh import collect_ssh_pixi
 from fractal_server.tasks.v2.utils_package_names import normalize_package_name
 from fractal_server.types import NonEmptyStr
 
-
 router = APIRouter()
 
 logger = set_logger(__name__)

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

@@ -5,17 +5,12 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import status
 from packaging.version import InvalidVersion
-from packaging.version import parse
 from packaging.version import Version
+from packaging.version import parse
 from pydantic.types import AwareDatetime
 from sqlmodel import or_
 from sqlmodel import select
 
-from ._aux_functions import _get_user_resource_id
-from ._aux_functions_tasks import _get_task_group_full_access
-from ._aux_functions_tasks import _get_task_group_read_access
-from ._aux_functions_tasks import _verify_non_duplication_group_constraint
-from ._aux_task_group_disambiguation import remove_duplicate_task_groups
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import LinkUserGroup
@@ -36,6 +31,12 @@ from fractal_server.app.schemas.v2 import TaskGroupReadV2
 from fractal_server.app.schemas.v2 import TaskGroupUpdateV2
 from fractal_server.logger import set_logger
 
+from ._aux_functions import _get_user_resource_id
+from ._aux_functions_tasks import _get_task_group_full_access
+from ._aux_functions_tasks import _get_task_group_read_access
+from ._aux_functions_tasks import _verify_non_duplication_group_constraint
+from ._aux_task_group_disambiguation import remove_duplicate_task_groups
+
 router = APIRouter()
 
 logger = set_logger(__name__)

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

@@ -5,10 +5,6 @@ from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
 
-from ._aux_functions_task_lifecycle import check_no_ongoing_activity
-from ._aux_functions_task_lifecycle import check_no_related_workflowtask
-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
 from fractal_server.app.models import UserOAuth
@@ -36,6 +32,11 @@ from fractal_server.tasks.v2.ssh import reactivate_ssh
 from fractal_server.tasks.v2.ssh import reactivate_ssh_pixi
 from fractal_server.utils import get_timestamp
 
+from ._aux_functions_task_lifecycle import check_no_ongoing_activity
+from ._aux_functions_task_lifecycle import check_no_related_workflowtask
+from ._aux_functions_task_lifecycle import check_no_submitted_job
+from ._aux_functions_tasks import _get_task_group_full_access
+
 router = APIRouter()
 
 
@@ -212,8 +213,7 @@ async def reactivate_task_group(
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
-                "Cannot reactivate a task group with "
-                f"{task_group.env_info=}."
+                f"Cannot reactivate a task group with {task_group.env_info=}."
             ),
         )
 

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

@@ -2,32 +2,33 @@ from fastapi import APIRouter
 from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import status
-from packaging.version import parse
 from packaging.version import Version
+from packaging.version import parse
 from pydantic import BaseModel
 from pydantic import ConfigDict
+from sqlmodel import String
 from sqlmodel import cast
 from sqlmodel import or_
 from sqlmodel import select
-from sqlmodel import String
 
-from ....db import AsyncSession
-from ....db import get_async_db
-from ....models import LinkUserGroup
-from ....models.v2 import TaskV2
-from ._aux_functions import _get_workflow_check_owner
-from ._aux_functions import _get_workflow_task_check_owner
-from ._aux_functions_task_version_update import get_new_workflow_task_meta
-from ._aux_functions_tasks import _check_type_filters_compatibility
-from ._aux_functions_tasks import _get_task_group_or_404
-from ._aux_functions_tasks import _get_task_read_access
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
+from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
+from fractal_server.app.models.v2 import TaskV2
 from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.app.schemas.v2 import TaskType
 from fractal_server.app.schemas.v2 import WorkflowTaskReadV2
 from fractal_server.app.schemas.v2 import WorkflowTaskReplaceV2
 
+from ._aux_functions import _get_workflow_check_owner
+from ._aux_functions import _get_workflow_task_check_owner
+from ._aux_functions_task_version_update import get_new_workflow_task_meta
+from ._aux_functions_tasks import _check_type_filters_compatibility
+from ._aux_functions_tasks import _get_task_group_or_404
+from ._aux_functions_tasks import _get_task_read_access
+
 router = APIRouter()