Skip to content

Automate browser based workflows with AI

[Database] Fix: use portable distinct step count (#7769)

Hemant679cafb03875
diff --git a/skyvern/forge/sdk/db/repositories/tasks.py b/skyvern/forge/sdk/db/repositories/tasks.py
index 048c434d9..6db3823eb 100644
--- a/skyvern/forge/sdk/db/repositories/tasks.py
+++ b/skyvern/forge/sdk/db/repositories/tasks.py
@@ -6,7 +6,7 @@ from decimal import Decimal
from typing import Any, Sequence
import structlog
-from sqlalchemy import and_, delete, distinct, func, select, tuple_, update
+from sqlalchemy import and_, delete, func, select, update
from skyvern.forge.sdk.db._error_handling import db_operation
from skyvern.forge.sdk.db.base_alchemy_db import read_retry
@@ -306,11 +306,14 @@ class TasksRepository(BaseRepository):
where s.task_id in task_ids
"""
async with self.Session() as session:
- query = (
- select(func.count(distinct(tuple_(StepModel.task_id, StepModel.order))))
+ unique_step_orders = (
+ select(StepModel.task_id, StepModel.order)
.where(StepModel.task_id.in_(task_ids))
.where(StepModel.organization_id == organization_id)
+ .distinct()
+ .subquery()
)
+ query = select(func.count()).select_from(unique_step_orders)
return (await session.execute(query)).scalar()
@db_operation("get_task_step_models")
diff --git a/tests/unit/forge/sdk/db/test_tasks_repository.py b/tests/unit/forge/sdk/db/test_tasks_repository.py
new file mode 100644
index 000000000..05d8e2182
--- /dev/null
+++ b/tests/unit/forge/sdk/db/test_tasks_repository.py
@@ -0,0 +1,43 @@
+import pytest
+
+
+async def test_total_unique_step_order_count_deduplicates_retries_in_sqlite(agent_db) -> None:
+ organization = await agent_db.organizations.create_organization(
+ organization_name="Test organization",
+ organization_id="o_test_task_step_count",
+ )
+ task = await agent_db.tasks.create_task(
+ url="https://example.com",
+ title="Count steps",
+ navigation_goal=None,
+ data_extraction_goal=None,
+ navigation_payload=None,
+ organization_id=organization.organization_id,
+ )
+ excluded_task = await agent_db.tasks.create_task(
+ url="https://example.com",
+ title="Excluded task",
+ navigation_goal=None,
+ data_extraction_goal=None,
+ navigation_payload=None,
+ organization_id=organization.organization_id,
+ )
+
+ await agent_db.tasks.create_step(task.task_id, order=0, retry_index=0, organization_id=organization.organization_id)
+ await agent_db.tasks.create_step(task.task_id, order=0, retry_index=1, organization_id=organization.organization_id)
+ await agent_db.tasks.create_step(task.task_id, order=1, retry_index=0, organization_id=organization.organization_id)
+ await agent_db.tasks.create_step(
+ excluded_task.task_id,
+ order=0,
+ retry_index=0,
+ organization_id=organization.organization_id,
+ )
+
+ assert (
+ await agent_db.tasks.get_total_unique_step_order_count_by_task_ids(
+ task_ids=[task.task_id],
+ organization_id=organization.organization_id,
+ )
+ == 2
+ )