feat: Phase 3-5 - workflow, labeling, reports, dashboard enhancement, tests
This commit is contained in:
+71
-41
@@ -6,6 +6,7 @@ from app.core.database import get_db
|
||||
from app.models.user import User
|
||||
from app.schemas.common import ResponseModel, ListResponse
|
||||
from app.api.deps import get_current_user
|
||||
from app.services import task_service, project_service
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
@@ -16,17 +17,15 @@ def my_tasks(
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user),
|
||||
):
|
||||
from app.models.project import ClassificationTask
|
||||
query = db.query(ClassificationTask).filter(ClassificationTask.assignee_id == current_user.id)
|
||||
if status:
|
||||
query = query.filter(ClassificationTask.status == status)
|
||||
items = query.order_by(ClassificationTask.created_at.desc()).all()
|
||||
items, _ = task_service.list_tasks(db, assignee_id=current_user.id, status=status)
|
||||
data = []
|
||||
for t in items:
|
||||
project = project_service.get_project(db, t.project_id)
|
||||
data.append({
|
||||
"id": t.id,
|
||||
"name": t.name,
|
||||
"name": t.name or (project.name if project else f"任务#{t.id}"),
|
||||
"project_id": t.project_id,
|
||||
"project_name": project.name if project else None,
|
||||
"status": t.status,
|
||||
"deadline": t.deadline.isoformat() if t.deadline else None,
|
||||
"created_at": t.created_at.isoformat() if t.created_at else None,
|
||||
@@ -34,47 +33,78 @@ def my_tasks(
|
||||
return ResponseModel(data=data)
|
||||
|
||||
|
||||
@router.get("/my-tasks/{task_id}/items")
|
||||
def task_items(
|
||||
@router.post("/my-tasks/{task_id}/start")
|
||||
def start_task(
|
||||
task_id: int,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user),
|
||||
):
|
||||
from app.models.project import ClassificationTask, ClassificationResult
|
||||
from app.models.metadata import DataColumn, DataTable, Database as MetaDatabase, DataSource
|
||||
from app.models.classification import Category, DataLevel
|
||||
|
||||
task = db.query(ClassificationTask).filter(ClassificationTask.id == task_id).first()
|
||||
task = task_service.get_task(db, task_id)
|
||||
if not task:
|
||||
from fastapi import HTTPException, status
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="任务不存在")
|
||||
task = task_service.update_task_status(db, task, "in_progress")
|
||||
return ResponseModel(data={"id": task.id, "status": task.status})
|
||||
|
||||
results = db.query(ClassificationResult).filter(
|
||||
ClassificationResult.project_id == task.project_id,
|
||||
).join(DataColumn).all()
|
||||
|
||||
data = []
|
||||
for r in results:
|
||||
col = r.column
|
||||
table = col.table if col else None
|
||||
database = table.database if table else None
|
||||
source = database.source if database else None
|
||||
data.append({
|
||||
"result_id": r.id,
|
||||
"column_id": col.id if col else None,
|
||||
"column_name": col.name if col else None,
|
||||
"data_type": col.data_type if col else None,
|
||||
"comment": col.comment if col else None,
|
||||
"table_name": table.name if table else None,
|
||||
"database_name": database.name if database else None,
|
||||
"source_name": source.name if source else None,
|
||||
"category_id": r.category_id,
|
||||
"category_name": r.category.name if r.category else None,
|
||||
"level_id": r.level_id,
|
||||
"level_name": r.level.name if r.level else None,
|
||||
"level_color": r.level.color if r.level else None,
|
||||
"source": r.source,
|
||||
"confidence": r.confidence,
|
||||
"status": r.status,
|
||||
})
|
||||
return ResponseModel(data=data)
|
||||
@router.post("/my-tasks/{task_id}/complete")
|
||||
def complete_task(
|
||||
task_id: int,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user),
|
||||
):
|
||||
task = task_service.get_task(db, task_id)
|
||||
if not task:
|
||||
from fastapi import HTTPException, status
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="任务不存在")
|
||||
task = task_service.update_task_status(db, task, "completed")
|
||||
return ResponseModel(data={"id": task.id, "status": task.status})
|
||||
|
||||
|
||||
@router.get("/my-tasks/{task_id}/items")
|
||||
def task_items(
|
||||
task_id: int,
|
||||
keyword: Optional[str] = Query(None),
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user),
|
||||
):
|
||||
task = task_service.get_task(db, task_id)
|
||||
if not task:
|
||||
from fastapi import HTTPException, status
|
||||
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="任务不存在")
|
||||
items = task_service.get_task_label_items(db, task.project_id, keyword=keyword)
|
||||
return ResponseModel(data=items)
|
||||
|
||||
|
||||
@router.post("/results/{result_id}/label")
|
||||
def label_result(
|
||||
result_id: int,
|
||||
category_id: int,
|
||||
level_id: int,
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user),
|
||||
):
|
||||
result = project_service.update_result_label(db, result_id, category_id, level_id, current_user.id)
|
||||
return ResponseModel(data={
|
||||
"result_id": result.id,
|
||||
"category_id": result.category_id,
|
||||
"level_id": result.level_id,
|
||||
"status": result.status,
|
||||
})
|
||||
|
||||
|
||||
@router.post("/projects/{project_id}/create-task")
|
||||
def create_task_for_project(
|
||||
project_id: int,
|
||||
name: str,
|
||||
assignee_id: int,
|
||||
target_type: str = Query("column"),
|
||||
db: Session = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user),
|
||||
):
|
||||
task = task_service.create_task(
|
||||
db, project_id=project_id, name=name,
|
||||
assigner_id=current_user.id, assignee_id=assignee_id,
|
||||
target_type=target_type,
|
||||
)
|
||||
return ResponseModel(data={"id": task.id, "name": task.name})
|
||||
|
||||
Reference in New Issue
Block a user