Skip to content

Automate browser based workflows with AI

[SKY-8713] BE (#5345)

Aaron Perez57aaee99b441
diff --git a/skyvern/forge/sdk/db/mixins/workflow_runs.py b/skyvern/forge/sdk/db/mixins/workflow_runs.py
index 15b767fcd..cea8835b9 100644
--- a/skyvern/forge/sdk/db/mixins/workflow_runs.py
+++ b/skyvern/forge/sdk/db/mixins/workflow_runs.py
@@ -38,7 +38,7 @@ from skyvern.forge.sdk.workflow.models.workflow import (
WorkflowRunStatus,
WorkflowRunTriggerType,
)
-from skyvern.schemas.runs import ProxyLocationInput
+from skyvern.schemas.runs import ProxyLocationInput, RunType
if TYPE_CHECKING:
from sqlalchemy.ext.asyncio import AsyncEngine
@@ -392,10 +392,32 @@ class WorkflowRunsMixin:
page_size: int = 10,
status: list[str] | None = None,
search_key: str | None = None,
- ) -> list[TaskRunModel]:
+ ) -> list[dict[str, Any]]:
async with self.Session() as session:
+ effective_status = func.coalesce(WorkflowRunModel.status, TaskRunModel.status)
query = (
- select(TaskRunModel)
+ select(
+ TaskRunModel.task_run_id.label("task_run_id"),
+ TaskRunModel.run_id.label("run_id"),
+ TaskRunModel.task_run_type.label("task_run_type"),
+ effective_status.label("status"),
+ TaskRunModel.title.label("title"),
+ TaskRunModel.started_at.label("started_at"),
+ TaskRunModel.finished_at.label("finished_at"),
+ TaskRunModel.created_at.label("created_at"),
+ TaskRunModel.workflow_permanent_id.label("workflow_permanent_id"),
+ TaskRunModel.script_run.label("script_run"),
+ TaskRunModel.searchable_text.label("searchable_text"),
+ )
+ .select_from(TaskRunModel)
+ .outerjoin(
+ WorkflowRunModel,
+ and_(
+ TaskRunModel.task_run_type == RunType.workflow_run,
+ WorkflowRunModel.workflow_run_id == TaskRunModel.run_id,
+ WorkflowRunModel.organization_id == TaskRunModel.organization_id,
+ ),
+ )
.filter(TaskRunModel.organization_id == organization_id)
.filter(TaskRunModel.status.isnot(None))
.filter(TaskRunModel.parent_workflow_run_id.is_(None))
@@ -403,7 +425,7 @@ class WorkflowRunsMixin:
)
if status:
- query = query.filter(TaskRunModel.status.in_(status))
+ query = query.filter(effective_status.in_(status))
if search_key:
query = query.filter(TaskRunModel.searchable_text.icontains(search_key, autoescape=True))
@@ -411,8 +433,8 @@ class WorkflowRunsMixin:
offset = (page - 1) * page_size
query = query.order_by(TaskRunModel.created_at.desc()).offset(offset).limit(page_size)
- result = await session.scalars(query)
- return list(result.all())
+ result = await session.execute(query)
+ return [dict(row) for row in result.mappings().all()]
@read_retry()
@db_operation("get_workflow_run", log_errors=False)
diff --git a/skyvern/forge/sdk/db/repositories/workflow_runs.py b/skyvern/forge/sdk/db/repositories/workflow_runs.py
index 5a341c496..37b913f6e 100644
--- a/skyvern/forge/sdk/db/repositories/workflow_runs.py
+++ b/skyvern/forge/sdk/db/repositories/workflow_runs.py
@@ -46,7 +46,7 @@ from skyvern.forge.sdk.workflow.models.workflow import (
WorkflowRunParameter,
WorkflowRunStatus,
)
-from skyvern.schemas.runs import ProxyLocationInput
+from skyvern.schemas.runs import ProxyLocationInput, RunType
LOG = structlog.get_logger()
@@ -401,10 +401,32 @@ class WorkflowRunsRepository(BaseRepository):
page_size: int = 10,
status: list[str] | None = None,
search_key: str | None = None,
- ) -> list[TaskRunModel]:
+ ) -> list[dict[str, Any]]:
async with self.Session() as session:
+ effective_status = func.coalesce(WorkflowRunModel.status, TaskRunModel.status)
query = (
- select(TaskRunModel)
+ select(
+ TaskRunModel.task_run_id.label("task_run_id"),
+ TaskRunModel.run_id.label("run_id"),
+ TaskRunModel.task_run_type.label("task_run_type"),
+ effective_status.label("status"),
+ TaskRunModel.title.label("title"),
+ TaskRunModel.started_at.label("started_at"),
+ TaskRunModel.finished_at.label("finished_at"),
+ TaskRunModel.created_at.label("created_at"),
+ TaskRunModel.workflow_permanent_id.label("workflow_permanent_id"),
+ TaskRunModel.script_run.label("script_run"),
+ TaskRunModel.searchable_text.label("searchable_text"),
+ )
+ .select_from(TaskRunModel)
+ .outerjoin(
+ WorkflowRunModel,
+ and_(
+ TaskRunModel.task_run_type == RunType.workflow_run,
+ WorkflowRunModel.workflow_run_id == TaskRunModel.run_id,
+ WorkflowRunModel.organization_id == TaskRunModel.organization_id,
+ ),
+ )
.filter(TaskRunModel.organization_id == organization_id)
.filter(TaskRunModel.status.isnot(None))
.filter(TaskRunModel.parent_workflow_run_id.is_(None))
@@ -412,7 +434,7 @@ class WorkflowRunsRepository(BaseRepository):
)
if status:
- query = query.filter(TaskRunModel.status.in_(status))
+ query = query.filter(effective_status.in_(status))
if search_key:
query = query.filter(TaskRunModel.searchable_text.icontains(search_key, autoescape=True))
@@ -420,8 +442,8 @@ class WorkflowRunsRepository(BaseRepository):
offset = (page - 1) * page_size
query = query.order_by(TaskRunModel.created_at.desc()).offset(offset).limit(page_size)
- result = await session.scalars(query)
- return list(result.all())
+ result = await session.execute(query)
+ return [dict(row) for row in result.mappings().all()]
@read_retry()
@db_operation("get_workflow_run", log_errors=False)
diff --git a/tests/unit/test_runs_v2_route.py b/tests/unit/test_runs_v2_route.py
new file mode 100644
index 000000000..6c6211e8e
--- /dev/null
+++ b/tests/unit/test_runs_v2_route.py
@@ -0,0 +1,60 @@
+from types import SimpleNamespace
+from unittest.mock import AsyncMock
+
+import orjson
+import pytest
+
+from skyvern.forge.sdk.routes import agent_protocol
+
+
+async def test_get_runs_v2_serializes_mapping_rows_from_database(monkeypatch: pytest.MonkeyPatch) -> None:
+ mock_database = SimpleNamespace(
+ get_all_runs_v2=AsyncMock(
+ return_value=[
+ {
+ "task_run_id": "tr_123",
+ "run_id": "wr_123",
+ "task_run_type": "workflow_run",
+ "status": "completed",
+ "title": "Workflow run",
+ "started_at": None,
+ "finished_at": None,
+ "created_at": "2026-04-01T00:00:00Z",
+ "workflow_permanent_id": "wpid_123",
+ "script_run": False,
+ "searchable_text": "Workflow run",
+ }
+ ]
+ )
+ )
+ monkeypatch.setattr(agent_protocol.app, "DATABASE", mock_database)
+
+ response = await agent_protocol.get_runs_v2(
+ current_org=SimpleNamespace(organization_id="org_123"),
+ page=2,
+ page_size=5,
+ search_key="abc",
+ )
+
+ mock_database.get_all_runs_v2.assert_awaited_once_with(
+ "org_123",
+ page=2,
+ page_size=5,
+ status=None,
+ search_key="abc",
+ )
+ assert orjson.loads(response.body) == [
+ {
+ "task_run_id": "tr_123",
+ "run_id": "wr_123",
+ "task_run_type": "workflow_run",
+ "status": "completed",
+ "title": "Workflow run",
+ "started_at": None,
+ "finished_at": None,
+ "created_at": "2026-04-01T00:00:00Z",
+ "workflow_permanent_id": "wpid_123",
+ "script_run": False,
+ }
+ ]