fractal-server 2.18.0a1__py3-none-any.whl → 2.18.0a3__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.18.0a1"
+__VERSION__ = "2.18.0a3"

fractal_server/__main__.py

@@ -167,7 +167,8 @@ def init_db_data(
             "`--admin-pwd` and `--admin-project-dir`. Exit."
         )
         sys.exit(1)
-    if admin_password and admin_email:
+
+    if admin_email:
         asyncio.run(
             _create_first_user(
                 email=admin_email,

fractal_server/app/models/security.py

@@ -6,7 +6,6 @@ from pydantic import EmailStr
 from sqlalchemy import Column
 from sqlalchemy import String
 from sqlalchemy.dialects.postgresql import ARRAY
-from sqlalchemy.dialects.postgresql import JSONB
 from sqlalchemy.types import DateTime
 from sqlmodel import Field
 from sqlmodel import Relationship
@@ -113,7 +112,13 @@ class UserOAuth(SQLModel, table=True):
         ondelete="RESTRICT",
     )
 
-    project_dir: str
+    # TODO-2.18.1: drop `project_dir`
+    project_dir: str | None = Field(default=None, nullable=True)
+    # TODO-2.18.1: `project_dirs: list[str] = Field(min_length=1)`
+    project_dirs: list[str] = Field(
+        sa_column=Column(ARRAY(String), nullable=False, server_default="{}"),
+    )
+
     slurm_accounts: list[str] = Field(
         sa_column=Column(ARRAY(String), server_default="{}"),
     )
@@ -135,6 +140,3 @@ class UserGroup(SQLModel, table=True):
         default_factory=get_timestamp,
         sa_column=Column(DateTime(timezone=True), nullable=False),
     )
-    viewer_paths: list[str] = Field(
-        sa_column=Column(JSONB, server_default="[]", nullable=False)
-    )

fractal_server/app/routes/api/__init__.py

@@ -8,7 +8,6 @@ from fastapi import Depends
 import fractal_server
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_superuser_act
-from fractal_server.config import get_data_settings
 from fractal_server.config import get_db_settings
 from fractal_server.config import get_email_settings
 from fractal_server.config import get_oauth_settings
