fractal-server 2.3.10__py3-none-any.whl → 2.4.0a0__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.3.10"
+__VERSION__ = "2.4.0a0"

fractal_server/__main__.py

@@ -1,8 +1,10 @@
 import argparse as ap
+import asyncio
 import sys
 
 import uvicorn
 
+
 parser = ap.ArgumentParser(description="fractal-server commands")
 
 subparsers = parser.add_subparsers(title="Commands", dest="cmd", required=True)
@@ -75,12 +77,33 @@ def set_db():
     import alembic.config
     from pathlib import Path
     import fractal_server
+    from fractal_server.app.security import _create_first_user
+    from fractal_server.app.security import _create_first_group
+    from fractal_server.syringe import Inject
+    from fractal_server.config import get_settings
 
     alembic_ini = Path(fractal_server.__file__).parent / "alembic.ini"
     alembic_args = ["-c", alembic_ini.as_posix(), "upgrade", "head"]
-
-    print(f"Run alembic.config, with argv={alembic_args}")
+    print(f"START: Run alembic.config, with argv={alembic_args}")
     alembic.config.main(argv=alembic_args)
+    print("END: alembic.config")
+    # Insert default group
+    print("START: Default group creation")
+    _create_first_group()
+    print("END: Default group creation")
+    # NOTE: It will be fixed with #1739
+    settings = Inject(get_settings)
+    print("START: First user creation")
+    asyncio.run(
+        _create_first_user(
+            email=settings.FRACTAL_DEFAULT_ADMIN_EMAIL,
+            password=settings.FRACTAL_DEFAULT_ADMIN_PASSWORD,
+            username=settings.FRACTAL_DEFAULT_ADMIN_USERNAME,
+            is_superuser=True,
+            is_verified=True,
+        )
+    )
+    print("END: First user creation")
 
 
 def update_db_data():

fractal_server/app/models/__init__.py

@@ -1,5 +1,11 @@
-from .v1 import Project  # noqa: F401
-from .v2 import ProjectV2  # noqa: F401
-
-# We include the project models to avoid issues with LinkUserProject
-# (sometimes taking place in alembic autogenerate)
+"""
+Note that this module is imported from `fractal_server/migrations/env.py`,
+thus we should always export all relevant database models from here or they
+will not be picked up by alembic.
+"""
+from .linkusergroup import LinkUserGroup  # noqa: F401
+from .linkuserproject import LinkUserProject  # noqa: F401
+from .linkuserproject import LinkUserProjectV2  # noqa: F401
+from .security import *  # noqa
+from .v1 import *  # noqa
+from .v2 import *  # noqa

fractal_server/app/models/linkusergroup.py

@@ -0,0 +1,11 @@
+from sqlmodel import Field
+from sqlmodel import SQLModel
+
+
+class LinkUserGroup(SQLModel, table=True):
+    """
+    Crossing table between User and UserGroup
+    """
+
+    group_id: int = Field(foreign_key="usergroup.id", primary_key=True)
+    user_id: int = Field(foreign_key="user_oauth.id", primary_key=True)

fractal_server/app/models/security.py

@@ -9,19 +9,23 @@
 #
 # Copyright 2022 (C) Friedrich Miescher Institute for Biomedical Research and
 # University of Zurich
+from datetime import datetime
 from typing import Optional
 
 from pydantic import EmailStr
 from sqlalchemy import Column
+from sqlalchemy.types import DateTime
 from sqlalchemy.types import JSON
 from sqlmodel import Field
 from sqlmodel import Relationship
 from sqlmodel import SQLModel
 
+from fractal_server.utils import get_timestamp
+
 
 class OAuthAccount(SQLModel, table=True):
     """
-    OAuth account model
+    ORM model for OAuth accounts (`oauthaccount` database table).
 
     This class is based on fastapi_users_db_sqlmodel::SQLModelBaseOAuthAccount.
     Original Copyright: 2021 François Voron, released under MIT licence.
@@ -56,7 +60,7 @@ class OAuthAccount(SQLModel, table=True):
 
 class UserOAuth(SQLModel, table=True):
     """
