fractal-server 2.17.0a11__tar.gz → 2.17.1__tar.gz

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/PKG-INFO

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

fractal_server-2.17.1/fractal_server/__init__.py

@@ -0,0 +1 @@
+__VERSION__ = "2.17.1"

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/fractal_server/__main__.py

@@ -7,7 +7,6 @@ from pathlib import Path
 import uvicorn
 from pydantic import ValidationError
 
-from fractal_server.app.schemas.v2 import ResourceType
 
 parser = ap.ArgumentParser(description="fractal-server commands")
 
@@ -149,6 +148,7 @@ def init_db_data(
     from fractal_server.app.models import Resource, Profile
     from fractal_server.app.schemas.v2.resource import cast_serialize_resource
     from fractal_server.app.schemas.v2.profile import cast_serialize_profile
+    from fractal_server.app.schemas.v2 import ResourceType
 
     # Create default group and user
     print()

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/fractal_server/app/models/__init__.py

@@ -6,5 +6,4 @@ will not be picked up by alembic.
 from .linkusergroup import LinkUserGroup  # noqa: F401
 from .linkuserproject import LinkUserProjectV2  # noqa: F401
 from .security import *  # noqa
-from .user_settings import UserSettings  # noqa
 from .v2 import *  # noqa

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/fractal_server/app/models/security.py

@@ -95,24 +95,11 @@ class UserOAuth(SQLModel, table=True):
         ondelete="RESTRICT",
     )
 
-    # TODO-2.17.1: update to `project_dir: str`
-    project_dir: str = Field(
-        sa_column=Column(
-            String,
-            server_default="/PLACEHOLDER",
-            nullable=False,
-        )
-    )
+    project_dir: str
     slurm_accounts: list[str] = Field(
         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-2.17.0a11 → fractal_server-2.17.1}/fractal_server/app/models/v2/project.py

