mirror of
https://github.com/fastapi-practices/fastapi-best-architecture.git
synced 2026-09-21 21:15:13 +00:00
Update return schema of query interface (#492)
* Update return model of query interface * Update tree data return type hints * Update code generation and task return types * Fix inconsistency between ORM query result and schema
This commit is contained in:
@@ -4,9 +4,9 @@ from typing import Annotated
|
||||
|
||||
from fastapi import APIRouter, Depends, Path
|
||||
|
||||
from backend.app.task.schema.task import RunParam
|
||||
from backend.app.task.schema.task import RunParam, TaskResult
|
||||
from backend.app.task.service.task_service import task_service
|
||||
from backend.common.response.response_schema import ResponseModel, response_base
|
||||
from backend.common.response.response_schema import ResponseModel, ResponseSchemaModel, response_base
|
||||
from backend.common.security.jwt import DependsJwtAuth
|
||||
from backend.common.security.permission import RequestPermission
|
||||
from backend.common.security.rbac import DependsRBAC
|
||||
@@ -15,7 +15,7 @@ router = APIRouter()
|
||||
|
||||
|
||||
@router.get('', summary='获取可执行任务', dependencies=[DependsJwtAuth])
|
||||
async def get_all_tasks() -> ResponseModel:
|
||||
async def get_all_tasks() -> ResponseSchemaModel[list[str]]:
|
||||
tasks = await task_service.get_list()
|
||||
return response_base.success(data=tasks)
|
||||
|
||||
@@ -27,7 +27,7 @@ async def get_all_tasks() -> ResponseModel:
|
||||
description='此接口被视为作废,建议使用 flower 查看任务详情',
|
||||
dependencies=[DependsJwtAuth],
|
||||
)
|
||||
async def get_task_detail(tid: Annotated[str, Path(description='任务ID')]) -> ResponseModel:
|
||||
async def get_task_detail(tid: Annotated[str, Path(description='任务ID')]) -> ResponseSchemaModel[TaskResult]:
|
||||
status = task_service.get_detail(tid=tid)
|
||||
return response_base.success(data=status)
|
||||
|
||||
@@ -53,6 +53,6 @@ async def revoke_task(tid: Annotated[str, Path(description='任务ID')]) -> Resp
|
||||
DependsRBAC,
|
||||
],
|
||||
)
|
||||
async def run_task(obj: RunParam) -> ResponseModel:
|
||||
async def run_task(obj: RunParam) -> ResponseSchemaModel[str]:
|
||||
task = task_service.run(obj=obj)
|
||||
return response_base.success(data=task)
|
||||
|
||||
Reference in New Issue
Block a user