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

fractal_server/__init__.py

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

fractal_server/app/models/security.py

@@ -92,7 +92,7 @@ class UserOAuth(SQLModel, table=True):
     profile_id: int | None = Field(
         foreign_key="profile.id",
         default=None,
-        ondelete="SET NULL",
+        ondelete="RESTRICT",
     )
 
     # TODO-2.17.1: update to `project_dir: str`
@@ -107,6 +107,12 @@ class UserOAuth(SQLModel, table=True):
         sa_column=Column(ARRAY(String), server_default="{}"),
     )
 
+    # TODO-2.17.1: remove
+    user_settings_id: int | None = Field(
+        foreign_key="user_settings.id",
+        default=None,
+    )
+
 
 class UserGroup(SQLModel, table=True):
     """

fractal_server/app/models/user_settings.py

@@ -29,5 +29,9 @@ class UserSettings(SQLModel, table=True):
     ssh_host: str | None = None
     ssh_username: str | None = None
     ssh_private_key_path: str | None = None
+
     slurm_user: str | None = None
     project_dir: str | None = None
+
+    ssh_tasks_dir: str | None = None
+    ssh_jobs_dir: str | None = None

fractal_server/app/models/v2/profile.py

@@ -4,7 +4,7 @@ from sqlmodel import SQLModel
 
 class Profile(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
-    resource_id: int = Field(foreign_key="resource.id", ondelete="CASCADE")
+    resource_id: int = Field(foreign_key="resource.id", ondelete="RESTRICT")
     resource_type: str
 
     name: str = Field(unique=True)

fractal_server/app/models/v2/project.py

@@ -14,8 +14,10 @@ from fractal_server.utils import get_timestamp
 class ProjectV2(SQLModel, table=True):
     id: int | None = Field(default=None, primary_key=True)
     name: str
+
+    # TODO-2.17.1: make `resource_id` not nullable
     resource_id: int | None = Field(
-        foreign_key="resource.id", default=None, ondelete="SET NULL"
+        foreign_key="resource.id", default=None, ondelete="RESTRICT"
     )
     timestamp_created: datetime = Field(
         default_factory=get_timestamp,

fractal_server/app/models/v2/resource.py

@@ -120,11 +120,11 @@ class Resource(SQLModel, table=True):
         # `type` column must be one of "local", "slurm_sudo" or "slurm_ssh"
         CheckConstraint(
             "type IN ('local', 'slurm_sudo', 'slurm_ssh')",
-            name="ck_resource_correct_type",
+            name="correct_type",
         ),
         # If `type` is not "local", `jobs_slurm_python_worker` must be set
         CheckConstraint(
             "(type = 'local') OR (jobs_slurm_python_worker IS NOT NULL)",
-            name="ck_resource_jobs_slurm_python_worker_set",
+            name="jobs_slurm_python_worker_set",
         ),
     )

fractal_server/app/models/v2/task_group.py

@@ -44,7 +44,7 @@ class TaskGroupV2(SQLModel, table=True):
     )
     # TODO-2.17.1: make `resource_id` not nullable
     resource_id: int | None = Field(
-        foreign_key="resource.id", default=None, ondelete="SET NULL"
+        foreign_key="resource.id", default=None, ondelete="RESTRICT"
     )
 
     origin: str

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

@@ -3,7 +3,7 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
-from sqlmodel import func
+from sqlalchemy.exc import IntegrityError
 from sqlmodel import select
 
 from ._aux_functions import _check_resource_name
@@ -13,9 +13,7 @@ from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import Profile
-from fractal_server.app.models.v2 import ProjectV2
 from fractal_server.app.models.v2 import Resource
-from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.app.schemas.v2 import ProfileCreate
 from fractal_server.app.schemas.v2 import ProfileRead
@@ -151,61 +149,20 @@ async def delete_resource(
     Delete single `Resource`.
     """
     resource = await _get_resource_or_404(resource_id=resource_id, db=db)
-
-    # Fail if at least one Profile is associated with the Resource.
-    res = await db.execute(
-        select(func.count(Profile.id)).where(
-            Profile.resource_id == resource_id
-        )
-    )
-    associated_profile_count = res.scalar()
-    if associated_profile_count > 0:
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-            detail=(
-                f"Cannot delete Resource {resource_id} because it's associated"
-                f" with {associated_profile_count} Profiles."
-            ),
-        )
-
-    # Fail if at least one Project is associated with the Resource.
-    res = await db.execute(
-        select(func.count(ProjectV2.id)).where(
-            ProjectV2.resource_id == resource_id
-        )
-    )
-    associated_project_count = res.scalar()
-    if associated_project_count > 0:
+    try:
+        await db.delete(resource)
+        await db.commit()
+        return Response(status_code=status.HTTP_204_NO_CONTENT)
+    except IntegrityError as e:
+        await db.rollback()
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
             detail=(
-                f"Cannot delete Resource {resource_id} because it's associated"
-                f" with {associated_project_count} Projects."
+                "IntegrityError for resource deletion. "
+                f"Original error:\n{str(e)}"
             ),
         )
 
