fractal-server 2.17.0a8__py3-none-any.whl → 2.17.0a10__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.17.0a8"
+__VERSION__ = "2.17.0a10"

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/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/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/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/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
+    settings = Inject(get_settings)
     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."
-        )
+    if settings.FRACTAL_DEFAULT_GROUP_NAME is not None:
+        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/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/app/routes/api/v2/task_collection.py

@@ -200,8 +200,8 @@ async def collect_tasks_pip(
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
-                f"Python version {task_group_attrs['python_version']} is "
-                "not available for Fractal task collection."
+                f"Python version {task_group_attrs['python_version']} "
+                "is not available on this Fractal instance."
             ),
         )
 
@@ -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/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/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/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/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/app/routes/auth/current_user.py

@@ -15,6 +15,7 @@ from fractal_server.app.models import Resource
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_user_act
+from fractal_server.app.routes.auth import current_user_act_ver
 from fractal_server.app.routes.auth._aux_auth import (
     _get_single_user_with_groups,
 )
@@ -111,7 +112,7 @@ async def get_current_user_profile_info(
     "/current-user/allowed-viewer-paths/", response_model=list[str]
 )
 async def get_current_user_allowed_viewer_paths(
-    current_user: UserOAuth = Depends(current_user_act),
+    current_user: UserOAuth = Depends(current_user_act_ver),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[str]:
     """

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()
 
 
@@ -38,7 +40,7 @@ async def get_list_user_groups(
     db: AsyncSession = Depends(get_async_db),
 ) -> list[UserGroupRead]:
     # Get all groups
-    stm_all_groups = select(UserGroup)
+    stm_all_groups = select(UserGroup).order_by(UserGroup.id)
     res = await db.execute(stm_all_groups)
     groups = res.scalars().all()
 
@@ -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/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.",
             ),
         )
 

fractal_server/app/schemas/user_group.py

@@ -7,6 +7,7 @@ from pydantic import field_serializer
 from pydantic.types import AwareDatetime
 
 from fractal_server.types import ListUniqueAbsolutePathStr
+from fractal_server.types import NonEmptyStr
 
 __all__ = (
     "UserGroupRead",
@@ -50,7 +51,7 @@ class UserGroupCreate(BaseModel):
 
     model_config = ConfigDict(extra="forbid")
 
-    name: str
+    name: NonEmptyStr
     viewer_paths: ListUniqueAbsolutePathStr = Field(default_factory=list)
 
 

fractal_server/app/security/__init__.py

@@ -51,13 +51,12 @@ from fractal_server.app.security.signup_email import (
 )
 from fractal_server.config import get_email_settings
 from fractal_server.config import get_settings
+from fractal_server.logger import close_logger
 from fractal_server.logger import set_logger
 from fractal_server.syringe import Inject
 
 logger = set_logger(__name__)
 
-FRACTAL_DEFAULT_GROUP_NAME = "All"
-
 
 class SQLModelUserDatabaseAsync(Generic[UP, ID], BaseUserDatabase[UP, ID]):
     """
@@ -281,12 +280,12 @@ class UserManager(IntegerIDMixin, BaseUserManager[UserOAuth, int]):
                 )
 
                 # (1) Prepare user-facing error message
-                settings = Inject(get_settings)
                 error_msg = (
                     "Thank you for registering for the Fractal service. "
                     "Administrators have been informed to configure your "
                     "account and will get back to you."
                 )
