Automate browser based workflows with AI
Python aiapiautomationbrowserbrowser-automationcomputergptllmplaywrightpowerautomatepuppeteerpythonrpaseleniumvisionworkflow
Optimize step count query to fix DB timeouts (SKY-8910) (#5478)
Shuchang Zheng499bb52ac909
diff --git a/skyvern/forge/sdk/db/repositories/tasks.py b/skyvern/forge/sdk/db/repositories/tasks.pyindex 6e54aa086..386d3e441 100644--- a/skyvern/forge/sdk/db/repositories/tasks.py+++ b/skyvern/forge/sdk/db/repositories/tasks.py@@ -209,6 +209,23 @@ class TasksRepository(BaseRepository):).all()return [convert_to_step(step, debug_enabled=self.debug_enabled) for step in steps]+ @db_operation("get_step_counts_by_task_ids")+ async def get_step_counts_by_task_ids(+ self, task_ids: list[str], organization_id: str | None = None+ ) -> tuple[int, int]:+ """Return (total_steps, completed_steps) counts without fetching full step objects."""+ async with self.Session() as session:+ query = (+ select(+ func.count().label("total"),+ func.count().filter(StepModel.status == StepStatus.completed).label("completed"),+ )+ .where(StepModel.task_id.in_(task_ids))+ .where(StepModel.organization_id == organization_id)+ )+ row = (await session.execute(query)).one()+ return row.total, row.completed+@db_operation("get_total_unique_step_order_count_by_task_ids")async def get_total_unique_step_order_count_by_task_ids(self,diff --git a/skyvern/forge/sdk/workflow/service.py b/skyvern/forge/sdk/workflow/service.pyindex 3ecbab9fc..ebfded48a 100644--- a/skyvern/forge/sdk/workflow/service.py+++ b/skyvern/forge/sdk/workflow/service.py@@ -60,7 +60,7 @@ from skyvern.forge.sdk.core import skyvern_contextfrom skyvern.forge.sdk.core.security import generate_skyvern_webhook_signaturefrom skyvern.forge.sdk.core.skyvern_context import SkyvernContextfrom skyvern.forge.sdk.db.enums import OrganizationAuthTokenType, WorkflowRunTriggerType-from skyvern.forge.sdk.models import Step, StepStatus+from skyvern.forge.sdk.models import Stepfrom skyvern.forge.sdk.schemas.files import FileInfofrom skyvern.forge.sdk.schemas.organizations import Organizationfrom skyvern.forge.sdk.schemas.persistent_browser_sessions import PersistentBrowserSession@@ -4395,10 +4395,10 @@ class WorkflowService:total_steps = Nonetotal_cost = Noneif include_step_count or include_cost:- workflow_run_steps = await app.DATABASE.tasks.get_steps_by_task_ids(+ step_count, completed_step_count = await app.DATABASE.tasks.get_step_counts_by_task_ids(task_ids=[task.task_id for task in workflow_run_tasks], organization_id=organization_id)- total_steps = len(workflow_run_steps)+ total_steps = step_countif include_cost:workflow_run_blocks = await app.DATABASE.observer.get_workflow_run_blocks(@@ -4408,9 +4408,7 @@ class WorkflowService:block for block in workflow_run_blocks if block.block_type == BlockType.TEXT_PROMPT]# TODO: This is a temporary cost calculation. We need to implement a more accurate cost calculation.- # successful steps are the ones that have a status of completed and the total count of unique step.order- successful_steps = [step for step in workflow_run_steps if step.status == StepStatus.completed]- total_cost = 0.05 * (len(successful_steps) + len(text_prompt_blocks))+ total_cost = 0.05 * (completed_step_count + len(text_prompt_blocks))return WorkflowRunResponseBase(workflow_id=workflow.workflow_permanent_id,workflow_run_id=workflow_run_id,