fractal-server 2.17.0a5__py3-none-any.whl → 2.17.0a6__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.17.0a5"
+__VERSION__ = "2.17.0a6"

fractal_server/app/routes/admin/v2/profile.py

@@ -10,6 +10,7 @@ from ._aux_functions import _check_profile_name
 from ._aux_functions import _get_profile_or_404
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
+from fractal_server.app.models import Profile
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.app.schemas.v2 import ProfileCreate
@@ -31,6 +32,19 @@ async def get_single_profile(
     return profile
 
 
+@router.get("/", response_model=list[ProfileRead], status_code=200)
+async def get_profile_list(
+    superuser: UserOAuth = Depends(current_superuser_act),
+    db: AsyncSession = Depends(get_async_db),
+) -> ProfileRead:
+    """
+    Query single `Profile`.
+    """
+    res = await db.execute(select(Profile).order_by(Profile.id))
+    profiles = res.scalars().all()
+    return profiles
+
+
 @router.put("/{profile_id}/", response_model=ProfileRead, status_code=200)
 async def put_profile(
     profile_id: int,

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

@@ -10,6 +10,7 @@ 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 TaskGroupV2
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import TaskV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
@@ -58,6 +59,7 @@ async def query_tasks(
     category: str | None = None,
     modality: str | None = None,
     author: str | None = None,
+    resource_id: int | None = None,
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskV2Info]:
@@ -75,6 +77,7 @@ async def query_tasks(
         category:
         modality:
         author:
+        resource_id:
     """
 
     stm = select(TaskV2)
@@ -93,6 +96,12 @@ async def query_tasks(
         stm = stm.where(func.lower(TaskV2.modality) == modality.lower())
     if author is not None:
         stm = stm.where(TaskV2.authors.icontains(author))
+    if resource_id is not None:
+        stm = (
+            stm.join(TaskGroupV2)
+            .where(TaskGroupV2.id == TaskV2.taskgroupv2_id)
+            .where(TaskGroupV2.resource_id == resource_id)
+        )
 
     res = await db.execute(stm)
     task_list = res.scalars().all()

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

@@ -19,11 +19,12 @@ from fractal_server.app.routes.auth._aux_auth import (
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
-from fractal_server.app.schemas.v2 import TaskGroupReadV2
+from fractal_server.app.schemas.v2 import TaskGroupReadSuperuser
 from fractal_server.app.schemas.v2 import TaskGroupUpdateV2
 from fractal_server.app.schemas.v2 import TaskGroupV2OriginEnum
 from fractal_server.logger import set_logger
 
+
 router = APIRouter()
 
 logger = set_logger(__name__)
@@ -64,12 +65,12 @@ async def get_task_group_activity_list(
     return activities
 
 
-@router.get("/{task_group_id}/", response_model=TaskGroupReadV2)
+@router.get("/{task_group_id}/", response_model=TaskGroupReadSuperuser)
 async def query_task_group(
     task_group_id: int,
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> TaskGroupReadV2:
+) -> TaskGroupReadSuperuser:
     task_group = await db.get(TaskGroupV2, task_group_id)
     if task_group is None:
         raise HTTPException(
@@ -79,7 +80,7 @@ async def query_task_group(
     return task_group
 
 
-@router.get("/", response_model=list[TaskGroupReadV2])
+@router.get("/", response_model=list[TaskGroupReadSuperuser])
 async def query_task_group_list(
     user_id: int | None = None,
     user_group_id: int | None = None,
@@ -89,9 +90,10 @@ async def query_task_group_list(
     origin: TaskGroupV2OriginEnum | None = None,
     timestamp_last_used_min: AwareDatetime | None = None,
     timestamp_last_used_max: AwareDatetime | None = None,
+    resource_id: int | None = None,
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> list[TaskGroupReadV2]:
+) -> list[TaskGroupReadSuperuser]:
     stm = select(TaskGroupV2)
 
     if user_group_id is not None and private is True:
@@ -128,19 +130,21 @@ async def query_task_group_list(
         stm = stm.where(
             TaskGroupV2.timestamp_last_used <= timestamp_last_used_max
         )
+    if resource_id is not None:
+        stm = stm.where(TaskGroupV2.resource_id == resource_id)
 
     res = await db.execute(stm)
     task_groups_list = res.scalars().all()
     return task_groups_list
 
 
-@router.patch("/{task_group_id}/", response_model=TaskGroupReadV2)
+@router.patch("/{task_group_id}/", response_model=TaskGroupReadSuperuser)
 async def patch_task_group(
     task_group_id: int,
     task_group_update: TaskGroupUpdateV2,
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> list[TaskGroupReadV2]:
+) -> list[TaskGroupReadSuperuser]:
     task_group = await db.get(TaskGroupV2, task_group_id)
     if task_group is None:
         raise HTTPException(

fractal_server/app/routes/api/__init__.py

@@ -7,6 +7,7 @@ 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
@@ -48,6 +49,14 @@ 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/submit.py

@@ -196,10 +196,8 @@ async def apply_workflow(
         dataset_id=dataset_id,
         workflow_id=workflow_id,
         user_email=user.email,
-        # The 'filters' field is not supported any more but still exists as a
-        # database column, therefore we manually exclude it from dumps.
         dataset_dump=json.loads(
-            dataset.model_dump_json(exclude={"images", "history", "filters"})
+            dataset.model_dump_json(exclude={"images", "history"})
         ),
         workflow_dump=json.loads(
             workflow.model_dump_json(exclude={"task_list"})

fractal_server/app/routes/auth/current_user.py

@@ -5,7 +5,6 @@ import os
 
 from fastapi import APIRouter
 from fastapi import Depends
-from fastapi_users import schemas
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import select
 
@@ -25,8 +24,8 @@ from fractal_server.app.schemas.user import UserUpdate
 from fractal_server.app.schemas.user import UserUpdateStrict
 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.config import ViewerAuthScheme
+from fractal_server.config import DataAuthScheme
+from fractal_server.config import get_data_settings
 from fractal_server.syringe import Inject
 
 router_current_user = APIRouter()
@@ -66,7 +65,7 @@ async def patch_current_user(
     # their own password
 
     user = await user_manager.update(update, current_user, safe=True)
-    validated_user = schemas.model_validate(UserOAuth, user.model_dump())
+    validated_user = UserOAuth.model_validate(user.model_dump())
 
     patched_user = await db.get(
         UserOAuth, validated_user.id, populate_existing=True
@@ -117,14 +116,14 @@ async def get_current_user_allowed_viewer_paths(
 ) -> list[str]:
     """
     Returns the allowed viewer paths for current user, according to the
-    selected FRACTAL_VIEWER_AUTHORIZATION_SCHEME
+    selected FRACTAL_DATA_AUTH_SCHEME
     """
 
-    settings = Inject(get_settings)
+    data_settings = Inject(get_data_settings)
 
     authorized_paths = []
 
-    if settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME == ViewerAuthScheme.NONE:
+    if data_settings.FRACTAL_DATA_AUTH_SCHEME == DataAuthScheme.NONE:
         return authorized_paths
 
     # Append `project_dir` to the list of authorized paths
@@ -133,20 +132,16 @@ async def get_current_user_allowed_viewer_paths(
     # If auth scheme is "users-folders" and `slurm_user` is set,
     # build and append the user folder
     if (
-        settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME
-        == ViewerAuthScheme.USERS_FOLDERS
+        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 = settings.FRACTAL_VIEWER_BASE_FOLDER
+            base_folder = data_settings.FRACTAL_DATA_BASE_FOLDER
             user_folder = os.path.join(base_folder, profile.username)
             authorized_paths.append(user_folder)
 
-    if (
-        settings.FRACTAL_VIEWER_AUTHORIZATION_SCHEME
-        == ViewerAuthScheme.VIEWER_PATHS
-    ):
+    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)

fractal_server/app/routes/auth/oauth.py

@@ -29,7 +29,7 @@ def _create_client_oidc(cfg: OAuthSettings) -> OpenID:
     return OpenID(
         client_id=cfg.OAUTH_CLIENT_ID.get_secret_value(),
         client_secret=cfg.OAUTH_CLIENT_SECRET.get_secret_value(),
-        openid_configuration_endpoint=cfg.OAUTH_OIDC_CONFIG_ENDPOINT,
+        openid_configuration_endpoint=cfg.OAUTH_OIDC_CONFIG_ENDPOINT.get_secret_value(),  # noqa
     )
 
 

fractal_server/app/routes/auth/users.py

@@ -6,7 +6,6 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import status
 from fastapi_users import exceptions
-from fastapi_users import schemas
 from fastapi_users.router.common import ErrorCode
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlmodel import func
@@ -80,7 +79,7 @@ async def patch_user(
             safe=False,
             request=None,
         )
-        validated_user = schemas.model_validate(UserOAuth, user.model_dump())
+        validated_user = UserOAuth.model_validate(user.model_dump())
         patched_user = await db.get(
             UserOAuth, validated_user.id, populate_existing=True
         )

fractal_server/app/schemas/user.py

@@ -76,8 +76,8 @@ class UserUpdate(schemas.BaseUserUpdate):
     profile_id: int | None = None
     project_dir: Annotated[
         AbsolutePathStr, AfterValidator(_validate_cmd)
-    ] | None = None
-    slurm_accounts: ListUniqueNonEmptyString | None = None
+    ] = None
+    slurm_accounts: ListUniqueNonEmptyString = None
 
 
 class UserUpdateStrict(BaseModel):
@@ -89,7 +89,7 @@ class UserUpdateStrict(BaseModel):
     """
 
     model_config = ConfigDict(extra="forbid")
-    slurm_accounts: ListUniqueNonEmptyString | None = None
+    slurm_accounts: ListUniqueNonEmptyString = None
 
 
 class UserCreate(schemas.BaseUserCreate):

fractal_server/app/schemas/v2/__init__.py

@@ -52,6 +52,7 @@ from .task_group import TaskGroupActivityStatusV2  # noqa F401
 from .task_group import TaskGroupActivityV2Read  # noqa F401
 from .task_group import TaskGroupCreateV2  # noqa F401
 from .task_group import TaskGroupCreateV2Strict  # noqa F401
+from .task_group import TaskGroupReadSuperuser  # noqa F401
 from .task_group import TaskGroupReadV2  # noqa F401
 from .task_group import TaskGroupUpdateV2  # noqa F401
 from .task_group import TaskGroupV2OriginEnum  # noqa F401

fractal_server/app/schemas/v2/task_group.py

@@ -96,6 +96,10 @@ class TaskGroupReadV2(BaseModel):
         return v.isoformat()
 
 
+class TaskGroupReadSuperuser(TaskGroupReadV2):
+    resource_id: int
+
+
 class TaskGroupUpdateV2(BaseModel):
     model_config = ConfigDict(extra="forbid")
     user_group_id: int | None = None

fractal_server/config/__init__.py

@@ -1,8 +1,9 @@
+from ._data import DataAuthScheme  # noqa F401
+from ._data import DataSettings
 from ._database import DatabaseSettings
 from ._email import EmailSettings
 from ._email import PublicEmailSettings  # noqa F401
 from ._main import Settings
-from ._main import ViewerAuthScheme  # noqa F401
 from ._oauth import OAuthSettings
 
 
@@ -20,3 +21,7 @@ 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

@@ -0,0 +1,68 @@
+from enum import StrEnum
+from typing import Self
+
+from pydantic import model_validator
+from pydantic_settings import BaseSettings
+from pydantic_settings import SettingsConfigDict
+
+from ._settings_config import SETTINGS_CONFIG_DICT
+from fractal_server.types import AbsolutePathStr
+
+
+class DataAuthScheme(StrEnum):
+    VIEWER_PATHS = "viewer-paths"
+    USERS_FOLDERS = "users-folders"
+    NONE = "none"
+
+
+class DataSettings(BaseSettings):
+    """
+    Settings for the `fractal-data` integration.
+    """
+
+    model_config = SettingsConfigDict(**SETTINGS_CONFIG_DICT)
+
+    FRACTAL_DATA_AUTH_SCHEME: DataAuthScheme = "none"
+    """
+    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:
+
+    - "viewer-paths": The list of allowed viewer paths will include the user's
+      `project_dir` along with any path defined in user groups' `viewer_paths`
+      attributes.
+    - "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`.
+    - "none": An empty list will be returned, indicating no access to
+       viewer paths. Useful when vizarr viewer is not used.
+    """
+
+    FRACTAL_DATA_BASE_FOLDER: AbsolutePathStr | None = None
+    """
+    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_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

@@ -1,7 +1,5 @@
 import logging
-from enum import StrEnum
 from typing import Literal
-from typing import TypeVar
 
 from pydantic import HttpUrl
 from pydantic import SecretStr
@@ -9,20 +7,6 @@ from pydantic_settings import BaseSettings
 from pydantic_settings import SettingsConfigDict
 
 from ._settings_config import SETTINGS_CONFIG_DICT
-from fractal_server.types import AbsolutePathStr
-
-
-class FractalConfigurationError(ValueError):
-    pass
-
-
-class ViewerAuthScheme(StrEnum):
-    VIEWER_PATHS = "viewer-paths"
-    USERS_FOLDERS = "users-folders"
-    NONE = "none"
-
-
-T = TypeVar("T")
 
 
 class Settings(BaseSettings):
@@ -34,7 +18,6 @@ class Settings(BaseSettings):
 
     model_config = SettingsConfigDict(**SETTINGS_CONFIG_DICT)
 
-    # JWT TOKEN
     JWT_EXPIRE_SECONDS: int = 180
     """
     JWT token lifetime, in seconds.
@@ -48,7 +31,6 @@ class Settings(BaseSettings):
     it.
     """
 
-    # COOKIE TOKEN
     COOKIE_EXPIRE_SECONDS: int = 86400
     """
     Cookie token lifetime, in seconds.
@@ -80,52 +62,6 @@ class Settings(BaseSettings):
     Waiting time for the shutdown phase of executors
     """
 
-    FRACTAL_VIEWER_AUTHORIZATION_SCHEME: ViewerAuthScheme = "none"
-    """
-    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-vizarr-viewer](https://github.com/fractal-analytics-platform/fractal-vizarr-viewer).
-
-    Options:
-
-    - "viewer-paths": The list of allowed viewer paths will include the user's
-      `project_dir` along with any path defined in user groups' `viewer_paths`
-      attributes.
-    - "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_VIEWER_BASE_FOLDER` with the user's
-       `slurm_user`.
-    - "none": An empty list will be returned, indicating no access to
-       viewer paths. Useful when vizarr viewer is not used.
-    """
-
-    FRACTAL_VIEWER_BASE_FOLDER: AbsolutePathStr | None = None
-    """
-    Base path to Zarr files that will be served by fractal-vizarr-viewer;
-    This variable is required and used only when
-    FRACTAL_VIEWER_AUTHORIZATION_SCHEME is set to "users-folders".
-    """
-
-    def check(self):
-        """
-        Make sure that required variables are set
-
-        This method must be called before the server starts
-        """
-        # FRACTAL_VIEWER_BASE_FOLDER is required when
-        # FRACTAL_VIEWER_AUTHORIZATION_SCHEME is set to "users-folders"
-        # and it must be an absolute path
-        if self.FRACTAL_VIEWER_AUTHORIZATION_SCHEME == "users-folders":
-            viewer_base_folder = self.FRACTAL_VIEWER_BASE_FOLDER
-            if viewer_base_folder is None:
-                raise FractalConfigurationError(
-                    "FRACTAL_VIEWER_BASE_FOLDER is required when "
-                    "FRACTAL_VIEWER_AUTHORIZATION_SCHEME is set to "
-                    "users-folders"
-                )
-
     FRACTAL_HELP_URL: HttpUrl | None = None
     """
     The URL of an instance-specific Fractal help page.

fractal_server/config/_oauth.py

@@ -37,7 +37,7 @@ class OAuthSettings(BaseSettings):
     """
     Secret to authorise against the identity provider.
     """
-    OAUTH_OIDC_CONFIG_ENDPOINT: str | None = None
+    OAUTH_OIDC_CONFIG_ENDPOINT: SecretStr | None = None
     """
     OpenID configuration endpoint, for autodiscovery of relevant endpoints.
     """
@@ -55,7 +55,7 @@ class OAuthSettings(BaseSettings):
             and self.OAUTH_OIDC_CONFIG_ENDPOINT is None
         ):
             raise ValueError(
-                f"{self.OAUTH_OIDC_CONFIG_ENDPOINT=} but "
+                f"self.OAUTH_OIDC_CONFIG_ENDPOINT=None but "
                 f"{self.OAUTH_CLIENT_NAME=}"
             )
         return self

fractal_server/main.py

@@ -6,6 +6,7 @@ from fastapi import FastAPI
 
 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
@@ -50,16 +51,16 @@ def check_settings() -> None:
         ValidationError: If the configuration is invalid.
     """
     settings = Inject(get_settings)
-    settings.check()
     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 = "*****"

{fractal_server-2.17.0a5.dist-info → fractal_server-2.17.0a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fractal-server
-Version: 2.17.0a5
+Version: 2.17.0a6
 Summary: Backend component of the Fractal analytics platform
 License-Expression: BSD-3-Clause
 License-File: LICENSE
@@ -13,18 +13,17 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: alembic (>=1.13.1,<2.0.0)
 Requires-Dist: fabric (>=3.2.2,<3.3.0)
-Requires-Dist: fastapi (>=0.118.0,<0.119.0)
-Requires-Dist: fastapi-users[oauth] (>=14,<15)
+Requires-Dist: fastapi (>=0.120.0,<0.121.0)
+Requires-Dist: fastapi-users[oauth] (>=15,<16)
 Requires-Dist: gunicorn (>=23.0,<24.0)
 Requires-Dist: packaging (>=25.0.0,<26.0.0)
 Requires-Dist: psycopg[binary] (>=3.1.0,<4.0.0)
 Requires-Dist: pydantic (>=2.12.0,<2.13.0)
 Requires-Dist: pydantic-settings (==2.11.0)
-Requires-Dist: python-dotenv (>=1.1.0,<1.2.0)
 Requires-Dist: sqlalchemy[asyncio] (>=2.0.23,<2.1)
 Requires-Dist: sqlmodel (==0.0.27)
 Requires-Dist: tomli_w (>=1.2.0,<1.3.0)
-Requires-Dist: uvicorn (>=0.37.0,<0.38.0)
+Requires-Dist: uvicorn (>=0.38.0,<0.39.0)
 Requires-Dist: uvicorn-worker (==0.4.0)
 Project-URL: Documentation, https://fractal-analytics-platform.github.io/fractal-server
 Project-URL: Homepage, https://github.com/fractal-analytics-platform/fractal-server

{fractal_server-2.17.0a5.dist-info → fractal_server-2.17.0a6.dist-info}/RECORD

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=twgXmjGJdfHSKap7ALSL1NPDHaBCT4z5bFl9BlhdIyk,25
+fractal_server/__init__.py,sha256=m6ro3f4bjmvJJ9DFzqslf5NSM9OxOGIbAGvKTxl1rZQ,25
 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
@@ -27,13 +27,13 @@ fractal_server/app/routes/admin/v2/_aux_functions.py,sha256=fqA5sUCFuD2iVANQt2WU
 fractal_server/app/routes/admin/v2/accounting.py,sha256=DjgMqzdrL8hYMn19cZj2pkwtLKl3QfBwxd473kH4KaI,3584
 fractal_server/app/routes/admin/v2/impersonate.py,sha256=ictDjuvBr3iLv3YtwkVRMNQRq5qtPAeAXbbC7STSsEg,1125
 fractal_server/app/routes/admin/v2/job.py,sha256=sFgMbOtUCIJ-ri6YD3ZWP7XETZZDQsLqPfT1kaH9RHQ,8577
-fractal_server/app/routes/admin/v2/profile.py,sha256=h9R4bwZQXBg0FAm2lj-DQ3vKQSFDtvjRARFpxfI3WR4,2733
+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=uel-MN3f9TkkIJ7flEC4yPH7q2qGQxoaxPB0LxfZzYs,7796
-fractal_server/app/routes/admin/v2/task.py,sha256=B_RfL320acBKFkOa34S0sWI44VCFBE_jg_jGHZASKO8,4303
-fractal_server/app/routes/admin/v2/task_group.py,sha256=sxASS5948inqcP2IU3C2tcLB5egXfxef0TPlVcRtP-U,6028
+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/task_group_lifecycle.py,sha256=W7LjIBAheyjrn0fEz0SsWINqcZK5HMB5GRGMjPrc6a4,9994
-fractal_server/app/routes/api/__init__.py,sha256=wJE77LxZ51p1N9AIX-kd4VdUDEk0RYbCy-T_pn2V73I,1408
+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
 fractal_server/app/routes/api/v2/_aux_functions.py,sha256=8xnXYPjzo1yZfcg18b5ZY5tu9OQ1e55fOnX1IEmDSHk,15019
 fractal_server/app/routes/api/v2/_aux_functions_history.py,sha256=PXsqMQ3sfkABqAMI7v1_VAzUEDF_-kvaZyyhEicqsCw,4431
@@ -48,7 +48,7 @@ fractal_server/app/routes/api/v2/job.py,sha256=fyIYGcplsxzx91FxYWlImp1ATPk5IC8bf
 fractal_server/app/routes/api/v2/pre_submission_checks.py,sha256=DEnlFj6PMNMy9DrnH6_pMW9evdKl6iTlAb0zlzBR1Qs,4953
 fractal_server/app/routes/api/v2/project.py,sha256=eQcQs0ElMpUN0OTcgG7DXk70t9Dn8Fdd6oHeQ0WbgJI,4782
 fractal_server/app/routes/api/v2/status_legacy.py,sha256=vZA4AYMehXbNFgekl4j6p8idETC3IylQQL64CmFCr98,6330
-fractal_server/app/routes/api/v2/submit.py,sha256=jPPvJNeLBcPVl0BsLnOZn_KtxoQvdBnAVnzFVihUJIc,9364
+fractal_server/app/routes/api/v2/submit.py,sha256=l12Duakx0lV43LCyX4C6cCIBsg-BEc-XxjRRe8l8Wys,9203
 fractal_server/app/routes/api/v2/task.py,sha256=KDIBrQpIbbVrffOBtxah-gXiOnN-EG84ujXeGPOqKhg,7160
 fractal_server/app/routes/api/v2/task_collection.py,sha256=A0mfajyJVVrWNuI7YaPih7juSWOnks78NnJDwnGfvdo,12281
 fractal_server/app/routes/api/v2/task_collection_custom.py,sha256=9SqiMPuED5LEGKo3Tiq5KfXFqmjaZPg9KWL-Yn5jdLo,7010
@@ -61,22 +61,22 @@ fractal_server/app/routes/api/v2/workflow_import.py,sha256=iFy8jPuMMt1DpIcs5iJc5
 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=A8GJpWV90FnheuhhYsAGjiuQn8IAoOVNAR0e53JHwPU,5611
+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/login.py,sha256=tSu6OBLOieoBtMZB4JkBAdEgH2Y8KqPGSbwy7NIypIo,566
-fractal_server/app/routes/auth/oauth.py,sha256=iI2vEdvDlEE5BrFz5Krq96VUk39HDuE0NzqW9fS3dDE,2261
+fractal_server/app/routes/auth/oauth.py,sha256=3TaGZpjgjUyqqbhdcUv1PwgiHdkUk41X5tc98FOIw-s,2288
 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=L94-1A62FFfASflURggYsVDOxtWNRU-gK6eSx8ZckyA,6921
+fractal_server/app/routes/auth/users.py,sha256=Gjj3_W4Zu1RZJv0r578wPJrbicMmiSELmJGJDeStyus,6878
 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
 fractal_server/app/routes/aux/validate_user_profile.py,sha256=fGqJDdAFkbQoEIjqZ5F9-SDY_4os63R2EUMqODC7eBg,1969
 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=nXsE4yEt8xiMlr2IhLoul0M0x2vYWaXIJBG_-NmRj6w,2919
+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/v2/__init__.py,sha256=ShdbfHQe_MNMQzyjaEl7NGj30h2u8mUD9-UX3hsS3sA,3669
+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
 fractal_server/app/schemas/v2/dumps.py,sha256=LCYiNF_FNYiA6HYp5GyFao3IKRX0RpzgNpiX56IwgCE,2293
@@ -89,17 +89,18 @@ fractal_server/app/schemas/v2/resource.py,sha256=4iXzZJeHVLcXYY08-okoJM_4gqpzhG4
 fractal_server/app/schemas/v2/status_legacy.py,sha256=eQT1zGxbkzSwd0EqclsOdZ60n1x6J3DB1CZ3m4LYyxc,955
 fractal_server/app/schemas/v2/task.py,sha256=IJv8loB4kx9FBkaIHoiMsswQyq02FxvyAnHK1u074fU,4364
 fractal_server/app/schemas/v2/task_collection.py,sha256=BzHQXq2_zLZTbigWauOR5Zi-mlsqCIF2NEF_z12Nqxg,4480
-fractal_server/app/schemas/v2/task_group.py,sha256=anC7YPiOEcLmxN2JyARLMMHp6l7NfvsCpx3sMcnug4o,3436
+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/signup_email.py,sha256=kphjq6TAygvPpYpg95QJWefyqmzdVrGz7fyRMctUJWE,1982
 fractal_server/app/shutdown.py,sha256=ViSNJyXWU_iWPSDOOMGNh_iQdUFrdPh_jvf8vVKLpAo,1950
-fractal_server/config/__init__.py,sha256=EDk6ylmCXc8FoCYWTQ1bC-27yZ7iYHWxbhcjjMbQX2A,611
+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=Xtcz2q2HuHYdk7DaD6uBG1KtQeBiQhKz6CANvevg1AA,3877
-fractal_server/config/_oauth.py,sha256=OYWqJnL0yn8ymagKb4fK-2zNqXVBbumRWwZrr9TFUms,1926
+fractal_server/config/_main.py,sha256=y1WQPFjEyctsVpRX2LVKfR_nJjFQHAey_i8e6Hmsq6E,1605
+fractal_server/config/_oauth.py,sha256=7J4FphGVFfVmtQycCkas6scEJQJGZUGEzQ-t2PZiqSo,1934
 fractal_server/config/_settings_config.py,sha256=tsyXQOnn9QKCFJD6hRo_dJXlQQyl70DbqgHMJoZ1xnY,144
 fractal_server/data_migrations/2_14_10.py,sha256=jzMg2c1zNO8C_Nho_9_EZJD6kR1-gkFNpNrMR5Hr8hM,1598
 fractal_server/data_migrations/README.md,sha256=_3AEFvDg9YkybDqCLlFPdDmGJvr6Tw7HRI14aZ3LOIw,398
@@ -111,7 +112,7 @@ fractal_server/images/models.py,sha256=6WchcIzLLLwdkLNRfg71Dl4Y-9UFLPyrrzh1lWgju
 fractal_server/images/status_tools.py,sha256=KICcThwHniHNkDftzJmK_n2gQK2IeTKlR_PFAesf204,4912
 fractal_server/images/tools.py,sha256=37jVIU6RiAGbiyucNDlKe9J3yN3Y47NOvv-RJor9Jm0,4154
 fractal_server/logger.py,sha256=2_IN0WcIzLEX20HFUUkwyZGSIi0yLbE0JamkzXREDZw,5302
-fractal_server/main.py,sha256=uTKl1XH3tZ1jvaGeZDEgVXC5WMWRM1Ep4gB-vYRPb-8,4313
+fractal_server/main.py,sha256=4HJO8EiGJp0Iw0p3xEm_zhwjnT4joFG1KuGccIIndjo,4419
 fractal_server/migrations/env.py,sha256=nfyBpMIOT3kny6t-b-tUjyRjZ4k906bb1_wCQ7me1BI,1353
 fractal_server/migrations/naming_convention.py,sha256=htbKrVdetx3pklowb_9Cdo5RqeF0fJ740DNecY5de_M,265
 fractal_server/migrations/versions/034a469ec2eb_task_groups.py,sha256=vrPhC8hfFu1c4HmLHNZyCuqEfecFD8-bWc49bXMNes0,6199
@@ -256,8 +257,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.0a5.dist-info/METADATA,sha256=oUgYkhW5EongBJTrbWUUyPKU6j64g8F9GG4PPY0NR0c,4272
-fractal_server-2.17.0a5.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-fractal_server-2.17.0a5.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
-fractal_server-2.17.0a5.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
-fractal_server-2.17.0a5.dist-info/RECORD,,
+fractal_server-2.17.0a6.dist-info/METADATA,sha256=X3vrUW4wnIOGZ8jAWbE4Ks9CaPszKHL2WuSPHtBk_aM,4226
+fractal_server-2.17.0a6.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+fractal_server-2.17.0a6.dist-info/entry_points.txt,sha256=8tV2kynvFkjnhbtDnxAqImL6HMVKsopgGfew0DOp5UY,58
+fractal_server-2.17.0a6.dist-info/licenses/LICENSE,sha256=QKAharUuhxL58kSoLizKJeZE3mTCBnX6ucmz8W0lxlk,1576
+fractal_server-2.17.0a6.dist-info/RECORD,,