fractal-server 2.13.0__py3-none-any.whl → 2.14.0__py3-none-any.whl

fractal_server/__init__.py

@@ -1 +1 @@
-__VERSION__ = "2.13.0"
+__VERSION__ = "2.14.0"

fractal_server/__main__.py

@@ -123,7 +123,9 @@ def set_db(skip_init_data: bool = False):
     asyncio.run(
         _create_first_user(
             email=settings.FRACTAL_DEFAULT_ADMIN_EMAIL,
-            password=settings.FRACTAL_DEFAULT_ADMIN_PASSWORD,
+            password=(
+                settings.FRACTAL_DEFAULT_ADMIN_PASSWORD.get_secret_value()
+            ),
             username=settings.FRACTAL_DEFAULT_ADMIN_USERNAME,
             is_superuser=True,
             is_verified=True,

fractal_server/app/models/linkusergroup.py

@@ -13,8 +13,12 @@ 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)
+    group_id: int = Field(
+        foreign_key="usergroup.id", primary_key=True, ondelete="CASCADE"
+    )
+    user_id: int = Field(
+        foreign_key="user_oauth.id", primary_key=True, ondelete="CASCADE"
+    )
 
     timestamp_created: datetime = Field(
         default_factory=get_timestamp,

fractal_server/app/models/v2/__init__.py

@@ -2,7 +2,12 @@
 v2 `models` module
 """
 from ..linkuserproject import LinkUserProjectV2
+from .accounting import AccountingRecord
+from .accounting import AccountingRecordSlurm
 from .dataset import DatasetV2
+from .history import HistoryImageCache
+from .history import HistoryRun
+from .history import HistoryUnit
 from .job import JobV2
 from .project import ProjectV2
 from .task import TaskV2
@@ -12,6 +17,8 @@ from .workflow import WorkflowV2
 from .workflowtask import WorkflowTaskV2
 
 __all__ = [
+    "AccountingRecord",
+    "AccountingRecordSlurm",
     "LinkUserProjectV2",
     "DatasetV2",
     "JobV2",
@@ -19,6 +26,9 @@ __all__ = [
     "TaskGroupV2",
     "TaskGroupActivityV2",
     "TaskV2",
-    "WorkflowTaskV2",
     "WorkflowV2",
+    "WorkflowTaskV2",
+    "HistoryRun",
+    "HistoryUnit",
+    "HistoryImageCache",
 ]

fractal_server/app/models/v2/accounting.py

@@ -0,0 +1,35 @@
+from datetime import datetime
+from typing import Optional
+
+from sqlalchemy import Column
+from sqlalchemy import Integer
+from sqlalchemy.dialects.postgresql import ARRAY
+from sqlalchemy.types import DateTime
+from sqlmodel import Field
+from sqlmodel import SQLModel
+
+from ....utils import get_timestamp
+
+
+class AccountingRecord(SQLModel, table=True):
+    id: Optional[int] = Field(default=None, primary_key=True)
+    user_id: int = Field(foreign_key="user_oauth.id", nullable=False)
+    timestamp: datetime = Field(
+        default_factory=get_timestamp,
+        sa_column=Column(DateTime(timezone=True), nullable=False),
+    )
+    num_tasks: int
+    num_new_images: int
+
+
+class AccountingRecordSlurm(SQLModel, table=True):
+    id: Optional[int] = Field(default=None, primary_key=True)
+    user_id: int = Field(foreign_key="user_oauth.id", nullable=False)
+    timestamp: datetime = Field(
+        default_factory=get_timestamp,
+        sa_column=Column(DateTime(timezone=True), nullable=False),
+    )
+    slurm_job_ids: list[int] = Field(
+        default_factory=list,
+        sa_column=Column(ARRAY(Integer)),
+    )

fractal_server/app/models/v2/dataset.py

@@ -11,7 +11,6 @@ from sqlmodel import Relationship
 from sqlmodel import SQLModel
 
 from ....utils import get_timestamp
-from fractal_server.images.models import AttributeFiltersType
 
 
 class DatasetV2(SQLModel, table=True):
@@ -20,7 +19,7 @@ class DatasetV2(SQLModel, table=True):
     id: Optional[int] = Field(default=None, primary_key=True)
     name: str
 
-    project_id: int = Field(foreign_key="projectv2.id")
+    project_id: int = Field(foreign_key="projectv2.id", ondelete="CASCADE")
     project: "ProjectV2" = Relationship(  # noqa: F821
         sa_relationship_kwargs=dict(lazy="selectin"),
     )
@@ -34,20 +33,11 @@ class DatasetV2(SQLModel, table=True):
         sa_column=Column(DateTime(timezone=True), nullable=False),
     )
 
-    # New in V2
-
     zarr_dir: str
     images: list[dict[str, Any]] = Field(
         sa_column=Column(JSON, server_default="[]", nullable=False)
     )
 
-    type_filters: dict[str, bool] = Field(
-        sa_column=Column(JSON, nullable=False, server_default="{}")
-    )
-    attribute_filters: AttributeFiltersType = Field(
-        sa_column=Column(JSON, nullable=False, server_default="{}")
-    )
-
     @property
     def image_zarr_urls(self) -> list[str]:
         return [image["zarr_url"] for image in self.images]

fractal_server/app/models/v2/history.py

@@ -0,0 +1,78 @@
+from datetime import datetime
+from typing import Any
+from typing import Optional
+
+from pydantic import ConfigDict
+from sqlalchemy import Column
+from sqlalchemy import String
+from sqlalchemy.dialects.postgresql import ARRAY
+from sqlalchemy.dialects.postgresql import JSONB
+from sqlalchemy.types import DateTime
+from sqlmodel import Field
+from sqlmodel import SQLModel
+
+from ....utils import get_timestamp
+
+
+class HistoryRun(SQLModel, table=True):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    id: Optional[int] = Field(default=None, primary_key=True)
+    dataset_id: int = Field(
+        foreign_key="datasetv2.id",
+        ondelete="CASCADE",
+    )
+    workflowtask_id: Optional[int] = Field(
+        foreign_key="workflowtaskv2.id",
+        default=None,
+        ondelete="SET NULL",
+    )
+    job_id: int = Field(foreign_key="jobv2.id")
+
+    workflowtask_dump: dict[str, Any] = Field(
+        sa_column=Column(JSONB, nullable=False),
+    )
+    task_group_dump: dict[str, Any] = Field(
+        sa_column=Column(JSONB, nullable=False),
+    )
+
+    timestamp_started: datetime = Field(
+        sa_column=Column(DateTime(timezone=True), nullable=False),
+        default_factory=get_timestamp,
+    )
+    status: str
+    num_available_images: int
+
+
+class HistoryUnit(SQLModel, table=True):
+    id: Optional[int] = Field(default=None, primary_key=True)
+    history_run_id: int = Field(
+        foreign_key="historyrun.id",
+        ondelete="CASCADE",
+    )
+
+    logfile: str
+    status: str
+    zarr_urls: list[str] = Field(
+        sa_column=Column(ARRAY(String)),
+        default_factory=list,
+    )
+
+
+class HistoryImageCache(SQLModel, table=True):
+    zarr_url: str = Field(primary_key=True)
+    dataset_id: int = Field(
+        primary_key=True,
+        foreign_key="datasetv2.id",
+        ondelete="CASCADE",
+    )
+    workflowtask_id: int = Field(
+        primary_key=True,
+        foreign_key="workflowtaskv2.id",
+        ondelete="CASCADE",
+    )
+
+    latest_history_unit_id: int = Field(
+        foreign_key="historyunit.id",
+        ondelete="CASCADE",
+    )

fractal_server/app/models/v2/job.py

@@ -18,11 +18,15 @@ class JobV2(SQLModel, table=True):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
     id: Optional[int] = Field(default=None, primary_key=True)
-    project_id: Optional[int] = Field(foreign_key="projectv2.id", default=None)
+    project_id: Optional[int] = Field(
+        foreign_key="projectv2.id", default=None, ondelete="SET NULL"
+    )
     workflow_id: Optional[int] = Field(
-        foreign_key="workflowv2.id", default=None
+        foreign_key="workflowv2.id", default=None, ondelete="SET NULL"
+    )
+    dataset_id: Optional[int] = Field(
+        foreign_key="datasetv2.id", default=None, ondelete="SET NULL"
     )
-    dataset_id: Optional[int] = Field(foreign_key="datasetv2.id", default=None)
 
     user_email: str = Field(nullable=False)
     slurm_account: Optional[str] = None
@@ -56,3 +60,6 @@ class JobV2(SQLModel, table=True):
     attribute_filters: AttributeFiltersType = Field(
         sa_column=Column(JSON, nullable=False, server_default="{}")
     )
+    type_filters: dict[str, bool] = Field(
+        sa_column=Column(JSON, nullable=False, server_default="{}")
+    )

fractal_server/app/models/v2/task_group.py

@@ -23,7 +23,7 @@ class TaskGroupV2(SQLModel, table=True):
 
     user_id: int = Field(foreign_key="user_oauth.id")
     user_group_id: Optional[int] = Field(
-        foreign_key="usergroup.id", default=None
+        foreign_key="usergroup.id", default=None, ondelete="SET NULL"
     )
 
     origin: str
@@ -100,7 +100,7 @@ class TaskGroupActivityV2(SQLModel, table=True):
     id: Optional[int] = Field(default=None, primary_key=True)
     user_id: int = Field(foreign_key="user_oauth.id")
     taskgroupv2_id: Optional[int] = Field(
-        default=None, foreign_key="taskgroupv2.id"
+        default=None, foreign_key="taskgroupv2.id", ondelete="SET NULL"
     )
     timestamp_started: datetime = Field(
         default_factory=get_timestamp,

fractal_server/app/models/v2/workflow.py

@@ -16,7 +16,7 @@ class WorkflowV2(SQLModel, table=True):
 
     id: Optional[int] = Field(default=None, primary_key=True)
     name: str
-    project_id: int = Field(foreign_key="projectv2.id")
+    project_id: int = Field(foreign_key="projectv2.id", ondelete="CASCADE")
     project: "ProjectV2" = Relationship(  # noqa: F821
         sa_relationship_kwargs=dict(lazy="selectin"),
     )

fractal_server/app/models/v2/workflowtask.py

@@ -16,7 +16,7 @@ class WorkflowTaskV2(SQLModel, table=True):
 
     id: Optional[int] = Field(default=None, primary_key=True)
 
-    workflow_id: int = Field(foreign_key="workflowv2.id")
+    workflow_id: int = Field(foreign_key="workflowv2.id", ondelete="CASCADE")
     order: Optional[int] = None
     meta_parallel: Optional[dict[str, Any]] = Field(
         sa_column=Column(JSON), default=None

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

@@ -3,6 +3,8 @@
 """
 from fastapi import APIRouter
 
+from .accounting import router as accounting_router
+from .impersonate import router as impersonate_router
 from .job import router as job_router
 from .project import router as project_router
 from .task import router as task_router
@@ -11,6 +13,7 @@ from .task_group_lifecycle import router as task_group_lifecycle_router
 
 router_admin_v2 = APIRouter()
 
+router_admin_v2.include_router(accounting_router, prefix="/accounting")
 router_admin_v2.include_router(job_router, prefix="/job")
 router_admin_v2.include_router(project_router, prefix="/project")
 router_admin_v2.include_router(task_router, prefix="/task")
@@ -18,3 +21,4 @@ router_admin_v2.include_router(task_group_router, prefix="/task-group")
 router_admin_v2.include_router(
     task_group_lifecycle_router, prefix="/task-group"
 )
+router_admin_v2.include_router(impersonate_router, prefix="/impersonate")

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

@@ -0,0 +1,98 @@
+from itertools import chain
+from typing import Optional
+
+from fastapi import APIRouter
+from fastapi import Depends
+from fastapi.responses import JSONResponse
+from pydantic import BaseModel
+from pydantic.types import AwareDatetime
+from sqlmodel import func
+from sqlmodel import select
+
+from fractal_server.app.db import AsyncSession
+from fractal_server.app.db import get_async_db
+from fractal_server.app.models import UserOAuth
+from fractal_server.app.models.v2 import AccountingRecord
+from fractal_server.app.models.v2 import AccountingRecordSlurm
+from fractal_server.app.routes.auth import current_active_superuser
+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 AccountingRecordRead
+
+
+class AccountingQuery(BaseModel):
+    user_id: Optional[int] = None
+    timestamp_min: Optional[AwareDatetime] = None
+    timestamp_max: Optional[AwareDatetime] = None
+
+
+router = APIRouter()
+
+
+@router.post("/", response_model=PaginationResponse[AccountingRecordRead])
+async def query_accounting(
+    query: AccountingQuery,
+    # Dependencies
+    pagination: PaginationRequest = Depends(get_pagination_params),
+    superuser: UserOAuth = Depends(current_active_superuser),
+    db: AsyncSession = Depends(get_async_db),
+) -> PaginationResponse[AccountingRecordRead]:
+    page = pagination.page
+    page_size = pagination.page_size
+
+    stm = select(AccountingRecord).order_by(AccountingRecord.id)
+    stm_count = select(func.count(AccountingRecord.id))
+    if query.user_id is not None:
+        stm = stm.where(AccountingRecord.user_id == query.user_id)
+        stm_count = stm_count.where(AccountingRecord.user_id == query.user_id)
+    if query.timestamp_min is not None:
+        stm = stm.where(AccountingRecord.timestamp >= query.timestamp_min)
+        stm_count = stm_count.where(
+            AccountingRecord.timestamp >= query.timestamp_min
+        )
+    if query.timestamp_max is not None:
+        stm = stm.where(AccountingRecord.timestamp <= query.timestamp_max)
+        stm_count = stm_count.where(
+            AccountingRecord.timestamp <= query.timestamp_max
+        )
+
+    res_total_count = await db.execute(stm_count)
+    total_count = res_total_count.scalar()
+
+    if page_size is not None:
+        stm = stm.offset((page - 1) * page_size).limit(page_size)
+    else:
+        page_size = total_count
+
+    res = await db.execute(stm)
+    records = res.scalars().all()
+
+    return PaginationResponse[AccountingRecordRead](
+        total_count=total_count,
+        page_size=page_size,
+        current_page=page,
+        items=[record.model_dump() for record in records],
+    )
+
+
+@router.post("/slurm/")
+async def query_accounting_slurm(
+    query: AccountingQuery,
+    # dependencies
+    superuser: UserOAuth = Depends(current_active_superuser),
+    db: AsyncSession = Depends(get_async_db),
+) -> JSONResponse:
+
+    stm = select(AccountingRecordSlurm.slurm_job_ids)
+    if query.user_id is not None:
+        stm = stm.where(AccountingRecordSlurm.user_id == query.user_id)
+    if query.timestamp_min is not None:
+        stm = stm.where(AccountingRecordSlurm.timestamp >= query.timestamp_min)
+    if query.timestamp_max is not None:
+        stm = stm.where(AccountingRecordSlurm.timestamp <= query.timestamp_max)
+
+    res = await db.execute(stm)
+    nested_slurm_job_ids = res.scalars().all()
+    aggregated_slurm_job_ids = list(chain(*nested_slurm_job_ids))
+    return JSONResponse(content=aggregated_slurm_job_ids, status_code=200)

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

@@ -0,0 +1,35 @@
+from fastapi import APIRouter
+from fastapi import Depends
+from fastapi.responses import JSONResponse
+from fastapi_users.authentication import JWTStrategy
+
+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.routes.auth import current_active_superuser
+from fractal_server.app.routes.auth._aux_auth import _user_or_404
+from fractal_server.config import get_settings
+from fractal_server.syringe import Inject
+
+router = APIRouter()
+
+
+@router.get("/{user_id}/")
+async def impersonate_user(
+    user_id: int,
+    superuser: UserOAuth = Depends(current_active_superuser),
+    db: AsyncSession = Depends(get_async_db),
+) -> JSONResponse:
+    user = await _user_or_404(user_id, db)
+
+    settings = Inject(get_settings)
+    jwt_strategy = JWTStrategy(
+        secret=settings.JWT_SECRET_KEY,  # type: ignore
+        lifetime_seconds=7200,  # 2 hours
+    )
+    token = await jwt_strategy.write_token(user)
+
+    return JSONResponse(
+        content={"access_token": token, "token_type": "bearer"},
+        status_code=200,
+    )

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

@@ -1,4 +1,3 @@
-from datetime import datetime
 from pathlib import Path
 from typing import Optional
 
@@ -8,6 +7,7 @@ from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
 from fastapi.responses import StreamingResponse
+from pydantic.types import AwareDatetime
 from sqlmodel import select
 
 from fractal_server.app.db import AsyncSession
@@ -16,7 +16,6 @@ from fractal_server.app.models import UserOAuth
 from fractal_server.app.models.v2 import JobV2
 from fractal_server.app.models.v2 import ProjectV2
 from fractal_server.app.routes.auth import current_active_superuser
-from fractal_server.app.routes.aux import _raise_if_naive_datetime
 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.runner.filenames import WORKFLOW_LOG_FILENAME
@@ -37,10 +36,10 @@ async def view_job(
     dataset_id: Optional[int] = None,
     workflow_id: Optional[int] = None,
     status: Optional[JobStatusTypeV2] = None,
-    start_timestamp_min: Optional[datetime] = None,
-    start_timestamp_max: Optional[datetime] = None,
-    end_timestamp_min: Optional[datetime] = None,
-    end_timestamp_max: Optional[datetime] = None,
+    start_timestamp_min: Optional[AwareDatetime] = None,
+    start_timestamp_max: Optional[AwareDatetime] = None,
+    end_timestamp_min: Optional[AwareDatetime] = None,
+    end_timestamp_max: Optional[AwareDatetime] = None,
     log: bool = True,
     user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
@@ -67,13 +66,6 @@ async def view_job(
             `job.log` is set to `None`.
     """
 
-    _raise_if_naive_datetime(
-        start_timestamp_min,
-        start_timestamp_max,
-        end_timestamp_min,
-        end_timestamp_max,
-    )
-
     stm = select(JobV2)
 
     if id is not None:

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

@@ -68,7 +68,7 @@ async def query_tasks(
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskV2Info]:
     """
-    Query `TaskV2` table and get informations about related items
+    Query `TaskV2` table and get information about related items
     (WorkflowV2s and ProjectV2s)
 
     Args:

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

@@ -1,4 +1,3 @@
-from datetime import datetime
 from typing import Optional
 
 from fastapi import APIRouter
@@ -6,6 +5,7 @@ from fastapi import Depends
 from fastapi import HTTPException
 from fastapi import Response
 from fastapi import status
+from pydantic.types import AwareDatetime
 from sqlalchemy.sql.operators import is_
 from sqlalchemy.sql.operators import is_not
 from sqlmodel import select
@@ -20,7 +20,6 @@ from fractal_server.app.routes.auth import current_active_superuser
 from fractal_server.app.routes.auth._aux_auth import (
     _verify_user_belongs_to_group,
 )
-from fractal_server.app.routes.aux import _raise_if_naive_datetime
 from fractal_server.app.schemas.v2 import TaskGroupActivityActionV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityStatusV2
 from fractal_server.app.schemas.v2 import TaskGroupActivityV2Read
@@ -42,13 +41,11 @@ async def get_task_group_activity_list(
     pkg_name: Optional[str] = None,
     status: Optional[TaskGroupActivityStatusV2] = None,
     action: Optional[TaskGroupActivityActionV2] = None,
-    timestamp_started_min: Optional[datetime] = None,
+    timestamp_started_min: Optional[AwareDatetime] = None,
     superuser: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupActivityV2Read]:
 
-    _raise_if_naive_datetime(timestamp_started_min)
-
     stm = select(TaskGroupActivityV2)
     if task_group_activity_id is not None:
         stm = stm.where(TaskGroupActivityV2.id == task_group_activity_id)
@@ -96,19 +93,14 @@ async def query_task_group_list(
     active: Optional[bool] = None,
     pkg_name: Optional[str] = None,
     origin: Optional[TaskGroupV2OriginEnum] = None,
-    timestamp_last_used_min: Optional[datetime] = None,
-    timestamp_last_used_max: Optional[datetime] = None,
+    timestamp_last_used_min: Optional[AwareDatetime] = None,
+    timestamp_last_used_max: Optional[AwareDatetime] = None,
     user: UserOAuth = Depends(current_active_superuser),
     db: AsyncSession = Depends(get_async_db),
 ) -> list[TaskGroupReadV2]:
 
     stm = select(TaskGroupV2)
 
-    _raise_if_naive_datetime(
-        timestamp_last_used_max,
-        timestamp_last_used_min,
-    )
-
     if user_group_id is not None and private is True:
         raise HTTPException(
             status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
@@ -200,23 +192,6 @@ async def delete_task_group(
             detail=f"TaskV2 {workflow_tasks[0].task_id} is still in use",
         )
 
-    # Cascade operations: set foreign-keys to null for TaskGroupActivityV2
-    # which are in relationship with the current TaskGroupV2
-    logger.debug("Start of cascade operations on TaskGroupActivityV2.")
-    stm = select(TaskGroupActivityV2).where(
-        TaskGroupActivityV2.taskgroupv2_id == task_group_id
-    )
-    res = await db.execute(stm)
-    task_group_activity_list = res.scalars().all()
-    for task_group_activity in task_group_activity_list:
-        logger.debug(
-            f"Setting TaskGroupActivityV2[{task_group_activity.id}]"
-            ".taskgroupv2_id to None."
-        )
-        task_group_activity.taskgroupv2_id = None
-        db.add(task_group_activity)
-    logger.debug("End of cascade operations on TaskGroupActivityV2.")
-
     await db.delete(task_group)
     await db.commit()
 

fractal_server/app/routes/api/__init__.py

@@ -25,4 +25,4 @@ async def alive():
 @router_api.get("/settings/")
 async def view_settings(user: UserOAuth = Depends(current_active_superuser)):
     settings = Inject(get_settings)
-    return settings.get_sanitized()
+    return settings.model_dump()

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

@@ -4,16 +4,18 @@
 from fastapi import APIRouter
 
 from .dataset import router as dataset_router_v2
+from .history import router as history_router_v2
 from .images import router as images_routes_v2
 from .job import router as job_router_v2
 from .project import router as project_router_v2
-from .status import router as status_router_v2
+from .status_legacy import router as status_legacy_router_v2
 from .submit import router as submit_job_router_v2
 from .task import router as task_router_v2
 from .task_collection import router as task_collection_router_v2
 from .task_collection_custom import router as task_collection_router_v2_custom
 from .task_group import router as task_group_router_v2
 from .task_group_lifecycle import router as task_group_lifecycle_router_v2
+from .verify_image_types import router as verify_image_types_router
 from .workflow import router as workflow_router_v2
 from .workflow_import import router as workflow_import_router_v2
 from .workflowtask import router as workflowtask_router_v2
@@ -24,10 +26,15 @@ from fractal_server.syringe import Inject
 router_api_v2 = APIRouter()
 
 router_api_v2.include_router(dataset_router_v2, tags=["V2 Dataset"])
+router_api_v2.include_router(verify_image_types_router, tags=["V2 Job"])
 router_api_v2.include_router(job_router_v2, tags=["V2 Job"])
 router_api_v2.include_router(images_routes_v2, tags=["V2 Images"])
 router_api_v2.include_router(project_router_v2, tags=["V2 Project"])
 router_api_v2.include_router(submit_job_router_v2, tags=["V2 Job"])
+router_api_v2.include_router(history_router_v2, tags=["V2 History"])
+router_api_v2.include_router(
+    status_legacy_router_v2, tags=["V2 Status Legacy"]
+)
 
 
 settings = Inject(get_settings)
@@ -56,4 +63,3 @@ router_api_v2.include_router(
     workflow_import_router_v2, tags=["V2 Workflow Import"]
 )
 router_api_v2.include_router(workflowtask_router_v2, tags=["V2 WorkflowTask"])
-router_api_v2.include_router(status_router_v2, tags=["V2 Status"])