@@ -50,14 +49,6 @@ async def view_email_settings(
     return settings.model_dump()
 
 
-@router_api.get("/settings/data/")
-async def view_data_settings(
-    user: UserOAuth = Depends(current_superuser_act),
-):
-    settings = Inject(get_data_settings)
-    return settings.model_dump()
-
-
 @router_api.get("/settings/oauth/")
 async def view_oauth_settings(
     user: UserOAuth = Depends(current_superuser_act),

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

@@ -1,3 +1,5 @@
+from pathlib import Path
+
 from fastapi import APIRouter
 from fastapi import Depends
 from fastapi import HTTPException
@@ -58,7 +60,7 @@ async def create_dataset(
         await db.commit()
         await db.refresh(db_dataset)
         path = (
-            f"{user.project_dir}/fractal/"
+            f"{user.project_dirs[0]}/fractal/"
             f"{project_id}_{sanitize_string(project.name)}/"
             f"{db_dataset.id}_{sanitize_string(db_dataset.name)}"
         )
@@ -69,6 +71,18 @@ async def create_dataset(
         await db.commit()
         await db.refresh(db_dataset)
     else:
+        if not any(
+            Path(dataset.zarr_dir).is_relative_to(project_dir)
+            for project_dir in user.project_dirs
+        ):
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+                detail=(
+                    "Dataset zarr_dir is not relative to any of the user "
+                    "project directories."
+                ),
+            )
+
         db_dataset = DatasetV2(project_id=project_id, **dataset.model_dump())
         db.add(db_dataset)
         await db.commit()
@@ -154,14 +168,26 @@ async def update_dataset(
     )
     db_dataset = output["dataset"]
 
-    if (dataset_update.zarr_dir is not None) and (len(db_dataset.images) != 0):
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-            detail=(
-                "Cannot modify `zarr_dir` because the dataset has a non-empty "
-                "image list."
-            ),
-        )
+    if dataset_update.zarr_dir is not None:
+        if db_dataset.images:
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+                detail=(
+                    "Cannot modify `zarr_dir` because the dataset has a "
+                    "non-empty image list."
+                ),
+            )
+        if not any(
+            Path(dataset_update.zarr_dir).is_relative_to(project_dir)
+            for project_dir in user.project_dirs
+        ):
+            raise HTTPException(
+                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+                detail=(
+                    "Dataset zarr_dir is not relative to any of the user "
+                    "project directories."
+                ),
+            )
 
     for key, value in dataset_update.model_dump(exclude_unset=True).items():
         setattr(db_dataset, key, value)

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

@@ -238,7 +238,7 @@ async def apply_workflow(
     )
 
     # Define user-side job directory
-    cache_dir = Path(user.project_dir, FRACTAL_CACHE_DIR)
+    cache_dir = Path(user.project_dirs[0], FRACTAL_CACHE_DIR)
     match resource.type:
         case ResourceType.LOCAL:
             WORKFLOW_DIR_REMOTE = WORKFLOW_DIR_LOCAL

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

@@ -5,12 +5,10 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
-from sqlmodel import select
 
 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.linkuserproject import LinkUserProjectV2
 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 WorkflowTaskCreateV2
@@ -53,31 +51,6 @@ async def create_workflowtask(
         db=db,
     )
 
-    res = await db.execute(
-        select(UserOAuth.id)
-        .join(LinkUserProjectV2, LinkUserProjectV2.user_id == UserOAuth.id)
-        .where(LinkUserProjectV2.project_id == project_id)
-        .where(LinkUserProjectV2.is_owner.is_(True))
-    )
-    project_owner_id = res.scalar_one()
-    if project_owner_id != user.id:
-        try:
-            await _get_task_read_access(
-                task_id=task_id,
-                user_id=project_owner_id,
-                db=db,
-                require_active=True,
-            )
-        except HTTPException as e:
-            raise (
-                HTTPException(
-                    status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-                    detail="The task must be accessible to the project owner.",
-                )
-                if e.status_code == 403
-                else e
-            )
-
     task = await _get_task_read_access(
         task_id=task_id, user_id=user.id, db=db, require_active=True
     )

fractal_server/app/routes/auth/current_user.py

@@ -2,21 +2,16 @@
 Definition of `/auth/current-user/` endpoints
 """
 
-import os
-
 from fastapi import APIRouter
 from fastapi import Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select
 
 from fractal_server.app.db import get_async_db
-from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import Profile
 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,
 )
@@ -26,9 +21,6 @@ from fractal_server.app.schemas.user import UserUpdate
 from fractal_server.app.schemas.user import UserUpdateStrict
 from fractal_server.app.security import UserManager
 from fractal_server.app.security import get_user_manager
-from fractal_server.config import DataAuthScheme
-from fractal_server.config import get_data_settings
-from fractal_server.syringe import Inject
 
 router_current_user = APIRouter()
 
@@ -106,58 +98,3 @@ async def get_current_user_profile_info(
         )
 
     return response_data
-
-
-@router_current_user.get(
-    "/current-user/allowed-viewer-paths/", response_model=list[str]
-)
-async def get_current_user_allowed_viewer_paths(
-    current_user: UserOAuth = Depends(current_user_act_ver),
-    db: AsyncSession = Depends(get_async_db),
-) -> list[str]:
-    """
-    Returns the allowed viewer paths for current user, according to the
-    selected FRACTAL_DATA_AUTH_SCHEME
-    """
-
-    data_settings = Inject(get_data_settings)
-
-    authorized_paths = []
-
-    if data_settings.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.NONE:
-        return authorized_paths
-
-    # Append `project_dir` to the list of authorized paths
-    authorized_paths.append(current_user.project_dir)
-
-    # If auth scheme is "users-folders" and `slurm_user` is set,
-    # build and append the user folder
-    if (
-        data_settings.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.USERS_FOLDERS
-        and current_user.profile_id is not None
-    ):
-        profile = await db.get(Profile, current_user.profile_id)
-        if profile is not None and profile.username is not None:
-            base_folder = data_settings.FRACTAL_DATA_BASE_FOLDER
-            user_folder = os.path.join(base_folder, profile.username)
-            authorized_paths.append(user_folder)
-
-    if data_settings.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.VIEWER_PATHS:
-        # Returns the union of `viewer_paths` for all user's groups
-        cmd = (
-            select(UserGroup.viewer_paths)
-            .join(LinkUserGroup, LinkUserGroup.group_id == UserGroup.id)
-            .where(LinkUserGroup.user_id == current_user.id)
-        )
-        res = await db.execute(cmd)
-        viewer_paths_nested = res.scalars().all()
-
-        # Flatten a nested object and make its elements unique
-        all_viewer_paths_set = {
-            path
-            for _viewer_paths in viewer_paths_nested
-            for path in _viewer_paths
-        }
-        authorized_paths.extend(all_viewer_paths_set)
-
-    return authorized_paths

fractal_server/app/routes/auth/group.py

@@ -16,7 +16,6 @@ from fractal_server.app.models import UserGroup
 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.config import get_settings
 from fractal_server.logger import set_logger
 from fractal_server.syringe import Inject
@@ -101,41 +100,13 @@ async def create_single_group(
         )
 
     # Create and return new group
-    new_group = UserGroup(
-        name=group_create.name, viewer_paths=group_create.viewer_paths
-    )
+    new_group = UserGroup(name=group_create.name)
     db.add(new_group)
     await db.commit()
 
     return dict(new_group.model_dump(), user_ids=[])
 
 
-@router_group.patch(
-    "/group/{group_id}/",
-    response_model=UserGroupRead,
-    status_code=status.HTTP_200_OK,
-)
-async def update_single_group(
-    group_id: int,
-    group_update: UserGroupUpdate,
-    user: UserOAuth = Depends(current_superuser_act),
-    db: AsyncSession = Depends(get_async_db),
-) -> UserGroupRead:
-    group = await _usergroup_or_404(group_id, db)
-
-    # Patch `viewer_paths`
-    if group_update.viewer_paths is not None:
-        group.viewer_paths = group_update.viewer_paths
-        db.add(group)
-        await db.commit()
-
-    updated_group = await _get_single_usergroup_with_user_ids(
-        group_id=group_id, db=db
-    )
-
-    return updated_group
-
-
 @router_group.delete("/group/{group_id}/", status_code=204)
 async def delete_single_group(
     group_id: int,

fractal_server/app/routes/auth/router.py

@@ -6,6 +6,7 @@ from .login import router_login
 from .oauth import get_oauth_router
 from .register import router_register
 from .users import router_users
+from .viewer_paths import router_viewer_paths
 
 router_auth = APIRouter()
 
@@ -14,6 +15,7 @@ router_auth.include_router(router_current_user)
 router_auth.include_router(router_login)
 router_auth.include_router(router_users)
 router_auth.include_router(router_group)
+router_auth.include_router(router_viewer_paths)
 router_oauth = get_oauth_router()
 if router_oauth is not None:
     router_auth.include_router(router_oauth)

fractal_server/app/routes/auth/viewer_paths.py

@@ -0,0 +1,43 @@
+from fastapi import APIRouter
+from fastapi import Depends
+from sqlalchemy.ext.asyncio import AsyncSession
+from sqlmodel import select
+
+from fractal_server.app.db import get_async_db
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.models.linkuserproject import LinkUserProjectV2
+from fractal_server.app.models.v2.dataset import DatasetV2
+from fractal_server.app.models.v2.project import ProjectV2
+from fractal_server.app.routes.auth import current_user_act_ver
+
+router_viewer_paths = APIRouter()
+
+
+@router_viewer_paths.get(
+    "/current-user/allowed-viewer-paths/", response_model=list[str]
+)
+async def get_current_user_allowed_viewer_paths(
+    include_shared_projects: bool = True,
+    current_user: UserOAuth = Depends(current_user_act_ver),
+    db: AsyncSession = Depends(get_async_db),
+) -> list[str]:
+    """
+    Returns the allowed viewer paths for current user.
+    """
+    authorized_paths = current_user.project_dirs.copy()
+
+    if include_shared_projects:
+        res = await db.execute(
+            select(DatasetV2.zarr_dir)
+            .join(ProjectV2, ProjectV2.id == DatasetV2.project_id)
+            .join(
+                LinkUserProjectV2, LinkUserProjectV2.project_id == ProjectV2.id
+            )
+            .where(LinkUserProjectV2.user_id == current_user.id)
+            .where(LinkUserProjectV2.is_owner.is_(False))
+        )
+        authorized_paths.extend(res.unique().scalars().all())
+        # Note that `project_dirs` and the `db.execute` result may have some
+        # common elements, and then this list may have non-unique items.
+
+    return authorized_paths

fractal_server/app/schemas/user.py

@@ -8,12 +8,18 @@ from pydantic import EmailStr
 from pydantic import Field
 
 from fractal_server.string_tools import validate_cmd
-from fractal_server.types import AbsolutePathStr
+from fractal_server.types import ListUniqueAbsolutePathStr
 from fractal_server.types import ListUniqueNonEmptyString
 from fractal_server.types import ListUniqueNonNegativeInt
 from fractal_server.types import NonEmptyStr
 
 
+def _validate_cmd_list(value: list[str]) -> list[str]:
+    for v in value:
+        validate_cmd(v)
+    return value
+
+
 class OAuthAccountRead(BaseModel):
     """
     Schema for storing essential `OAuthAccount` information within
@@ -38,20 +44,17 @@ class UserRead(schemas.BaseUser[int]):
         group_ids_names:
         oauth_accounts:
         profile_id:
+        project_dirs:
+        slurm_accounts:
     """
 
     group_ids_names: list[tuple[int, str]] | None = None
     oauth_accounts: list[OAuthAccountRead]
     profile_id: int | None = None
-    project_dir: str
+    project_dirs: list[str]
     slurm_accounts: list[str]
 
 
-def _validate_cmd(value: str) -> str:
-    validate_cmd(value)
-    return value
-
-
 class UserUpdate(schemas.BaseUserUpdate):
     """
     Schema for `User` update.
@@ -63,7 +66,7 @@ class UserUpdate(schemas.BaseUserUpdate):
         is_superuser:
         is_verified:
         profile_id:
-        project_dir:
+        project_dirs:
         slurm_accounts:
     """
 
@@ -74,9 +77,9 @@ class UserUpdate(schemas.BaseUserUpdate):
     is_superuser: bool = None
     is_verified: bool = None
     profile_id: int | None = None
-    project_dir: Annotated[AbsolutePathStr, AfterValidator(_validate_cmd)] = (
-        None
-    )
+    project_dirs: Annotated[
+        ListUniqueAbsolutePathStr, AfterValidator(_validate_cmd_list)
+    ] = None
     slurm_accounts: ListUniqueNonEmptyString = None
 
 
@@ -98,10 +101,14 @@ class UserCreate(schemas.BaseUserCreate):
 
     Attributes:
         profile_id:
+        project_dirs:
+        slurm_accounts:
     """
 
     profile_id: int | None = None
-    project_dir: Annotated[AbsolutePathStr, AfterValidator(_validate_cmd)]
+    project_dirs: Annotated[
+        ListUniqueAbsolutePathStr, AfterValidator(_validate_cmd_list)
+    ] = Field(min_length=1)
     slurm_accounts: list[str] = Field(default_factory=list)
 
 
@@ -109,6 +116,8 @@ class UserUpdateGroups(BaseModel):
     """
     Schema for `POST /auth/users/{user_id}/set-groups/`
 
+    Attributes:
+        group_ids:
     """
 
     model_config = ConfigDict(extra="forbid")
@@ -117,6 +126,14 @@ class UserUpdateGroups(BaseModel):
 
 
 class UserProfileInfo(BaseModel):
+    """
+    Attributes:
+        has_profile:
+        resource_name:
+        profile_name:
+        username:
+    """
+
     has_profile: bool
     resource_name: str | None = None
     profile_name: str | None = None

fractal_server/app/schemas/user_group.py

@@ -2,16 +2,13 @@ from datetime import datetime
 
 from pydantic import BaseModel
 from pydantic import ConfigDict
-from pydantic import Field
 from pydantic import field_serializer
 from pydantic.types import AwareDatetime
 
-from fractal_server.types import ListUniqueAbsolutePathStr
 from fractal_server.types import NonEmptyStr
 
 __all__ = (
     "UserGroupRead",
-    "UserGroupUpdate",
     "UserGroupCreate",
 )
 
@@ -34,7 +31,6 @@ class UserGroupRead(BaseModel):
     name: str
     timestamp_created: AwareDatetime
     user_ids: list[int] | None = None
-    viewer_paths: list[str]
 
     @field_serializer("timestamp_created")
     def serialize_datetime(v: datetime) -> str:
@@ -52,14 +48,3 @@ class UserGroupCreate(BaseModel):
     model_config = ConfigDict(extra="forbid")
 
     name: NonEmptyStr
-    viewer_paths: ListUniqueAbsolutePathStr = Field(default_factory=list)
-
-
-class UserGroupUpdate(BaseModel):
-    """
-    Schema for `UserGroup` update
-    """
-
-    model_config = ConfigDict(extra="forbid")
-
-    viewer_paths: ListUniqueAbsolutePathStr = None

fractal_server/app/security/__init__.py

@@ -425,7 +425,7 @@ async def _create_first_user(
                     kwargs = dict(
                         email=email,
                         password=password,
-                        project_dir=project_dir,
+                        project_dirs=[project_dir],
                         profile_id=profile_id,
                         is_superuser=is_superuser,
                         is_verified=is_verified,

fractal_server/config/__init__.py

@@ -1,5 +1,3 @@
-from ._data import DataAuthScheme  # noqa F401
-from ._data import DataSettings
 from ._database import DatabaseSettings
 from ._email import EmailSettings
 from ._email import PublicEmailSettings  # noqa F401
@@ -21,7 +19,3 @@ def get_email_settings(email_settings=EmailSettings()) -> EmailSettings:
 
 def get_oauth_settings(oauth_settings=OAuthSettings()) -> OAuthSettings:
     return oauth_settings
-
-
-def get_data_settings(data_settings=DataSettings()) -> DataSettings:
-    return data_settings

fractal_server/config/_data.py

@@ -1,79 +0,0 @@
-from enum import StrEnum
-from typing import Self
-
-from pydantic import model_validator
-from pydantic_settings import BaseSettings
-from pydantic_settings import SettingsConfigDict
-
-from fractal_server.types import AbsolutePathStr
-
-from ._settings_config import SETTINGS_CONFIG_DICT
-
-
-class DataAuthScheme(StrEnum):
-    VIEWER_PATHS = "viewer-paths"
-    USERS_FOLDERS = "users-folders"
-    NONE = "none"
-
-
-class DataSettings(BaseSettings):
-    """
-    Settings for the `fractal-data` integration.
-
-    See https://github.com/fractal-analytics-platform/fractal-data.
-
-    Attributes:
-        FRACTAL_DATA_AUTH_SCHEME:
-            Defines how the list of allowed viewer paths is built.
-
-            This variable affects the
-            `GET /auth/current-user/allowed-viewer-paths/` response, which is
-            then consumed by
-            [fractal-data](https://github.com/fractal-analytics-platform/fractal-data).
-
-            Options:
-                <ul>
-                <li> `"viewer-paths"`: The list of allowed viewer paths will
-                    include the user's `project_dir` along with any path
-                    defined in  UserGroups `viewer_paths` attributes.
-                </li>
-                <li> `"users-folders"`: The list will consist of the user's
-                    `project_dir` and a user-specific folder. The user folder
-                    is constructed by concatenating the base folder
-                    `FRACTAL_DATA_BASE_FOLDER` with the user's profile
-                    `username`.
-                </li>
-                <li> `"none"`: An empty list will be returned, indicating no
-                    access to viewer paths. Useful when vizarr viewer is not
-                    used.
-                </li>
-                </ul>
-        FRACTAL_DATA_BASE_FOLDER:
-            Base path to Zarr files that will be served by
-            fractal-vizarr-viewer.
-            This variable is required and used only when
-            `FRACTAL_DATA_AUTHORIZATION_SCHEME` is set to `"users-folders"`.
-    """
-
-    model_config = SettingsConfigDict(**SETTINGS_CONFIG_DICT)
-
-    FRACTAL_DATA_AUTH_SCHEME: DataAuthScheme = "none"
-
-    FRACTAL_DATA_BASE_FOLDER: AbsolutePathStr | None = None
-
-    @model_validator(mode="after")
-    def check(self: Self) -> Self:
-        """
-        `FRACTAL_DATA_BASE_FOLDER` is required when
-        `FRACTAL_DATA_AUTHORIZATION_SCHEME` is set to `"users-folders"`.
-        """
-        if (
-            self.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.USERS_FOLDERS
-            and self.FRACTAL_DATA_BASE_FOLDER is None
-        ):
-            raise ValueError(
-                "FRACTAL_DATA_BASE_FOLDER is required when "
-                "FRACTAL_DATA_AUTH_SCHEME is set to "
-                "users-folders"
-            )
-        return self

fractal_server/config/_main.py

@@ -41,6 +41,10 @@ class Settings(BaseSettings):
             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_LONG_REQUEST_TIME:
+            Time limit beyond which the execution of an API request is
+            considered *slow* and an appropriate warning is logged by the
+            middleware.
     """
 
     model_config = SettingsConfigDict(**SETTINGS_CONFIG_DICT)
@@ -57,3 +61,4 @@ class Settings(BaseSettings):
     FRACTAL_GRACEFUL_SHUTDOWN_TIME: float = 30.0
     FRACTAL_HELP_URL: HttpUrl | None = None
     FRACTAL_DEFAULT_GROUP_NAME: Literal["All"] | None = None
+    FRACTAL_LONG_REQUEST_TIME: float = 30.0

fractal_server/data_migrations/2_18_1.py

@@ -0,0 +1,29 @@
+import logging
+import sys
+
+from sqlalchemy.orm.attributes import flag_modified
+from sqlmodel import select
+
+from fractal_server.app.db import get_sync_db
+from fractal_server.app.models import UserOAuth
+
+logging.basicConfig(level=logging.INFO)
+
+
+def fix_db():
+    logging.info("START - fix db")
+
+    with next(get_sync_db()) as db:
+        res = db.execute(select(UserOAuth).order_by(UserOAuth.email))
+        user_list = res.scalars().unique().all()
+
+        for user in user_list:
+            logging.info(f"Now handling user {user.email}.")
+            if user.project_dirs != []:
+                sys.exit(f"Non empty `project_dirs` for User[{user.id}]")
+            user.project_dirs.append(user.project_dir)
+            flag_modified(user, "project_dirs")
+
+        db.commit()
+
+    logging.info("END - fix db")

fractal_server/main.py

@@ -1,15 +1,20 @@
 import os
+import time
 from contextlib import asynccontextmanager
+from datetime import datetime
 from itertools import chain
 
 from fastapi import FastAPI
+from starlette.types import Message
+from starlette.types import Receive
+from starlette.types import Scope
+from starlette.types import Send
 
 from fractal_server import __VERSION__
 from fractal_server.app.schemas.v2 import ResourceType
 
 from .app.routes.aux._runner import _backend_supports_shutdown
 from .app.shutdown import cleanup_after_shutdown
-from .config import get_data_settings
 from .config import get_db_settings
 from .config import get_email_settings
 from .config import get_settings
@@ -54,14 +59,12 @@ def check_settings() -> None:
     settings = Inject(get_settings)
     db_settings = Inject(get_db_settings)
     email_settings = Inject(get_email_settings)
-    data_settings = Inject(get_data_settings)
     logger = set_logger("fractal_server_settings")
     logger.debug("Fractal Settings:")
     for key, value in chain(
         db_settings.model_dump().items(),
         settings.model_dump().items(),
         email_settings.model_dump().items(),
-        data_settings.model_dump().items(),
     ):
         if any(s in key.upper() for s in ["PASSWORD", "SECRET", "KEY"]):
             value = "*****"
@@ -131,6 +134,50 @@ async def lifespan(app: FastAPI):
     reset_logger_handlers(logger)
 
 
+slow_response_logger = set_logger("slow-response")
+
+MIDDLEWARE_DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S.%f"
+
+
+class SlowResponseMiddleware:
+    def __init__(self, app: FastAPI, time_threshold: float):
+        self.app = app
+        self.time_threshold = time_threshold
+
+    async def __call__(self, scope: Scope, receive: Receive, send: Send):
+        # Filter out any non-http scope (e.g. `type="lifespan"`)
+        if scope["type"] != "http":
+            await self.app(scope, receive, send)
+            return
+
+        # Mutable variable which can be updated from within `send_wrapper`
+        context = {"status_code": None}
+
+        async def send_wrapper(message: Message):
+            if message["type"] == "http.response.start":
+                context["status_code"] = message["status"]
+            await send(message)
+
+        # Measure request time
+        start_timestamp = datetime.now()
+        start_time = time.perf_counter()
+        await self.app(scope, receive, send_wrapper)
+        stop_time = time.perf_counter()
+        request_time = stop_time - start_time
+
+        # Log if process time is too high
+        if request_time > self.time_threshold:
+            end_timestamp = datetime.now()
+            slow_response_logger.warning(
+                f"{scope['method']} {scope['route'].path}"
+                f"?{scope['query_string'].decode('utf-8')}, "
+                f"{context['status_code']}, "
+                f"{request_time:.2f}, "
+                f"{start_timestamp.strftime(MIDDLEWARE_DATETIME_FORMAT)}, "
+                f"{end_timestamp.strftime(MIDDLEWARE_DATETIME_FORMAT)}"
+            )
+
+
 def start_application() -> FastAPI:
     """
     Create the application, initialise it and collect all available routers.
@@ -140,6 +187,13 @@ def start_application() -> FastAPI:
             The fully initialised application.
     """
     app = FastAPI(lifespan=lifespan)
+
+    settings = Inject(get_settings)
+    app.add_middleware(
+        SlowResponseMiddleware,
+        time_threshold=settings.FRACTAL_LONG_REQUEST_TIME,
+    )
+
     collect_routers(app)
     return app
 

fractal_server/migrations/versions/7910eed4cf97_user_project_dirs_and_usergroup_viewer_.py

@@ -0,0 +1,60 @@
+"""User project_dirs and UserGroup viewer paths
+
+Revision ID: 7910eed4cf97
+Revises: bc0e8b3327a7
+Create Date: 2025-11-27 16:02:51.824653
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "7910eed4cf97"
+down_revision = "bc0e8b3327a7"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("user_oauth", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "project_dirs",
+                postgresql.ARRAY(sa.String()),
+                server_default="{}",
+                nullable=False,
+            )
+        )
+        batch_op.alter_column(
+            "project_dir", existing_type=sa.VARCHAR(), nullable=True
+        )
+
+    with op.batch_alter_table("usergroup", schema=None) as batch_op:
+        batch_op.drop_column("viewer_paths")
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("usergroup", schema=None) as batch_op:
+        batch_op.add_column(
+            sa.Column(
+                "viewer_paths",
+                postgresql.JSONB(astext_type=sa.Text()),
+                server_default=sa.text("'[]'::json"),
+                autoincrement=False,
+                nullable=False,
+            )
+        )
+
+    with op.batch_alter_table("user_oauth", schema=None) as batch_op:
+        batch_op.alter_column(
+            "project_dir", existing_type=sa.VARCHAR(), nullable=False
+        )
+        batch_op.drop_column("project_dirs")
+
+    # ### end Alembic commands ###

fractal_server/runner/v2/_local.py

@@ -59,7 +59,7 @@ def process_workflow(
         resource: Computational resource for running this job.
         profile: Computational profile for running this job.
         user_cache_dir:
-            User-writeable folder (typically a subfolder of `project_dir`).
+            User-writeable folder (typically a subfolder of `project_dirs`).
             Only relevant for `slurm_sudo` and `slurm_ssh` backends.
         fractal_ssh:
             `FractalSSH` object, only relevant for the `slurm_ssh` backend.

fractal_server/runner/v2/_slurm_ssh.py

@@ -80,7 +80,7 @@ def process_workflow(
         resource: Computational resource for running this job.
         profile: Computational profile for running this job.
         user_cache_dir:
-            User-writeable folder (typically a subfolder of `project_dir`).
+            User-writeable folder (typically a subfolder of `project_dirs`).
             Only relevant for `slurm_sudo` and `slurm_ssh` backends.
         fractal_ssh:
             `FractalSSH` object, only relevant for the `slurm_ssh` backend.

fractal_server/runner/v2/_slurm_sudo.py

@@ -77,7 +77,7 @@ def process_workflow(
         resource: Computational resource for running this job.
         profile: Computational profile for running this job.
         user_cache_dir:
-            User-writeable folder (typically a subfolder of `project_dir`).
+            User-writeable folder (typically a subfolder of `project_dirs`).
             Only relevant for `slurm_sudo` and `slurm_ssh` backends.
         fractal_ssh:
             `FractalSSH` object, only relevant for the `slurm_ssh` backend.

fractal_server/types/__init__.py

@@ -9,6 +9,7 @@ from pydantic.types import StringConstraints
 from fractal_server.urls import normalize_url
 
 from .validators import val_absolute_path
+from .validators import val_canonical_path
 from .validators import val_http_url
 from .validators import val_unique_list
 from .validators import valdict_keys
@@ -27,9 +28,13 @@ A non-empty string, with no leading/trailing whitespaces.
 AbsolutePathStr = Annotated[
     NonEmptyStr,
     AfterValidator(val_absolute_path),
+    AfterValidator(val_canonical_path),
 ]
 """
 String representing an absolute path.
+
+Validation fails if the path is not absolute or if it contains a
+parent-directory reference "/../".
 """
 
 
@@ -44,19 +49,27 @@ String representing an URL.
 
 ZarrUrlStr = Annotated[
     NonEmptyStr,
+    AfterValidator(val_canonical_path),
     AfterValidator(normalize_url),
 ]
 """
 String representing a zarr URL/path.
+
+Validation fails if the path is not absolute or if it contains a
+parent-directory reference "/../".
 """
 
 
 ZarrDirStr = Annotated[
     NonEmptyStr,
+    AfterValidator(val_canonical_path),
     AfterValidator(normalize_url),
 ]
 """
 String representing a `zarr_dir` path.
+
+Validation fails if the path is not absolute or if it contains a
+parent-directory reference "/../".
 """
 
 DictStrAny = Annotated[

fractal_server/types/validators/__init__.py

@@ -1,4 +1,5 @@
 from ._common_validators import val_absolute_path  # noqa F401
+from ._common_validators import val_canonical_path  # noqa F401
 from ._common_validators import val_http_url  # noqa F401
 from ._common_validators import val_unique_list  # noqa F401
 from ._common_validators import valdict_keys  # noqa F401

fractal_server/types/validators/_common_validators.py

@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 from typing import Any
 
 from pydantic import HttpUrl
@@ -29,6 +30,15 @@ def val_absolute_path(path: str) -> str:
     return path
 
 
+def val_canonical_path(path: str) -> str:
+    """
+    Check that a string attribute has no '/../' in it
+    """
+    if ".." in Path(path).parts:
+        raise ValueError("String must not contain '/../'.")
+    return path
+
+
 def val_unique_list(must_be_unique: list) -> list:
     if len(set(must_be_unique)) != len(must_be_unique):
         raise ValueError("List has repetitions")

{fractal_server-2.18.0a1.dist-info → fractal_server-2.18.0a3.dist-info}/METADATA

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

{fractal_server-2.18.0a1.dist-info → fractal_server-2.18.0a3.dist-info}/RECORD

@@ -1,12 +1,12 @@
-fractal_server/__init__.py,sha256=d1wgepBuIO5PKrE5xiGZw1xlgLPm7KgGhQwIApPL-xw,25
-fractal_server/__main__.py,sha256=o63YYNPm6wv0YG5PTtxPselXY6g3ii5VoBP8blPGgK8,11423
+fractal_server/__init__.py,sha256=YVD3Xi1NM3Zl__B7xtAU5mWok-xR764nteyhjwyFRHU,25
+fractal_server/__main__.py,sha256=QeKoAgqoiozLJDa8kSVe-Aso1WWgrk1yLUYWS8RxZVM,11405
 fractal_server/alembic.ini,sha256=MWwi7GzjzawI9cCAK1LW7NxIBQDUqD12-ptJoq5JpP0,3153
 fractal_server/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/db/__init__.py,sha256=Otswoi_PlwX1zRhLTFQUKbW9Ho7piRn8dezjq8k-XaU,2834
 fractal_server/app/models/__init__.py,sha256=oglUT1A1lLhXy2GFz3XsQ7wqkyfs3NXRtuNov-gOHXM,368
 fractal_server/app/models/linkusergroup.py,sha256=3KkkE4QIUAlTrBAZs_tVy0pGvAxUAq6yOEjflct_z2M,678
 fractal_server/app/models/linkuserproject.py,sha256=LW09JFTY2lFLqp3KdxUNjldeJRaao3WnTko_gS21EU4,1572
-fractal_server/app/models/security.py,sha256=p9h1wqWzkJ2_P1kVmsHgeA81Bt5DU24v7THCr2-J238,4671
+fractal_server/app/models/security.py,sha256=mhKmRN5Ln2nwDOf-K_-BrSdTB6qQZrjeT_FiD76sMu4,4781
 fractal_server/app/models/v2/__init__.py,sha256=xL05Mvdx0dqUFhJf694oPfuqkUQxZbxOkoUgRuNIXl4,949
 fractal_server/app/models/v2/accounting.py,sha256=VNweFARrvY3mj5LI0834Ku061S2aGC61kuVHzi_tZhc,1187
 fractal_server/app/models/v2/dataset.py,sha256=BL5elDU0UXnUSwvuXSO4JeKa9gje0QFerU_LP7sI754,1273
@@ -32,7 +32,7 @@ fractal_server/app/routes/admin/v2/sharing.py,sha256=x7RtbDPapyENEU_s4-glPoEeEOx
 fractal_server/app/routes/admin/v2/task.py,sha256=DMGMUY2uF55wrCkPr3u8qBLp4UWZbAEk2W5sbYMQS-Q,6101
 fractal_server/app/routes/admin/v2/task_group.py,sha256=CodDIzTBbTOOdLbXr7qAv6VZydpA6xl0be0W_cw42tE,9330
 fractal_server/app/routes/admin/v2/task_group_lifecycle.py,sha256=3LtyLDLFDEWSx9e4huXV_uBUdoDuIWib7IzMjlD1OMI,9975
-fractal_server/app/routes/api/__init__.py,sha256=kq_c4t4a0rrJ6zMO0WGOTjCHf46SAlmWhh7Sa-3LkNg,1659
+fractal_server/app/routes/api/__init__.py,sha256=GaNOm1elJLldHNWZ482qlvETLAXhdJ8u_X6kGxMmwQs,1409
 fractal_server/app/routes/api/v2/__init__.py,sha256=lOSRxe408B3dUfd1FtpfynEWBwKDVFlUt3I4NpIQTRo,2938
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=df6-Eep_402StSOiGeDHfKWZb7E1yJkFyHdi_EThRgE,15921
 fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=RhKheO2mdSpA0PYGPuDfr8XTaE4e8LkuKeVJlilNtko,5683
@@ -41,7 +41,7 @@ fractal_server/app/routes/api/v2/_aux_functions_task_lifecycle.py,sha256=u7KO6VX
 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=jg1QUQhDmeTw6c36-gBOVqOiBgI9kqBiuU77hHaJ_ag,13627
 fractal_server/app/routes/api/v2/_aux_task_group_disambiguation.py,sha256=vdvMTa3San1HMTzctN5Vk7zxpqe4ccByrFBQyHfgWW8,4889
-fractal_server/app/routes/api/v2/dataset.py,sha256=FE5m8t8KyBQG-df_uBJIpaPHBjbHOGkFbSDhMN6fsuw,8579
+fractal_server/app/routes/api/v2/dataset.py,sha256=oDS8_2nzG923VnvspSud94OC1CKgqA2yPcvY5pd_aX4,9477
 fractal_server/app/routes/api/v2/history.py,sha256=BYsfBlvcBGbJCL47KlMpZDktXAHB8ft2nIaOQMMjqPA,18183
 fractal_server/app/routes/api/v2/images.py,sha256=k9wd44iwjCtEWSH9j6X6zToBwuOOo6J4FxSW7AGbPHA,8266
 fractal_server/app/routes/api/v2/job.py,sha256=vRN3Ovwami_4CpZw8zJN1azltMCh2ed42dlOfVHHG6Q,7274
@@ -49,7 +49,7 @@ fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=Cs_ODoRWmkbSJJh
 fractal_server/app/routes/api/v2/project.py,sha256=TlcixNdrss6-0jSiFGnlLP-qCsuX8_nhUyagG5tip3c,5833
 fractal_server/app/routes/api/v2/sharing.py,sha256=MvegcF3xaT9nztVwLiUisp4B8IrKRa2LVlSR2GGTqYk,9398
 fractal_server/app/routes/api/v2/status_legacy.py,sha256=zP5YheZBoeffanUpVZvKYL4kYIiGIkGtR9W9GX0pXVE,6599
-fractal_server/app/routes/api/v2/submit.py,sha256=HScEY2IC4xVLXBoe1Pwiy9bjNR1FnEuAJWjQTidEGFU,9562
+fractal_server/app/routes/api/v2/submit.py,sha256=FpdMRCRDLGEXWPIDC6m9EcvrhysQo43fmMRMJ6UAKQY,9566
 fractal_server/app/routes/api/v2/task.py,sha256=gekExcUmk-A8psT0_D356U-j8k38aw_wrCO8kWgG2Tw,7536
 fractal_server/app/routes/api/v2/task_collection.py,sha256=x6TMI3JeeIJQJS7bIbn3fnRZaxIxQlp-SQHr2ZVDLBw,12384
 fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=9Ycm8-C_bgsEgjqyRLqa64e0HwMVYZWPYr--r-oomB4,6948
@@ -59,24 +59,25 @@ fractal_server/app/routes/api/v2/task_group_lifecycle.py,sha256=g20Egnwlw8Qvm1Pz
 fractal_server/app/routes/api/v2/task_version_update.py,sha256=p0Bk8B7EZi9T0IWeDPqH7U7JNcjMGj1x72-ngZGgTOU,8497
 fractal_server/app/routes/api/v2/workflow.py,sha256=EW6u-_O6ox3DVBYgrllMfCMHC-DNetUNT6OZudbThko,10830
 fractal_server/app/routes/api/v2/workflow_import.py,sha256=zSCWKFzwIX2fWpxZJKXHbFk11nuUrgJL50-P0E_vYTc,9668
-fractal_server/app/routes/api/v2/workflowtask.py,sha256=R9yFTSfyIAfL42tNnbGUZ3CHSdko8-kSPKww9Erg4QE,9237
+fractal_server/app/routes/api/v2/workflowtask.py,sha256=t4h7l63Kfr0vrD6OsN39YSDBXQyoyPqFX3hX7mYXk3U,8274
 fractal_server/app/routes/auth/__init__.py,sha256=RghfjGuu0RTW8RxBCvaePx9KErO4rTkI96XgbtbeSJU,2337
 fractal_server/app/routes/auth/_aux_auth.py,sha256=s_boxuhPC60j74NmE8FopYPv_Fc4hiADvL0beWPcuE0,5474
-fractal_server/app/routes/auth/current_user.py,sha256=Y_2Es3HFtTMuVUmWVHFFvk3vsRgmlqS_x5BwkeavlvI,5552
-fractal_server/app/routes/auth/group.py,sha256=5bIM8LoUVv1C5-bMYoJbNSS8eESgVpK8-o47sUjMcZU,7293
+fractal_server/app/routes/auth/current_user.py,sha256=uDWttWo9isG69Jv1EGnnr2Ki5ZGd0D76jgjVDQMkn8c,3251
+fractal_server/app/routes/auth/group.py,sha256=uR98vdQHH-7BFl-Czj85ESPxT2yQymy4qtagaMrnUPU,6491
 fractal_server/app/routes/auth/login.py,sha256=buVa5Y8T0cd_SW1CqC-zMv-3SfPxGJknf7MYlUyKOl0,567
 fractal_server/app/routes/auth/oauth.py,sha256=NxrwOWBGPe7hLPEnD66nfWPGMWzDM80LIrwtmONVw-4,2731
 fractal_server/app/routes/auth/register.py,sha256=IiUJhgY0ZrTs0RlBRRjoTv4wF5Gb3eXTInFV-dXkpsE,615
-fractal_server/app/routes/auth/router.py,sha256=-E87A8h2UvcLucy5xjzKiWbXHVKcqxUmmZGeV_utEzA,598
+fractal_server/app/routes/auth/router.py,sha256=Zip_fw9qJWtoXWjluznschyrCKb2n_rf3xWarSXMkgI,692
 fractal_server/app/routes/auth/users.py,sha256=2E1TEWRGprp-TyF39VJ3Bu6p9tyy37xObG0Ijqa1aHg,7089
+fractal_server/app/routes/auth/viewer_paths.py,sha256=pzlZ1Gd_CDHVCD9ysJPfJwSbwemSab2wuEfHg0dKnxI,1616
 fractal_server/app/routes/aux/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/app/routes/aux/_job.py,sha256=n-UhONvomKyKkQDDqd0lFh2kCMhlCGXpfdMNW39R1E4,644
 fractal_server/app/routes/aux/_runner.py,sha256=-SvcXCVEV7Mb6q4PbbxuTCCruX6sAlR5QGXk9CzBVv8,979
 fractal_server/app/routes/aux/validate_user_profile.py,sha256=fGqJDdAFkbQoEIjqZ5F9-SDY_4os63R2EUMqODC7eBg,1969
 fractal_server/app/routes/pagination.py,sha256=C4XW6cnyDfyu1XMHXRN4wgk72lsS0UtlINZmwGZFb4Y,1174
 fractal_server/app/schemas/__init__.py,sha256=VIWJCaqokte3OljDLX00o-EC2d12rFoPb5HOLKQI94Y,86
-fractal_server/app/schemas/user.py,sha256=ed1kXyVoCboNiHTQSA9EVGCZNIFByFknPluehHbYKmE,2900
-fractal_server/app/schemas/user_group.py,sha256=uTTOVGoy89SxVDpJumjqOEWxqXWR41MNOTBDCyNxEDA,1478
+fractal_server/app/schemas/user.py,sha256=6-UoImeMCcmu6-CJ4CYNNCVuB3s99wpRYn5PFgIc6Bg,3265
+fractal_server/app/schemas/user_group.py,sha256=irel29GbffKCXNcyrAYbNSN3pCgmoUQ1wG32_s6jvos,1082
 fractal_server/app/schemas/v2/__init__.py,sha256=mMhdt4Jo-lyG8bITGAbpuyhDJx4MNgk-VSTKqcE6Ymo,4101
 fractal_server/app/schemas/v2/accounting.py,sha256=6EVUdPTkFY6Wb9-Vc0cIEZYVXwGEvJ3tP4YOXYE1hao,546
 fractal_server/app/schemas/v2/dataset.py,sha256=cBsEkny-EgNqFETMGRbJu5ChfYOnsKhkivqXK5dEOxQ,1938
@@ -94,16 +95,17 @@ fractal_server/app/schemas/v2/task_collection.py,sha256=QUiMAwckHSzjXlC_cyNSR1QX
 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=ckfPmbPTAn0lzbiaWQItdGxEUuWsRxiWBj898VEb1gw,3640
-fractal_server/app/security/__init__.py,sha256=L-Q0wsh2GjDyeiT4FfgWTyfrSH1QA52cp9zl5U5OT9I,18360
+fractal_server/app/security/__init__.py,sha256=sblIH9DFCt_iyk22WzV6k4LuKdbvNPtS1HqPCHIiBJ4,18363
 fractal_server/app/security/signup_email.py,sha256=ZnwwjpL6jyIkegHBebTqYYGGVtllLI0_x48K-yJtkNk,1969
 fractal_server/app/shutdown.py,sha256=QU4DfNvqwUXlHiLORtYJit4DxlFQo014SKTfs4dcE2U,2295
-fractal_server/config/__init__.py,sha256=ZCmroNB50sUxJiFtkW0a4fFtmfyPnL4LWhtKY5FbQfg,737
-fractal_server/config/_data.py,sha256=M7bwGDrvTV2mIo9Y3BilzluCyEIlE-PyIjCdcTbzWZg,2804
+fractal_server/config/__init__.py,sha256=WvcoE3qiY1qnkumv3qspcemCFw5iFG5NkSFR78vN4ks,562
+fractal_server/config/_data.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/config/_database.py,sha256=0_FvboMkQEKKRxvr9uFdp98oiQwMTFbdCW3loTZNSY0,1846
 fractal_server/config/_email.py,sha256=vMwLHN9-beYp_-up-WkTpeyNUZk4EHwt3N2l6-PYnx4,4364
-fractal_server/config/_main.py,sha256=s11lg9r-4hALGefG8xiMlc12ul0hL7ct4YviD-YBWWE,2230
+fractal_server/config/_main.py,sha256=H2VbUsQEb4lnwe-ReHqHrb3IVbTdxxBUtbXkVlQ6JzY,2478
 fractal_server/config/_oauth.py,sha256=UTmlFppDZcOQhr3RvkiG5XMqvr54XRAQ_Y-iR0V8N-8,2024
 fractal_server/config/_settings_config.py,sha256=tsyXQOnn9QKCFJD6hRo_dJXlQQyl70DbqgHMJoZ1xnY,144
+fractal_server/data_migrations/2_18_1.py,sha256=swGQGMOh5HzB09CVWVpk_a0OoksuYKQq-_MuWK89WME,815
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/exceptions.py,sha256=l6aZDk_6u_9PwDaQSoIFdI40ekpzqOJaxjx5rhW-HVI,141
@@ -113,7 +115,7 @@ fractal_server/images/models.py,sha256=dNcCW7XzRRbqL86LJ5aGc6LUAqIPsZXMq67IZyGbI
 fractal_server/images/status_tools.py,sha256=Is2QWThbLCrVJuI0NpGv7TcWs1T8z8q_8Qsidr3TdBU,4932
 fractal_server/images/tools.py,sha256=37jVIU6RiAGbiyucNDlKe9J3yN3Y47NOvv-RJor9Jm0,4154
 fractal_server/logger.py,sha256=9EhRdgPnGdbJ51vxhOD42K0iaDRhKx7wuikpHoh9kzY,5302
-fractal_server/main.py,sha256=6hI23zI6x3Hz1Cj7JDBNHFYVg5yCymL8oe5UyIc9T2Q,4420
+fractal_server/main.py,sha256=CrPlBe95ng1nYiVRRl_F5qe6h0W_YTVt_H0zXXJJf8c,6255
 fractal_server/migrations/env.py,sha256=nfyBpMIOT3kny6t-b-tUjyRjZ4k906bb1_wCQ7me1BI,1353
 fractal_server/migrations/naming_convention.py,sha256=bSEMiMZeArmWKrUk-12lhnOw1pAFMg6LEl7yucohPqc,263
 fractal_server/migrations/versions/034a469ec2eb_task_groups.py,sha256=uuf0sJibC4Am1HDb_dX_Jdj2oinptlg2ojiHwCpjDCY,6155
@@ -135,6 +137,7 @@ fractal_server/migrations/versions/5bf02391cfef_v2.py,sha256=jTNyZ8H5VDh4eRvCEy-
 fractal_server/migrations/versions/70e77f1c38b0_add_applyworkflow_first_task_index_and_.py,sha256=vJ6nDb7UnkCMIPg2zNM7ZE0JOTvaqFL3Fe9UarP-ivM,1633
 fractal_server/migrations/versions/71eefd1dd202_add_slurm_accounts.py,sha256=qpHZC97AduFk5_G0xHs9akhnhpzb1LZooYCTPHy7n28,1353
 fractal_server/migrations/versions/7673fe18c05d_remove_project_dir_server_default.py,sha256=PwTfY9Kq3_cwb5G4E0sM9u7UjzOhOwsYCspymmPgipQ,795
+fractal_server/migrations/versions/7910eed4cf97_user_project_dirs_and_usergroup_viewer_.py,sha256=FvX6dq0DsbKmF-M1TZ63b6lpPGCiJev88sVmQOU80M4,1730
 fractal_server/migrations/versions/791ce783d3d8_add_indices.py,sha256=IeWDVBRryFcFYIJVXhj-QJ6jczGnN_41K7sh6RYF0C4,1154
 fractal_server/migrations/versions/83bc2ad3ffcc_2_17_0.py,sha256=bLFmGJF7jLkices6PJFO1pmit_4-bu8rwykR6ZWDiCQ,6378
 fractal_server/migrations/versions/84bf0fffde30_add_dumps_to_applyworkflow.py,sha256=mOlqERL0MrF6Inp4onoSB2mAnyGeh4gW_IysCeCHTj4,2685
@@ -200,9 +203,9 @@ fractal_server/runner/filenames.py,sha256=lPnxKHtdRizr6FqG3zOdjDPyWA7GoaJGTtiuJV
 fractal_server/runner/set_start_and_last_task_index.py,sha256=NsioSzfEpGyo9ZKrV5KsbxeI7d5V3tE678Y3IAo5rHM,1218
 fractal_server/runner/task_files.py,sha256=n54A1x0MQRGSgqhzOTE-TPzEGJymUhQIUV9ApcVCV9M,4318
 fractal_server/runner/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-fractal_server/runner/v2/_local.py,sha256=XT6uFi0wwO5ZxR_qoszgibkUqal-pNPWWcd101NFgCg,3838
-fractal_server/runner/v2/_slurm_ssh.py,sha256=GcpBLvvSwadxnchS5phOXVk42BlADeDi-xr2K6FBIyU,4529
-fractal_server/runner/v2/_slurm_sudo.py,sha256=iexw_hpUf-jVngMRxntiKIwNT_Dvdbk2R-yHHWEFnws,4424
+fractal_server/runner/v2/_local.py,sha256=BzHnl6vc9KlHEEW_ObaBtP33JS1NXVu-KF6pmsodVgI,3839
+fractal_server/runner/v2/_slurm_ssh.py,sha256=8MLn5ux2IQ_a4Sti0pajBkduSp0pwxvEJckoUXqfBZY,4530
+fractal_server/runner/v2/_slurm_sudo.py,sha256=mMGqlhhbQLHwniiTzJwxUCLKPEMbYASQ4DL-exszQ2Y,4425
 fractal_server/runner/v2/db_tools.py,sha256=twqFWVENkxWCYglb__BAXASDuJppwHE-VxdEUC67mq0,3317
 fractal_server/runner/v2/deduplicate_list.py,sha256=TWxHDucal0VZPswy_H7IFaEb4ddGnpl_QBwJ8g9Ybug,668
 fractal_server/runner/v2/merge_outputs.py,sha256=0ahaSwdMFAoEhxVaEaO9nSJuKIcWg9pDZ356ktSHcC0,897
@@ -255,16 +258,16 @@ fractal_server/tasks/v2/utils_package_names.py,sha256=-FAcbwBHsjyvhIK0QKue9_0xJU
 fractal_server/tasks/v2/utils_pixi.py,sha256=Z0FnRqVynSvXDDeFL0anz7zwKrBDLGdQxyuJdipt2DI,3411
 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=z5jzdESBld-orcOyBe6J5I-V-CQfY64nRYVFQXZUlWs,2934
-fractal_server/types/validators/__init__.py,sha256=5uj6KJ9MelFZgyoq3MzXLhgWCl0yiriS7XKmb0gathg,392
-fractal_server/types/validators/_common_validators.py,sha256=LTIQPfOPBM-KjxPgbeCLvLFwSESxAQjppzON9pt_RDQ,1148
+fractal_server/types/__init__.py,sha256=NU70aH1wiUKaMOU2Fx0vPqVaWhM6vqCtwkRtfnCtMzs,3400
+fractal_server/types/validators/__init__.py,sha256=tkwLSeI_KQs0mEQSs6PRPBAVTOzYf2nAISQLeQVSBAw,456
+fractal_server/types/validators/_common_validators.py,sha256=EUMYJiTGjxp022dNIBCzhj2ckUn6Zl02L_WwRAUQO_I,1396
 fractal_server/types/validators/_filter_validators.py,sha256=irmjzycmiR6F4fmWUeA45Pdh7AeLufwVjNItskDsknk,831
 fractal_server/types/validators/_workflow_task_arguments_validators.py,sha256=zt4TQBiLiNVD3yMYbN-dkX0AWRAjG4vRv3FIybh9zLQ,372
 fractal_server/urls.py,sha256=QjIKAC1a46bCdiPMu3AlpgFbcv6a4l3ABcd5xz190Og,471
 fractal_server/utils.py,sha256=-rjg8QTXQcKweXjn0NcmETFs1_uM9PGnbl0Q7c4ERPM,2181
 fractal_server/zip_tools.py,sha256=Uhn-ax4_9g1PJ32BdyaX30hFpAeVOv2tZYTUK-zVn1E,5719
-fractal_server-2.18.0a1.dist-info/METADATA,sha256=JjghryAslh4WzJasCM1A3DpZAEolcHca19OBC9HN1T8,4277
-fractal_server-2.18.0a1.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-fractal_server-2.18.0a1.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.18.0a1.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.18.0a1.dist-info/RECORD,,
+fractal_server-2.18.0a3.dist-info/METADATA,sha256=2LQOCxz4cW7IElYNF6K7Qm-Y1HQgGAuss3Nsrtyd2nw,4277
+fractal_server-2.18.0a3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+fractal_server-2.18.0a3.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.18.0a3.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.18.0a3.dist-info/RECORD,,