-    # Fail if at least one TaskGroupV2 is associated with the Resource.
-    res = await db.execute(
-        select(func.count(TaskGroupV2.id)).where(
-            TaskGroupV2.resource_id == resource_id
-        )
-    )
-    associated_taskgroup_count = res.scalar()
-    if associated_taskgroup_count > 0:
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-            detail=(
-                f"Cannot delete Resource {resource_id} because it's associated"
-                f" with {associated_taskgroup_count} TaskGroupV2."
-            ),
-        )
-
-    # Delete
-    await db.delete(resource)
-    await db.commit()
-
-    return Response(status_code=status.HTTP_204_NO_CONTENT)
-
 
 @router.get(
     "/{resource_id}/profile/",

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

@@ -543,24 +543,14 @@ async def _get_submitted_job_or_none(
         )
 
 
-async def _get_resource_and_profile_ids(
-    *,
-    user_id: int,
-    db: AsyncSession,
-) -> tuple[int, int] | tuple[None, None]:
-    """
-    Get `(resource_id, profile_id)` pair for a given user, or `(None,None)`.
-    """
-    stm = (
-        select(Resource.id, Profile.id)
+async def _get_user_resource_id(user_id: int, db: AsyncSession) -> int | None:
+    res = await db.execute(
+        select(Resource.id)
+        .join(Profile)
         .join(UserOAuth)
         .where(Resource.id == Profile.resource_id)
         .where(Profile.id == UserOAuth.profile_id)
         .where(UserOAuth.id == user_id)
     )
-    res = await db.execute(stm)
-    data = res.one_or_none()
-    if data is None:
-        return (None, None)
-    else:
-        return tuple(data)
+    resource_id = res.scalar_one_or_none()
+    return resource_id

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

@@ -12,10 +12,14 @@ from fractal_server.app.db import AsyncSession
 from fractal_server.app.models import LinkUserGroup
 from fractal_server.app.models import UserGroup
 from fractal_server.app.models import UserOAuth
+from fractal_server.app.models.v2 import Profile
 from fractal_server.app.models.v2 import TaskGroupActivityV2
 from fractal_server.app.models.v2 import TaskGroupV2
 from fractal_server.app.models.v2 import TaskV2
 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 (
     _verify_user_belongs_to_group,
@@ -80,11 +84,16 @@ async def _get_task_group_read_access(
     else:
         stm = (
             select(LinkUserGroup)
+            .join(UserOAuth)
+            .join(Profile)
             .where(LinkUserGroup.group_id == task_group.user_group_id)
             .where(LinkUserGroup.user_id == user_id)
+            .where(UserOAuth.id == user_id)
+            .where(Profile.id == UserOAuth.profile_id)
+            .where(TaskGroupV2.resource_id == Profile.resource_id)
         )
         res = await db.execute(stm)
-        link = res.scalar_one_or_none()
+        link = res.unique().scalars().one_or_none()
         if link is None:
             raise forbidden_exception
         else:
@@ -153,9 +162,17 @@ async def _get_task_full_access(
         db: An asynchronous db session.
     """
     task = await _get_task_or_404(task_id=task_id, db=db)
-    await _get_task_group_full_access(
+    task_group = await _get_task_group_full_access(
         task_group_id=task.taskgroupv2_id, user_id=user_id, db=db
     )
+
+    resource_id = await _get_user_resource_id(user_id=user_id, db=db)
+    if resource_id is None or resource_id != task_group.resource_id:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail=f"User {user_id} has no access to TaskGroup's Resource.",
+        )
+
     return task
 
 
@@ -179,12 +196,20 @@ async def _get_task_read_access(
     task_group = await _get_task_group_read_access(
         task_group_id=task.taskgroupv2_id, user_id=user_id, db=db
     )
-    if require_active:
-        if not task_group.active:
-            raise HTTPException(
-                status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-                detail=f"Error: task {task_id} ({task.name}) is not active.",
-            )
+
+    resource_id = await _get_user_resource_id(user_id=user_id, db=db)
+    if resource_id is None or resource_id != task_group.resource_id:
+        raise HTTPException(
+            status_code=status.HTTP_403_FORBIDDEN,
+            detail=f"User {user_id} has no access to TaskGroup's Resource.",
+        )
+
+    if require_active and not task_group.active:
+        raise HTTPException(
+            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
+            detail=f"Error: task {task_id} ({task.name}) is not active.",
+        )
+
     return task
 
 
@@ -255,16 +280,19 @@ async def _get_collection_task_group_activity_status_message(
 
 
 async def _verify_non_duplication_user_constraint(
+    *,
     db: AsyncSession,
     user_id: int,
     pkg_name: str,
     version: str | None,
+    user_resource_id: int,
 ):
     stm = (
         select(TaskGroupV2)
         .where(TaskGroupV2.user_id == user_id)
         .where(TaskGroupV2.pkg_name == pkg_name)
         .where(TaskGroupV2.version == version)
+        .where(TaskGroupV2.resource_id == user_resource_id)
     )
     res = await db.execute(stm)
     duplicate = res.scalars().all()

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

@@ -15,9 +15,9 @@ from ....models.v2 import ProjectV2
 from ....schemas.v2 import ProjectCreateV2
 from ....schemas.v2 import ProjectReadV2
 from ....schemas.v2 import ProjectUpdateV2
+from ...aux.validate_user_profile import validate_user_profile
 from ._aux_functions import _check_project_exists
 from ._aux_functions import _get_project_check_owner
-from ._aux_functions import _get_resource_and_profile_ids
 from ._aux_functions import _get_submitted_jobs_statement
 from fractal_server.app.models import UserOAuth
 from fractal_server.app.routes.auth import current_user_act_ver_prof
@@ -54,13 +54,17 @@ async def create_project(
     Create new project
     """
 
+    # Get validated resource and profile
+    resource, profile = await validate_user_profile(
+        user=user,
+        db=db,
+    )
+    resource_id = resource.id
+
     # Check that there is no project with the same user and name
     await _check_project_exists(
         project_name=project.name, user_id=user.id, db=db
     )
-    resource_id, _ = await _get_resource_and_profile_ids(
-        user_id=user.id, db=db
-    )
 
     db_project = ProjectV2(**project.model_dump(), resource_id=resource_id)
     db_project.user_list.append(user)

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

@@ -59,6 +59,9 @@ async def apply_workflow(
 ) -> JobReadV2 | None:
     # Remove non-submitted V2 jobs from the app state when the list grows
     # beyond a threshold
+    # NOTE: this may lead to a race condition on `app.state.jobsV2` if two
+    # requests take place at the same time and `clean_app_job_list_v2` is
+    # somewhat slow.
     settings = Inject(get_settings)
     if (
         len(request.app.state.jobsV2)

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

@@ -9,7 +9,8 @@ from sqlmodel import func
 from sqlmodel import or_
 from sqlmodel import select
 
-from ._aux_functions import _get_resource_and_profile_ids
+from ...aux.validate_user_profile import validate_user_profile
+from ._aux_functions import _get_user_resource_id
 from ._aux_functions_tasks import _get_task_full_access
 from ._aux_functions_tasks import _get_task_read_access
 from ._aux_functions_tasks import _get_valid_user_group_id
@@ -46,10 +47,14 @@ async def get_list_task(
     """
     Get list of available tasks
     """
+
+    user_resource_id = await _get_user_resource_id(user_id=user.id, db=db)
+
     stm = (
         select(TaskV2)
         .join(TaskGroupV2)
         .where(TaskGroupV2.id == TaskV2.taskgroupv2_id)
+        .where(TaskGroupV2.resource_id == user_resource_id)
         .where(
             or_(
                 TaskGroupV2.user_id == user.id,
@@ -144,6 +149,13 @@ async def create_task(
     Create a new task
     """
 
+    # Get validated resource and profile
+    resource, profile = await validate_user_profile(
+        user=user,
+        db=db,
+    )
+    resource_id = resource.id
+
     # Validate query parameters related to user-group ownership
     user_group_id = await _get_valid_user_group_id(
         user_group_id=user_group_id,
@@ -179,7 +191,11 @@ async def create_task(
     db_task = TaskV2(**task.model_dump(exclude_unset=True))
     pkg_name = db_task.name
     await _verify_non_duplication_user_constraint(
-        db=db, pkg_name=pkg_name, user_id=user.id, version=db_task.version
+        db=db,
+        pkg_name=pkg_name,
+        user_id=user.id,
+        version=db_task.version,
+        user_resource_id=resource_id,
     )
     await _verify_non_duplication_group_constraint(
         db=db,
@@ -187,9 +203,6 @@ async def create_task(
         user_group_id=user_group_id,
         version=db_task.version,
     )
-    resource_id, _ = await _get_resource_and_profile_ids(
-        user_id=user.id, db=db
-    )
     db_task_group = TaskGroupV2(
         user_id=user.id,
         user_group_id=user_group_id,

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

@@ -25,7 +25,6 @@ from ....schemas.v2 import TaskGroupActivityStatusV2
 from ....schemas.v2 import TaskGroupActivityV2Read
 from ....schemas.v2 import TaskGroupCreateV2Strict
 from ...aux.validate_user_profile import validate_user_profile
-from ._aux_functions import _get_resource_and_profile_ids
 from ._aux_functions_task_lifecycle import get_package_version_from_pypi
 from ._aux_functions_tasks import _get_valid_user_group_id
 from ._aux_functions_tasks import _verify_non_duplication_group_constraint
@@ -173,13 +172,11 @@ async def collect_tasks_pip(
         user=user,
         db=db,
     )
+    resource_id = resource.id
+
     # Get some validated request data
     task_collect = request_data.task_collect
 
-    resource_id, _ = await _get_resource_and_profile_ids(
-        user_id=user.id, db=db
-    )
-
     # Initialize task-group attributes
     task_group_attrs = dict(
         user_id=user.id,
@@ -297,6 +294,7 @@ async def collect_tasks_pip(
         user_id=user.id,
         pkg_name=task_group_attrs["pkg_name"],
         version=task_group_attrs["version"],
+        user_resource_id=resource_id,
         db=db,
     )
     await _verify_non_duplication_group_constraint(

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

@@ -10,7 +10,6 @@ from fastapi import status
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from ...aux.validate_user_profile import validate_user_profile
-from ._aux_functions import _get_resource_and_profile_ids
 from ._aux_functions_tasks import _get_valid_user_group_id
 from ._aux_functions_tasks import _verify_non_duplication_group_constraint
 from ._aux_functions_tasks import _verify_non_duplication_user_constraint
@@ -50,6 +49,7 @@ async def collect_task_custom(
 ) -> list[TaskReadV2]:
     # Get validated resource and profile
     resource, profile = await validate_user_profile(user=user, db=db)
+    resource_id = resource.id
 
     # Validate query parameters related to user-group ownership
     user_group_id = await _get_valid_user_group_id(
@@ -145,10 +145,6 @@ async def collect_task_custom(
         package_version=task_collect.version,
     )
 
-    resource_id, _ = await _get_resource_and_profile_ids(
-        user_id=user.id, db=db
-    )
-
     # Prepare task-group attributes
     task_group_attrs = dict(
         origin=TaskGroupV2OriginEnum.OTHER,
@@ -165,6 +161,7 @@ async def collect_task_custom(
         user_id=user.id,
         pkg_name=task_group_attrs["pkg_name"],
         version=task_group_attrs["version"],
+        user_resource_id=resource_id,
         db=db,
     )
     await _verify_non_duplication_group_constraint(

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

@@ -10,7 +10,6 @@ from fastapi import Response
 from fastapi import status
 from fastapi import UploadFile
 
-from ._aux_functions import _get_resource_and_profile_ids
 from fractal_server.app.db import AsyncSession
 from fractal_server.app.db import get_async_db
 from fractal_server.app.models import UserOAuth
@@ -90,6 +89,7 @@ async def collect_task_pixi(
 ) -> TaskGroupActivityV2Read:
     # Get validated resource and profile
     resource, profile = await validate_user_profile(user=user, db=db)
+    resource_id = resource.id
 
     # Check if Pixi is available
     if not resource.tasks_pixi_config:
@@ -133,10 +133,6 @@ async def collect_task_pixi(
         Path(base_tasks_path) / str(user.id) / pkg_name / version
     ).as_posix()
 
-    resource_id, _ = await _get_resource_and_profile_ids(
-        user_id=user.id, db=db
-    )
-
     task_group_attrs = dict(
         user_id=user.id,
         user_group_id=user_group_id,
@@ -152,6 +148,7 @@ async def collect_task_pixi(
         user_id=user.id,
         pkg_name=task_group_attrs["pkg_name"],
         version=task_group_attrs["version"],
+        user_resource_id=resource_id,
         db=db,
     )
     await _verify_non_duplication_group_constraint(

fractal_server/app/routes/auth/oauth.py

@@ -2,6 +2,7 @@ from fastapi import APIRouter
 from httpx_oauth.clients.github import GitHubOAuth2
 from httpx_oauth.clients.google import GoogleOAuth2
 from httpx_oauth.clients.openid import OpenID
+from httpx_oauth.clients.openid import OpenIDConfigurationError
 
 from . import cookie_backend
 from . import fastapi_users
@@ -26,11 +27,21 @@ def _create_client_google(cfg: OAuthSettings) -> GoogleOAuth2:
 
 
 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.get_secret_value(),  # noqa
-    )
+    try:
+        open_id = 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.get_secret_value(),  # noqa
+        )
+    except OpenIDConfigurationError as e:
+        OAUTH_OIDC_CONFIG_ENDPOINT = (
+            cfg.OAUTH_OIDC_CONFIG_ENDPOINT.get_secret_value()
+        )
+        raise RuntimeError(
+            f"Cannot initialize OpenID client. Original error: '{e}'. "
+            f"Hint: is {OAUTH_OIDC_CONFIG_ENDPOINT=} reachable?"
+        )
+    return open_id
 
 
 def get_oauth_router() -> APIRouter | None:
@@ -44,7 +55,6 @@ def get_oauth_router() -> APIRouter | None:
         return None
 
     client_name = oauth_settings.OAUTH_CLIENT_NAME
-
     if client_name == "google":
         client = _create_client_google(oauth_settings)
     elif client_name == "github":

fractal_server/config/_main.py

@@ -51,7 +51,7 @@ class Settings(BaseSettings):
     Only logs of with this level (or higher) will appear in the console logs.
     """
 
-    FRACTAL_API_MAX_JOB_LIST_LENGTH: int = 50
+    FRACTAL_API_MAX_JOB_LIST_LENGTH: int = 25
     """
     Number of ids that can be stored in the `jobsV2` attribute of
     `app.state`.

fractal_server/migrations/naming_convention.py

@@ -1,7 +1,7 @@
 NAMING_CONVENTION = {
     "ix": "ix_%(column_0_label)s",
     "uq": "uq_%(table_name)s_%(column_0_name)s",
-    "ck": "ck_%(table_name)s_`%(constraint_name)s`",
+    "ck": "ck_%(table_name)s_%(constraint_name)s",
     "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
     "pk": "pk_%(table_name)s",
 }

fractal_server/migrations/versions/{a80ac5a352bf_resource_profile.py → 83bc2ad3ffcc_2_17_0.py}

@@ -1,8 +1,8 @@
-"""resource-profile
+"""2.17.0
 
-Revision ID: a80ac5a352bf
+Revision ID: 83bc2ad3ffcc
 Revises: 981d588fe248
-Create Date: 2025-10-15 15:53:34.823398
+Create Date: 2025-10-30 14:16:53.639006
 
 """
 import sqlalchemy as sa
@@ -11,7 +11,7 @@ from alembic import op
 from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
-revision = "a80ac5a352bf"
+revision = "83bc2ad3ffcc"
 down_revision = "981d588fe248"
 branch_labels = None
 depends_on = None
@@ -64,13 +64,11 @@ def upgrade() -> None:
         ),
         sa.CheckConstraint(
             "(type = 'local') OR (jobs_slurm_python_worker IS NOT NULL)",
-            name=op.f(
-                "ck_resource_`ck_resource_jobs_slurm_python_worker_set`"
-            ),
+            name=op.f("ck_resource_jobs_slurm_python_worker_set"),
         ),
         sa.CheckConstraint(
             "type IN ('local', 'slurm_sudo', 'slurm_ssh')",
-            name=op.f("ck_resource_`ck_resource_correct_type`"),
+            name=op.f("ck_resource_correct_type"),
         ),
         sa.PrimaryKeyConstraint("id", name=op.f("pk_resource")),
         sa.UniqueConstraint("name", name=op.f("uq_resource_name")),
@@ -103,7 +101,7 @@ def upgrade() -> None:
             ["resource_id"],
             ["resource.id"],
             name=op.f("fk_profile_resource_id_resource"),
-            ondelete="CASCADE",
+            ondelete="RESTRICT",
         ),
         sa.PrimaryKeyConstraint("id", name=op.f("pk_profile")),
         sa.UniqueConstraint("name", name=op.f("uq_profile_name")),
@@ -117,7 +115,7 @@ def upgrade() -> None:
             "resource",
             ["resource_id"],
             ["id"],
-            ondelete="SET NULL",
+            ondelete="RESTRICT",
         )
 
     with op.batch_alter_table("taskgroupv2", schema=None) as batch_op:
@@ -129,52 +127,54 @@ def upgrade() -> None:
             "resource",
             ["resource_id"],
             ["id"],
-            ondelete="SET NULL",
+            ondelete="RESTRICT",
         )
 
     with op.batch_alter_table("user_oauth", schema=None) as batch_op:
         batch_op.add_column(
             sa.Column("profile_id", sa.Integer(), nullable=True)
         )
+        batch_op.add_column(
+            sa.Column(
+                "project_dir",
+                sa.String(),
+                server_default="/PLACEHOLDER",
+                nullable=False,
+            )
+        )
+        batch_op.add_column(
+            sa.Column(
+                "slurm_accounts",
+                postgresql.ARRAY(sa.String()),
+                server_default="{}",
+                nullable=True,
+            )
+        )
         batch_op.create_foreign_key(
             batch_op.f("fk_user_oauth_profile_id_profile"),
             "profile",
             ["profile_id"],
             ["id"],
-            ondelete="SET NULL",
+            ondelete="RESTRICT",
         )
-
-    with op.batch_alter_table("user_settings", schema=None) as batch_op:
-        batch_op.drop_column("ssh_jobs_dir")
-        batch_op.drop_column("ssh_tasks_dir")
+        batch_op.drop_column("username")
 
     # ### end Alembic commands ###
 
 
 def downgrade() -> None:
     # ### commands auto generated by Alembic - please adjust! ###
-    with op.batch_alter_table("user_settings", schema=None) as batch_op:
-        batch_op.add_column(
-            sa.Column(
-                "ssh_tasks_dir",
-                sa.VARCHAR(),
-                autoincrement=False,
-                nullable=True,
-            )
-        )
+    with op.batch_alter_table("user_oauth", schema=None) as batch_op:
         batch_op.add_column(
             sa.Column(
-                "ssh_jobs_dir",
-                sa.VARCHAR(),
-                autoincrement=False,
-                nullable=True,
+                "username", sa.VARCHAR(), autoincrement=False, nullable=True
             )
         )
-
-    with op.batch_alter_table("user_oauth", schema=None) as batch_op:
         batch_op.drop_constraint(
             batch_op.f("fk_user_oauth_profile_id_profile"), type_="foreignkey"
         )
+        batch_op.drop_column("slurm_accounts")
+        batch_op.drop_column("project_dir")
         batch_op.drop_column("profile_id")
 
     with op.batch_alter_table("taskgroupv2", schema=None) as batch_op:

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

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

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

@@ -1,4 +1,4 @@
-fractal_server/__init__.py,sha256=m6ro3f4bjmvJJ9DFzqslf5NSM9OxOGIbAGvKTxl1rZQ,25
+fractal_server/__init__.py,sha256=BC6X5ShipZaJdAYWlIFWgdo5G_eS3ZXxSgaZP3AQsdU,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
@@ -6,18 +6,18 @@ fractal_server/app/db/__init__.py,sha256=sttX0mHVV0ESI1SJ1kcxUKiuEwqeP-BWsst0o_9
 fractal_server/app/models/__init__.py,sha256=xJWiGAwpXmCpnFMC4c_HTqoUCzMOXrakoGLUH_uMvdA,415
 fractal_server/app/models/linkusergroup.py,sha256=3KkkE4QIUAlTrBAZs_tVy0pGvAxUAq6yOEjflct_z2M,678
 fractal_server/app/models/linkuserproject.py,sha256=hvaxh3Lkiy2uUCwB8gvn8RorCpvxSSdzWdCS_U1GL7g,315
-fractal_server/app/models/security.py,sha256=snHmvnjYnq37qcXlUfieTUDz9bf-djOMeXMixP5EW3g,3736
-fractal_server/app/models/user_settings.py,sha256=6Cc4r6ZVcASwlcPtnKZfKe2OidzOafQlmzWYZNTpRYU,1126
+fractal_server/app/models/security.py,sha256=VThWDEmzUP4SgLsAvd5WjJ1p2WVxBuc6D5TMQJaOyd8,3873
+fractal_server/app/models/user_settings.py,sha256=u0GOK1JdqDmXzA8hK2JV93rZxY_rF-0oKMkArRolnN8,1201
 fractal_server/app/models/v2/__init__.py,sha256=A668GF4z_UPar6kAOwC-o_qUo3CIRJ3SmBGYTs3Xc7k,923
 fractal_server/app/models/v2/accounting.py,sha256=i-2TsjqyuclxFQ21C-TeDoss7ZBTRuXdzIJfVr2UxwE,1081
 fractal_server/app/models/v2/dataset.py,sha256=P_zy4dPQAqrCALQ6737VkAFk1SvcgYjnslGUZhPI8sc,1226
 fractal_server/app/models/v2/history.py,sha256=CBN2WVg9vW5pHU1RP8TkB_nnJrwnuifCcxgnd53UtEE,2163
 fractal_server/app/models/v2/job.py,sha256=YYzt3ef2CU1WXFNjlltR3ft2kM9T0Hq8oskSipQSxuM,2042
-fractal_server/app/models/v2/profile.py,sha256=dH5xftMYThd6xqw86a--2MPCysxGTLTsyyEsOCgcK4c,439
-fractal_server/app/models/v2/project.py,sha256=b6QZaMutwTfT1e_1mDDuwccgKVs4pcB0SMSYTtvfMrg,866
-fractal_server/app/models/v2/resource.py,sha256=RPQqOp1auoiXdPf27QazSXvzuUz9iPN1qfh7cRwxF64,3536
+fractal_server/app/models/v2/profile.py,sha256=QqOE7XGeq-ckQAbGhcgzDN5zFFaTNrtcuWgOXy9psR8,440
+fractal_server/app/models/v2/project.py,sha256=oXNcuNVDeNYZ60fwAx-Y_vnkS3xd9pwFdoT2pZmnBNI,918
+fractal_server/app/models/v2/resource.py,sha256=ReaBGtKb3e0_1PZOZncdGqrttkrC-bsgDCv3wPCGfOs,3512
 fractal_server/app/models/v2/task.py,sha256=iBIQB8POQE5MyKvLZhw7jZWlBhbrThzCDzRTcgiAczQ,1493
-fractal_server/app/models/v2/task_group.py,sha256=sOlBhOkDyIJN19yD358TsQtDJOVSeGhHffrxgB3KkkQ,4753
+fractal_server/app/models/v2/task_group.py,sha256=gHkuyIBw8hkoMCwHgo08SWVMc8T1MXC5xqoW2YNd5Sw,4753
 fractal_server/app/models/v2/workflow.py,sha256=gBjDXO-RytVT81aAlesImBhmVHrwNUrmsF_UsGa1qLM,1057
 fractal_server/app/models/v2/workflowtask.py,sha256=qkTc-hcFLpJUVsEUbnDq2BJL0qg9jagy2doZeusF1ek,1266
 fractal_server/app/routes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,30 +29,30 @@ 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=uel-MN3f9TkkIJ7flEC4yPH7q2qGQxoaxPB0LxfZzYs,7796
+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/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
-fractal_server/app/routes/api/v2/_aux_functions.py,sha256=8xnXYPjzo1yZfcg18b5ZY5tu9OQ1e55fOnX1IEmDSHk,15019
+fractal_server/app/routes/api/v2/_aux_functions.py,sha256=0OC5ydaX-XpscMRAsqiE03w2UVcd0xZ_vGs2PahDf1Y,14821
 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=eAXGnC7yEYGn1g2VDfSGvApN2mw79r4fW7ykRlDY2CY,12468
+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/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
 fractal_server/app/routes/api/v2/job.py,sha256=fyIYGcplsxzx91FxYWlImp1ATPk5IC8bfIcJkuZOhws,6526
 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/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=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
-fractal_server/app/routes/api/v2/task_collection_pixi.py,sha256=QHqdnaddTW-DZKrnzLKwCPP5j3UiqxOtFO04aZeexdk,7244
+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_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_group_lifecycle.py,sha256=ZSn8Ibjwkp89v87OPBquULPc9xsdpBfRvV1PiQdiicw,10593
 fractal_server/app/routes/api/v2/task_version_update.py,sha256=JO5xggiRqay4zNlbjlRa26ygMEue2klSFPyLrXS215k,8254
@@ -64,7 +64,7 @@ fractal_server/app/routes/auth/_aux_auth.py,sha256=fyGxBVb6yrVrsE7-2tTyiJ7orb9Jz
 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=3TaGZpjgjUyqqbhdcUv1PwgiHdkUk41X5tc98FOIw-s,2288
+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
@@ -99,10 +99,9 @@ fractal_server/config/__init__.py,sha256=ZCmroNB50sUxJiFtkW0a4fFtmfyPnL4LWhtKY5F
 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=y1WQPFjEyctsVpRX2LVKfR_nJjFQHAey_i8e6Hmsq6E,1605
+fractal_server/config/_main.py,sha256=L0sLfePAlnvEPxxtzDdY3xJRhzTAvIO5pdEoTd99byY,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
 fractal_server/data_migrations/tools.py,sha256=LeMeASwYGtEqd-3wOLle6WARdTGAimoyMmRbbJl-hAM,572
 fractal_server/exceptions.py,sha256=7ftpWwNsTQmNonWCynhH5ErUh1haPPhIaVPrNHla7-o,53
@@ -114,7 +113,7 @@ fractal_server/images/tools.py,sha256=37jVIU6RiAGbiyucNDlKe9J3yN3Y47NOvv-RJor9Jm
 fractal_server/logger.py,sha256=2_IN0WcIzLEX20HFUUkwyZGSIi0yLbE0JamkzXREDZw,5302
 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/naming_convention.py,sha256=bSEMiMZeArmWKrUk-12lhnOw1pAFMg6LEl7yucohPqc,263
 fractal_server/migrations/versions/034a469ec2eb_task_groups.py,sha256=vrPhC8hfFu1c4HmLHNZyCuqEfecFD8-bWc49bXMNes0,6199
 fractal_server/migrations/versions/091b01f51f88_add_usergroup_and_linkusergroup_table.py,sha256=-BSS9AFTPcu3gYC-sYbawSy4MWQQx8TfMb5BW5EBKmQ,1450
 fractal_server/migrations/versions/0f5f85bb2ae7_add_pre_pinned_packages.py,sha256=FxnIvfktnSjy2nBKDIow24on1nMkLw1THhO84FtNZSo,1055
@@ -131,10 +130,10 @@ fractal_server/migrations/versions/5bf02391cfef_v2.py,sha256=axhNkr_H6R4rRbY7oGY
 fractal_server/migrations/versions/70e77f1c38b0_add_applyworkflow_first_task_index_and_.py,sha256=Q-DsMzG3IcUV2Ol1dhJWosDvKERamBE6QvA2zzS5zpQ,1632
 fractal_server/migrations/versions/71eefd1dd202_add_slurm_accounts.py,sha256=mbWuCkTpRAdGbRhW7lhXs_e5S6O37UAcCN6JfoY5H8A,1353
 fractal_server/migrations/versions/791ce783d3d8_add_indices.py,sha256=gNE6AgJgeJZY99Fbd336Z9see3gRMQvuNBC0xDk_5sw,1154
+fractal_server/migrations/versions/83bc2ad3ffcc_2_17_0.py,sha256=U7t_8n58taRkd9sxCXOshrTr9M5AhlsQne8SGKa5Jt4,6377
 fractal_server/migrations/versions/84bf0fffde30_add_dumps_to_applyworkflow.py,sha256=NSCuhANChsg76vBkShBl-9tQ4VEHubOjtAv1etHhlvY,2684
 fractal_server/migrations/versions/8e8f227a3e36_update_taskv2_post_2_7_0.py,sha256=68y9-fpSuKx6KPtM_9n8Ho0I1qwa8IoG-yJqXUYQrGg,1111
 fractal_server/migrations/versions/8f79bd162e35_add_docs_info_and_docs_link_to_task_.py,sha256=6pgODDtyAxevZvAJBj9IJ41inhV1RpwbpZr_qfPPu1A,1115
-fractal_server/migrations/versions/90f6508c6379_drop_useroauth_username.py,sha256=NomnX0HH2M4wvNOnsla6hNx8270stB-WBZrl94xlGNk,897
 fractal_server/migrations/versions/94a47ea2d3ff_remove_cache_dir_slurm_user_and_slurm_.py,sha256=yL3-Hvzw5jBLKj4LFP1z5ofZE9L9W3tLwYtPNW7z4ko,1508
 fractal_server/migrations/versions/969d84257cac_add_historyrun_task_id.py,sha256=4nLSYEMp_Tm7VRfo8p9YKLHVnoizTXaPV6lfcfvWhj0,1143
 fractal_server/migrations/versions/97f444d47249_add_applyworkflow_project_dump.py,sha256=eKTZm3EgUgapXBxO0RuHkEfTKic-TZG3ADaMpGLuc0k,1057
@@ -144,7 +143,6 @@ fractal_server/migrations/versions/9c5ae74c9b98_add_user_settings_table.py,sha25
 fractal_server/migrations/versions/9db60297b8b2_set_ondelete.py,sha256=F0IdXk8vclViOGKe2SOHO3MsQsqe7SsZRSqz9cXhhrE,7928
 fractal_server/migrations/versions/9fd26a2b0de4_add_workflow_timestamp_created.py,sha256=4l1AHGUsa0ONoJVZlr3fTXw_xbbQ8O7wlD92Az2aRfM,1849
 fractal_server/migrations/versions/a7f4d6137b53_add_workflow_dump_to_applyworkflow.py,sha256=ekDUML7ILpmdoqEclKbEUdyLi4uw9HSG_sTjG2hp_JE,867
-fractal_server/migrations/versions/a80ac5a352bf_resource_profile.py,sha256=sKJmepSBxz91xZx8fyM1LZt-ajit_kzGa3dHTXe-YWo,6371
 fractal_server/migrations/versions/af1ef1c83c9b_add_accounting_tables.py,sha256=BftudWuSGvKGBzIL5AMb3yWkgTAuaKPBGsYcOzp_gLQ,1899
 fractal_server/migrations/versions/af8673379a5c_drop_old_filter_columns.py,sha256=9sLd0F7nO5chHHm7RZ4wBA-9bvWomS-av_odKwODADM,1551
 fractal_server/migrations/versions/b1e7f7a1ff71_task_group_for_pixi.py,sha256=loDrqBB-9U3vqLKePEeJy4gK4EuPs_1F345mdrnoCt0,1293
@@ -159,7 +157,6 @@ fractal_server/migrations/versions/e81103413827_add_job_type_filters.py,sha256=t
 fractal_server/migrations/versions/efa89c30e0a4_add_project_timestamp_created.py,sha256=jilQW3QIqYQ4Q6hCnUiG7UtNMpA41ujqrB3tPFiPM1Q,1221
 fractal_server/migrations/versions/f37aceb45062_make_historyunit_logfile_required.py,sha256=jLHcVq9z0Ou20u-mwPf6EICDKY4dwFAzBgbRRx9_xDw,1007
 fractal_server/migrations/versions/f384e1c0cf5d_drop_task_default_args_columns.py,sha256=9BwqUS9Gf7UW_KjrzHbtViC880qhD452KAytkHWWZyk,746
-fractal_server/migrations/versions/f65ee53991e3_user_settings_related.py,sha256=q9oaVpp85X4EZt3f33ThyBDZD3_9trO2va9uAIh2yK0,1883
 fractal_server/migrations/versions/fbce16ff4e47_new_history_items.py,sha256=TDWCaIoM0Q4SpRWmR9zr_rdp3lJXhCfBPTMhtrP5xYE,3950
 fractal_server/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 fractal_server/runner/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -257,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.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,,
+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/data_migrations/2_14_10.py

@@ -1,48 +0,0 @@
-import logging
-
-from sqlmodel import select
-
-from fractal_server.app.db import get_sync_db
-from fractal_server.app.models import HistoryRun
-from fractal_server.app.models import TaskV2
-from fractal_server.app.models import WorkflowTaskV2
-
-logger = logging.getLogger("fix_db")
-logger.setLevel(logging.INFO)
-
-
-def fix_db():
-    logger.info("START execution of fix_db function")
-
-    with next(get_sync_db()) as db:
-        stm = select(HistoryRun).order_by(HistoryRun.id)
-        history_runs = db.execute(stm).scalars().all()
-
-        for hr in history_runs:
-            logger.info(f"HistoryRun[{hr.id}] START")
-            if hr.workflowtask_id is None:
-                continue
-            wft = db.get(WorkflowTaskV2, hr.workflowtask_id)
-            if wft is None:
-                logger.warning(
-                    f"WorkflowTaskV2[{hr.workflowtask_id}] not found. "
-                    "Trying to use HistoryRun.workflowtask_dump"
-                )
-                task_id = hr.workflowtask_dump.get("task_id")
-                if task_id is not None and db.get(TaskV2, task_id) is not None:
-                    hr.task_id = task_id
-                else:
-                    logger.warning(f"TaskV2[{task_id}] not found")
-            else:
-                hr.task_id = wft.task_id
-                logger.info(
-                    f"HistoryRun[{hr.id}].task_id set to {wft.task_id}"
-                )
-
-            db.add(hr)
-            logger.info(f"HistoryRun[{hr.id}] END")
-
-        db.commit()
-        logger.info("Changes committed.")
-
-    logger.info("END execution of fix_db function")

fractal_server/migrations/versions/90f6508c6379_drop_useroauth_username.py

@@ -1,36 +0,0 @@
-"""drop useroauth.username
-
-Revision ID: 90f6508c6379
-Revises: a80ac5a352bf
-Create Date: 2025-10-15 16:09:40.922407
-
-"""
-import sqlalchemy as sa
-from alembic import op
-
-
-# revision identifiers, used by Alembic.
-revision = "90f6508c6379"
-down_revision = "a80ac5a352bf"
-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.drop_column("username")
-
-    # ### end Alembic commands ###
-
-
-def downgrade() -> 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(
-                "username", sa.VARCHAR(), autoincrement=False, nullable=True
-            )
-        )
-
-    # ### end Alembic commands ###

fractal_server/migrations/versions/f65ee53991e3_user_settings_related.py

@@ -1,67 +0,0 @@
-"""user-settings-related
-
-Revision ID: f65ee53991e3
-Revises: 90f6508c6379
-Create Date: 2025-10-22 15:16:42.217910
-
-"""
-import sqlalchemy as sa
-from alembic import op
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision = "f65ee53991e3"
-down_revision = "90f6508c6379"
-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_dir",
-                sa.String(),
-                server_default="/PLACEHOLDER",
-                nullable=False,
-            )
-        )
-        batch_op.add_column(
-            sa.Column(
-                "slurm_accounts",
-                postgresql.ARRAY(sa.String()),
-                server_default="{}",
-                nullable=True,
-            )
-        )
-        batch_op.drop_constraint(
-            batch_op.f("fk_user_oauth_user_settings_id_user_settings"),
-            type_="foreignkey",
-        )
-        batch_op.drop_column("user_settings_id")
-
-    # ### end Alembic commands ###
-
-
-def downgrade() -> 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(
-                "user_settings_id",
-                sa.INTEGER(),
-                autoincrement=False,
-                nullable=True,
-            )
-        )
-        batch_op.create_foreign_key(
-            batch_op.f("fk_user_oauth_user_settings_id_user_settings"),
-            "user_settings",
-            ["user_settings_id"],
-            ["id"],
-        )
-        batch_op.drop_column("slurm_accounts")
-        batch_op.drop_column("project_dir")
-
-    # ### end Alembic commands ###