+                settings = Inject(get_settings)
                 if settings.FRACTAL_HELP_URL is not None:
                     error_msg = (
                         f"{error_msg}\n"
@@ -329,28 +328,38 @@ class UserManager(IntegerIDMixin, BaseUserManager[UserOAuth, int]):
     async def on_after_register(
         self, user: UserOAuth, request: Request | None = None
     ):
+        settings = Inject(get_settings)
         logger.info(
             f"New-user registration completed ({user.id=}, {user.email=})."
         )
         async for db in get_async_db():
-            stm = select(UserGroup).where(
-                UserGroup.name == FRACTAL_DEFAULT_GROUP_NAME
+            # Note: if `FRACTAL_DEFAULT_GROUP_NAME=None`, this query will
+            # result into `None`
+            settings = Inject(get_settings)
+            stm = select(UserGroup.id).where(
+                UserGroup.name == settings.FRACTAL_DEFAULT_GROUP_NAME
             )
             res = await db.execute(stm)
-            default_group = res.scalar_one_or_none()
-            if default_group is None:
-                logger.warning(
-                    f"No group found with name {FRACTAL_DEFAULT_GROUP_NAME}"
-                )
-            else:
+            default_group_id_or_none = res.scalars().one_or_none()
+            if default_group_id_or_none is not None:
                 link = LinkUserGroup(
-                    user_id=user.id, group_id=default_group.id
+                    user_id=user.id, group_id=default_group_id_or_none
                 )
                 db.add(link)
                 await db.commit()
                 logger.info(
-                    f"Added {user.email} user to group {default_group.id=}."
+                    f"Added {user.email} user to group "
+                    f"{default_group_id_or_none=}."
                 )
+            elif settings.FRACTAL_DEFAULT_GROUP_NAME is not None:
+                logger.error(
+                    "No group found with name "
+                    f"{settings.FRACTAL_DEFAULT_GROUP_NAME}"
+                )
+            # NOTE: the `else` of this branch would simply be a `pass`. The
+            # "All" group was not found, but this is not worth a WARNING
+            # because `FRACTAL_DEFAULT_GROUP_NAME` is set to `None` in the
+            # settings.
 
 
 async def get_user_manager(
@@ -433,34 +442,43 @@ async def _create_first_user(
         raise e
     finally:
         function_logger.info(f"END   _create_first_user, with email '{email}'")
+        close_logger(function_logger)
 
 
 def _create_first_group():
     """
-    Create a `UserGroup` with `name=FRACTAL_DEFAULT_GROUP_NAME`, if missing.
+    Create a `UserGroup` named `FRACTAL_DEFAULT_GROUP_NAME`, if this variable
+    is set and if such a group does not already exist.
     """
+    settings = Inject(get_settings)
     function_logger = set_logger("fractal_server.create_first_group")
 
+    if settings.FRACTAL_DEFAULT_GROUP_NAME is None:
+        function_logger.info(
+            f"SKIP because '{settings.FRACTAL_DEFAULT_GROUP_NAME=}'"
+        )
+        return
+
     function_logger.info(
-        f"START _create_first_group, with name '{FRACTAL_DEFAULT_GROUP_NAME}'"
+        f"START, name '{settings.FRACTAL_DEFAULT_GROUP_NAME}'"
     )
     with next(get_sync_db()) as db:
         group_all = db.execute(
             select(UserGroup).where(
-                UserGroup.name == FRACTAL_DEFAULT_GROUP_NAME
+                UserGroup.name == settings.FRACTAL_DEFAULT_GROUP_NAME
             )
         )
         if group_all.scalars().one_or_none() is None:
-            first_group = UserGroup(name=FRACTAL_DEFAULT_GROUP_NAME)
+            first_group = UserGroup(name=settings.FRACTAL_DEFAULT_GROUP_NAME)
             db.add(first_group)
             db.commit()
             function_logger.info(
-                f"Created group '{FRACTAL_DEFAULT_GROUP_NAME}'"
+                f"Created group '{settings.FRACTAL_DEFAULT_GROUP_NAME}'"
             )
         else:
             function_logger.info(
-                f"Group '{FRACTAL_DEFAULT_GROUP_NAME}' already exists, skip."
+                f"Group '{settings.FRACTAL_DEFAULT_GROUP_NAME}' "
+                "already exists, skip."
             )
-    function_logger.info(
-        f"END   _create_first_group, with name '{FRACTAL_DEFAULT_GROUP_NAME}'"
-    )
+    function_logger.info("END")
+    close_logger(function_logger)

fractal_server/config/_main.py

@@ -66,3 +66,13 @@ class Settings(BaseSettings):
     """
     The URL of an instance-specific Fractal help page.
     """
+
+    FRACTAL_DEFAULT_GROUP_NAME: Literal["All"] | None = None
+    """
+    Name of the default user group.
+
+    If set to `"All"`, then the user group with that name is a special user
+    group (e.g. it cannot be deleted, and new users are automatically added
+    to it). If set to `None` (the default value), then user groups are all
+    equivalent, independently on their name.
+    """

fractal_server/tasks/v2/utils_pixi.py

@@ -74,6 +74,9 @@ def simplify_pyproject_toml(
         return original_toml_string
 
     # Use a single platform (or skip, if not set)
+    # Note: we look both for `[workspace.platforms]` and `[project.platforms]`,
+    # even though `[project]` is deprecated as of
+    # https://pixi.sh/dev/CHANGELOG/#0570-2025-10-20.
     try:
         pixi_data["workspace"]["platforms"] = [pixi_platform]
     except KeyError:

{fractal_server-2.17.0a8.dist-info → fractal_server-2.17.0a10.dist-info}/METADATA

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

{fractal_server-2.17.0a8.dist-info → fractal_server-2.17.0a10.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=BC6X5ShipZaJdAYWlIFWgdo5G_eS3ZXxSgaZP3AQsdU,25
+fractal_server/__init__.py,sha256=G5BYCg1etHirfVvA4-6BLaLisXMafnQOALbQLrNgQAU,26
 fractal_server/__main__.py,sha256=68FlTuST3zbzVofFI8JSYsSBrBQ07Bv3Mu3PsZX9Fw0,11423
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,9 +29,9 @@ fractal_server/app/routes/admin/v2/impersonate.py,sha256=ictDjuvBr3iLv3YtwkVRMNQ
 fractal_server/app/routes/admin/v2/job.py,sha256=sFgMbOtUCIJ-ri6YD3ZWP7XETZZDQsLqPfT1kaH9RHQ,8577
 fractal_server/app/routes/admin/v2/profile.py,sha256=0Y_1Qv-BA6cHVrxPTDDBOpttpfuJN8g1FqFlG6JiOD8,3164
 fractal_server/app/routes/admin/v2/project.py,sha256=rRq7ZDngr_29skASnte1xfycZCjK-WPdeTf7siBXiCU,1182
-fractal_server/app/routes/admin/v2/resource.py,sha256=X5ifGY3VEVeGqtixMorh5PT6m5EHS3yg6kzzlFWmlmo,6288
-fractal_server/app/routes/admin/v2/task.py,sha256=aACI0RXVODclIqfaFYyQ3ncB8YCcd36qy3a0vFGnsfo,4621
-fractal_server/app/routes/admin/v2/task_group.py,sha256=RV697PI79X9w5zEKQTlQplAsp-vDS4fGyXwqsHc5eY0,6210
+fractal_server/app/routes/admin/v2/resource.py,sha256=eLK3PxvpibwQgVfgpMb_CdqkiB7hz8-RtPqqtP9ujz8,6310
+fractal_server/app/routes/admin/v2/task.py,sha256=9MMUI2PnyHQx08Xmt93O5rM60C_tlic27mP6t7ljpYo,4655
+fractal_server/app/routes/admin/v2/task_group.py,sha256=EDY9oliXq_xYVJ2HgRuE4-5MbL85j-y4LbWwupZxy38,6249
 fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=W7LjIBAheyjrn0fEz0SsWINqcZK5HMB5GRGMjPrc6a4,9994
 fractal_server/app/routes/api/__init__.py,sha256=ewprevw6hZ0FWM-GPHoQZU0w-yfItqLeQT-Jr_Nbjnw,1658
 fractal_server/app/routes/api/v2/__init__.py,sha256=D3sRRsqkmZO6kBxUjg40q0aRDsnuXI4sOOfn0xF9JsM,2820
@@ -39,8 +39,8 @@ fractal_server/app/routes/api/v2/_aux_functions.py,sha256=0OC5ydaX-XpscMRAsqiE03
 fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=PXsqMQ3sfkABqAMI7v1_VAzUEDF_-kvaZyyhEicqsCw,4431
 fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=5gNt35rYR8sHG2f1N8coQbOJacYIRJ5zUrmMEXcs2LQ,8585
 fractal_server/app/routes/api/v2/_aux_functions_task_version_update.py,sha256=PKjV7r8YsPRXoNiVSnOK4KBYVV3l_Yb_ZPrqAkMkXrQ,1182
-fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=IJ_q_2x3ar1WM8u_3LM2UWdRERZU5g_N2nfQjW9Ujlc,13542
-fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py,sha256=8x1_q9FyCzItnPmdSdLQuwUTy4B9xCsXscp97_lJcpM,4635
+fractal_server/app/routes/api/v2/_aux_functions_tasks.py,sha256=63CFMe1QZKRPmmU1xk1qZ_R6A1VANCxAlUBTGDrE0GI,13674
+fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py,sha256=492tLRUWTxsAZuhkZUt9PmJtKNLIhkAqKAa-LDtwG_Y,4893
 fractal_server/app/routes/api/v2/dataset.py,sha256=HhRrReo_isFJFMaUhQfxEQkLj0_lXNfGblzwpLG81VU,8623
 fractal_server/app/routes/api/v2/history.py,sha256=T-7GDLZ_x4cp9PMEozJoEFt4cGFYPDqv9-akYmN2JSU,17150
 fractal_server/app/routes/api/v2/images.py,sha256=_R-F1qrsFv3PPukrwXSa-5swNS4kNghY0DTrxjLC_7E,7897
@@ -49,25 +49,25 @@ fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=DEnlFj6PMNMy9Dr
 fractal_server/app/routes/api/v2/project.py,sha256=PkRR1lQayBvY8uEOMherXpvv_YwIMwxWzVMjC5nFfm4,4857
 fractal_server/app/routes/api/v2/status_legacy.py,sha256=vZA4AYMehXbNFgekl4j6p8idETC3IylQQL64CmFCr98,6330
 fractal_server/app/routes/api/v2/submit.py,sha256=o0r58Dc6A1BHOUPp2OK7PKEHc4dIqnp3-kXBWnX8KsY,9373
-fractal_server/app/routes/api/v2/task.py,sha256=88cMBcUL_QQ25GvwAEVSiyncnJ7nZ1EX6PlLNGsgNfU,7485
-fractal_server/app/routes/api/v2/task_collection.py,sha256=03LXiSde7ODVsfARDdgSXWVDYMao2zce-2lqQHelF1M,12196
+fractal_server/app/routes/api/v2/task.py,sha256=HIQRA7lAW41P89eveCGmUI2HERMakxOw5is-F-j-fco,7519
+fractal_server/app/routes/api/v2/task_collection.py,sha256=wgY5-sry8Dg9IbLyzjxur8iqoe9ALs2zNK0bmNtO8Co,12226
 fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=WjByW-raK-HU1IR02JNc39XMjkRftXyUSHwHrgnZFBw,6924
-fractal_server/app/routes/api/v2/task_collection_pixi.py,sha256=oSSDyhdrgE71nXjIPPA2et9LlgEKkxIBlpBkrRuEuns,7158
-fractal_server/app/routes/api/v2/task_group.py,sha256=_M_munannm0wMmLdOwo-qATqrl0Vu_TsrpLb-2554fs,8104
+fractal_server/app/routes/api/v2/task_collection_pixi.py,sha256=-HlgVzYxZb0Ysk6fkHbhkiVvVtQxmvli1kW03PTVaVo,7191
+fractal_server/app/routes/api/v2/task_group.py,sha256=7eGVim9D6AE4synpxAYMijyHIC1HTSBojY08MiuqMBg,8349
 fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=ZSn8Ibjwkp89v87OPBquULPc9xsdpBfRvV1PiQdiicw,10593
 fractal_server/app/routes/api/v2/task_version_update.py,sha256=JO5xggiRqay4zNlbjlRa26ygMEue2klSFPyLrXS215k,8254
 fractal_server/app/routes/api/v2/workflow.py,sha256=szb6t9OWOjr0CwboF0fJUyO5jUPj_HRpf5N0CDuHkqc,10755
-fractal_server/app/routes/api/v2/workflow_import.py,sha256=iFy8jPuMMt1DpIcs5iJc5Gzcq-wbMtnk05NdU1y5nkQ,9095
+fractal_server/app/routes/api/v2/workflow_import.py,sha256=cEs1bt5urKIbaC8PjnUwYAaPK3kGqupXpUdgwEXM0Ss,9445
 fractal_server/app/routes/api/v2/workflowtask.py,sha256=-V7WjTfYb2L7i3_dQ0Am_ydqepdqs-j3BY67_5iZPfU,7960
 fractal_server/app/routes/auth/__init__.py,sha256=Y-RQMwY5V25ZVgyYYoFIXvEDQgm6PGTDgxH755oa_NM,2358
-fractal_server/app/routes/auth/_aux_auth.py,sha256=fyGxBVb6yrVrsE7-2tTyiJ7orb9Jzkg36m_q-rP7Zs8,4868
-fractal_server/app/routes/auth/current_user.py,sha256=BsM_lm9iNiaL8_iMY8NZnfgSXhzEY8xgkQUgtC40h8o,5517
-fractal_server/app/routes/auth/group.py,sha256=wZnqzIOZHpoUW2Yp6dkAMRqIiM_otVdG4fZuBYmLocA,6919
+fractal_server/app/routes/auth/_aux_auth.py,sha256=10eQlLWCsuwmkGiZB3eSR9JhnU4db67wsWRxu8arKqc,5435
+fractal_server/app/routes/auth/current_user.py,sha256=xYun8dn9Ie3mzTczq1BC7HfIjPpj3x8QOtJ1H6Yb_GM,5585
+fractal_server/app/routes/auth/group.py,sha256=JfQKmmafgVfsPmuVcA4wGs5qKwq9Xx4f-m4uwIyY3-Y,7291
 fractal_server/app/routes/auth/login.py,sha256=tSu6OBLOieoBtMZB4JkBAdEgH2Y8KqPGSbwy7NIypIo,566
 fractal_server/app/routes/auth/oauth.py,sha256=5BTEKb7Cb6ASVmgiPb5kVbHcBg0rF8Iqho0aJZd7PPQ,2730
 fractal_server/app/routes/auth/register.py,sha256=Ola-lNdYYEOK8Wh0Q-TFKwIJ25e6UswlUojJ8QGBCfc,581
 fractal_server/app/routes/auth/router.py,sha256=-E87A8h2UvcLucy5xjzKiWbXHVKcqxUmmZGeV_utEzA,598
-fractal_server/app/routes/auth/users.py,sha256=Gjj3_W4Zu1RZJv0r578wPJrbicMmiSELmJGJDeStyus,6878
+fractal_server/app/routes/auth/users.py,sha256=xUvzH_hIwOOSU5QiJyJmU1NRZHkTcypjTgSbuTm8A5I,7060
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/aux/_job.py,sha256=nqqdcW5B7fL_PbvHf57_TcifjUfcMgl04tKNvG2sV1U,628
 fractal_server/app/routes/aux/_runner.py,sha256=SDzI7glEfkW_XecWFuRQitbSWSvAPegI-J5c7i5d0_w,957
@@ -75,7 +75,7 @@ fractal_server/app/routes/aux/validate_user_profile.py,sha256=fGqJDdAFkbQoEIjqZ5
 fractal_server/app/routes/pagination.py,sha256=IGy8Ll5lYr6ENYE18h3huH5s0GMX1DCs5VdCi6j1cdk,1174
 fractal_server/app/schemas/__init__.py,sha256=VIWJCaqokte3OljDLX00o-EC2d12rFoPb5HOLKQI94Y,86
 fractal_server/app/schemas/user.py,sha256=MGggiWGqQV97426IzoaKNIkqHUMEuadW7BbJgom6tB8,2898
-fractal_server/app/schemas/user_group.py,sha256=x3-kqbo0q2wTP7QI0iZ7PU_9Dr957UYrFMKqS7BXLhE,1425
+fractal_server/app/schemas/user_group.py,sha256=uTTOVGoy89SxVDpJumjqOEWxqXWR41MNOTBDCyNxEDA,1478
 fractal_server/app/schemas/v2/__init__.py,sha256=XQex5ojpELgO0xvq2l-Y8oV85ZgM3GBj6lrGGctPb1g,3729
 fractal_server/app/schemas/v2/accounting.py,sha256=C_ekrYQwhi7PtrxxB07oVAG2y1NLigXjYwyp4E38fao,396
 fractal_server/app/schemas/v2/dataset.py,sha256=NKCjBwGBC7mPiSlXktZAcleJsvlLY6KfNKw7Wx4Zfqk,1728
@@ -92,14 +92,14 @@ fractal_server/app/schemas/v2/task_collection.py,sha256=BzHQXq2_zLZTbigWauOR5Zi-
 fractal_server/app/schemas/v2/task_group.py,sha256=4hNZUXnWYSozpLXR3JqBvGzfZBG2TbjqydckHHu2Aq0,3506
 fractal_server/app/schemas/v2/workflow.py,sha256=L-dW6SzCH_VNoH6ENip44lTgGGqVYHHBk_3PtM-Ooy8,1772
 fractal_server/app/schemas/v2/workflowtask.py,sha256=6eweAMyziwaoMT-7R1fVJYunIeZKzT0-7fAVgPO_FEc,3639
-fractal_server/app/security/__init__.py,sha256=gtfJkwdXTm_F38sFgb5LH3AcdvKs42fOUJa8jo8Cmbw,17484
+fractal_server/app/security/__init__.py,sha256=k-La8Da89C1hSUGsiidrWo6Az4u6dbe5PzN1Ctt1t34,18394
 fractal_server/app/security/signup_email.py,sha256=kphjq6TAygvPpYpg95QJWefyqmzdVrGz7fyRMctUJWE,1982
 fractal_server/app/shutdown.py,sha256=ViSNJyXWU_iWPSDOOMGNh_iQdUFrdPh_jvf8vVKLpAo,1950
 fractal_server/config/__init__.py,sha256=ZCmroNB50sUxJiFtkW0a4fFtmfyPnL4LWhtKY5FbQfg,737
 fractal_server/config/_data.py,sha256=9Jyt83yrSsr_0_9ANWDAXz88_jjyFlcB5VWJGXq8aUY,2311
 fractal_server/config/_database.py,sha256=YOBi3xuJno5wLGw1hKsjLm-bftaxVWiBNIQWVTMX3Ag,1661
 fractal_server/config/_email.py,sha256=j1QmZCyspNbD1xxkypc9Kv299tU3vTO1AqDFJ8-LZzQ,4201
-fractal_server/config/_main.py,sha256=L0sLfePAlnvEPxxtzDdY3xJRhzTAvIO5pdEoTd99byY,1605
+fractal_server/config/_main.py,sha256=9v64gJsvY1oGP70_AoJMnyMIeRo7FcIg6T8NDV-p9as,1992
 fractal_server/config/_oauth.py,sha256=7J4FphGVFfVmtQycCkas6scEJQJGZUGEzQ-t2PZiqSo,1934
 fractal_server/config/_settings_config.py,sha256=tsyXQOnn9QKCFJD6hRo_dJXlQQyl70DbqgHMJoZ1xnY,144
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
@@ -243,7 +243,7 @@ fractal_server/tasks/v2/templates/pixi_3_post_install.sh,sha256=99J8KXkNeQk9utuE
 fractal_server/tasks/v2/utils_background.py,sha256=jjWxNbHPuvAkXNIQ9Bqs67X72xHSRqmY8_BCoj0HM3E,4840
 fractal_server/tasks/v2/utils_database.py,sha256=C1td6m6ab1NdXVoT6stvVdrY_3FNck8OkRZZhn9h8ZA,1797
 fractal_server/tasks/v2/utils_package_names.py,sha256=RDg__xrvQs4ieeVzmVdMcEh95vGQYrv9Hfal-5EDBM8,2393
-fractal_server/tasks/v2/utils_pixi.py,sha256=tqCnxMdxs7KGWncWvk0alrdvDbX-w77P3fAot68Bqh4,3257
+fractal_server/tasks/v2/utils_pixi.py,sha256=4q0inbOfJ-TWe7wFIq-f7W7-iKyd98tgNQpEkR-TE6E,3441
 fractal_server/tasks/v2/utils_python_interpreter.py,sha256=36AvrMoydr9w6Rm_7hKl5QK8zYI0KIm4Pv8WHANWwjE,658
 fractal_server/tasks/v2/utils_templates.py,sha256=L5GblhIKJwyzUbCORj1et5mh-7mG19nT5kmIpxOEj90,3489
 fractal_server/types/__init__.py,sha256=aA_8J1xXzuiLqpwO_Qf18-qzaRcYkHzevhH_T-diXWM,2026
@@ -254,8 +254,8 @@ fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=HL
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=SYVVUuXe_nWyrJLsy7QA-KJscwc5PHEXjvsW4TK7XQI,2180
 fractal_server/zip_tools.py,sha256=H0w7wS5yE4ebj7hw1_77YQ959dl2c-L0WX6J_ro1TY4,4884
-fractal_server-2.17.0a8.dist-info/METADATA,sha256=pq54GpIDEoMvbVhOdhAZFeogzh1wQNJ0WcbSi0DsdSw,4226
-fractal_server-2.17.0a8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-fractal_server-2.17.0a8.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.17.0a8.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.17.0a8.dist-info/RECORD,,
+fractal_server-2.17.0a10.dist-info/METADATA,sha256=-hVkYe_goWyUvm96LujeOSDCXsmkYPVPlojm9jxLHGs,4227
+fractal_server-2.17.0a10.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+fractal_server-2.17.0a10.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.17.0a10.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.17.0a10.dist-info/RECORD,,