@@ -15,10 +15,7 @@ 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="RESTRICT"
-    )
+    resource_id: int = Field(foreign_key="resource.id", ondelete="RESTRICT")
     timestamp_created: datetime = Field(
         default_factory=get_timestamp,
         sa_column=Column(DateTime(timezone=True), nullable=False),

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/fractal_server/app/models/v2/task_group.py

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

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/fractal_server/app/routes/admin/v2/job.py

@@ -7,6 +7,7 @@ from fastapi import Response
 from fastapi import status
 from fastapi.responses import StreamingResponse
 from pydantic.types import AwareDatetime
+from sqlalchemy import func
 from sqlmodel import select
 
 from fractal_server.app.db import AsyncSession
@@ -19,6 +20,9 @@ from fractal_server.app.models.v2 import ProjectV2
 from fractal_server.app.routes.auth import current_superuser_act
 from fractal_server.app.routes.aux._job import _write_shutdown_file
 from fractal_server.app.routes.aux._runner import _check_shutdown_is_supported
+from fractal_server.app.routes.pagination import get_pagination_params
+from fractal_server.app.routes.pagination import PaginationRequest
+from fractal_server.app.routes.pagination import PaginationResponse
 from fractal_server.app.schemas.v2 import HistoryUnitStatus
 from fractal_server.app.schemas.v2 import JobReadV2
 from fractal_server.app.schemas.v2 import JobStatusTypeV2
@@ -30,7 +34,7 @@ from fractal_server.zip_tools import _zip_folder_to_byte_stream_iterator
 router = APIRouter()
 
 
-@router.get("/", response_model=list[JobReadV2])
+@router.get("/", response_model=PaginationResponse[JobReadV2])
 async def view_job(
     id: int | None = None,
     user_id: int | None = None,
@@ -43,9 +47,10 @@ async def view_job(
     end_timestamp_min: AwareDatetime | None = None,
     end_timestamp_max: AwareDatetime | None = None,
     log: bool = True,
+    pagination: PaginationRequest = Depends(get_pagination_params),
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> list[JobReadV2]:
+) -> PaginationResponse[JobReadV2]:
     """
     Query `ApplyWorkflow` table.
 
@@ -68,43 +73,74 @@ async def view_job(
             `job.log` is set to `None`.
     """
 
-    stm = select(JobV2)
+    # Assign pagination parameters
+    page = pagination.page
+    page_size = pagination.page_size
 
+    # Prepare statements
+    stm = select(JobV2).order_by(JobV2.start_timestamp.desc())
+    stm_count = select(func.count(JobV2.id))
     if id is not None:
         stm = stm.where(JobV2.id == id)
+        stm_count = stm_count.where(JobV2.id == id)
     if user_id is not None:
         stm = stm.join(ProjectV2).where(
             ProjectV2.user_list.any(UserOAuth.id == user_id)
         )
+        stm_count = stm_count.join(ProjectV2).where(
+            ProjectV2.user_list.any(UserOAuth.id == user_id)
+        )
     if project_id is not None:
         stm = stm.where(JobV2.project_id == project_id)
+        stm_count = stm_count.where(JobV2.project_id == project_id)
     if dataset_id is not None:
         stm = stm.where(JobV2.dataset_id == dataset_id)
+        stm_count = stm_count.where(JobV2.dataset_id == dataset_id)
     if workflow_id is not None:
         stm = stm.where(JobV2.workflow_id == workflow_id)
+        stm_count = stm_count.where(JobV2.workflow_id == workflow_id)
     if status is not None:
         stm = stm.where(JobV2.status == status)
+        stm_count = stm_count.where(JobV2.status == status)
     if start_timestamp_min is not None:
-        start_timestamp_min = start_timestamp_min
         stm = stm.where(JobV2.start_timestamp >= start_timestamp_min)
+        stm_count = stm_count.where(
+            JobV2.start_timestamp >= start_timestamp_min
+        )
     if start_timestamp_max is not None:
-        start_timestamp_max = start_timestamp_max
         stm = stm.where(JobV2.start_timestamp <= start_timestamp_max)
+        stm_count = stm_count.where(
+            JobV2.start_timestamp <= start_timestamp_max
+        )
     if end_timestamp_min is not None:
-        end_timestamp_min = end_timestamp_min
         stm = stm.where(JobV2.end_timestamp >= end_timestamp_min)
+        stm_count = stm_count.where(JobV2.end_timestamp >= end_timestamp_min)
     if end_timestamp_max is not None:
-        end_timestamp_max = end_timestamp_max
         stm = stm.where(JobV2.end_timestamp <= end_timestamp_max)
+        stm_count = stm_count.where(JobV2.end_timestamp <= end_timestamp_max)
 
+    # Find total number of elements
+    res_total_count = await db.execute(stm_count)
+    total_count = res_total_count.scalar()
+    if page_size is None:
+        page_size = total_count
+    else:
+        stm = stm.offset((page - 1) * page_size).limit(page_size)
+
+    # Get `page_size` rows
     res = await db.execute(stm)
     job_list = res.scalars().all()
-    await db.close()
+
     if not log:
         for job in job_list:
             setattr(job, "log", None)
 
-    return job_list
+    return PaginationResponse[JobReadV2](
+        total_count=total_count,
+        page_size=page_size,
+        current_page=page,
+        items=[job.model_dump() for job in job_list],
+    )
 
 
 @router.get("/{job_id}/", response_model=JobReadV2)

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/fractal_server/app/routes/admin/v2/task.py

@@ -1,7 +1,5 @@
 from fastapi import APIRouter
 from fastapi import Depends
-from fastapi import HTTPException
-from fastapi import status
 from pydantic import BaseModel
 from pydantic import EmailStr
 from pydantic import Field
@@ -16,6 +14,10 @@ from fractal_server.app.models.v2 import TaskV2
 from fractal_server.app.models.v2 import WorkflowTaskV2
 from fractal_server.app.models.v2 import WorkflowV2
 from fractal_server.app.routes.auth import current_superuser_act
+from fractal_server.app.routes.pagination import get_pagination_params
+from fractal_server.app.routes.pagination import PaginationRequest
+from fractal_server.app.routes.pagination import PaginationResponse
+from fractal_server.app.schemas.v2.task import TaskType
 
 router = APIRouter()
 
@@ -49,75 +51,85 @@ class TaskV2Info(BaseModel):
     relationships: list[TaskV2Relationship]
 
 
-@router.get("/", response_model=list[TaskV2Info])
+@router.get("/", response_model=PaginationResponse[TaskV2Info])
 async def query_tasks(
     id: int | None = None,
     source: str | None = None,
     version: str | None = None,
     name: str | None = None,
-    max_number_of_results: int = 25,
+    task_type: TaskType | None = None,
     category: str | None = None,
     modality: str | None = None,
     author: str | None = None,
     resource_id: int | None = None,
+    pagination: PaginationRequest = Depends(get_pagination_params),
     user: UserOAuth = Depends(current_superuser_act),
     db: AsyncSession = Depends(get_async_db),
-) -> list[TaskV2Info]:
+) -> PaginationResponse[TaskV2Info]:
     """
-    Query `TaskV2` table and get information about related items
-    (WorkflowV2s and ProjectV2s)
-
-    Args:
-        id: If not `None`, query for matching `task.id`.
-        source: If not `None`, query for contained case insensitive
-            `task.source`.
-        version: If not `None`, query for matching `task.version`.
-        name: If not `None`, query for contained case insensitive `task.name`.
-        max_number_of_results: The maximum length of the response.
-        category:
-        modality:
-        author:
-        resource_id:
+    Query `TaskV2` and get information about related workflows and projects.
     """
 
-    stm = select(TaskV2)
+    # Assign pagination parameters
+    page = pagination.page
+    page_size = pagination.page_size
 
+    # Prepare statements
+    stm = select(TaskV2).order_by(TaskV2.id)
+    stm_count = select(func.count(TaskV2.id))
     if id is not None:
         stm = stm.where(TaskV2.id == id)
+        stm_count = stm_count.where(TaskV2.id == id)
     if source is not None:
         stm = stm.where(TaskV2.source.icontains(source))
+        stm_count = stm_count.where(TaskV2.source.icontains(source))
     if version is not None:
         stm = stm.where(TaskV2.version == version)
+        stm_count = stm_count.where(TaskV2.version == version)
     if name is not None:
         stm = stm.where(TaskV2.name.icontains(name))
+        stm_count = stm_count.where(TaskV2.name.icontains(name))
+    if task_type is not None:
+        stm = stm.where(TaskV2.type == task_type)
+        stm_count = stm_count.where(TaskV2.type == task_type)
     if category is not None:
         stm = stm.where(func.lower(TaskV2.category) == category.lower())
+        stm_count = stm_count.where(
+            func.lower(TaskV2.category) == category.lower()
+        )
     if modality is not None:
         stm = stm.where(func.lower(TaskV2.modality) == modality.lower())
+        stm_count = stm_count.where(
+            func.lower(TaskV2.modality) == modality.lower()
+        )
     if author is not None:
         stm = stm.where(TaskV2.authors.icontains(author))
+        stm_count = stm_count.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)
         )
