vodorod/Dorod-Sky
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Add a query param to filter out workflow tasks (#919)

Browse Source
This commit is contained in:
Kerem Yilmaz
2024-10-07 14:09:46 -07:00
committed by GitHub
parent cdd654723d
commit 8aa29bedcf
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
skyvern/forge/sdk/db/client.py
View File

@@ -438,6 +438,7 @@ class AgentDB:
task_status: list[TaskStatus] | None = None, task_status: list[TaskStatus] | None = None,
workflow_run_id: str | None = None, workflow_run_id: str | None = None,
organization_id: str | None = None, organization_id: str | None = None,
only_standalone_tasks: bool = False,
) -> list[Task]: ) -> list[Task]:
""" """
Get all tasks. Get all tasks.
@@ -445,6 +446,7 @@ class AgentDB:
:param page_size: :param page_size:
:param task_status: :param task_status:
:param workflow_run_id: :param workflow_run_id:
:param only_standalone_tasks:
:return: :return:
""" """
if page < 1: if page < 1:
@@ -458,6 +460,8 @@ class AgentDB:
query = query.filter(TaskModel.status.in_(task_status)) query = query.filter(TaskModel.status.in_(task_status))
if workflow_run_id: if workflow_run_id:
query = query.filter(TaskModel.workflow_run_id == workflow_run_id) query = query.filter(TaskModel.workflow_run_id == workflow_run_id)
if only_standalone_tasks:
query = query.filter(TaskModel.workflow_run_id.is_(None))
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]

8
skyvern/forge/sdk/routes/agent_protocol.py
View File

@@ -383,6 +383,7 @@ async def get_agent_tasks(
task_status: Annotated[list[TaskStatus] | None, Query()] = None, task_status: Annotated[list[TaskStatus] | None, Query()] = None,
workflow_run_id: Annotated[str | None, Query()] = None, workflow_run_id: Annotated[str | None, Query()] = None,
current_org: Organization = Depends(org_auth_service.get_current_org), current_org: Organization = Depends(org_auth_service.get_current_org),
only_standalone_tasks: bool = Query(False),
) -> Response: ) -> Response:
""" """
Get all tasks. Get all tasks.
@@ -390,16 +391,23 @@ async def get_agent_tasks(
:param page_size: Page size, defaults to 10 :param page_size: Page size, defaults to 10
:param task_status: Task status filter :param task_status: Task status filter
:param workflow_run_id: Workflow run id filter :param workflow_run_id: Workflow run id filter
:param only_standalone_tasks: Only standalone tasks, tasks which are part of a workflow run will be filtered out
:return: List of tasks with pagination without steps populated. Steps can be populated by calling the :return: List of tasks with pagination without steps populated. Steps can be populated by calling the
get_agent_task endpoint. get_agent_task endpoint.
""" """
analytics.capture("skyvern-oss-agent-tasks-get") analytics.capture("skyvern-oss-agent-tasks-get")
if only_standalone_tasks and workflow_run_id:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="only_standalone_tasks and workflow_run_id cannot be used together",
)
tasks = await app.DATABASE.get_tasks( tasks = await app.DATABASE.get_tasks(
page, page,
page_size, page_size,
task_status=task_status, task_status=task_status,
workflow_run_id=workflow_run_id, workflow_run_id=workflow_run_id,
organization_id=current_org.organization_id, organization_id=current_org.organization_id,
only_standalone_tasks=only_standalone_tasks,
) )
return ORJSONResponse([task.to_task_response().model_dump() for task in tasks]) return ORJSONResponse([task.to_task_response().model_dump() for task in tasks])