-    User model
+    ORM model for the `user_oauth` database table.
 
     This class is a modification of SQLModelBaseUserDB from from
     fastapi_users_db_sqlmodel. Original Copyright: 2022 François Voron,
@@ -74,7 +78,6 @@ class UserOAuth(SQLModel, table=True):
         cache_dir:
         username:
         oauth_accounts:
-        project_list:
     """
 
     __tablename__ = "user_oauth"
@@ -103,3 +106,21 @@ class UserOAuth(SQLModel, table=True):
 
     class Config:
         orm_mode = True
+
+
+class UserGroup(SQLModel, table=True):
+    """
+    ORM model for the `usergroup` database table.
+
+    Attributes:
+        id: ID of the group
+        name: Name of the group
+        timestamp_created: Time of creation
+    """
+
+    id: Optional[int] = Field(default=None, primary_key=True)
+    name: str = Field(unique=True)
+    timestamp_created: datetime = Field(
+        default_factory=get_timestamp,
+        sa_column=Column(DateTime(timezone=True), nullable=False),
+    )

fractal_server/app/models/v1/project.py

@@ -10,7 +10,7 @@ from sqlmodel import SQLModel
 from . import LinkUserProject
 from ....utils import get_timestamp
 from ...schemas.v1.project import _ProjectBaseV1
-from ..security import UserOAuth
+from fractal_server.app.models import UserOAuth
 
 
 class Project(_ProjectBaseV1, SQLModel, table=True):

fractal_server/app/models/v2/project.py

@@ -7,9 +7,9 @@ from sqlmodel import Field
 from sqlmodel import Relationship
 from sqlmodel import SQLModel
 
-from . import LinkUserProjectV2
-from ....utils import get_timestamp
-from ..security import UserOAuth
+from .. import LinkUserProjectV2
+from fractal_server.app.models import UserOAuth
+from fractal_server.utils import get_timestamp
 
 
 class ProjectV2(SQLModel, table=True):

fractal_server/app/routes/admin/v1.py

@@ -21,7 +21,6 @@ from ....utils import get_timestamp
 from ....zip_tools import _zip_folder_to_byte_stream_iterator
 from ...db import AsyncSession
 from ...db import get_async_db
-from ...models.security import UserOAuth as User
 from ...models.v1 import ApplyWorkflow
 from ...models.v1 import Dataset
 from ...models.v1 import JobStatusTypeV1
@@ -33,9 +32,10 @@ from ...schemas.v1 import ApplyWorkflowUpdateV1
 from ...schemas.v1 import DatasetReadV1
 from ...schemas.v1 import ProjectReadV1
 from ...schemas.v1 import WorkflowReadV1
-from ...security import current_active_superuser
 from ..aux._job import _write_shutdown_file
 from ..aux._runner import _check_shutdown_is_supported
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.routes.auth import current_active_superuser
 
 router_admin_v1 = APIRouter()
 
@@ -63,7 +63,7 @@ async def view_project(
     user_id: Optional[int] = None,
     timestamp_created_min: Optional[datetime] = None,
     timestamp_created_max: Optional[datetime] = None,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ProjectReadV1]:
     """
