Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(agents-api): rafactor get and list executions queries to not use latest_executions #1188

Merged
merged 1 commit into from
Feb 26, 2025
+88 −12
Merged

fix(agents-api): rafactor get and list executions queries to not use latest_executions #1188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 37 additions & 3 deletions agents-api/agents_api/queries/executions/get_execution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,43 @@

# Query to get an execution
get_execution_query = """
SELECT * FROM latest_executions
WHERE
execution_id = $1
SELECT
e.developer_id,
e.task_id,
e.task_version,
e.execution_id,
e.input,
e.metadata,
e.created_at,
coalesce(lt.created_at, e.created_at) AS updated_at,
CASE
WHEN lt.type::text IS NULL THEN 'queued'
WHEN lt.type::text = 'init' THEN 'starting'
WHEN lt.type::text = 'init_branch' THEN 'running'
WHEN lt.type::text = 'wait' THEN 'awaiting_input'
WHEN lt.type::text = 'resume' THEN 'running'
WHEN lt.type::text = 'step' THEN 'running'
WHEN lt.type::text = 'finish' THEN 'succeeded'
WHEN lt.type::text = 'finish_branch' THEN 'running'
WHEN lt.type::text = 'error' THEN 'failed'
WHEN lt.type::text = 'cancelled' THEN 'cancelled'
ELSE 'queued'
END AS status,
CASE
WHEN lt.type::text = 'error' THEN lt.output ->> 'error'
ELSE NULL
END AS error,
coalesce(lt.output, '{}'::jsonb) AS output,
lt.current_step,
lt.next_step,
lt.step_label,
lt.task_token,
lt.metadata AS transition_metadata
FROM
executions e
LEFT JOIN transitions lt ON e.execution_id = lt.execution_id
WHERE e.execution_id = $1
ORDER BY lt.created_at DESC
Comment on lines +46 to +49
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ORDER BY lt.created_at DESC with LEFT JOIN can return incorrect status when there are no transitions, since NULL values from lt.created_at will be ordered last. Should use COALESCE(lt.created_at, e.created_at) in ORDER BY.

📝 Committable Code Suggestion

‼️ Ensure you review the code suggestion before committing it to the branch. Make sure it replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
executions e
LEFT JOIN transitions lt ON e.execution_id = lt.execution_id
WHERE e.execution_id = $1
ORDER BY lt.created_at DESC
executions e
LEFT JOIN transitions lt ON e.execution_id = lt.execution_id
WHERE e.execution_id = $1
ORDER BY COALESCE(lt.created_at, e.created_at) DESC

LIMIT 1;
"""

Expand Down
60 changes: 51 additions & 9 deletions agents-api/agents_api/queries/executions/list_executions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,59 @@
from .constants import OUTPUT_UNNEST_KEY

# Query to list executions
# FIXME: order by updated_at as well
# FIXME: return to latest_executions view once latest_transitions is fixed
list_executions_query = """
SELECT * FROM latest_executions
SELECT
e.developer_id,
e.task_id,
e.task_version,
e.execution_id,
e.input,
e.metadata,
e.created_at,
coalesce(lt.created_at, e.created_at) AS updated_at,
CASE
WHEN lt.type::text IS NULL THEN 'queued'
WHEN lt.type::text = 'init' THEN 'starting'
WHEN lt.type::text = 'init_branch' THEN 'running'
WHEN lt.type::text = 'wait' THEN 'awaiting_input'
WHEN lt.type::text = 'resume' THEN 'running'
WHEN lt.type::text = 'step' THEN 'running'
WHEN lt.type::text = 'finish' THEN 'succeeded'
WHEN lt.type::text = 'finish_branch' THEN 'running'
WHEN lt.type::text = 'error' THEN 'failed'
WHEN lt.type::text = 'cancelled' THEN 'cancelled'
ELSE 'queued'
END AS status,
CASE
WHEN lt.type::text = 'error' THEN lt.output ->> 'error'
ELSE NULL
END AS error,
coalesce(lt.output, '{}'::jsonb) AS output,
lt.current_step,
lt.next_step,
lt.step_label,
lt.task_token,
lt.metadata AS transition_metadata
FROM
executions e
LEFT JOIN LATERAL (
SELECT *
FROM transitions t
WHERE t.execution_id = e.execution_id
ORDER BY t.created_at DESC
LIMIT 1
) lt ON true
WHERE
developer_id = $1 AND
task_id = $2
e.developer_id = $1 AND
e.task_id = $2
ORDER BY
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The ORDER BY only handles 'created_at' based on direction, ignoring the validated 'sort_by' (which includes 'updated_at'). Update the ordering logic or remove 'sort_by' if not needed.

CASE WHEN $3 = 'created_at' AND $4 = 'asc' THEN created_at END ASC NULLS LAST,
CASE WHEN $3 = 'created_at' AND $4 = 'desc' THEN created_at END DESC NULLS LAST,
CASE WHEN $3 = 'updated_at' AND $4 = 'asc' THEN updated_at END ASC NULLS LAST,
CASE WHEN $3 = 'updated_at' AND $4 = 'desc' THEN updated_at END DESC NULLS LAST
LIMIT $5 OFFSET $6;
CASE WHEN $3 = 'asc' THEN e.created_at END ASC NULLS LAST,
CASE WHEN $3 = 'desc' THEN e.created_at END DESC NULLS LAST
-- CASE WHEN $3 = 'updated_at' AND $4 = 'asc' THEN e.updated_at END ASC NULLS LAST,
-- CASE WHEN $3 = 'updated_at' AND $4 = 'desc' THEN e.updated_at END DESC NULLS LAST
LIMIT $4 OFFSET $5;
"""


Expand Down Expand Up @@ -84,7 +126,7 @@ async def list_executions(
[
developer_id,
task_id,
sort_by,
# sort_by,
direction,
limit,
offset,
Comment on lines 126 to 132
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Parameter binding mismatch after removing sort_by - $3 now binds to direction but query assumes it's for sort field comparison, leading to incorrect sorting.

📝 Committable Code Suggestion

‼️ Ensure you review the code suggestion before committing it to the branch. Make sure it replaces the highlighted code, contains no missing lines, and has no issues with indentation.

Suggested change
[
developer_id,
task_id,
sort_by,
# sort_by,
direction,
limit,
offset,
[
developer_id,
task_id,
direction,
limit,
offset,

Expand Down