Allow querying multiple statuses (#232)
This commit is contained in:
@@ -46,12 +46,15 @@ function TaskList() {
|
|||||||
} = useQuery<Array<TaskApiResponse>>({
|
} = useQuery<Array<TaskApiResponse>>({
|
||||||
queryKey: ["tasks", "all", page],
|
queryKey: ["tasks", "all", page],
|
||||||
queryFn: async () => {
|
queryFn: async () => {
|
||||||
|
const params = new URLSearchParams();
|
||||||
|
params.append("page", String(page));
|
||||||
|
params.append("page_size", String(PAGE_SIZE));
|
||||||
|
params.append("task_status", "completed");
|
||||||
|
params.append("task_status", "failed");
|
||||||
|
params.append("task_status", "terminated");
|
||||||
return client
|
return client
|
||||||
.get("/tasks", {
|
.get("/tasks", {
|
||||||
params: {
|
params,
|
||||||
page,
|
|
||||||
page_size: PAGE_SIZE,
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
.then((response) => response.data);
|
.then((response) => response.data);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -394,7 +394,7 @@ class AgentDB:
|
|||||||
self,
|
self,
|
||||||
page: int = 1,
|
page: int = 1,
|
||||||
page_size: int = 10,
|
page_size: int = 10,
|
||||||
task_status: TaskStatus | None = None,
|
task_status: list[TaskStatus] | None = None,
|
||||||
organization_id: str | None = None,
|
organization_id: str | None = None,
|
||||||
) -> list[Task]:
|
) -> list[Task]:
|
||||||
"""
|
"""
|
||||||
@@ -411,7 +411,7 @@ class AgentDB:
|
|||||||
db_page = page - 1 # offset logic is 0 based
|
db_page = page - 1 # offset logic is 0 based
|
||||||
query = select(TaskModel).filter_by(organization_id=organization_id)
|
query = select(TaskModel).filter_by(organization_id=organization_id)
|
||||||
if task_status:
|
if task_status:
|
||||||
query = query.filter_by(status=task_status)
|
query = query.filter(TaskModel.status.in_(task_status))
|
||||||
query = query.order_by(TaskModel.created_at.desc()).limit(page_size).offset(db_page * page_size)
|
query = query.order_by(TaskModel.created_at.desc()).limit(page_size).offset(db_page * page_size)
|
||||||
tasks = (await session.scalars(query)).all()
|
tasks = (await session.scalars(query)).all()
|
||||||
return [convert_to_task(task, debug_enabled=self.debug_enabled) for task in tasks]
|
return [convert_to_task(task, debug_enabled=self.debug_enabled) for task in tasks]
|
||||||
|
|||||||
@@ -313,7 +313,7 @@ async def get_task_internal(
|
|||||||
async def get_agent_tasks(
|
async def get_agent_tasks(
|
||||||
page: int = Query(1, ge=1),
|
page: int = Query(1, ge=1),
|
||||||
page_size: int = Query(10, ge=1),
|
page_size: int = Query(10, ge=1),
|
||||||
task_status: TaskStatus | None = None,
|
task_status: Annotated[list[TaskStatus] | None, Query()] = None,
|
||||||
current_org: Organization = Depends(org_auth_service.get_current_org),
|
current_org: Organization = Depends(org_auth_service.get_current_org),
|
||||||
) -> Response:
|
) -> Response:
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user