fractal-server 2.17.0a8__tar.gz → 2.17.0a9__tar.gz

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.17.0a8
+Version: 2.17.0a9
 Summary: Backend component of the Fractal analytics platform
 License-Expression: BSD-3-Clause
 License-File: LICENSE

fractal_server-2.17.0a9/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.17.0a9"

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/admin/v2/resource.py

@@ -62,7 +62,7 @@ async def get_resource_list(
     Query `Resource` table.
     """
 
-    stm = select(Resource)
+    stm = select(Resource).order_by(Resource.id)
     res = await db.execute(stm)
     resource_list = res.scalars().all()
 

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/admin/v2/task.py

@@ -103,6 +103,7 @@ async def query_tasks(
             .where(TaskGroupV2.resource_id == resource_id)
         )
 
+    stm = stm.order_by(TaskV2.id)
     res = await db.execute(stm)
     task_list = res.scalars().all()
     if len(task_list) > max_number_of_results:

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/admin/v2/task_group.py

@@ -133,6 +133,7 @@ async def query_task_group_list(
     if resource_id is not None:
         stm = stm.where(TaskGroupV2.resource_id == resource_id)
 
+    stm = stm.order_by(TaskGroupV2.id)
     res = await db.execute(stm)
     task_groups_list = res.scalars().all()
     return task_groups_list

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/api/v2/_aux_functions_tasks.py

@@ -20,7 +20,9 @@ from fractal_server.app.models.v2 import WorkflowTaskV2
 from fractal_server.app.routes.api.v2._aux_functions import (
     _get_user_resource_id,
 )
-from fractal_server.app.routes.auth._aux_auth import _get_default_usergroup_id
+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,
 )
@@ -73,7 +75,7 @@ async def _get_task_group_read_access(
         status_code=status.HTTP_403_FORBIDDEN,
         detail=(
             "Current user has no read access to TaskGroupV2 "
-            f"{task_group_id}.",
+            f"{task_group_id}."
         ),
     )
 
@@ -90,7 +92,7 @@ async def _get_task_group_read_access(
             .where(LinkUserGroup.user_id == user_id)
             .where(UserOAuth.id == user_id)
             .where(Profile.id == UserOAuth.profile_id)
-            .where(TaskGroupV2.resource_id == Profile.resource_id)
+            .where(task_group.resource_id == Profile.resource_id)
         )
         res = await db.execute(stm)
         link = res.unique().scalars().one_or_none()
@@ -237,7 +239,7 @@ async def _get_valid_user_group_id(
     elif private is True:
         user_group_id = None
     elif user_group_id is None:
-        user_group_id = await _get_default_usergroup_id(db=db)
+        user_group_id = await _get_default_usergroup_id_or_none(db=db)
     else:
         await _verify_user_belongs_to_group(
             user_id=user_id, user_group_id=user_group_id, db=db
@@ -370,7 +372,9 @@ async def _verify_non_duplication_group_constraint(
 
 
 async def _verify_non_duplication_group_path(
+    *,
     path: str | None,
+    resource_id: int,
     db: AsyncSession,
 ) -> None:
     """
@@ -378,7 +382,11 @@ async def _verify_non_duplication_group_path(
     """
     if path is None:
         return
-    stm = select(TaskGroupV2.id).where(TaskGroupV2.path == path)
+    stm = (
+        select(TaskGroupV2.id)
+        .where(TaskGroupV2.path == path)
+        .where(TaskGroupV2.resource_id == resource_id)
+    )
     res = await db.execute(stm)
     duplicate_ids = res.scalars().all()
     if duplicate_ids:

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py

@@ -5,8 +5,10 @@ from sqlmodel import select
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models.v2 import TaskGroupV2
+from fractal_server.config import get_settings
 from fractal_server.exceptions import UnreachableBranchError
 from fractal_server.logger import set_logger
+from fractal_server.syringe import Inject
 
 
 logger = set_logger(__name__)
@@ -16,7 +18,7 @@ async def _disambiguate_task_groups(
     *,
     matching_task_groups: list[TaskGroupV2],
     user_id: int,
-    default_group_id: int,
+    default_group_id: int | None,
     db: AsyncSession,
 ) -> TaskGroupV2 | None:
     """
@@ -49,21 +51,23 @@ async def _disambiguate_task_groups(
         )
 
     # Medium priority: task groups owned by default user group
-    list_user_group_ids = [tg.user_group_id for tg in matching_task_groups]
-    try:
-        ind_user_group_id = list_user_group_ids.index(default_group_id)
-        task_group = matching_task_groups[ind_user_group_id]
-        logger.debug(
-            "[_disambiguate_task_groups] "
-            f"Found task group {task_group.id} with {user_id=}, return."
-        )
-        return task_group
-    except ValueError:
-        logger.debug(
-            "[_disambiguate_task_groups] "
-            "No task group with user_group_id="
-            f"{default_group_id}, continue."
-        )
+    settings = Inject(get_settings)
+    if settings.FRACTAL_DEFAULT_GROUP_NAME is not None:
+        list_user_group_ids = [tg.user_group_id for tg in matching_task_groups]
+        try:
+            ind_user_group_id = list_user_group_ids.index(default_group_id)
+            task_group = matching_task_groups[ind_user_group_id]
+            logger.debug(
+                "[_disambiguate_task_groups] "
+                f"Found task group {task_group.id} with {user_id=}, return."
+            )
+            return task_group
+        except ValueError:
+            logger.debug(
+                "[_disambiguate_task_groups] "
+                "No task group with user_group_id="
+                f"{default_group_id}, continue."
+            )
 
     # Lowest priority: task groups owned by other groups, sorted
     # according to age of the user/usergroup link
@@ -97,7 +101,7 @@ async def _disambiguate_task_groups_not_none(
     *,
     matching_task_groups: list[TaskGroupV2],
     user_id: int,
-    default_group_id: int,
+    default_group_id: int | None,
     db: AsyncSession,
 ) -> TaskGroupV2:
     """
@@ -133,7 +137,7 @@ async def remove_duplicate_task_groups(
     *,
     task_groups: list[TaskGroupV2],
     user_id: int,
-    default_group_id: int,
+    default_group_id: int | None,
     db: AsyncSession,
 ) -> list[TaskGroupV2]:
     """

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/api/v2/task.py

@@ -73,6 +73,7 @@ async def get_list_task(
     if author is not None:
         stm = stm.where(TaskV2.authors.icontains(author))
 
+    stm = stm.order_by(TaskV2.id)
     res = await db.execute(stm)
     task_list = list(res.scalars().all())
     await db.close()

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/api/v2/task_collection.py

@@ -305,6 +305,7 @@ async def collect_tasks_pip(
     )
     await _verify_non_duplication_group_path(
         path=task_group_attrs["path"],
+        resource_id=resource_id,
         db=db,
     )
 

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/api/v2/task_collection_pixi.py

@@ -159,6 +159,7 @@ async def collect_task_pixi(
     )
     await _verify_non_duplication_group_path(
         path=task_group_attrs["path"],
+        resource_id=resource_id,
         db=db,
     )
 

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/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
@@ -22,7 +23,9 @@ 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.routes.auth._aux_auth import _get_default_usergroup_id
+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,
 )
@@ -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,

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/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
@@ -25,7 +26,9 @@ from fractal_server.app.routes.api.v2._aux_task_group_disambiguation import (
     _disambiguate_task_groups,
 )
 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
+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:
     """
@@ -212,6 +221,8 @@ async def import_workflow(
     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,
@@ -227,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 = []

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/auth/_aux_auth.py

@@ -9,8 +9,10 @@ from fractal_server.app.models.security import UserGroup
 from fractal_server.app.models.security import UserOAuth
 from fractal_server.app.schemas.user import UserRead
 from fractal_server.app.schemas.user_group import UserGroupRead
-from fractal_server.app.security import FRACTAL_DEFAULT_GROUP_NAME
+from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
+from fractal_server.syringe import Inject
+
 
 logger = set_logger(__name__)
 
@@ -29,6 +31,9 @@ async def _get_single_user_with_groups(
     Returns:
         A `UserRead` object with `group_ids_names` dict
     """
+
+    settings = Inject(get_settings)
+
     stm_groups = (
         select(UserGroup)
         .join(LinkUserGroup)
@@ -39,25 +44,25 @@ async def _get_single_user_with_groups(
     groups = res.scalars().unique().all()
     group_ids_names = [(group.id, group.name) for group in groups]
 
-    # Check that Fractal Default Group is the first of the list. If not, fix.
+    # Identify the default-group position in the list of groups
     index = next(
         (
-            i
-            for i, group_tuple in enumerate(group_ids_names)
-            if group_tuple[1] == FRACTAL_DEFAULT_GROUP_NAME
+            ind
+            for ind, group_tuple in enumerate(group_ids_names)
+            if group_tuple[1] == settings.FRACTAL_DEFAULT_GROUP_NAME
         ),
         None,
     )
-    if index is None:
-        logger.warning(
-            f"User {user.id} not in "
-            f"default UserGroup '{FRACTAL_DEFAULT_GROUP_NAME}'"
-        )
-    elif index != 0:
+    if (index is None) or (index == 0):
+        # Either the default group does not exist, or it is already the first
+        # one. No action needed.
+        pass
+    else:
+        # Move the default group to the first position
         default_group = group_ids_names.pop(index)
         group_ids_names.insert(0, default_group)
-    else:
-        pass
+
+    # Create dump of `user.oauth_accounts` relationship
     oauth_accounts = [
         oauth_account.model_dump() for oauth_account in user.oauth_accounts
     ]
@@ -121,17 +126,31 @@ async def _usergroup_or_404(usergroup_id: int, db: AsyncSession) -> UserGroup:
     return user
 
 
-async def _get_default_usergroup_id(db: AsyncSession) -> int:
+async def _get_default_usergroup_id_or_none(db: AsyncSession) -> int | None:
+    """
+    Return the ID of the group named `"All"`, if `FRACTAL_DEFAULT_GROUP_NAME`
+    is set and such group exists. Return `None`, if
+    `FRACTAL_DEFAULT_GROUP_NAME=None` or if the `"All"` group does not exist.
+    """
+    settings = Inject(get_settings)
     stm = select(UserGroup.id).where(
-        UserGroup.name == FRACTAL_DEFAULT_GROUP_NAME
+        UserGroup.name == settings.FRACTAL_DEFAULT_GROUP_NAME
     )
     res = await db.execute(stm)
     user_group_id = res.scalars().one_or_none()
-    if user_group_id is None:
+
+    if (
+        settings.FRACTAL_DEFAULT_GROUP_NAME is not None
+        and user_group_id is None
+    ):
         raise HTTPException(
             status_code=status.HTTP_404_NOT_FOUND,
-            detail=f"User group '{FRACTAL_DEFAULT_GROUP_NAME}' not found.",
+            detail=(
+                f"User group '{settings.FRACTAL_DEFAULT_GROUP_NAME}'"
+                " not found.",
+            ),
         )
+
     return user_group_id
 
 

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/auth/group.py

@@ -10,7 +10,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select
 
 from . import current_superuser_act
-from ._aux_auth import _get_default_usergroup_id
+from ._aux_auth import _get_default_usergroup_id_or_none
 from ._aux_auth import _get_single_usergroup_with_user_ids
 from ._aux_auth import _user_or_404
 from ._aux_auth import _usergroup_or_404
@@ -21,11 +21,13 @@ from fractal_server.app.models import UserOAuth
 from fractal_server.app.schemas.user_group import UserGroupCreate
 from fractal_server.app.schemas.user_group import UserGroupRead
 from fractal_server.app.schemas.user_group import UserGroupUpdate
-from fractal_server.app.security import FRACTAL_DEFAULT_GROUP_NAME
+from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
+from fractal_server.syringe import Inject
 
 logger = set_logger(__name__)
 
+
 router_group = APIRouter()
 
 
@@ -138,19 +140,24 @@ async def delete_single_group(
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
+    """
+    Delete a user group.
+
+    If `FRACTAL_DEFAULT_GROUP_NAME="All"`, a group named `"All"` cannot be
+    deleted. If `FRACTAL_DEFAULT_GROUP_NAME=None`, any group can be deleted.
+    """
+    settings = Inject(get_settings)
     group = await _usergroup_or_404(group_id, db)
 
-    if group.name == FRACTAL_DEFAULT_GROUP_NAME:
+    if group.name == settings.FRACTAL_DEFAULT_GROUP_NAME:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 "Cannot delete default UserGroup "
-                f"'{FRACTAL_DEFAULT_GROUP_NAME}'."
+                f"'{settings.FRACTAL_DEFAULT_GROUP_NAME}'."
             ),
         )
 
-    # Delete
-
     await db.delete(group)
     await db.commit()
 
@@ -188,18 +195,21 @@ async def remove_user_from_group(
     superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserGroupRead:
+    settings = Inject(get_settings)
     # Check that user and group exist
     await _usergroup_or_404(group_id, db)
     user = await _user_or_404(user_id, db)
 
     # Check that group is not the default one
-    default_user_group_id = await _get_default_usergroup_id(db=db)
-    if default_user_group_id == group_id:
+    default_user_group_id_or_none = await _get_default_usergroup_id_or_none(
+        db=db
+    )
+    if default_user_group_id_or_none == group_id:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
-                f"Cannot remove user from '{FRACTAL_DEFAULT_GROUP_NAME}' "
-                "group.",
+                f"Cannot remove user from "
+                f"'{settings.FRACTAL_DEFAULT_GROUP_NAME}' group.",
             ),
         )
 

{fractal_server-2.17.0a8 → fractal_server-2.17.0a9}/fractal_server/app/routes/auth/users.py

@@ -15,9 +15,8 @@ from . import current_superuser_act
 from ...db import get_async_db
 from ...schemas.user import UserRead
 from ...schemas.user import UserUpdate
-from ._aux_auth import _get_default_usergroup_id
+from ._aux_auth import _get_default_usergroup_id_or_none
 from ._aux_auth import _get_single_user_with_groups
-from ._aux_auth import FRACTAL_DEFAULT_GROUP_NAME
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
@@ -26,7 +25,10 @@ from fractal_server.app.routes.auth._aux_auth import _user_or_404
 from fractal_server.app.schemas.user import UserUpdateGroups
 from fractal_server.app.security import get_user_manager
 from fractal_server.app.security import UserManager
+from fractal_server.config import get_settings
 from fractal_server.logger import set_logger
+from fractal_server.syringe import Inject
+
 
 router_users = APIRouter()
 
@@ -146,6 +148,7 @@ async def set_user_groups(
     superuser: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> UserRead:
+    settings = Inject(get_settings)
     # Preliminary check that all objects exist in the db
     user = await _user_or_404(user_id=user_id, db=db)
     target_group_ids = user_update.group_ids
@@ -161,13 +164,16 @@ async def set_user_groups(
         )
 
     # Check that default group is not being removed
-    default_group_id = await _get_default_usergroup_id(db=db)
-    if default_group_id not in target_group_ids:
+    default_group_id_or_none = await _get_default_usergroup_id_or_none(db=db)
+    if (
+        default_group_id_or_none is not None
+        and default_group_id_or_none not in target_group_ids
+    ):
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
                 f"Cannot remove user from "
-                f"'{FRACTAL_DEFAULT_GROUP_NAME}' group.",
+                f"'{settings.FRACTAL_DEFAULT_GROUP_NAME}' group.",
             ),
         )