Skip to content

Automate browser based workflows with AI

Finish a swept workflow run even when its child cascade fails (SKY-17793) (#8827)

Aaron Pereze3a4b830406b
diff --git a/skyvern/forge/sdk/db/repositories/observer.py b/skyvern/forge/sdk/db/repositories/observer.py
index 6a4cfd171..dd80e7f9d 100644
--- a/skyvern/forge/sdk/db/repositories/observer.py
+++ b/skyvern/forge/sdk/db/repositories/observer.py
@@ -629,6 +629,7 @@ class ObserverRepository(BaseRepository):
new_status: str,
only_if_status_in: list[str],
failure_reason: str | None = None,
+ organization_id: str | None = None,
) -> int:
if not only_if_status_in:
return 0
@@ -638,12 +639,13 @@ class ObserverRepository(BaseRepository):
if failure_reason is not None:
update_values["failure_reason"] = failure_reason
- stmt = (
- update(WorkflowRunBlockModel)
- .where(WorkflowRunBlockModel.workflow_run_id == workflow_run_id)
- .where(WorkflowRunBlockModel.status.in_(only_if_status_in))
- .values(**update_values)
- )
+ stmt = update(WorkflowRunBlockModel).where(WorkflowRunBlockModel.workflow_run_id == workflow_run_id)
+ # No index leads with workflow_run_id; the run lookup index is (organization_id, workflow_run_id).
+ # An unknown organization still has to match every block of the run, so None adds no predicate
+ # rather than the `IS NULL` a filter_by would generate.
+ if organization_id is not None:
+ stmt = stmt.where(WorkflowRunBlockModel.organization_id == organization_id)
+ stmt = stmt.where(WorkflowRunBlockModel.status.in_(only_if_status_in)).values(**update_values)
result = await session.execute(stmt)
await session.commit()
return result.rowcount or 0
diff --git a/skyvern/forge/sdk/workflow/service.py b/skyvern/forge/sdk/workflow/service.py
index 06581363a..fd53965a7 100644
--- a/skyvern/forge/sdk/workflow/service.py
+++ b/skyvern/forge/sdk/workflow/service.py
@@ -12190,16 +12190,26 @@ class WorkflowService:
return workflow_run
- async def _cascade_child_entities_on_terminal(self, workflow_run_id: str, status: WorkflowRunStatus) -> None:
+ async def _cascade_child_entities_on_terminal(
+ self,
+ workflow_run_id: str,
+ status: WorkflowRunStatus,
+ organization_id: str | None = None,
+ ) -> None:
if status != WorkflowRunStatus.timed_out:
return
try:
- await self._do_cascade_child_entities(workflow_run_id, status)
+ await self._do_cascade_child_entities(workflow_run_id, status, organization_id=organization_id)
except Exception:
LOG.exception("Failed to cascade child entity status", workflow_run_id=workflow_run_id)
- async def _do_cascade_child_entities(self, workflow_run_id: str, status: WorkflowRunStatus) -> None:
+ async def _do_cascade_child_entities(
+ self,
+ workflow_run_id: str,
+ status: WorkflowRunStatus,
+ organization_id: str | None = None,
+ ) -> None:
block_status = BLOCK_STATUS_MAP[status]
task_status = TASK_STATUS_MAP[status]
step_status = STEP_STATUS_MAP[status]
@@ -12207,6 +12217,7 @@ class WorkflowService:
blocks_updated = await app.DATABASE.observer.bulk_update_workflow_run_blocks_by_workflow_run_id(
workflow_run_id=workflow_run_id,
+ organization_id=organization_id,
new_status=block_status.value,
only_if_status_in=NONFINAL_BLOCK_STATUSES,
failure_reason=failure_reason,
@@ -13370,7 +13381,11 @@ class WorkflowService:
if updated is None:
return await self._current_row_after_lost_finalize(workflow_run_id, workflow_run)
if pre_finally_status == WorkflowRunStatus.timed_out:
- await self._cascade_child_entities_on_terminal(workflow_run_id, WorkflowRunStatus.timed_out)
+ await self._cascade_child_entities_on_terminal(
+ workflow_run_id,
+ WorkflowRunStatus.timed_out,
+ organization_id=updated.organization_id,
+ )
return updated
return workflow_run
@@ -13587,7 +13602,11 @@ class WorkflowService:
# Opt-in: run-level failures normally leave child rows to their own executors,
# but out-of-band finalization (an interrupted worker) has no executor left to do it.
try:
- await self._do_cascade_child_entities(workflow_run_id, WorkflowRunStatus.failed)
+ await self._do_cascade_child_entities(
+ workflow_run_id,
+ WorkflowRunStatus.failed,
+ organization_id=workflow_run.organization_id,
+ )
except Exception:
LOG.exception("Failed to cascade child entity status", workflow_run_id=workflow_run_id)
return workflow_run
@@ -13721,7 +13740,11 @@ class WorkflowService:
)
if cascade_children:
try:
- await self._do_cascade_child_entities(workflow_run_id, WorkflowRunStatus.failed)
+ await self._do_cascade_child_entities(
+ workflow_run_id,
+ WorkflowRunStatus.failed,
+ organization_id=workflow_run.organization_id,
+ )
except Exception:
LOG.exception("Failed to cascade child entity status", workflow_run_id=workflow_run_id)
return workflow_run
@@ -14009,7 +14032,11 @@ class WorkflowService:
return updated_workflow_run
otel_trace.get_current_span().set_attribute("task.completion_status", WorkflowRunStatus.timed_out)
- await self._cascade_child_entities_on_terminal(workflow_run_id, WorkflowRunStatus.timed_out)
+ await self._cascade_child_entities_on_terminal(
+ workflow_run_id,
+ WorkflowRunStatus.timed_out,
+ organization_id=updated_workflow_run.organization_id,
+ )
return updated_workflow_run
async def get_workflow_run(self, workflow_run_id: str, organization_id: str | None = None) -> WorkflowRun:
diff --git a/skyvern/services/browser_recording/state_machines/url_change.py b/skyvern/services/browser_recording/state_machines/url_change.py
index 4f3b9c515..026128649 100644
--- a/skyvern/services/browser_recording/state_machines/url_change.py
+++ b/skyvern/services/browser_recording/state_machines/url_change.py
@@ -60,11 +60,14 @@ class StateMachineUrlChange(StateMachine):
texts=[],
)
+ # CDP events carry server time.time() seconds; every other action uses the page's Date.now() ms.
+ timestamp_ms = event.timestamp * 1000
+
return ActionUrlChange(
kind=ActionKind.URL_CHANGE.value,
target=action_target,
- timestamp_start=event.timestamp,
- timestamp_end=event.timestamp,
+ timestamp_start=timestamp_ms,
+ timestamp_end=timestamp_ms,
url=url,
)
diff --git a/tests/unit/forge/sdk/db/test_repositories.py b/tests/unit/forge/sdk/db/test_repositories.py
index 667708170..fcbb01cd0 100644
--- a/tests/unit/forge/sdk/db/test_repositories.py
+++ b/tests/unit/forge/sdk/db/test_repositories.py
@@ -8,6 +8,7 @@ from unittest.mock import AsyncMock, MagicMock, patch
import pytest
from pydantic import BaseModel
+from sqlalchemy import select
from sqlalchemy.exc import IntegrityError
from sqlalchemy.ext.asyncio import AsyncEngine, async_sessionmaker
@@ -20,6 +21,7 @@ from skyvern.forge.sdk.db.models import (
ScriptBlockModel,
ScriptModel,
TaskModel,
+ WorkflowRunBlockModel,
WorkflowScriptModel,
)
from skyvern.forge.sdk.db.repositories.organizations import OrganizationsRepository
@@ -871,3 +873,37 @@ async def test_create_returns_the_stored_row_without_reading_it_back(
stored = await read_back(db, organization_id, created)
assert stored is not None
assert created.model_dump() == stored.model_dump()
+
+
+async def test_block_bulk_update_scopes_to_the_given_organization_and_none_matches_every_block(
+ agent_db: AgentDB,
+) -> None:
+ async with agent_db.Session() as session:
+ session.add_all(
+ WorkflowRunBlockModel(
+ workflow_run_block_id=block_id,
+ workflow_run_id="wr_shared",
+ organization_id=organization_id,
+ status="running",
+ block_type="task",
+ )
+ for block_id, organization_id in (("wrb_own", "o_own"), ("wrb_other", "o_other"), ("wrb_null", None))
+ )
+ await session.commit()
+
+ async def statuses() -> dict[str, str]:
+ async with agent_db.Session() as session:
+ rows = (await session.execute(select(WorkflowRunBlockModel))).scalars().all()
+ return {row.workflow_run_block_id: row.status for row in rows}
+
+ update = agent_db.observer.bulk_update_workflow_run_blocks_by_workflow_run_id
+ scoped = await update(
+ workflow_run_id="wr_shared", organization_id="o_own", new_status="timed_out", only_if_status_in=["running"]
+ )
+ assert scoped == 1
+ assert await statuses() == {"wrb_own": "timed_out", "wrb_other": "running", "wrb_null": "running"}
+
+ unscoped = await update(workflow_run_id="wr_shared", new_status="timed_out", only_if_status_in=["running"])
+ assert unscoped == 2
+ assert set((await statuses()).values()) == {"timed_out"}
diff --git a/tests/unit/services/test_browser_recording_evidence.py b/tests/unit/services/test_browser_recording_evidence.py
index 2c8f24166..af7753ae1 100644
--- a/tests/unit/services/test_browser_recording_evidence.py
+++ b/tests/unit/services/test_browser_recording_evidence.py
@@ -1,7 +1,8 @@
from skyvern.services.browser_recording.evidence import RecordedPointerEvidence, build_recording_evidence
+from skyvern.services.browser_recording.service import Processor
from skyvern.services.browser_recording.state_machines.click import StateMachineClick
from skyvern.services.browser_recording.types import Action, ActionKind, Mouse
-from tests.unit.services.test_browser_recording import make_console_event
+from tests.unit.services.test_browser_recording import make_cdp_event, make_click_event, make_console_event
from tests.unit.services.test_browser_recording_code_first import (
PBS_ID,
WP_ID,
@@ -170,6 +171,30 @@ def test_navigation_attribution_and_action_order() -> None:
assert packet.actions[2].navigated_to is None
+def test_cdp_navigation_seconds_share_the_click_millisecond_clock() -> None:
+ events = [
+ make_cdp_event("nav:frame_started_navigating", 1_700_000_000.0, {"url": "https://example.com"}),
+ make_click_event({"id": "next", "skyId": "sky-next", "tagName": "BUTTON"}, 1_700_000_002_000.0),
+ make_cdp_event("nav:frame_started_navigating", 1_700_000_002.5, {"url": "https://example.com/next"}),
+ ]
+ actions = Processor(PBS_ID, "org_123", WP_ID).events_to_actions(events)
+
+ packet = build_recording_evidence(
+ actions,
+ None,
+ browser_session_id=PBS_ID,
+ workflow_permanent_id=WP_ID,
+ recording_attempt_id="rra_test",
+ )
+
+ assert [action.kind for action in packet.actions] == [
+ ActionKind.URL_CHANGE,
+ ActionKind.CLICK,
+ ActionKind.URL_CHANGE,
+ ]
+ assert packet.actions[1].navigated_to == "https://example.com/next"
+
+
def test_focus_click_credential_transfers_to_fill() -> None:
click = make_click(1000, selector="#password")
fill = make_input(2000, "typed-secret", selector="#password", input_type="text")