+        stm_count = (
+            stm_count.join(TaskGroupV2)
+            .where(TaskGroupV2.id == TaskV2.taskgroupv2_id)
+            .where(TaskGroupV2.resource_id == resource_id)
+        )
+
+    # Find total number of elements
+    res_total_count = await db.execute(stm_count)
+    total_count = res_total_count.scalar()
+    if page_size is None:
+        page_size = total_count
+    else:
+        stm = stm.offset((page - 1) * page_size).limit(page_size)
 
-    stm = stm.order_by(TaskV2.id)
+    # Get `page_size` rows
     res = await db.execute(stm)
     task_list = res.scalars().all()
-    if len(task_list) > max_number_of_results:
-        await db.close()
-        raise HTTPException(
-            status_code=status.HTTP_422_UNPROCESSABLE_CONTENT,
-            detail=(
-                f"Too many Tasks ({len(task_list)} > {max_number_of_results})."
-                " Please add more query filters."
-            ),
-        )
 
     task_info_list = []
-
     for task in task_list:
         stm = (
             select(WorkflowV2)
@@ -147,4 +159,9 @@ async def query_tasks(
             )
         )
 
-    return task_info_list
+    return PaginationResponse[TaskV2Info](
+        total_count=total_count,
+        page_size=page_size,
+        current_page=page,
+        items=task_info_list,
+    )

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/fractal_server/app/schemas/v2/task_collection.py

@@ -51,9 +51,17 @@ class TaskCollectPipV2(BaseModel):
     package: NonEmptyStr | None = None
     package_version: NonEmptyStr | None = None
     package_extras: NonEmptyStr | None = None
-    python_version: Literal[
-        "3.9", "3.10", "3.11", "3.12", "3.13"
-    ] | None = None
+    python_version: (
+        Literal[
+            "3.9",
+            "3.10",
+            "3.11",
+            "3.12",
+            "3.13",
+            "3.14",
+        ]
+        | None
+    ) = None
     pinned_package_versions_pre: DictStrStr | None = None
     pinned_package_versions_post: DictStrStr | None = None
 

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/fractal_server/app/shutdown.py

