Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
fix(SKY-12131): batch workflow-run parameter definition lookups to remove sequential queries (#7330)
Aaron Perezdfca4ca98337
diff --git a/skyvern/forge/failure_classifier.py b/skyvern/forge/failure_classifier.pyindex 3f92d7b30..3cdcd2d18 100644--- a/skyvern/forge/failure_classifier.py+++ b/skyvern/forge/failure_classifier.py@@ -76,9 +76,9 @@ def classify_from_failure_reason(# Proxy errors — check before browser errors so proxy failures don't fall into BROWSER_ERROR.# The exception name may contain "Browser" (e.g. UnknownErrorWhileCreatingBrowserContext) but the- # root cause is proxy pool exhaustion.- _proxy_exc_keywords = ["NoProxy", "ProxyError"]- _proxy_reason_keywords = ["no proxy available", "proxy unavailable"]+ # root cause is proxy pool exhaustion or proxy connectivity failure.+ _proxy_exc_keywords = ["NoProxy", "ProxyError", "GetOutboundIP"]+ _proxy_reason_keywords = ["no proxy available", "proxy unavailable", "failed to get outbound ip"]if any(kw in exc_name for kw in _proxy_exc_keywords) or any(kw in reason for kw in _proxy_reason_keywords):categories.append({diff --git a/skyvern/forge/sdk/db/protocols.py b/skyvern/forge/sdk/db/protocols.pyindex 43fedb192..a5b0861c6 100644--- a/skyvern/forge/sdk/db/protocols.py+++ b/skyvern/forge/sdk/db/protocols.py@@ -36,6 +36,11 @@ class WorkflowParameterReader(Protocol):organization_id: str | None = None,) -> WorkflowParameter | None: ...+ async def get_workflow_parameters_by_ids(+ self,+ workflow_parameter_ids: list[str],+ ) -> list[WorkflowParameter]: ...+@runtime_checkableclass RunReader(Protocol):diff --git a/skyvern/forge/sdk/db/repositories/workflow_parameters.py b/skyvern/forge/sdk/db/repositories/workflow_parameters.pyindex 77c256664..0ee848b39 100644--- a/skyvern/forge/sdk/db/repositories/workflow_parameters.py+++ b/skyvern/forge/sdk/db/repositories/workflow_parameters.py@@ -425,6 +425,22 @@ class WorkflowParametersRepository(BaseRepository):return convert_to_workflow_parameter(workflow_parameter, self.debug_enabled)return None+ @db_operation("get_workflow_parameters_by_ids")+ async def get_workflow_parameters_by_ids(self, workflow_parameter_ids: list[str]) -> list[WorkflowParameter]:+ # Batch equivalent of get_workflow_parameter: matches on id only, without a+ # deleted_at filter, so historical workflow-run lookups still resolve soft-deleted params.+ if not workflow_parameter_ids:+ return []+ async with self.Session() as session:+ workflow_parameters = (+ await session.scalars(+ select(WorkflowParameterModel).where(+ WorkflowParameterModel.workflow_parameter_id.in_(workflow_parameter_ids)+ )+ )+ ).all()+ return [convert_to_workflow_parameter(parameter, self.debug_enabled) for parameter in workflow_parameters]+@db_operation("create_task_generation")async def create_task_generation(self,diff --git a/skyvern/forge/sdk/db/repositories/workflow_runs.py b/skyvern/forge/sdk/db/repositories/workflow_runs.pyindex 7667ef4aa..43a9f8b98 100644--- a/skyvern/forge/sdk/db/repositories/workflow_runs.py+++ b/skyvern/forge/sdk/db/repositories/workflow_runs.py@@ -1433,13 +1433,19 @@ class WorkflowRunsRepository(BaseRepository):workflow_run_parameters = (await session.scalars(select(WorkflowRunParameterModel).filter_by(workflow_run_id=workflow_run_id))).all()+ if not workflow_run_parameters:+ return []+ if self._workflow_parameter_reader is None:+ raise RuntimeError("workflow_parameter_reader dependency not set")+ workflow_parameters_by_id = {+ workflow_parameter.workflow_parameter_id: workflow_parameter+ for workflow_parameter in await self._workflow_parameter_reader.get_workflow_parameters_by_ids(+ [workflow_run_parameter.workflow_parameter_id for workflow_run_parameter in workflow_run_parameters]+ )+ }results = []for workflow_run_parameter in workflow_run_parameters:- if self._workflow_parameter_reader is None:- raise RuntimeError("workflow_parameter_reader dependency not set")- workflow_parameter = await self._workflow_parameter_reader.get_workflow_parameter(- workflow_run_parameter.workflow_parameter_id- )+ workflow_parameter = workflow_parameters_by_id.get(workflow_run_parameter.workflow_parameter_id)if not workflow_parameter:raise WorkflowParameterNotFound(workflow_parameter_id=workflow_run_parameter.workflow_parameter_id)results.append(diff --git a/tests/unit/forge/sdk/db/conftest.py b/tests/unit/forge/sdk/db/conftest.pynew file mode 100644index 000000000..71a489240--- /dev/null+++ b/tests/unit/forge/sdk/db/conftest.py@@ -0,0 +1,25 @@+"""Shared fixtures for the DB-repository unit tests: an AgentDB backed by in-memory SQLite."""++from __future__ import annotations++from typing import Any, AsyncGenerator++import pytest_asyncio+from sqlalchemy.ext.asyncio import create_async_engine++from skyvern.forge.sdk.db.agent_db import AgentDB+from skyvern.forge.sdk.db.models import Base+++@pytest_asyncio.fixture+async def db_engine() -> AsyncGenerator[Any]:+ engine = create_async_engine("sqlite+aiosqlite:///:memory:")+ async with engine.begin() as conn:+ await conn.run_sync(Base.metadata.create_all)+ yield engine+ await engine.dispose()+++@pytest_asyncio.fixture+async def agent_db(db_engine: Any) -> AsyncGenerator[AgentDB]:+ yield AgentDB(database_string="sqlite+aiosqlite:///:memory:", debug_enabled=True, db_engine=db_engine)diff --git a/tests/unit/forge/sdk/db/test_workflow_run_parameters.py b/tests/unit/forge/sdk/db/test_workflow_run_parameters.pynew file mode 100644index 000000000..6bacdfd4f--- /dev/null+++ b/tests/unit/forge/sdk/db/test_workflow_run_parameters.py@@ -0,0 +1,90 @@+"""Tests for WorkflowRunsRepository.get_workflow_run_parameters against in-memory SQLite.++The method resolves each run parameter's definition. It used to issue one query per+parameter (sequential N+1); it now batch-fetches all definitions in a single query.+The load-bearing invariant is that a run referencing a soft-deleted parameter definition+still resolves — batch resolution must match on id only, without a deleted_at filter.+"""++from __future__ import annotations++from datetime import datetime, timezone+from typing import Any++import pytest++from skyvern.forge.sdk.db.agent_db import AgentDB+from skyvern.forge.sdk.workflow.models.parameter import WorkflowParameter, WorkflowParameterType+from skyvern.forge.sdk.workflow.models.workflow import WorkflowDefinition+++def _wp(key: str, workflow_id: str, default_value: Any = None) -> WorkflowParameter:+ now = datetime.now(timezone.utc)+ return WorkflowParameter(+ workflow_parameter_id=f"wp_{key}",+ workflow_parameter_type=WorkflowParameterType.STRING,+ key=key,+ description=None,+ workflow_id=workflow_id,+ default_value=default_value,+ created_at=now,+ modified_at=now,+ )+++async def _seed(agent_db: AgentDB) -> dict[str, str]:+ org = await agent_db.organizations.create_organization(organization_name="Test Org", domain="wrp.test")+ workflow = await agent_db.workflows.create_workflow(+ title="Test Workflow",+ workflow_definition={"parameters": [], "blocks": []},+ organization_id=org.organization_id,+ )+ return {"organization_id": org.organization_id, "workflow_id": workflow.workflow_id}+++async def _reconcile(agent_db: AgentDB, ids: dict[str, str], params: list[WorkflowParameter]) -> None:+ await agent_db.workflows.update_workflow_and_reconcile_definition_params(+ workflow_id=ids["workflow_id"],+ organization_id=ids["organization_id"],+ workflow_definition=WorkflowDefinition(parameters=params, blocks=[]),+ )+++async def test_resolves_all_params_including_soft_deleted(agent_db: AgentDB) -> None:+ ids = await _seed(agent_db)+ workflow_id = ids["workflow_id"]++ await _reconcile(agent_db, ids, [_wp("live", workflow_id, "a"), _wp("gone", workflow_id, "b")])+ persisted = {p.key: p for p in await agent_db.workflow_params.get_workflow_parameters(workflow_id=workflow_id)}++ # Soft-delete "gone" — its definition row survives and must still resolve by id.+ await _reconcile(agent_db, ids, [_wp("live", workflow_id, "a")])++ workflow_run = await agent_db.workflow_runs.create_workflow_run(+ workflow_permanent_id="wpid_test",+ workflow_id=workflow_id,+ organization_id=ids["organization_id"],+ )+ await agent_db.workflow_runs.create_workflow_run_parameters(+ workflow_run_id=workflow_run.workflow_run_id,+ workflow_parameter_values=[(persisted["live"], "live_val"), (persisted["gone"], "gone_val")],+ )++ results = await agent_db.workflow_runs.get_workflow_run_parameters(workflow_run.workflow_run_id)++ by_key = {wp.key: (wp, wrp) for wp, wrp in results}+ assert set(by_key) == {"live", "gone"}+ assert by_key["live"][1].value == "live_val"+ assert by_key["gone"][1].value == "gone_val"+++async def test_returns_empty_when_no_run_parameters(agent_db: AgentDB) -> None:+ ids = await _seed(agent_db)+ workflow_run = await agent_db.workflow_runs.create_workflow_run(+ workflow_permanent_id="wpid_test",+ workflow_id=ids["workflow_id"],+ organization_id=ids["organization_id"],+ )+ assert await agent_db.workflow_runs.get_workflow_run_parameters(workflow_run.workflow_run_id) == []diff --git a/tests/unit/test_failure_classifier.py b/tests/unit/test_failure_classifier.pyindex 066e91e38..96421bfe4 100644--- a/tests/unit/test_failure_classifier.py+++ b/tests/unit/test_failure_classifier.py@@ -16,6 +16,41 @@ class UnknownErrorWhileCreatingBrowserContext(Exception):class ProxyErrorOccurred(Exception):pass+ def test_get_outbound_ip_failed_exception_is_proxy_not_browser(self) -> None:+ """GetOutboundIPFailed should be PROXY_ERROR, not BROWSER_ERROR."""++ class GetOutboundIPFailed(Exception):+ pass++ result = classify_from_failure_reason(+ "Failed to create browser context for dynamic-browser (GetOutboundIPFailed). "+ "Failed to get outbound ip (proxy_network=joinmassive-isp-dedicated): "+ "https://checkip.amazonaws.com=ProxyError",+ exception=GetOutboundIPFailed(),+ )+ assert result is not None+ assert result[0]["category"] == "PROXY_ERROR"+ categories = [r["category"] for r in result]+ assert "BROWSER_ERROR" not in categories++ def test_get_outbound_ip_failed_reason_without_exception(self) -> None:+ """GetOutboundIPFailed in failure_reason text alone should yield PROXY_ERROR.++ The workflow run failure path calls classify_from_failure_reason without exception=,+ so the proxy classification must be driven by the failure_reason text.+ """+ reason = (+ "goto_url block failed. failure reason: Failed to create browser context for dynamic-browser "+ "(GetOutboundIPFailed). Failed to get outbound ip (proxy_network=joinmassive-isp-dedicated): "+ "https://checkip.amazonaws.com=ProxyError, https://ipinfo.io/ip=ProxyError"+ )+ result = classify_from_failure_reason(reason, fallback_to_unknown=True)+ assert result is not None+ assert result[0]["category"] == "PROXY_ERROR"+ categories = [r["category"] for r in result]+ assert "UNKNOWN" not in categories+ assert "BROWSER_ERROR" not in categories+class BrowserCrashError(Exception):pass