fractal-server 2.16.5__py3-none-any.whl → 2.17.0__py3-none-any.whl

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

@@ -27,19 +27,17 @@ from fractal_server.app.routes.api.v2._aux_functions_tasks import (
 from fractal_server.app.routes.api.v2._aux_functions_tasks import (
     _verify_non_duplication_user_constraint,
 )
-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.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 FractalUploadedFile
+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.task_group import TaskGroupV2OriginEnum
-from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
-from fractal_server.ssh._fabric import SSHConfig
-from fractal_server.syringe import Inject
 from fractal_server.tasks.v2.local import collect_local_pixi
 from fractal_server.tasks.v2.ssh import collect_ssh_pixi
 from fractal_server.tasks.v2.utils_package_names import normalize_package_name
@@ -86,26 +84,30 @@ async def collect_task_pixi(
     pixi_version: NonEmptyStr | None = Form(None),
     private: bool = False,
     user_group_id: int | None = None,
-    user: UserOAuth = Depends(current_active_verified_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityV2Read:
-    settings = Inject(get_settings)
+    # Get validated resource and profile
+    resource, profile = await validate_user_profile(user=user, db=db)
+    resource_id = resource.id
+
     # Check if Pixi is available
-    if settings.pixi is None:
+    if not resource.tasks_pixi_config:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail="Pixi task collection is not available.",
         )
     # Check if provided Pixi version is available. Use default if not provided
     if pixi_version is None:
-        pixi_version = settings.pixi.default_version
+        pixi_version = resource.tasks_pixi_config["default_version"]
     else:
-        if pixi_version not in settings.pixi.versions:
+        if pixi_version not in resource.tasks_pixi_config["versions"]:
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
                 detail=(
-                    f"Pixi version {pixi_version} is not available. Available "
-                    f"versions: {list(settings.pixi.versions.keys())}"
+                    f"Pixi version '{pixi_version}' is not available. "
+                    "Available versions: "
+                    f"{list(resource.tasks_pixi_config['versions'].keys())}"
                 ),
             )
 
@@ -123,14 +125,10 @@ async def collect_task_pixi(
         db=db,
     )
 
-    user_settings = await validate_user_settings(
-        user=user, backend=settings.FRACTAL_RUNNER_BACKEND, db=db
-    )
-
-    if settings.FRACTAL_RUNNER_BACKEND == "slurm_ssh":
-        base_tasks_path = user_settings.ssh_tasks_dir
+    if resource.type == ResourceType.SLURM_SSH:
+        base_tasks_path = profile.tasks_remote_dir
     else:
-        base_tasks_path = settings.FRACTAL_TASKS_DIR.as_posix()
+        base_tasks_path = resource.tasks_local_dir
     task_group_path = (
         Path(base_tasks_path) / str(user.id) / pkg_name / version
     ).as_posix()
@@ -138,6 +136,7 @@ async def collect_task_pixi(
     task_group_attrs = dict(
         user_id=user.id,
         user_group_id=user_group_id,
+        resource_id=resource_id,
         origin=TaskGroupV2OriginEnum.PIXI,
         pixi_version=pixi_version,
         pkg_name=pkg_name,
@@ -149,6 +148,7 @@ async def collect_task_pixi(
         user_id=user.id,
         pkg_name=task_group_attrs["pkg_name"],
         version=task_group_attrs["version"],
+        user_resource_id=resource_id,
         db=db,
     )
     await _verify_non_duplication_group_constraint(
@@ -159,10 +159,11 @@ async def collect_task_pixi(
     )
     await _verify_non_duplication_group_path(
         path=task_group_attrs["path"],
+        resource_id=resource_id,
         db=db,
     )
 
-    if settings.FRACTAL_RUNNER_BACKEND != "slurm_ssh":
+    if resource.type != ResourceType.SLURM_SSH:
         if Path(task_group_path).exists():
             raise HTTPException(
                 status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
@@ -187,28 +188,19 @@ async def collect_task_pixi(
     await db.commit()
     await db.refresh(task_group_activity)
 
-    if settings.FRACTAL_RUNNER_BACKEND == "slurm_ssh":
-        ssh_config = SSHConfig(
-            user=user_settings.ssh_username,
-            host=user_settings.ssh_host,
-            key_path=user_settings.ssh_private_key_path,
-        )
-
-        background_tasks.add_task(
-            collect_ssh_pixi,
-            task_group_id=task_group.id,
-            task_group_activity_id=task_group_activity.id,
-            ssh_config=ssh_config,
-            tasks_base_dir=user_settings.ssh_tasks_dir,
-            tar_gz_file=tar_gz_file,
-        )
+    if resource.type == ResourceType.SLURM_SSH:
+        collect_function = collect_ssh_pixi
     else:
-        background_tasks.add_task(
-            collect_local_pixi,
-            task_group_id=task_group.id,
-            task_group_activity_id=task_group_activity.id,
-            tar_gz_file=tar_gz_file,
-        )
+        collect_function = collect_local_pixi
+
+    background_tasks.add_task(
+        collect_function,
+        task_group_id=task_group.id,
+        task_group_activity_id=task_group_activity.id,
+        tar_gz_file=tar_gz_file,
+        resource=resource,
+        profile=profile,
+    )
     logger.info(
         "Task-collection endpoint: start background collection "
         "and return task_group_activity. "

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

@@ -11,6 +11,7 @@ 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
@@ -21,8 +22,10 @@ from fractal_server.app.models import LinkUserGroup
 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_active_user
-from fractal_server.app.routes.auth._aux_auth import _get_default_usergroup_id
+from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth._aux_auth import (
+    _get_default_usergroup_id_or_none,
+)
 from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
@@ -66,7 +69,7 @@ async def get_task_group_activity_list(
     status: TaskGroupActivityStatusV2 | None = None,
     action: TaskGroupActivityActionV2 | None = None,
     timestamp_started_min: AwareDatetime | None = None,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupActivityV2Read]:
     stm = select(TaskGroupActivityV2).where(
@@ -98,7 +101,7 @@ async def get_task_group_activity_list(
 )
 async def get_task_group_activity(
     task_group_activity_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityV2Read:
     activity = await db.get(TaskGroupActivityV2, task_group_activity_id)
@@ -122,7 +125,7 @@ async def get_task_group_activity(
 
 @router.get("/", response_model=list[tuple[str, list[TaskGroupReadV2]]])
 async def get_task_group_list(
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
     only_active: bool = False,
     only_owner: bool = False,
@@ -142,7 +145,14 @@ async def get_task_group_list(
                 )
             ),
         )
-    stm = select(TaskGroupV2).where(condition).order_by(TaskGroupV2.pkg_name)
+
+    user_resource_id = await _get_user_resource_id(user_id=user.id, db=db)
+    stm = (
+        select(TaskGroupV2)
+        .where(TaskGroupV2.resource_id == user_resource_id)
+        .where(condition)
+        .order_by(TaskGroupV2.pkg_name)
+    )
     if only_active:
         stm = stm.where(TaskGroupV2.active)
 
@@ -155,7 +165,7 @@ async def get_task_group_list(
                 setattr(task, "args_schema_non_parallel", None)
                 setattr(task, "args_schema_parallel", None)
 
-    default_group_id = await _get_default_usergroup_id(db)
+    default_group_id = await _get_default_usergroup_id_or_none(db)
     grouped_result = [
         (
             pkg_name,
@@ -182,7 +192,7 @@ async def get_task_group_list(
 @router.get("/{task_group_id}/", response_model=TaskGroupReadV2)
 async def get_task_group(
     task_group_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupReadV2:
     """
@@ -200,7 +210,7 @@ async def get_task_group(
 async def patch_task_group(
     task_group_id: int,
     task_group_update: TaskGroupUpdateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupReadV2:
     """

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

@@ -5,7 +5,6 @@ from fastapi import HTTPException
 from fastapi import Response
 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_related_workflowtask
 from ._aux_functions_task_lifecycle import check_no_submitted_job
@@ -14,16 +13,17 @@ 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.routes.auth import current_active_user
+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 TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
 from fractal_server.app.schemas.v2 import TaskGroupReadV2
 from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
-from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
-from fractal_server.ssh._fabric import SSHConfig
-from fractal_server.syringe import Inject
 from fractal_server.tasks.v2.local import deactivate_local
 from fractal_server.tasks.v2.local import deactivate_local_pixi
 from fractal_server.tasks.v2.local import delete_local
@@ -50,12 +50,16 @@ async def deactivate_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityV2Read:
     """
     Deactivate task-group venv
     """
+
+    # Get validated resource and profile
+    resource, profile = await validate_user_profile(user=user, db=db)
+
     # Check access
     task_group = await _get_task_group_full_access(
         task_group_id=task_group_id,
@@ -116,41 +120,23 @@ async def deactivate_task_group(
     await db.commit()
 
     # Submit background task
-    settings = Inject(get_settings)
-    if settings.FRACTAL_RUNNER_BACKEND == "slurm_ssh":
-        # Validate user settings (backend-specific)
-        user_settings = await validate_user_settings(
-            user=user, backend=settings.FRACTAL_RUNNER_BACKEND, db=db
-        )
-
-        # User appropriate FractalSSH object
-        ssh_config = SSHConfig(
-            user=user_settings.ssh_username,
-            host=user_settings.ssh_host,
-            key_path=user_settings.ssh_private_key_path,
-        )
+    if resource.type == ResourceType.SLURM_SSH:
         if task_group.origin == TaskGroupV2OriginEnum.PIXI:
             deactivate_function = deactivate_ssh_pixi
         else:
             deactivate_function = deactivate_ssh
-        background_tasks.add_task(
-            deactivate_function,
-            task_group_id=task_group.id,
-            task_group_activity_id=task_group_activity.id,
-            ssh_config=ssh_config,
-            tasks_base_dir=user_settings.ssh_tasks_dir,
-        )
-
     else:
         if task_group.origin == TaskGroupV2OriginEnum.PIXI:
             deactivate_function = deactivate_local_pixi
         else:
             deactivate_function = deactivate_local
-        background_tasks.add_task(
-            deactivate_function,
-            task_group_id=task_group.id,
-            task_group_activity_id=task_group_activity.id,
-        )
+    background_tasks.add_task(
+        deactivate_function,
+        task_group_id=task_group.id,
+        task_group_activity_id=task_group_activity.id,
+        resource=resource,
+        profile=profile,
+    )
 
     logger.debug(
         "Task group deactivation endpoint: start deactivate "
@@ -168,12 +154,14 @@ async def reactivate_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupReadV2:
     """
     Deactivate task-group venv
     """
+    # Get validated resource and profile
+    resource, profile = await validate_user_profile(user=user, db=db)
 
     # Check access
     task_group = await _get_task_group_full_access(
@@ -242,42 +230,23 @@ async def reactivate_task_group(
     await db.commit()
 
     # Submit background task
-    settings = Inject(get_settings)
-    if settings.FRACTAL_RUNNER_BACKEND == "slurm_ssh":
-        # Validate user settings (backend-specific)
-        user_settings = await validate_user_settings(
-            user=user, backend=settings.FRACTAL_RUNNER_BACKEND, db=db
-        )
-
-        # Use appropriate SSH credentials
-        ssh_config = SSHConfig(
-            user=user_settings.ssh_username,
-            host=user_settings.ssh_host,
-            key_path=user_settings.ssh_private_key_path,
-        )
-
+    if resource.type == ResourceType.SLURM_SSH:
         if task_group.origin == TaskGroupV2OriginEnum.PIXI:
             reactivate_function = reactivate_ssh_pixi
         else:
             reactivate_function = reactivate_ssh
-        background_tasks.add_task(
-            reactivate_function,
-            task_group_id=task_group.id,
-            task_group_activity_id=task_group_activity.id,
-            ssh_config=ssh_config,
-            tasks_base_dir=user_settings.ssh_tasks_dir,
-        )
-
     else:
         if task_group.origin == TaskGroupV2OriginEnum.PIXI:
             reactivate_function = reactivate_local_pixi
         else:
             reactivate_function = reactivate_local
-        background_tasks.add_task(
-            reactivate_function,
-            task_group_id=task_group.id,
-            task_group_activity_id=task_group_activity.id,
-        )
+    background_tasks.add_task(
+        reactivate_function,
+        task_group_id=task_group.id,
+        task_group_activity_id=task_group_activity.id,
+        resource=resource,
+        profile=profile,
+    )
     logger.debug(
         "Task group reactivation endpoint: start reactivate "
         "and return task_group_activity"
@@ -294,12 +263,14 @@ async def delete_task_group(
     task_group_id: int,
     background_tasks: BackgroundTasks,
     response: Response,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> TaskGroupActivityV2Read:
     """
     Deletion of task-group from db and file system
     """
+    # Get validated resource and profile
+    resource, profile = await validate_user_profile(user=user, db=db)
 
     task_group = await _get_task_group_full_access(
         task_group_id=task_group_id,
@@ -321,32 +292,18 @@ async def delete_task_group(
     db.add(task_group_activity)
     await db.commit()
 
-    settings = Inject(get_settings)
-    if settings.FRACTAL_RUNNER_BACKEND == "slurm_ssh":
-        # Validate user settings (backend-specific)
-        user_settings = await validate_user_settings(
-            user=user, backend=settings.FRACTAL_RUNNER_BACKEND, db=db
-        )
-        # User appropriate FractalSSH object
-        ssh_config = SSHConfig(
-            user=user_settings.ssh_username,
-            host=user_settings.ssh_host,
-            key_path=user_settings.ssh_private_key_path,
-        )
-
-        background_tasks.add_task(
-            delete_ssh,
-            task_group_id=task_group.id,
-            task_group_activity_id=task_group_activity.id,
-            ssh_config=ssh_config,
-            tasks_base_dir=user_settings.ssh_tasks_dir,
-        )
+    if resource.type == ResourceType.SLURM_SSH:
+        delete_function = delete_ssh
     else:
-        background_tasks.add_task(
-            delete_local,
-            task_group_id=task_group.id,
-            task_group_activity_id=task_group_activity.id,
-        )
+        delete_function = delete_local
+
+    background_tasks.add_task(
+        delete_function,
+        task_group_id=task_group.id,
+        task_group_activity_id=task_group_activity.id,
+        resource=resource,
+        profile=profile,
+    )
 
     response.status_code = status.HTTP_202_ACCEPTED
     return task_group_activity

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

@@ -23,7 +23,7 @@ from ._aux_functions_tasks import _get_task_group_or_404
 from ._aux_functions_tasks import _get_task_read_access
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.app.routes.auth import current_active_user
+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
@@ -75,7 +75,7 @@ class TaskVersionRead(BaseModel):
 async def get_workflow_version_update_candidates(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[list[TaskVersionRead]]:
     workflow = await _get_workflow_check_owner(
@@ -177,7 +177,7 @@ async def replace_workflowtask(
     workflow_task_id: int,
     task_id: int,
     replace: WorkflowTaskReplaceV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowTaskReadV2:
     # Get objects from database

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

@@ -26,7 +26,7 @@ from ._aux_functions import _workflow_has_submitted_job
 from ._aux_functions_tasks import _add_warnings_to_workflow_tasks
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskGroupV2
-from fractal_server.app.routes.auth import current_active_user
+from fractal_server.app.routes.auth import current_user_act_ver_prof
 from fractal_server.images.tools import merge_type_filters
 
 router = APIRouter()
@@ -38,7 +38,7 @@ router = APIRouter()
 )
 async def get_workflow_list(
     project_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[WorkflowReadV2] | None:
     """
@@ -65,7 +65,7 @@ async def get_workflow_list(
 async def create_workflow(
     project_id: int,
     workflow: WorkflowCreateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowReadV2 | None:
     """
@@ -93,7 +93,7 @@ async def create_workflow(
 async def read_workflow(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowReadV2WithWarnings | None:
     """
@@ -127,7 +127,7 @@ async def update_workflow(
     project_id: int,
     workflow_id: int,
     patch: WorkflowUpdateV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowReadV2WithWarnings | None:
     """
@@ -201,7 +201,7 @@ async def update_workflow(
 async def delete_workflow(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -246,7 +246,7 @@ async def delete_workflow(
 async def export_workflow(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowExportV2 | None:
     """
@@ -277,7 +277,7 @@ async def export_workflow(
 
 @router.get("/workflow/", response_model=list[WorkflowReadV2])
 async def get_user_workflows(
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[WorkflowReadV2]:
     """
@@ -303,7 +303,7 @@ class WorkflowTaskTypeFiltersInfo(BaseModel):
 async def get_workflow_type_filters(
     project_id: int,
     workflow_id: int,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[WorkflowTaskTypeFiltersInfo]:
     """

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

@@ -15,6 +15,7 @@ from ....schemas.v2 import WorkflowReadV2WithWarnings
 from ....schemas.v2 import WorkflowTaskCreateV2
 from ._aux_functions import _check_workflow_exists
 from ._aux_functions import _get_project_check_owner
+from ._aux_functions import _get_user_resource_id
 from ._aux_functions import _workflow_insert_task
 from ._aux_functions_tasks import _add_warnings_to_workflow_tasks
 from ._aux_functions_tasks import _check_type_filters_compatibility
@@ -24,8 +25,10 @@ from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.routes.api.v2._aux_task_group_disambiguation import (
     _disambiguate_task_groups,
 )
-from fractal_server.app.routes.auth import current_active_user
-from fractal_server.app.routes.auth._aux_auth import _get_default_usergroup_id
+from fractal_server.app.routes.auth import current_user_act_ver_prof
+from fractal_server.app.routes.auth._aux_auth import (
+    _get_default_usergroup_id_or_none,
+)
 from fractal_server.app.schemas.v2 import TaskImportV2
 from fractal_server.logger import set_logger
 
@@ -38,20 +41,26 @@ logger = set_logger(__name__)
 async def _get_user_accessible_taskgroups(
     *,
     user_id: int,
+    user_resource_id: int,
     db: AsyncSession,
 ) -> list[TaskGroupV2]:
     """
     Retrieve list of task groups that the user has access to.
     """
-    stm = select(TaskGroupV2).where(
-        or_(
-            TaskGroupV2.user_id == user_id,
-            TaskGroupV2.user_group_id.in_(
-                select(LinkUserGroup.group_id).where(
-                    LinkUserGroup.user_id == user_id
-                )
-            ),
+
+    stm = (
+        select(TaskGroupV2)
+        .where(
+            or_(
+                TaskGroupV2.user_id == user_id,
+                TaskGroupV2.user_group_id.in_(
+                    select(LinkUserGroup.group_id).where(
+                        LinkUserGroup.user_id == user_id
+                    )
+                ),
+            )
         )
+        .where(TaskGroupV2.resource_id == user_resource_id)
     )
     res = await db.execute(stm)
     accessible_task_groups = res.scalars().all()
@@ -93,7 +102,7 @@ async def _get_task_by_taskimport(
     task_import: TaskImportV2,
     task_groups_list: list[TaskGroupV2],
     user_id: int,
-    default_group_id: int,
+    default_group_id: int | None,
     db: AsyncSession,
 ) -> int | None:
     """
@@ -149,7 +158,7 @@ async def _get_task_by_taskimport(
 
     # Filter task groups by version
     final_matching_task_groups = list(
-        filter(lambda tg: tg.version == version, task_groups_list)
+        filter(lambda tg: tg.version == version, matching_task_groups)
     )
 
     if len(final_matching_task_groups) < 1:
@@ -167,10 +176,11 @@ async def _get_task_by_taskimport(
     else:
         logger.info(
             "[_get_task_by_taskimport] "
-            "Found many task groups, after filtering by version."
+            f"Found {len(final_matching_task_groups)} task groups, "
+            "after filtering by version."
         )
         final_task_group = await _disambiguate_task_groups(
-            matching_task_groups=matching_task_groups,
+            matching_task_groups=final_matching_task_groups,
             user_id=user_id,
             db=db,
             default_group_id=default_group_id,
@@ -204,13 +214,15 @@ async def _get_task_by_taskimport(
 async def import_workflow(
     project_id: int,
     workflow_import: WorkflowImportV2,
-    user: UserOAuth = Depends(current_active_user),
+    user: UserOAuth = Depends(current_user_act_ver_prof),
     db: AsyncSession = Depends(get_async_db),
 ) -> WorkflowReadV2WithWarnings:
     """
     Import an existing workflow into a project and create required objects.
     """
 
+    user_resource_id = await _get_user_resource_id(user_id=user.id, db=db)
+
     # Preliminary checks
     await _get_project_check_owner(
         project_id=project_id,
@@ -226,8 +238,9 @@ async def import_workflow(
     task_group_list = await _get_user_accessible_taskgroups(
         user_id=user.id,
         db=db,
+        user_resource_id=user_resource_id,
     )
-    default_group_id = await _get_default_usergroup_id(db)
+    default_group_id = await _get_default_usergroup_id_or_none(db)
 
     list_wf_tasks = []
     list_task_ids = []