@@ -12,44 +12,48 @@ from fractal_server.syringe import Inject
 
 
 async def cleanup_after_shutdown(*, jobsV2: list[int], logger_name: str):
+    settings = Inject(get_settings)
     logger = get_logger(logger_name)
     logger.info("Cleanup function after shutdown")
-    stm_v2 = (
+    stm_objects = (
         select(JobV2)
         .where(JobV2.id.in_(jobsV2))
         .where(JobV2.status == JobStatusTypeV2.SUBMITTED)
     )
+    stm_ids = (
+        select(JobV2.id)
+        .where(JobV2.id.in_(jobsV2))
+        .where(JobV2.status == JobStatusTypeV2.SUBMITTED)
+    )
 
     async for session in get_async_db():
-        jobsV2_db = (await session.execute(stm_v2)).scalars().all()
-
-        for job in jobsV2_db:
+        # Write shutdown file for all jobs
+        jobs = (await session.execute(stm_objects)).scalars().all()
+        for job in jobs:
             _write_shutdown_file(job=job)
 
-        settings = Inject(get_settings)
-
+        # Wait for completion of all job - with a timeout
+        interval = settings.FRACTAL_GRACEFUL_SHUTDOWN_TIME / 20
         t_start = time.perf_counter()
         while (
             time.perf_counter() - t_start
-        ) < settings.FRACTAL_GRACEFUL_SHUTDOWN_TIME:  # 30 seconds
-            logger.info("Waiting 3 seconds before checking")
-            time.sleep(3)
-            jobsV2_db = (await session.execute(stm_v2)).scalars().all()
-
-            if len(jobsV2_db) == 0:
-                logger.info(
-                    "All jobs associated to this app are "
-                    "either done or failed. Exit."
-                )
+        ) <= settings.FRACTAL_GRACEFUL_SHUTDOWN_TIME:
+            job_ids = (await session.execute(stm_ids)).scalars().all()
+            if len(job_ids) == 0:
+                logger.info("All jobs are either done or failed. Exit.")
                 return
             else:
-                logger.info(f"Some jobs are still 'submitted' {jobsV2_db=}")
+                logger.info(f"Some jobs are still 'submitted': {job_ids=}")
+                logger.info(f"Wait {interval:.4f} seconds before next check.")
+                time.sleep(interval)
         logger.info(
             "Graceful shutdown reached its maximum time, "
-            "but some jobs are still submitted"
+            "but some jobs are still submitted."
         )
 
-        for job in jobsV2_db:
+        # Mark jobs as failed and update their logs.
+        jobs = (await session.execute(stm_objects)).scalars().all()
+        for job in jobs:
             job.status = "failed"
             job.log = (job.log or "") + "\nJob stopped due to app shutdown\n"
             session.add(job)

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/fractal_server/config/_database.py

@@ -1,4 +1,5 @@
 from pydantic import SecretStr
+from pydantic.types import NonNegativeInt
 from pydantic_settings import BaseSettings
 from pydantic_settings import SettingsConfigDict
 from sqlalchemy.engine import URL
@@ -27,11 +28,11 @@ class DatabaseSettings(BaseSettings):
     """
     Password to use when connecting to the PostgreSQL database.
     """
-    POSTGRES_HOST: NonEmptyStr | None = "localhost"
+    POSTGRES_HOST: NonEmptyStr = "localhost"
     """
     URL to the PostgreSQL server or path to a UNIX domain socket.
     """
-    POSTGRES_PORT: NonEmptyStr | None = "5432"
+    POSTGRES_PORT: NonNegativeInt = 5432
     """
     Port number to use when connecting to the PostgreSQL server.
     """

{fractal_server-2.17.0a11 → fractal_server-2.17.1}/fractal_server/config/_main.py

