feat: add manual revision and dashboard list apis
This commit is contained in:
@@ -7,12 +7,20 @@
|
||||
"""
|
||||
|
||||
from datetime import timedelta
|
||||
from math import ceil
|
||||
|
||||
from fastapi import HTTPException, status
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy import String, cast, func, or_, select
|
||||
from sqlalchemy.orm import selectinload
|
||||
|
||||
from app.api.schemas.workflow import WorkflowStatusResponse, WorkflowStepRead
|
||||
from app.api.schemas.workflow import (
|
||||
WorkflowListItemResponse,
|
||||
WorkflowListResponse,
|
||||
WorkflowStatusResponse,
|
||||
WorkflowStepRead,
|
||||
)
|
||||
from app.domain.enums import OrderStatus
|
||||
from app.application.services.revision_service import RevisionService
|
||||
from app.domain.enums import ServiceMode
|
||||
from app.infra.db.models.workflow_run import WorkflowRunORM
|
||||
from app.infra.temporal.client import get_temporal_client
|
||||
@@ -25,6 +33,9 @@ from app.workers.workflows.types import PipelineWorkflowInput, ReviewSignalPaylo
|
||||
class WorkflowService:
|
||||
"""Temporal 编排服务。"""
|
||||
|
||||
def __init__(self) -> None:
|
||||
self.revision_service = RevisionService()
|
||||
|
||||
@staticmethod
|
||||
def workflow_type_for_mode(service_mode: ServiceMode) -> str:
|
||||
"""根据服务模式返回对应的 workflow 类型名。"""
|
||||
@@ -81,13 +92,101 @@ class WorkflowService:
|
||||
if workflow_run is None:
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Workflow not found")
|
||||
|
||||
snapshot = await self.revision_service.get_revision_snapshot(session, order_id)
|
||||
|
||||
return WorkflowStatusResponse(
|
||||
order_id=workflow_run.order_id,
|
||||
workflow_id=workflow_run.workflow_id,
|
||||
workflow_type=workflow_run.workflow_type,
|
||||
workflow_status=workflow_run.status,
|
||||
current_step=workflow_run.current_step,
|
||||
current_revision_asset_id=snapshot.current_revision_asset_id,
|
||||
current_revision_version=snapshot.current_revision_version,
|
||||
latest_revision_asset_id=snapshot.latest_revision_asset_id,
|
||||
latest_revision_version=snapshot.latest_revision_version,
|
||||
revision_count=snapshot.revision_count,
|
||||
review_task_status=snapshot.review_task_status,
|
||||
pending_manual_confirm=snapshot.pending_manual_confirm,
|
||||
steps=[WorkflowStepRead.model_validate(step) for step in workflow_run.steps],
|
||||
created_at=workflow_run.created_at,
|
||||
updated_at=workflow_run.updated_at,
|
||||
)
|
||||
|
||||
async def list_workflows(
|
||||
self,
|
||||
session,
|
||||
*,
|
||||
page: int = 1,
|
||||
limit: int = 20,
|
||||
query: str | None = None,
|
||||
status_filter: OrderStatus | None = None,
|
||||
order_id: int | None = None,
|
||||
) -> WorkflowListResponse:
|
||||
"""Return recent workflow runs for dashboard lookup pages."""
|
||||
|
||||
filters = []
|
||||
|
||||
if status_filter is not None:
|
||||
filters.append(WorkflowRunORM.status == status_filter)
|
||||
|
||||
if order_id is not None:
|
||||
filters.append(WorkflowRunORM.order_id == order_id)
|
||||
|
||||
if query:
|
||||
search_term = query.strip()
|
||||
if search_term:
|
||||
filters.append(
|
||||
or_(
|
||||
cast(WorkflowRunORM.order_id, String).ilike(f"{search_term}%"),
|
||||
WorkflowRunORM.workflow_id.ilike(f"%{search_term}%"),
|
||||
)
|
||||
)
|
||||
|
||||
query = select(WorkflowRunORM).options(selectinload(WorkflowRunORM.steps))
|
||||
count_query = select(func.count()).select_from(WorkflowRunORM)
|
||||
|
||||
if filters:
|
||||
query = query.where(*filters)
|
||||
count_query = count_query.where(*filters)
|
||||
|
||||
total = (await session.execute(count_query)).scalar_one()
|
||||
total_pages = ceil(total / limit) if total else 0
|
||||
offset = (page - 1) * limit
|
||||
|
||||
query = query.order_by(WorkflowRunORM.updated_at.desc(), WorkflowRunORM.id.desc()).offset(offset).limit(limit)
|
||||
|
||||
result = await session.execute(query)
|
||||
workflow_runs = result.scalars().all()
|
||||
|
||||
items = []
|
||||
for workflow_run in workflow_runs:
|
||||
snapshot = await self.revision_service.get_revision_snapshot(
|
||||
session,
|
||||
workflow_run.order_id,
|
||||
)
|
||||
items.append(
|
||||
WorkflowListItemResponse(
|
||||
order_id=workflow_run.order_id,
|
||||
workflow_id=workflow_run.workflow_id,
|
||||
workflow_type=workflow_run.workflow_type,
|
||||
workflow_status=workflow_run.status,
|
||||
current_step=workflow_run.current_step,
|
||||
updated_at=workflow_run.updated_at,
|
||||
failure_count=sum(
|
||||
1 for step in workflow_run.steps if step.step_status.value == "failed"
|
||||
),
|
||||
review_task_status=snapshot.review_task_status,
|
||||
latest_revision_asset_id=snapshot.latest_revision_asset_id,
|
||||
latest_revision_version=snapshot.latest_revision_version,
|
||||
revision_count=snapshot.revision_count,
|
||||
pending_manual_confirm=snapshot.pending_manual_confirm,
|
||||
)
|
||||
)
|
||||
|
||||
return WorkflowListResponse(
|
||||
page=page,
|
||||
limit=limit,
|
||||
total=total,
|
||||
total_pages=total_pages,
|
||||
items=items,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user