Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
fix: refresh expired model in update_workflow_run_if_not_final (#6655)
LawyZheng3b94344b35fe
diff --git a/skyvern/forge/sdk/db/repositories/workflow_runs.py b/skyvern/forge/sdk/db/repositories/workflow_runs.pyindex 515f92452..7f4c0cdbf 100644--- a/skyvern/forge/sdk/db/repositories/workflow_runs.py+++ b/skyvern/forge/sdk/db/repositories/workflow_runs.py@@ -408,6 +408,9 @@ class WorkflowRunsRepository(BaseRepository):await session.scalars(select(WorkflowRunModel).filter_by(workflow_run_id=workflow_run_id))).one()await save_workflow_run_logs(workflow_run_id)+ # save_workflow_run_logs reuses this session and commits, expiring `refreshed`.+ # Refresh before convert_to_workflow_run to avoid a greenlet-less lazy-load (MissingGreenlet).+ await session.refresh(refreshed)return convert_to_workflow_run(refreshed)@db_operation("bulk_update_workflow_runs")diff --git a/tests/unit/test_workflow_runs_repository_refresh.py b/tests/unit/test_workflow_runs_repository_refresh.pynew file mode 100644index 000000000..130d1e0c6--- /dev/null+++ b/tests/unit/test_workflow_runs_repository_refresh.py@@ -0,0 +1,130 @@+"""Regression: `update_workflow_run_if_not_final` must refresh after `save_workflow_run_logs` so the sync converter doesn't trigger an async lazy-load (MissingGreenlet)."""++from unittest.mock import AsyncMock, MagicMock, patch++import pytest++from skyvern.forge.sdk.db.repositories.workflow_runs import WorkflowRunsRepository+from skyvern.forge.sdk.workflow.models.workflow import WorkflowRunStatus+from tests.unit.conftest import MockAsyncSessionCtx+++def _make_repo_with_session(mock_workflow_run: MagicMock) -> tuple[WorkflowRunsRepository, AsyncMock]:+ scalars_result = MagicMock()+ scalars_result.one.return_value = mock_workflow_run++ execute_result = MagicMock()+ execute_result.scalar_one_or_none.return_value = mock_workflow_run.workflow_run_id++ session = AsyncMock()+ session.execute = AsyncMock(return_value=execute_result)+ session.scalars = AsyncMock(return_value=scalars_result)+ session.commit = AsyncMock()+ session.refresh = AsyncMock()++ repo = WorkflowRunsRepository(session_factory=lambda: MockAsyncSessionCtx(session))+ return repo, session+++async def test_refreshes_loaded_model_after_save_logs() -> None:+ mock_workflow_run = MagicMock()+ mock_workflow_run.workflow_run_id = "wr_test"++ repo, session = _make_repo_with_session(mock_workflow_run)++ with (+ patch(+ "skyvern.forge.sdk.db.repositories.workflow_runs.save_workflow_run_logs",+ new=AsyncMock(),+ ) as mock_save,+ patch(+ "skyvern.forge.sdk.db.repositories.workflow_runs.convert_to_workflow_run",+ return_value=MagicMock(),+ ),+ ):+ await repo.update_workflow_run_if_not_final(+ workflow_run_id="wr_test",+ status=WorkflowRunStatus.running,+ )++ mock_save.assert_awaited_once_with("wr_test")+ session.refresh.assert_awaited_once_with(mock_workflow_run)+++async def test_refresh_is_called_after_save_logs_not_before() -> None:+ """Order matters: refreshing before ``save_workflow_run_logs`` does nothing,+ because it's the nested commit inside save that does the expiring."""+ mock_workflow_run = MagicMock()+ mock_workflow_run.workflow_run_id = "wr_test"++ repo, session = _make_repo_with_session(mock_workflow_run)++ call_log: list[str] = []++ async def refresh_spy(_: object) -> None:+ call_log.append("refresh")++ async def save_spy(_: str) -> None:+ call_log.append("save")++ session.refresh.side_effect = refresh_spy++ with (+ patch(+ "skyvern.forge.sdk.db.repositories.workflow_runs.save_workflow_run_logs",+ new=save_spy,+ ),+ patch(+ "skyvern.forge.sdk.db.repositories.workflow_runs.convert_to_workflow_run",+ return_value=MagicMock(),+ ),+ ):+ await repo.update_workflow_run_if_not_final(+ workflow_run_id="wr_test",+ status=WorkflowRunStatus.running,+ )++ assert call_log == ["save", "refresh"], (+ f"expected save_workflow_run_logs to run before session.refresh, got {call_log!r}"+ )+++async def test_returns_none_without_calling_save_or_refresh_when_no_row_updated() -> None:+ """If no non-terminal row matched the conditional UPDATE we return None+ early; refresh and save_workflow_run_logs should not run."""+ scalars_result = MagicMock()+ scalars_result.one.return_value = MagicMock()++ execute_result = MagicMock()+ execute_result.scalar_one_or_none.return_value = None++ session = AsyncMock()+ session.execute = AsyncMock(return_value=execute_result)+ session.scalars = AsyncMock(return_value=scalars_result)+ session.commit = AsyncMock()+ session.refresh = AsyncMock()++ repo = WorkflowRunsRepository(session_factory=lambda: MockAsyncSessionCtx(session))++ with (+ patch(+ "skyvern.forge.sdk.db.repositories.workflow_runs.save_workflow_run_logs",+ new=AsyncMock(),+ ) as mock_save,+ patch(+ "skyvern.forge.sdk.db.repositories.workflow_runs.convert_to_workflow_run",+ return_value=MagicMock(),+ ) as mock_convert,+ ):+ result = await repo.update_workflow_run_if_not_final(+ workflow_run_id="wr_test",+ status=WorkflowRunStatus.canceled,+ )++ assert result is None+ mock_save.assert_not_awaited()+ session.refresh.assert_not_awaited()+ mock_convert.assert_not_called()