@@ -80,7 +80,7 @@ async def view_project(
         stm = stm.where(Project.id == id)
 
     if user_id is not None:
-        stm = stm.where(Project.user_list.any(User.id == user_id))
+        stm = stm.where(Project.user_list.any(UserOAuth.id == user_id))
     if timestamp_created_min is not None:
         timestamp_created_min = _convert_to_db_timestamp(timestamp_created_min)
         stm = stm.where(Project.timestamp_created >= timestamp_created_min)
@@ -103,7 +103,7 @@ async def view_workflow(
     name_contains: Optional[str] = None,
     timestamp_created_min: Optional[datetime] = None,
     timestamp_created_max: Optional[datetime] = None,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[WorkflowReadV1]:
     """
@@ -119,7 +119,7 @@ async def view_workflow(
 
     if user_id is not None:
         stm = stm.join(Project).where(
-            Project.user_list.any(User.id == user_id)
+            Project.user_list.any(UserOAuth.id == user_id)
         )
     if id is not None:
         stm = stm.where(Workflow.id == id)
@@ -153,7 +153,7 @@ async def view_dataset(
     type: Optional[str] = None,
     timestamp_created_min: Optional[datetime] = None,
     timestamp_created_max: Optional[datetime] = None,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[DatasetReadV1]:
     """
@@ -170,7 +170,7 @@ async def view_dataset(
 
     if user_id is not None:
         stm = stm.join(Project).where(
-            Project.user_list.any(User.id == user_id)
+            Project.user_list.any(UserOAuth.id == user_id)
         )
     if id is not None:
         stm = stm.where(Dataset.id == id)
@@ -211,7 +211,7 @@ async def view_job(
     end_timestamp_min: Optional[datetime] = None,
     end_timestamp_max: Optional[datetime] = None,
     log: bool = True,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ApplyWorkflowReadV1]:
     """
@@ -243,7 +243,7 @@ async def view_job(
         stm = stm.where(ApplyWorkflow.id == id)
     if user_id is not None:
         stm = stm.join(Project).where(
-            Project.user_list.any(User.id == user_id)
+            Project.user_list.any(UserOAuth.id == user_id)
         )
     if project_id is not None:
         stm = stm.where(ApplyWorkflow.project_id == project_id)
@@ -282,7 +282,7 @@ async def view_job(
 async def view_single_job(
     job_id: int = None,
     show_tmp_logs: bool = False,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> ApplyWorkflowReadV1:
 
@@ -311,7 +311,7 @@ async def view_single_job(
 async def update_job(
     job_update: ApplyWorkflowUpdateV1,
     job_id: int,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[ApplyWorkflowReadV1]:
     """
@@ -344,7 +344,7 @@ async def update_job(
 @router_admin_v1.get("/job/{job_id}/stop/", status_code=202)
 async def stop_job(
     job_id: int,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -371,7 +371,7 @@ async def stop_job(
 )
 async def download_job_logs(
     job_id: int,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> StreamingResponse:
     """

fractal_server/app/routes/admin/v2.py

@@ -24,7 +24,6 @@ from ....utils import get_timestamp
 from ....zip_tools import _zip_folder_to_byte_stream_iterator
 from ...db import AsyncSession
 from ...db import get_async_db
-from ...models.security import UserOAuth as User
 from ...models.v1 import Task
 from ...models.v2 import JobV2
 from ...models.v2 import ProjectV2
@@ -36,9 +35,10 @@ from ...schemas.v2 import JobReadV2
 from ...schemas.v2 import JobStatusTypeV2
 from ...schemas.v2 import JobUpdateV2
 from ...schemas.v2 import ProjectReadV2
-from ...security import current_active_superuser
 from ..aux._job import _write_shutdown_file
 from ..aux._runner import _check_shutdown_is_supported
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.routes.auth import current_active_superuser
 
 router_admin_v2 = APIRouter()
 
@@ -64,7 +64,7 @@ def _convert_to_db_timestamp(dt: datetime) -> datetime:
 async def view_project(
     id: Optional[int] = None,
     user_id: Optional[int] = None,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ProjectReadV2]:
     """
@@ -80,7 +80,7 @@ async def view_project(
     if id is not None:
         stm = stm.where(ProjectV2.id == id)
     if user_id is not None:
-        stm = stm.where(ProjectV2.user_list.any(User.id == user_id))
+        stm = stm.where(ProjectV2.user_list.any(UserOAuth.id == user_id))
 
     res = await db.execute(stm)
     project_list = res.scalars().all()
@@ -102,7 +102,7 @@ async def view_job(
     end_timestamp_min: Optional[datetime] = None,
     end_timestamp_max: Optional[datetime] = None,
     log: bool = True,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[JobReadV2]:
     """
@@ -132,7 +132,7 @@ async def view_job(
         stm = stm.where(JobV2.id == id)
     if user_id is not None:
         stm = stm.join(ProjectV2).where(
-            ProjectV2.user_list.any(User.id == user_id)
+            ProjectV2.user_list.any(UserOAuth.id == user_id)
         )
     if project_id is not None:
         stm = stm.where(JobV2.project_id == project_id)
@@ -169,7 +169,7 @@ async def view_job(
 async def view_single_job(
     job_id: int = None,
     show_tmp_logs: bool = False,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> JobReadV2:
 
@@ -198,7 +198,7 @@ async def view_single_job(
 async def update_job(
     job_update: JobUpdateV2,
     job_id: int,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[JobReadV2]:
     """
@@ -231,7 +231,7 @@ async def update_job(
 @router_admin_v2.get("/job/{job_id}/stop/", status_code=202)
 async def stop_job(
     job_id: int,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -258,7 +258,7 @@ async def stop_job(
 )
 async def download_job_logs(
     job_id: int,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> StreamingResponse:
     """
@@ -292,7 +292,7 @@ class TaskCompatibility(BaseModel):
 async def flag_task_v1_as_v2_compatible(
     task_id: int,
     compatibility: TaskCompatibility,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
 
@@ -352,7 +352,7 @@ async def query_tasks(
     owner: Optional[str] = None,
     kind: Optional[Literal["common", "users"]] = None,
     max_number_of_results: int = 25,
-    user: User = Depends(current_active_superuser),
+    user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskV2Info]:
     """

fractal_server/app/routes/api/__init__.py

@@ -6,8 +6,8 @@ from fastapi import Depends
 
 from ....config import get_settings
 from ....syringe import Inject
-from ...models.security import UserOAuth
-from ...security import current_active_superuser
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.routes.auth import current_active_superuser
 
 
 router_api = APIRouter()

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

@@ -22,7 +22,7 @@ from ....models.v1 import Task
 from ....models.v1 import Workflow
 from ....models.v1 import WorkflowTask
 from ....schemas.v1 import JobStatusTypeV1
-from ....security import User
+from fractal_server.app.models import UserOAuth
 
 
 def _raise_if_v1_is_read_only() -> None:
@@ -327,7 +327,7 @@ async def _get_job_check_owner(
 async def _get_task_check_owner(
     *,
     task_id: int,
-    user: User,
+    user: UserOAuth,
     db: AsyncSession,
 ) -> Task:
     """

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

@@ -27,13 +27,13 @@ from ....schemas.v1 import ResourceReadV1
 from ....schemas.v1 import ResourceUpdateV1
 from ....schemas.v1 import WorkflowExportV1
 from ....schemas.v1 import WorkflowTaskExportV1
-from ....security import current_active_user
-from ....security import User
 from ._aux_functions import _get_dataset_check_owner
 from ._aux_functions import _get_project_check_owner
 from ._aux_functions import _get_submitted_jobs_statement
 from ._aux_functions import _get_workflow_check_owner
 from ._aux_functions import _raise_if_v1_is_read_only
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.routes.auth import current_active_user
 
 router = APIRouter()
 
@@ -46,7 +46,7 @@ router = APIRouter()
 async def create_dataset(
     project_id: int,
     dataset: DatasetCreateV1,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[DatasetReadV1]:
     """
@@ -72,7 +72,7 @@ async def create_dataset(
 async def read_dataset_list(
     project_id: int,
     history: bool = True,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[list[DatasetReadV1]]:
     """
@@ -103,7 +103,7 @@ async def read_dataset_list(
 async def read_dataset(
     project_id: int,
     dataset_id: int,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[DatasetReadV1]:
     """
@@ -128,7 +128,7 @@ async def update_dataset(
     project_id: int,
     dataset_id: int,
     dataset_update: DatasetUpdateV1,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[DatasetReadV1]:
     """
@@ -165,7 +165,7 @@ async def update_dataset(
 async def delete_dataset(
     project_id: int,
     dataset_id: int,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -239,7 +239,7 @@ async def create_resource(
     project_id: int,
     dataset_id: int,
     resource: ResourceCreateV1,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[ResourceReadV1]:
     """
@@ -268,7 +268,7 @@ async def create_resource(
 async def get_resource_list(
     project_id: int,
     dataset_id: int,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[list[ResourceReadV1]]:
     """
@@ -296,7 +296,7 @@ async def update_resource(
     dataset_id: int,
     resource_id: int,
     resource_update: ResourceUpdateV1,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[ResourceReadV1]:
     """
@@ -337,7 +337,7 @@ async def delete_resource(
     project_id: int,
     dataset_id: int,
     resource_id: int,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """
@@ -371,7 +371,7 @@ async def delete_resource(
 async def export_history_as_workflow(
     project_id: int,
     dataset_id: int,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[WorkflowExportV1]:
     """
@@ -439,7 +439,7 @@ async def export_history_as_workflow(
 async def get_workflowtask_status(
     project_id: int,
     dataset_id: int,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[DatasetStatusReadV1]:
     """
@@ -535,14 +535,16 @@ async def get_workflowtask_status(
 @router.get("/dataset/", response_model=list[DatasetReadV1])
 async def get_user_datasets(
     history: bool = True,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[DatasetReadV1]:
     """
     Returns all the datasets of the current user
     """
     stm = select(Dataset)
-    stm = stm.join(Project).where(Project.user_list.any(User.id == user.id))
+    stm = stm.join(Project).where(
+        Project.user_list.any(UserOAuth.id == user.id)
+    )
     res = await db.execute(stm)
     dataset_list = res.scalars().all()
     await db.close()

fractal_server/app/routes/api/v1/job.py

@@ -16,20 +16,20 @@ from ....models.v1 import JobStatusTypeV1
 from ....models.v1 import Project
 from ....runner.filenames import WORKFLOW_LOG_FILENAME
 from ....schemas.v1 import ApplyWorkflowReadV1
-from ....security import current_active_user
-from ....security import User
 from ...aux._job import _write_shutdown_file
 from ...aux._runner import _check_shutdown_is_supported
 from ._aux_functions import _get_job_check_owner
 from ._aux_functions import _get_project_check_owner
 from ._aux_functions import _get_workflow_check_owner
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.routes.auth import current_active_user
 
 router = APIRouter()
 
 
 @router.get("/job/", response_model=list[ApplyWorkflowReadV1])
 async def get_user_jobs(
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     log: bool = True,
     db: AsyncSession = Depends(get_async_db),
 ) -> list[ApplyWorkflowReadV1]:
@@ -37,7 +37,9 @@ async def get_user_jobs(
     Returns all the jobs of the current user
     """
     stm = select(ApplyWorkflow)
-    stm = stm.join(Project).where(Project.user_list.any(User.id == user.id))
+    stm = stm.join(Project).where(
+        Project.user_list.any(UserOAuth.id == user.id)
+    )
     res = await db.execute(stm)
     job_list = res.scalars().all()
     await db.close()
@@ -55,7 +57,7 @@ async def get_user_jobs(
 async def get_workflow_jobs(
     project_id: int,
     workflow_id: int,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[list[ApplyWorkflowReadV1]]:
     """
@@ -78,7 +80,7 @@ async def read_job(
     project_id: int,
     job_id: int,
     show_tmp_logs: bool = False,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[ApplyWorkflowReadV1]:
     """
@@ -111,7 +113,7 @@ async def read_job(
 async def download_job_logs(
     project_id: int,
     job_id: int,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> StreamingResponse:
     """
@@ -141,7 +143,7 @@ async def download_job_logs(
 )
 async def get_job_list(
     project_id: int,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     log: bool = True,
     db: AsyncSession = Depends(get_async_db),
 ) -> Optional[list[ApplyWorkflowReadV1]]:
@@ -170,7 +172,7 @@ async def get_job_list(
 async def stop_job(
     project_id: int,
     job_id: int,
-    user: User = Depends(current_active_user),
+    user: UserOAuth = Depends(current_active_user),
     db: AsyncSession = Depends(get_async_db),
 ) -> Response:
     """