Skip to content

Automate browser based workflows with AI

join query performance improvement - add organization_id to the workflow_scripts & scripts table join (#4429)

Shuchang Zheng6cd5d90f5597
diff --git a/skyvern/forge/sdk/db/agent_db.py b/skyvern/forge/sdk/db/agent_db.py
index dfb052df7..3b4e86e32 100644
--- a/skyvern/forge/sdk/db/agent_db.py
+++ b/skyvern/forge/sdk/db/agent_db.py
@@ -5806,9 +5806,16 @@ class AgentDB(BaseAlchemyDB):
try:
async with self.Session() as session:
# Build the query: join workflow_scripts with scripts
+ # Join on both script_id and organization_id to leverage uc_org_script_version index
query = (
select(ScriptModel)
- .join(WorkflowScriptModel, ScriptModel.script_id == WorkflowScriptModel.script_id)
+ .join(
+ WorkflowScriptModel,
+ and_(
+ ScriptModel.organization_id == WorkflowScriptModel.organization_id,
+ ScriptModel.script_id == WorkflowScriptModel.script_id,
+ ),
+ )
.where(
WorkflowScriptModel.organization_id == organization_id,
WorkflowScriptModel.workflow_permanent_id == workflow_permanent_id,