@@ -57,7 +57,7 @@ class Settings(BaseSettings):
     `app.state`.
     """
 
-    FRACTAL_GRACEFUL_SHUTDOWN_TIME: int = 30
+    FRACTAL_GRACEFUL_SHUTDOWN_TIME: float = 30.0
     """
     Waiting time for the shutdown phase of executors
     """

fractal_server-2.17.1/fractal_server/migrations/versions/45fbb391d7af_make_resource_id_fk_non_nullable.py

@@ -0,0 +1,46 @@
+"""Make resource_id FK non-nullable
+
+Revision ID: 45fbb391d7af
+Revises: caba9fb1ea5e
+Create Date: 2025-11-11 16:39:12.813766
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "45fbb391d7af"
+down_revision = "caba9fb1ea5e"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("projectv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "resource_id", existing_type=sa.INTEGER(), nullable=False
+        )
+
+    with op.batch_alter_table("taskgroupv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "resource_id", existing_type=sa.INTEGER(), nullable=False
+        )
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table("taskgroupv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "resource_id", existing_type=sa.INTEGER(), nullable=True
+        )
+
+    with op.batch_alter_table("projectv2", schema=None) as batch_op:
+        batch_op.alter_column(
+            "resource_id", existing_type=sa.INTEGER(), nullable=True
+        )
+
+    # ### end Alembic commands ###

fractal_server-2.17.1/fractal_server/migrations/versions/49d0856e9569_drop_table.py

@@ -0,0 +1,63 @@
+"""Drop  table
+
+Revision ID: 49d0856e9569
+Revises: 45fbb391d7af
+Create Date: 2025-11-11 16:39:41.497832
+
+"""
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision = "49d0856e9569"
+down_revision = "45fbb391d7af"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_table("user_settings")
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "user_settings",
+        sa.Column("id", sa.INTEGER(), autoincrement=True, nullable=False),
+        sa.Column(
+            "slurm_accounts",
+            postgresql.JSONB(astext_type=sa.Text()),
+            server_default=sa.text("'[]'::json"),
+            autoincrement=False,
+            nullable=False,
+        ),
+        sa.Column(
+            "ssh_host", sa.VARCHAR(), autoincrement=False, nullable=True
+        ),
+        sa.Column(
+            "ssh_username", sa.VARCHAR(), autoincrement=False, nullable=True
+        ),
+        sa.Column(
+            "ssh_private_key_path",
+            sa.VARCHAR(),
+            autoincrement=False,
+            nullable=True,
+        ),
+        sa.Column(
+            "ssh_tasks_dir", sa.VARCHAR(), autoincrement=False, nullable=True
+        ),
+        sa.Column(
+            "ssh_jobs_dir", sa.VARCHAR(), autoincrement=False, nullable=True
+        ),
+        sa.Column(
+            "slurm_user", sa.VARCHAR(), autoincrement=False, nullable=True
+        ),
+        sa.Column(
+            "project_dir", sa.VARCHAR(), autoincrement=False, nullable=True
+        ),
+        sa.PrimaryKeyConstraint("id", name=op.f("pk_user_settings")),
+    )
+    # ### end Alembic commands ###

fractal_server-2.17.1/fractal_server/migrations/versions/7673fe18c05d_remove_project_dir_server_default.py

@@ -0,0 +1,29 @@
+"""Remove project_dir server_default
+
+Revision ID: 7673fe18c05d
+Revises: 49d0856e9569
+Create Date: 2025-11-11 16:50:20.079193
+
+"""
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "7673fe18c05d"
+down_revision = "49d0856e9569"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    """
+    Remove `server_default` for `project_dir` column - see
+    https://alembic.sqlalchemy.org/en/latest/ops.html#alembic.operations.Operations.alter_column.params.server_default
+    """
+    with op.batch_alter_table("user_oauth") as batch_op:
+        batch_op.alter_column("project_dir", server_default=None)
+
+
+def downgrade() -> None:
+    with op.batch_alter_table("user_oauth") as batch_op:
+        batch_op.alter_column("project_dir", server_default="/PLACEHOLDER")

fractal_server-2.17.1/fractal_server/migrations/versions/caba9fb1ea5e_drop_useroauth_user_settings_id.py

@@ -0,0 +1,49 @@
+"""Drop UserOAuth.user_settings_id
+
+Revision ID: caba9fb1ea5e
+Revises: 83bc2ad3ffcc
+Create Date: 2025-11-11 16:38:27.243693
+
+"""
+import sqlalchemy as sa
+from alembic import op
+
+
+# revision identifiers, used by Alembic.
+revision = "caba9fb1ea5e"
+down_revision = "83bc2ad3ffcc"
+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_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"],
+        )
+
+    # ### end Alembic commands ###