From a7cde692f0d5845c10770e624a7cee6142a622e8 Mon Sep 17 00:00:00 2001 From: LawyZheng Date: Wed, 4 Feb 2026 16:15:39 +0800 Subject: [PATCH] fix stuck cron task not found issue (#4627) --- skyvern/forge/sdk/db/agent_db.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/skyvern/forge/sdk/db/agent_db.py b/skyvern/forge/sdk/db/agent_db.py index 720fe8f5..84351d83 100644 --- a/skyvern/forge/sdk/db/agent_db.py +++ b/skyvern/forge/sdk/db/agent_db.py @@ -378,11 +378,10 @@ class AgentDB(BaseAlchemyDB): async def get_task(self, task_id: str, organization_id: str | None = None) -> Task | None: """Get a task by its id""" async with self.Session() as session: - if task_obj := ( - await session.scalars( - select(TaskModel).filter_by(task_id=task_id).filter_by(organization_id=organization_id) - ) - ).first(): + query = select(TaskModel).filter_by(task_id=task_id) + if organization_id is not None: + query = query.filter_by(organization_id=organization_id) + if task_obj := (await session.scalars(query)).first(): return convert_to_task(task_obj, self.debug_enabled) else: LOG.info( @@ -395,7 +394,7 @@ class AgentDB(BaseAlchemyDB): async def get_tasks_by_ids( self, task_ids: list[str], - organization_id: str | None = None, + organization_id: str, ) -> list[Task]: try: async with self.Session() as session: