Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow querying multiple statuses #232

Merged
merged 1 commit into from
Apr 24, 2024
Merged

Allow querying multiple statuses #232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions skyvern-frontend/src/routes/tasks/list/TaskList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,15 @@ function TaskList() {
} = useQuery<Array<TaskApiResponse>>({
queryKey: ["tasks", "all", page],
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
.get("/tasks", {
params: {
page,
page_size: PAGE_SIZE,
},
params,
})
.then((response) => response.data);
},
Expand Down
4 changes: 2 additions & 2 deletions skyvern/forge/sdk/db/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@ async def get_tasks(
self,
page: int = 1,
page_size: int = 10,
task_status: TaskStatus | None = None,
task_status: list[TaskStatus] | None = None,
organization_id: str | None = None,
) -> list[Task]:
"""
Expand All @@ -411,7 +411,7 @@ async def get_tasks(
db_page = page - 1 # offset logic is 0 based
query = select(TaskModel).filter_by(organization_id=organization_id)
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)
tasks = (await session.scalars(query)).all()
return [convert_to_task(task, debug_enabled=self.debug_enabled) for task in tasks]
Expand Down
2 changes: 1 addition & 1 deletion skyvern/forge/sdk/routes/agent_protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ async def get_task_internal(
async def get_agent_tasks(
page: int = Query(1, 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),
) -> Response:
"""
Expand Down
Loading