Skip to content

AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.

feat(backend;frontend): Implement node-specific auto-approval, safety popup, and race condition fixes (#11810)

Zamil Majdyfb58827c6169
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/run_agent_test.py b/autogpt_platform/backend/backend/api/features/chat/tools/run_agent_test.py
index 9e10304429..404df2adb6 100644
--- a/autogpt_platform/backend/backend/api/features/chat/tools/run_agent_test.py
+++ b/autogpt_platform/backend/backend/api/features/chat/tools/run_agent_test.py
@@ -29,7 +29,7 @@ def mock_embedding_functions():
yield
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent(setup_test_data):
"""Test that the run_agent tool successfully executes an approved agent"""
# Use test data from fixture
@@ -70,7 +70,7 @@ async def test_run_agent(setup_test_data):
assert result_data["graph_name"] == "Test Agent"
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent_missing_inputs(setup_test_data):
"""Test that the run_agent tool returns error when inputs are missing"""
# Use test data from fixture
@@ -106,7 +106,7 @@ async def test_run_agent_missing_inputs(setup_test_data):
assert "message" in result_data
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent_invalid_agent_id(setup_test_data):
"""Test that the run_agent tool returns error for invalid agent ID"""
# Use test data from fixture
@@ -141,7 +141,7 @@ async def test_run_agent_invalid_agent_id(setup_test_data):
)
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent_with_llm_credentials(setup_llm_test_data):
"""Test that run_agent works with an agent requiring LLM credentials"""
# Use test data from fixture
@@ -185,7 +185,7 @@ async def test_run_agent_with_llm_credentials(setup_llm_test_data):
assert result_data["graph_name"] == "LLM Test Agent"
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent_shows_available_inputs_when_none_provided(setup_test_data):
"""Test that run_agent returns available inputs when called without inputs or use_defaults."""
user = setup_test_data["user"]
@@ -219,7 +219,7 @@ async def test_run_agent_shows_available_inputs_when_none_provided(setup_test_da
assert "inputs" in result_data["message"].lower()
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent_with_use_defaults(setup_test_data):
"""Test that run_agent executes successfully with use_defaults=True."""
user = setup_test_data["user"]
@@ -251,7 +251,7 @@ async def test_run_agent_with_use_defaults(setup_test_data):
assert result_data["graph_id"] == graph.id
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent_missing_credentials(setup_firecrawl_test_data):
"""Test that run_agent returns setup_requirements when credentials are missing."""
user = setup_firecrawl_test_data["user"]
@@ -285,7 +285,7 @@ async def test_run_agent_missing_credentials(setup_firecrawl_test_data):
assert len(setup_info["user_readiness"]["missing_credentials"]) > 0
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent_invalid_slug_format(setup_test_data):
"""Test that run_agent returns error for invalid slug format (no slash)."""
user = setup_test_data["user"]
@@ -313,7 +313,7 @@ async def test_run_agent_invalid_slug_format(setup_test_data):
assert "username/agent-name" in result_data["message"]
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent_unauthenticated():
"""Test that run_agent returns need_login for unauthenticated users."""
tool = RunAgentTool()
@@ -340,7 +340,7 @@ async def test_run_agent_unauthenticated():
assert "sign in" in result_data["message"].lower()
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent_schedule_without_cron(setup_test_data):
"""Test that run_agent returns error when scheduling without cron expression."""
user = setup_test_data["user"]
@@ -372,7 +372,7 @@ async def test_run_agent_schedule_without_cron(setup_test_data):
assert "cron" in result_data["message"].lower()
[email protected](scope="session")
[email protected](loop_scope="session")
async def test_run_agent_schedule_without_name(setup_test_data):
"""Test that run_agent returns error when scheduling without schedule_name."""
user = setup_test_data["user"]
diff --git a/autogpt_platform/backend/backend/api/features/executions/review/model.py b/autogpt_platform/backend/backend/api/features/executions/review/model.py
index 74f72fe1ff..bad8b8d304 100644
--- a/autogpt_platform/backend/backend/api/features/executions/review/model.py
+++ b/autogpt_platform/backend/backend/api/features/executions/review/model.py
@@ -23,6 +23,7 @@ class PendingHumanReviewModel(BaseModel):
id: Unique identifier for the review record
user_id: ID of the user who must perform the review
node_exec_id: ID of the node execution that created this review
+ node_id: ID of the node definition (for grouping reviews from same node)
graph_exec_id: ID of the graph execution containing the node
graph_id: ID of the graph template being executed
graph_version: Version number of the graph template
@@ -37,6 +38,10 @@ class PendingHumanReviewModel(BaseModel):
"""
node_exec_id: str = Field(description="Node execution ID (primary key)")
+ node_id: str = Field(
+ description="Node definition ID (for grouping)",
+ default="", # Temporary default for test compatibility
+ )
user_id: str = Field(description="User ID associated with the review")
graph_exec_id: str = Field(description="Graph execution ID")
graph_id: str = Field(description="Graph ID")
@@ -66,7 +71,9 @@ class PendingHumanReviewModel(BaseModel):
)
@classmethod
- def from_db(cls, review: "PendingHumanReview") -> "PendingHumanReviewModel":
+ def from_db(
+ cls, review: "PendingHumanReview", node_id: str
+ ) -> "PendingHumanReviewModel":
"""
Convert a database model to a response model.
@@ -74,9 +81,14 @@ class PendingHumanReviewModel(BaseModel):
payload, instructions, and editable flag.
Handles invalid data gracefully by using safe defaults.
+
+ Args:
+ review: Database review object
+ node_id: Node definition ID (fetched from NodeExecution)
"""
return cls(
node_exec_id=review.nodeExecId,
+ node_id=node_id,
user_id=review.userId,
graph_exec_id=review.graphExecId,
graph_id=review.graphId,
@@ -107,6 +119,13 @@ class ReviewItem(BaseModel):
reviewed_data: SafeJsonData | None = Field(
None, description="Optional edited data (ignored if approved=False)"
)
+ auto_approve_future: bool = Field(
+ default=False,
+ description=(
+ "If true and this review is approved, future executions of this same "
+ "block (node) will be automatically approved. This only affects approved reviews."
+ ),
+ )
@field_validator("reviewed_data")
@classmethod
@@ -174,6 +193,9 @@ class ReviewRequest(BaseModel):
This request must include ALL pending reviews for a graph execution.
Each review will be either approved (with optional data modifications)
or rejected (data ignored). The execution will resume only after ALL reviews are processed.
+
+ Each review item can individually specify whether to auto-approve future executions
+ of the same block via the `auto_approve_future` field on ReviewItem.
"""
reviews: List[ReviewItem] = Field(
diff --git a/autogpt_platform/backend/backend/api/features/executions/review/review_routes_test.py b/autogpt_platform/backend/backend/api/features/executions/review/review_routes_test.py
index c4eba0befc..d0c24f2cf8 100644
--- a/autogpt_platform/backend/backend/api/features/executions/review/review_routes_test.py
+++ b/autogpt_platform/backend/backend/api/features/executions/review/review_routes_test.py
@@ -1,35 +1,43 @@
import datetime
+from typing import AsyncGenerator
-import fastapi
-import fastapi.testclient
+import httpx
import pytest
+import pytest_asyncio
import pytest_mock
from prisma.enums import ReviewStatus
from pytest_snapshot.plugin import Snapshot
-from backend.api.rest_api import handle_internal_http_error
+from backend.api.rest_api import app
+from backend.data.execution import (
+ ExecutionContext,
+ ExecutionStatus,
+ NodeExecutionResult,
+)
+from backend.data.graph import GraphSettings
from .model import PendingHumanReviewModel
-from .routes import router
# Using a fixed timestamp for reproducible tests
FIXED_NOW = datetime.datetime(2023, 1, 1, 0, 0, 0, tzinfo=datetime.timezone.utc)
-app = fastapi.FastAPI()
-app.include_router(router, prefix="/api/review")
-app.add_exception_handler(ValueError, handle_internal_http_error(400))
-client = fastapi.testclient.TestClient(app)
-
-
[email protected](autouse=True)
-def setup_app_auth(mock_jwt_user):
- """Setup auth overrides for all tests in this module"""
+@pytest_asyncio.fixture(loop_scope="session")
+async def client(server, mock_jwt_user) -> AsyncGenerator[httpx.AsyncClient, None]:
+ """Create async HTTP client with auth overrides"""
from autogpt_libs.auth.jwt_utils import get_jwt_payload
+ # Override get_jwt_payload dependency to return our test user
app.dependency_overrides[get_jwt_payload] = mock_jwt_user["get_jwt_payload"]
- yield
- app.dependency_overrides.clear()
+
+ async with httpx.AsyncClient(
+ transport=httpx.ASGITransport(app=app),
+ base_url="http://test",
+ ) as http_client:
+ yield http_client
+
+ # Clean up overrides
+ app.dependency_overrides.pop(get_jwt_payload, None)
@pytest.fixture
@@ -37,6 +45,7 @@ def sample_pending_review(test_user_id: str) -> PendingHumanReviewModel:
"""Create a sample pending review for testing"""
return PendingHumanReviewModel(
node_exec_id="test_node_123",
+ node_id="test_node_def_456",
user_id=test_user_id,
graph_exec_id="test_graph_exec_456",
graph_id="test_graph_789",
@@ -54,7 +63,9 @@ def sample_pending_review(test_user_id: str) -> PendingHumanReviewModel:
)
-def test_get_pending_reviews_empty(
[email protected](loop_scope="session")
+async def test_get_pending_reviews_empty(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
snapshot: Snapshot,
test_user_id: str,
@@ -65,14 +76,16 @@ def test_get_pending_reviews_empty(
)
mock_get_reviews.return_value = []
- response = client.get("/api/review/pending")
+ response = await client.get("/api/review/pending")
assert response.status_code == 200
assert response.json() == []
mock_get_reviews.assert_called_once_with(test_user_id, 1, 25)
-def test_get_pending_reviews_with_data(
[email protected](loop_scope="session")
+async def test_get_pending_reviews_with_data(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
sample_pending_review: PendingHumanReviewModel,
snapshot: Snapshot,
@@ -84,7 +97,7 @@ def test_get_pending_reviews_with_data(
)
mock_get_reviews.return_value = [sample_pending_review]
- response = client.get("/api/review/pending?page=2&page_size=10")
+ response = await client.get("/api/review/pending?page=2&page_size=10")
assert response.status_code == 200
data = response.json()
@@ -94,7 +107,9 @@ def test_get_pending_reviews_with_data(
mock_get_reviews.assert_called_once_with(test_user_id, 2, 10)
-def test_get_pending_reviews_for_execution_success(
[email protected](loop_scope="session")
+async def test_get_pending_reviews_for_execution_success(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
sample_pending_review: PendingHumanReviewModel,
snapshot: Snapshot,
@@ -114,7 +129,7 @@ def test_get_pending_reviews_for_execution_success(
)
mock_get_reviews.return_value = [sample_pending_review]
- response = client.get("/api/review/execution/test_graph_exec_456")
+ response = await client.get("/api/review/execution/test_graph_exec_456")
assert response.status_code == 200
data = response.json()
@@ -122,7 +137,9 @@ def test_get_pending_reviews_for_execution_success(
assert data[0]["graph_exec_id"] == "test_graph_exec_456"
-def test_get_pending_reviews_for_execution_not_available(
[email protected](loop_scope="session")
+async def test_get_pending_reviews_for_execution_not_available(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
) -> None:
"""Test access denied when user doesn't own the execution"""
@@ -131,13 +148,15 @@ def test_get_pending_reviews_for_execution_not_available(
)
mock_get_graph_execution.return_value = None
- response = client.get("/api/review/execution/test_graph_exec_456")
+ response = await client.get("/api/review/execution/test_graph_exec_456")
assert response.status_code == 404
assert "not found" in response.json()["detail"]
-def test_process_review_action_approve_success(
[email protected](loop_scope="session")
+async def test_process_review_action_approve_success(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
sample_pending_review: PendingHumanReviewModel,
test_user_id: str,
@@ -145,6 +164,12 @@ def test_process_review_action_approve_success(
"""Test successful review approval"""
# Mock the route functions
+ # Mock get_pending_reviews_by_node_exec_ids (called to find the graph_exec_id)
+ mock_get_reviews_for_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_pending_reviews_by_node_exec_ids"
+ )
+ mock_get_reviews_for_user.return_value = {"test_node_123": sample_pending_review}
+
mock_get_reviews_for_execution = mocker.patch(
"backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
)
@@ -173,6 +198,14 @@ def test_process_review_action_approve_success(
)
mock_process_all_reviews.return_value = {"test_node_123": approved_review}
+ # Mock get_graph_execution_meta to return execution in REVIEW status
+ mock_get_graph_exec = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_execution_meta"
+ )
+ mock_graph_exec_meta = mocker.Mock()
+ mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+ mock_get_graph_exec.return_value = mock_graph_exec_meta
+
mock_has_pending = mocker.patch(
"backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
)
@@ -191,7 +224,7 @@ def test_process_review_action_approve_success(
]
}
- response = client.post("/api/review/action", json=request_data)
+ response = await client.post("/api/review/action", json=request_data)
assert response.status_code == 200
data = response.json()
@@ -201,7 +234,9 @@ def test_process_review_action_approve_success(
assert data["error"] is None
-def test_process_review_action_reject_success(
[email protected](loop_scope="session")
+async def test_process_review_action_reject_success(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
sample_pending_review: PendingHumanReviewModel,
test_user_id: str,
@@ -209,6 +244,20 @@ def test_process_review_action_reject_success(
"""Test successful review rejection"""
# Mock the route functions
+ # Mock get_pending_reviews_by_node_exec_ids (called to find the graph_exec_id)
+ mock_get_reviews_for_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_pending_reviews_by_node_exec_ids"
+ )
+ mock_get_reviews_for_user.return_value = {"test_node_123": sample_pending_review}
+
+ # Mock get_graph_execution_meta to return execution in REVIEW status
+ mock_get_graph_exec = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_execution_meta"
+ )
+ mock_graph_exec_meta = mocker.Mock()
+ mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+ mock_get_graph_exec.return_value = mock_graph_exec_meta
+
mock_get_reviews_for_execution = mocker.patch(
"backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
)
@@ -251,7 +300,7 @@ def test_process_review_action_reject_success(
]
}
- response = client.post("/api/review/action", json=request_data)
+ response = await client.post("/api/review/action", json=request_data)
assert response.status_code == 200
data = response.json()
@@ -261,7 +310,9 @@ def test_process_review_action_reject_success(
assert data["error"] is None
-def test_process_review_action_mixed_success(
[email protected](loop_scope="session")
+async def test_process_review_action_mixed_success(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
sample_pending_review: PendingHumanReviewModel,
test_user_id: str,
@@ -288,6 +339,15 @@ def test_process_review_action_mixed_success(
# Mock the route functions
+ # Mock get_pending_reviews_by_node_exec_ids (called to find the graph_exec_id)
+ mock_get_reviews_for_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_pending_reviews_by_node_exec_ids"
+ )
+ mock_get_reviews_for_user.return_value = {
+ "test_node_123": sample_pending_review,
+ "test_node_456": second_review,
+ }
+
mock_get_reviews_for_execution = mocker.patch(
"backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
)
@@ -337,6 +397,14 @@ def test_process_review_action_mixed_success(
"test_node_456": rejected_review,
}
+ # Mock get_graph_execution_meta to return execution in REVIEW status
+ mock_get_graph_exec = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_execution_meta"
+ )
+ mock_graph_exec_meta = mocker.Mock()
+ mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+ mock_get_graph_exec.return_value = mock_graph_exec_meta
+
mock_has_pending = mocker.patch(
"backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
)
@@ -358,7 +426,7 @@ def test_process_review_action_mixed_success(
]
}
- response = client.post("/api/review/action", json=request_data)
+ response = await client.post("/api/review/action", json=request_data)
assert response.status_code == 200
data = response.json()
@@ -368,14 +436,16 @@ def test_process_review_action_mixed_success(
assert data["error"] is None
-def test_process_review_action_empty_request(
[email protected](loop_scope="session")
+async def test_process_review_action_empty_request(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
test_user_id: str,
) -> None:
"""Test error when no reviews provided"""
request_data = {"reviews": []}
- response = client.post("/api/review/action", json=request_data)
+ response = await client.post("/api/review/action", json=request_data)
assert response.status_code == 422
response_data = response.json()
@@ -385,11 +455,29 @@ def test_process_review_action_empty_request(
assert "At least one review must be provided" in response_data["detail"][0]["msg"]
-def test_process_review_action_review_not_found(
[email protected](loop_scope="session")
+async def test_process_review_action_review_not_found(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
+ sample_pending_review: PendingHumanReviewModel,
test_user_id: str,
) -> None:
"""Test error when review is not found"""
+ # Mock get_pending_reviews_by_node_exec_ids (called to find the graph_exec_id)
+ mock_get_reviews_for_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_pending_reviews_by_node_exec_ids"
+ )
+ # Return empty dict to simulate review not found
+ mock_get_reviews_for_user.return_value = {}
+
+ # Mock get_graph_execution_meta to return execution in REVIEW status
+ mock_get_graph_exec = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_execution_meta"
+ )
+ mock_graph_exec_meta = mocker.Mock()
+ mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+ mock_get_graph_exec.return_value = mock_graph_exec_meta
+
# Mock the functions that extract graph execution ID from the request
mock_get_reviews_for_execution = mocker.patch(
"backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
@@ -415,18 +503,34 @@ def test_process_review_action_review_not_found(
]
}
- response = client.post("/api/review/action", json=request_data)
+ response = await client.post("/api/review/action", json=request_data)
- assert response.status_code == 400
- assert "Reviews not found" in response.json()["detail"]
+ assert response.status_code == 404
+ assert "No pending review found" in response.json()["detail"]
-def test_process_review_action_partial_failure(
[email protected](loop_scope="session")
+async def test_process_review_action_partial_failure(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
sample_pending_review: PendingHumanReviewModel,
test_user_id: str,
) -> None:
"""Test handling of partial failures in review processing"""
+ # Mock get_pending_reviews_by_node_exec_ids (called to find the graph_exec_id)
+ mock_get_reviews_for_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_pending_reviews_by_node_exec_ids"
+ )
+ mock_get_reviews_for_user.return_value = {"test_node_123": sample_pending_review}
+
+ # Mock get_graph_execution_meta to return execution in REVIEW status
+ mock_get_graph_exec = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_execution_meta"
+ )
+ mock_graph_exec_meta = mocker.Mock()
+ mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+ mock_get_graph_exec.return_value = mock_graph_exec_meta
+
# Mock the route functions
mock_get_reviews_for_execution = mocker.patch(
"backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
@@ -449,31 +553,34 @@ def test_process_review_action_partial_failure(
]
}
- response = client.post("/api/review/action", json=request_data)
+ response = await client.post("/api/review/action", json=request_data)
assert response.status_code == 400
assert "Some reviews failed validation" in response.json()["detail"]
-def test_process_review_action_invalid_node_exec_id(
[email protected](loop_scope="session")
+async def test_process_review_action_invalid_node_exec_id(
+ client: httpx.AsyncClient,
mocker: pytest_mock.MockerFixture,
sample_pending_review: PendingHumanReviewModel,
test_user_id: str,
) -> None:
"""Test failure when trying to process review with invalid node execution ID"""
- # Mock the route functions
- mock_get_reviews_for_execution = mocker.patch(
- "backend.api.features.executions.review.routes.get_pending_reviews_for_execution"
+ # Mock get_pending_reviews_by_node_exec_ids (called to find the graph_exec_id)
+ mock_get_reviews_for_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_pending_reviews_by_node_exec_ids"
)
- mock_get_reviews_for_execution.return_value = [sample_pending_review]
+ # Return empty dict to simulate review not found
+ mock_get_reviews_for_user.return_value = {}
- # Mock validation failure - this should return 400, not 500
- mock_process_all_reviews = mocker.patch(
- "backend.api.features.executions.review.routes.process_all_reviews_for_execution"
- )
- mock_process_all_reviews.side_effect = ValueError(
- "Invalid node execution ID format"
+ # Mock get_graph_execution_meta to return execution in REVIEW status
+ mock_get_graph_exec = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_execution_meta"
)
+ mock_graph_exec_meta = mocker.Mock()
+ mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+ mock_get_graph_exec.return_value = mock_graph_exec_meta
request_data = {
"reviews": [
@@ -485,8 +592,638 @@ def test_process_review_action_invalid_node_exec_id(
]
}
- response = client.post("/api/review/action", json=request_data)
+ response = await client.post("/api/review/action", json=request_data)
- # Should be a 400 Bad Request, not 500 Internal Server Error
- assert response.status_code == 400
- assert "Invalid node execution ID format" in response.json()["detail"]
+ # Returns 404 when review is not found
+ assert response.status_code == 404
+ assert "No pending review found" in response.json()["detail"]
+
+
[email protected](loop_scope="session")
+async def test_process_review_action_auto_approve_creates_auto_approval_records(
+ client: httpx.AsyncClient,
+ mocker: pytest_mock.MockerFixture,
+ sample_pending_review: PendingHumanReviewModel,
+ test_user_id: str,
+) -> None:
+ """Test that auto_approve_future_actions flag creates auto-approval records"""
+ # Mock get_pending_reviews_by_node_exec_ids (called to find the graph_exec_id)
+ mock_get_reviews_for_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_pending_reviews_by_node_exec_ids"
+ )
+ mock_get_reviews_for_user.return_value = {"test_node_123": sample_pending_review}
+
+ # Mock process_all_reviews
+ mock_process_all_reviews = mocker.patch(
+ "backend.api.features.executions.review.routes.process_all_reviews_for_execution"
+ )
+ approved_review = PendingHumanReviewModel(
+ node_exec_id="test_node_123",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec_456",
+ graph_id="test_graph_789",
+ graph_version=1,
+ payload={"data": "test payload"},
+ instructions="Please review",
+ editable=True,
+ status=ReviewStatus.APPROVED,
+ review_message="Approved",
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ updated_at=FIXED_NOW,
+ reviewed_at=FIXED_NOW,
+ )
+ mock_process_all_reviews.return_value = {"test_node_123": approved_review}
+
+ # Mock get_node_executions to return node_id mapping
+ mock_get_node_executions = mocker.patch(
+ "backend.data.execution.get_node_executions"
+ )
+ mock_node_exec = mocker.Mock(spec=NodeExecutionResult)
+ mock_node_exec.node_exec_id = "test_node_123"
+ mock_node_exec.node_id = "test_node_def_456"
+ mock_get_node_executions.return_value = [mock_node_exec]
+
+ # Mock create_auto_approval_record
+ mock_create_auto_approval = mocker.patch(
+ "backend.api.features.executions.review.routes.create_auto_approval_record"
+ )
+
+ # Mock get_graph_execution_meta to return execution in REVIEW status
+ mock_get_graph_exec = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_execution_meta"
+ )
+ mock_graph_exec_meta = mocker.Mock()
+ mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+ mock_get_graph_exec.return_value = mock_graph_exec_meta
+
+ # Mock has_pending_reviews_for_graph_exec
+ mock_has_pending = mocker.patch(
+ "backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
+ )
+ mock_has_pending.return_value = False
+
+ # Mock get_graph_settings to return custom settings
+ mock_get_settings = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_settings"
+ )
+ mock_get_settings.return_value = GraphSettings(
+ human_in_the_loop_safe_mode=True,
+ sensitive_action_safe_mode=True,
+ )
+
+ # Mock get_user_by_id to prevent database access
+ mock_get_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_user_by_id"
+ )
+ mock_user = mocker.Mock()
+ mock_user.timezone = "UTC"
+ mock_get_user.return_value = mock_user
+
+ # Mock add_graph_execution
+ mock_add_execution = mocker.patch(
+ "backend.api.features.executions.review.routes.add_graph_execution"
+ )
+
+ request_data = {
+ "reviews": [
+ {
+ "node_exec_id": "test_node_123",
+ "approved": True,
+ "message": "Approved",
+ "auto_approve_future": True,
+ }
+ ],
+ }
+
+ response = await client.post("/api/review/action", json=request_data)
+
+ assert response.status_code == 200
+
+ # Verify process_all_reviews_for_execution was called (without auto_approve param)
+ mock_process_all_reviews.assert_called_once()
+
+ # Verify create_auto_approval_record was called for the approved review
+ mock_create_auto_approval.assert_called_once_with(
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec_456",
+ graph_id="test_graph_789",
+ graph_version=1,
+ node_id="test_node_def_456",
+ payload={"data": "test payload"},
+ )
+
+ # Verify get_graph_settings was called with correct parameters
+ mock_get_settings.assert_called_once_with(
+ user_id=test_user_id, graph_id="test_graph_789"
+ )
+
+ # Verify add_graph_execution was called with proper ExecutionContext
+ mock_add_execution.assert_called_once()
+ call_kwargs = mock_add_execution.call_args.kwargs
+ execution_context = call_kwargs["execution_context"]
+
+ assert isinstance(execution_context, ExecutionContext)
+ assert execution_context.human_in_the_loop_safe_mode is True
+ assert execution_context.sensitive_action_safe_mode is True
+
+
[email protected](loop_scope="session")
+async def test_process_review_action_without_auto_approve_still_loads_settings(
+ client: httpx.AsyncClient,
+ mocker: pytest_mock.MockerFixture,
+ sample_pending_review: PendingHumanReviewModel,
+ test_user_id: str,
+) -> None:
+ """Test that execution context is created with settings even without auto-approve"""
+ # Mock get_pending_reviews_by_node_exec_ids (called to find the graph_exec_id)
+ mock_get_reviews_for_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_pending_reviews_by_node_exec_ids"
+ )
+ mock_get_reviews_for_user.return_value = {"test_node_123": sample_pending_review}
+
+ # Mock process_all_reviews
+ mock_process_all_reviews = mocker.patch(
+ "backend.api.features.executions.review.routes.process_all_reviews_for_execution"
+ )
+ approved_review = PendingHumanReviewModel(
+ node_exec_id="test_node_123",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec_456",
+ graph_id="test_graph_789",
+ graph_version=1,
+ payload={"data": "test payload"},
+ instructions="Please review",
+ editable=True,
+ status=ReviewStatus.APPROVED,
+ review_message="Approved",
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ updated_at=FIXED_NOW,
+ reviewed_at=FIXED_NOW,
+ )
+ mock_process_all_reviews.return_value = {"test_node_123": approved_review}
+
+ # Mock create_auto_approval_record - should NOT be called when auto_approve is False
+ mock_create_auto_approval = mocker.patch(
+ "backend.api.features.executions.review.routes.create_auto_approval_record"
+ )
+
+ # Mock get_graph_execution_meta to return execution in REVIEW status
+ mock_get_graph_exec = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_execution_meta"
+ )
+ mock_graph_exec_meta = mocker.Mock()
+ mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+ mock_get_graph_exec.return_value = mock_graph_exec_meta
+
+ # Mock has_pending_reviews_for_graph_exec
+ mock_has_pending = mocker.patch(
+ "backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
+ )
+ mock_has_pending.return_value = False
+
+ # Mock get_graph_settings with sensitive_action_safe_mode enabled
+ mock_get_settings = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_settings"
+ )
+ mock_get_settings.return_value = GraphSettings(
+ human_in_the_loop_safe_mode=False,
+ sensitive_action_safe_mode=True,
+ )
+
+ # Mock get_user_by_id to prevent database access
+ mock_get_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_user_by_id"
+ )
+ mock_user = mocker.Mock()
+ mock_user.timezone = "UTC"
+ mock_get_user.return_value = mock_user
+
+ # Mock add_graph_execution
+ mock_add_execution = mocker.patch(
+ "backend.api.features.executions.review.routes.add_graph_execution"
+ )
+
+ # Request WITHOUT auto_approve_future (defaults to False)
+ request_data = {
+ "reviews": [
+ {
+ "node_exec_id": "test_node_123",
+ "approved": True,
+ "message": "Approved",
+ # auto_approve_future defaults to False
+ }
+ ],
+ }
+
+ response = await client.post("/api/review/action", json=request_data)
+
+ assert response.status_code == 200
+
+ # Verify process_all_reviews_for_execution was called
+ mock_process_all_reviews.assert_called_once()
+
+ # Verify create_auto_approval_record was NOT called (auto_approve_future=False)
+ mock_create_auto_approval.assert_not_called()
+
+ # Verify settings were loaded
+ mock_get_settings.assert_called_once()
+
+ # Verify ExecutionContext has proper settings
+ mock_add_execution.assert_called_once()
+ call_kwargs = mock_add_execution.call_args.kwargs
+ execution_context = call_kwargs["execution_context"]
+
+ assert isinstance(execution_context, ExecutionContext)
+ assert execution_context.human_in_the_loop_safe_mode is False
+ assert execution_context.sensitive_action_safe_mode is True
+
+
[email protected](loop_scope="session")
+async def test_process_review_action_auto_approve_only_applies_to_approved_reviews(
+ client: httpx.AsyncClient,
+ mocker: pytest_mock.MockerFixture,
+ test_user_id: str,
+) -> None:
+ """Test that auto_approve record is created only for approved reviews"""
+ # Create two reviews - one approved, one rejected
+ approved_review = PendingHumanReviewModel(
+ node_exec_id="node_exec_approved",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec_456",
+ graph_id="test_graph_789",
+ graph_version=1,
+ payload={"data": "approved"},
+ instructions="Review",
+ editable=True,
+ status=ReviewStatus.APPROVED,
+ review_message=None,
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ updated_at=FIXED_NOW,
+ reviewed_at=FIXED_NOW,
+ )
+ rejected_review = PendingHumanReviewModel(
+ node_exec_id="node_exec_rejected",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec_456",
+ graph_id="test_graph_789",
+ graph_version=1,
+ payload={"data": "rejected"},
+ instructions="Review",
+ editable=True,
+ status=ReviewStatus.REJECTED,
+ review_message="Rejected",
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ updated_at=FIXED_NOW,
+ reviewed_at=FIXED_NOW,
+ )
+
+ # Mock get_pending_reviews_by_node_exec_ids (called to find the graph_exec_id)
+ mock_get_reviews_for_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_pending_reviews_by_node_exec_ids"
+ )
+ # Need to return both reviews in WAITING state (before processing)
+ approved_review_waiting = PendingHumanReviewModel(
+ node_exec_id="node_exec_approved",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec_456",
+ graph_id="test_graph_789",
+ graph_version=1,
+ payload={"data": "approved"},
+ instructions="Review",
+ editable=True,
+ status=ReviewStatus.WAITING,
+ review_message=None,
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ )
+ rejected_review_waiting = PendingHumanReviewModel(
+ node_exec_id="node_exec_rejected",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec_456",
+ graph_id="test_graph_789",
+ graph_version=1,
+ payload={"data": "rejected"},
+ instructions="Review",
+ editable=True,
+ status=ReviewStatus.WAITING,
+ review_message=None,
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ )
+ mock_get_reviews_for_user.return_value = {
+ "node_exec_approved": approved_review_waiting,
+ "node_exec_rejected": rejected_review_waiting,
+ }
+
+ # Mock process_all_reviews
+ mock_process_all_reviews = mocker.patch(
+ "backend.api.features.executions.review.routes.process_all_reviews_for_execution"
+ )
+ mock_process_all_reviews.return_value = {
+ "node_exec_approved": approved_review,
+ "node_exec_rejected": rejected_review,
+ }
+
+ # Mock get_node_executions to return node_id mapping
+ mock_get_node_executions = mocker.patch(
+ "backend.data.execution.get_node_executions"
+ )
+ mock_node_exec = mocker.Mock(spec=NodeExecutionResult)
+ mock_node_exec.node_exec_id = "node_exec_approved"
+ mock_node_exec.node_id = "test_node_def_approved"
+ mock_get_node_executions.return_value = [mock_node_exec]
+
+ # Mock create_auto_approval_record
+ mock_create_auto_approval = mocker.patch(
+ "backend.api.features.executions.review.routes.create_auto_approval_record"
+ )
+
+ # Mock get_graph_execution_meta to return execution in REVIEW status
+ mock_get_graph_exec = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_execution_meta"
+ )
+ mock_graph_exec_meta = mocker.Mock()
+ mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+ mock_get_graph_exec.return_value = mock_graph_exec_meta
+
+ # Mock has_pending_reviews_for_graph_exec
+ mock_has_pending = mocker.patch(
+ "backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
+ )
+ mock_has_pending.return_value = False
+
+ # Mock get_graph_settings
+ mock_get_settings = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_settings"
+ )
+ mock_get_settings.return_value = GraphSettings()
+
+ # Mock get_user_by_id to prevent database access
+ mock_get_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_user_by_id"
+ )
+ mock_user = mocker.Mock()
+ mock_user.timezone = "UTC"
+ mock_get_user.return_value = mock_user
+
+ # Mock add_graph_execution
+ mock_add_execution = mocker.patch(
+ "backend.api.features.executions.review.routes.add_graph_execution"
+ )
+
+ request_data = {
+ "reviews": [
+ {
+ "node_exec_id": "node_exec_approved",
+ "approved": True,
+ "auto_approve_future": True,
+ },
+ {
+ "node_exec_id": "node_exec_rejected",
+ "approved": False,
+ "auto_approve_future": True, # Should be ignored since rejected
+ },
+ ],
+ }
+
+ response = await client.post("/api/review/action", json=request_data)
+
+ assert response.status_code == 200
+
+ # Verify process_all_reviews_for_execution was called
+ mock_process_all_reviews.assert_called_once()
+
+ # Verify create_auto_approval_record was called ONLY for the approved review
+ # (not for the rejected one)
+ mock_create_auto_approval.assert_called_once_with(
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec_456",
+ graph_id="test_graph_789",
+ graph_version=1,
+ node_id="test_node_def_approved",
+ payload={"data": "approved"},
+ )
+
+ # Verify get_node_executions was called to batch-fetch node data
+ mock_get_node_executions.assert_called_once()
+
+ # Verify ExecutionContext was created (auto-approval is now DB-based)
+ call_kwargs = mock_add_execution.call_args.kwargs
+ execution_context = call_kwargs["execution_context"]
+ assert isinstance(execution_context, ExecutionContext)
+
+
[email protected](loop_scope="session")
+async def test_process_review_action_per_review_auto_approve_granularity(
+ client: httpx.AsyncClient,
+ mocker: pytest_mock.MockerFixture,
+ sample_pending_review: PendingHumanReviewModel,
+ test_user_id: str,
+) -> None:
+ """Test that auto-approval can be set per-review (granular control)"""
+ # Mock get_pending_reviews_by_node_exec_ids - return different reviews based on node_exec_id
+ mock_get_reviews_for_user = mocker.patch(
+ "backend.api.features.executions.review.routes.get_pending_reviews_by_node_exec_ids"
+ )
+
+ # Create a mapping of node_exec_id to review
+ review_map = {
+ "node_1_auto": PendingHumanReviewModel(
+ node_exec_id="node_1_auto",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec",
+ graph_id="test_graph",
+ graph_version=1,
+ payload={"data": "node1"},
+ instructions="Review 1",
+ editable=True,
+ status=ReviewStatus.WAITING,
+ review_message=None,
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ ),
+ "node_2_manual": PendingHumanReviewModel(
+ node_exec_id="node_2_manual",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec",
+ graph_id="test_graph",
+ graph_version=1,
+ payload={"data": "node2"},
+ instructions="Review 2",
+ editable=True,
+ status=ReviewStatus.WAITING,
+ review_message=None,
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ ),
+ "node_3_auto": PendingHumanReviewModel(
+ node_exec_id="node_3_auto",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec",
+ graph_id="test_graph",
+ graph_version=1,
+ payload={"data": "node3"},
+ instructions="Review 3",
+ editable=True,
+ status=ReviewStatus.WAITING,
+ review_message=None,
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ ),
+ }
+
+ # Return the review map dict (batch function returns all requested reviews)
+ mock_get_reviews_for_user.return_value = review_map
+
+ # Mock process_all_reviews - return 3 approved reviews
+ mock_process_all_reviews = mocker.patch(
+ "backend.api.features.executions.review.routes.process_all_reviews_for_execution"
+ )
+ mock_process_all_reviews.return_value = {
+ "node_1_auto": PendingHumanReviewModel(
+ node_exec_id="node_1_auto",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec",
+ graph_id="test_graph",
+ graph_version=1,
+ payload={"data": "node1"},
+ instructions="Review 1",
+ editable=True,
+ status=ReviewStatus.APPROVED,
+ review_message=None,
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ updated_at=FIXED_NOW,
+ reviewed_at=FIXED_NOW,
+ ),
+ "node_2_manual": PendingHumanReviewModel(
+ node_exec_id="node_2_manual",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec",
+ graph_id="test_graph",
+ graph_version=1,
+ payload={"data": "node2"},
+ instructions="Review 2",
+ editable=True,
+ status=ReviewStatus.APPROVED,
+ review_message=None,
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ updated_at=FIXED_NOW,
+ reviewed_at=FIXED_NOW,
+ ),
+ "node_3_auto": PendingHumanReviewModel(
+ node_exec_id="node_3_auto",
+ user_id=test_user_id,
+ graph_exec_id="test_graph_exec",
+ graph_id="test_graph",
+ graph_version=1,
+ payload={"data": "node3"},
+ instructions="Review 3",
+ editable=True,
+ status=ReviewStatus.APPROVED,
+ review_message=None,
+ was_edited=False,
+ processed=False,
+ created_at=FIXED_NOW,
+ updated_at=FIXED_NOW,
+ reviewed_at=FIXED_NOW,
+ ),
+ }
+
+ # Mock get_node_executions to return batch node data
+ mock_get_node_executions = mocker.patch(
+ "backend.data.execution.get_node_executions"
+ )
+ # Create mock node executions for each review
+ mock_node_execs = []
+ for node_exec_id in ["node_1_auto", "node_2_manual", "node_3_auto"]:
+ mock_node = mocker.Mock(spec=NodeExecutionResult)
+ mock_node.node_exec_id = node_exec_id
+ mock_node.node_id = f"node_def_{node_exec_id}"
+ mock_node_execs.append(mock_node)
+ mock_get_node_executions.return_value = mock_node_execs
+
+ # Mock create_auto_approval_record
+ mock_create_auto_approval = mocker.patch(
+ "backend.api.features.executions.review.routes.create_auto_approval_record"
+ )
+
+ # Mock get_graph_execution_meta
+ mock_get_graph_exec = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_execution_meta"
+ )
+ mock_graph_exec_meta = mocker.Mock()
+ mock_graph_exec_meta.status = ExecutionStatus.REVIEW
+ mock_get_graph_exec.return_value = mock_graph_exec_meta
+
+ # Mock has_pending_reviews_for_graph_exec
+ mock_has_pending = mocker.patch(
+ "backend.api.features.executions.review.routes.has_pending_reviews_for_graph_exec"
+ )
+ mock_has_pending.return_value = False
+
+ # Mock settings and execution
+ mock_get_settings = mocker.patch(
+ "backend.api.features.executions.review.routes.get_graph_settings"
+ )
+ mock_get_settings.return_value = GraphSettings(
+ human_in_the_loop_safe_mode=False, sensitive_action_safe_mode=False
+ )
+
+ mocker.patch("backend.api.features.executions.review.routes.add_graph_execution")
+ mocker.patch("backend.api.features.executions.review.routes.get_user_by_id")
+
+ # Request with granular auto-approval:
+ # - node_1_auto: auto_approve_future=True
+ # - node_2_manual: auto_approve_future=False (explicit)
+ # - node_3_auto: auto_approve_future=True
+ request_data = {
+ "reviews": [
+ {
+ "node_exec_id": "node_1_auto",
+ "approved": True,
+ "auto_approve_future": True,
+ },
+ {
+ "node_exec_id": "node_2_manual",
+ "approved": True,
+ "auto_approve_future": False, # Don't auto-approve this one
+ },
+ {
+ "node_exec_id": "node_3_auto",
+ "approved": True,
+ "auto_approve_future": True,
+ },
+ ],
+ }
+
+ response = await client.post("/api/review/action", json=request_data)
+
+ assert response.status_code == 200
+
+ # Verify create_auto_approval_record was called ONLY for reviews with auto_approve_future=True
+ assert mock_create_auto_approval.call_count == 2
+
+ # Check that it was called for node_1 and node_3, but NOT node_2
+ call_args_list = [call.kwargs for call in mock_create_auto_approval.call_args_list]
+ node_ids_with_auto_approval = [args["node_id"] for args in call_args_list]
+
+ assert "node_def_node_1_auto" in node_ids_with_auto_approval
+ assert "node_def_node_3_auto" in node_ids_with_auto_approval
+ assert "node_def_node_2_manual" not in node_ids_with_auto_approval
diff --git a/autogpt_platform/backend/backend/api/features/executions/review/routes.py b/autogpt_platform/backend/backend/api/features/executions/review/routes.py
index 88646046da..a10071e9cb 100644
--- a/autogpt_platform/backend/backend/api/features/executions/review/routes.py
+++ b/autogpt_platform/backend/backend/api/features/executions/review/routes.py
@@ -1,17 +1,27 @@
+import asyncio
import logging
-from typing import List
+from typing import Any, List
import autogpt_libs.auth as autogpt_auth_lib
from fastapi import APIRouter, HTTPException, Query, Security, status
from prisma.enums import ReviewStatus
-from backend.data.execution import get_graph_execution_meta
+from backend.data.execution import (
+ ExecutionContext,
+ ExecutionStatus,
+ get_graph_execution_meta,
+)
+from backend.data.graph import get_graph_settings
from backend.data.human_review import (
+ create_auto_approval_record,
+ get_pending_reviews_by_node_exec_ids,
get_pending_reviews_for_execution,
get_pending_reviews_for_user,
has_pending_reviews_for_graph_exec,
process_all_reviews_for_execution,
)
+from backend.data.model import USER_TIMEZONE_NOT_SET
+from backend.data.user import get_user_by_id
from backend.executor.utils import add_graph_execution
from .model import PendingHumanReviewModel, ReviewRequest, ReviewResponse
@@ -127,17 +137,70 @@ async def process_review_action(
detail="At least one review must be provided",
)
- # Build review decisions map
+ # Batch fetch all requested reviews
+ reviews_map = await get_pending_reviews_by_node_exec_ids(
+ list(all_request_node_ids), user_id
+ )
+
+ # Validate all reviews were found
+ missing_ids = all_request_node_ids - set(reviews_map.keys())
+ if missing_ids:
+ raise HTTPException(
+ status_code=status.HTTP_404_NOT_FOUND,
+ detail=f"No pending review found for node execution(s): {', '.join(missing_ids)}",
+ )
+
+ # Validate all reviews belong to the same execution
+ graph_exec_ids = {review.graph_exec_id for review in reviews_map.values()}
+ if len(graph_exec_ids) > 1:
+ raise HTTPException(
+ status_code=status.HTTP_409_CONFLICT,
+ detail="All reviews in a single request must belong to the same execution.",
+ )
+
+ graph_exec_id = next(iter(graph_exec_ids))
+
+ # Validate execution status before processing reviews
+ graph_exec_meta = await get_graph_execution_meta(
+ user_id=user_id, execution_id=graph_exec_id
+ )
+
+ if not graph_exec_meta:
+ raise HTTPException(
+ status_code=status.HTTP_404_NOT_FOUND,
+ detail=f"Graph execution #{graph_exec_id} not found",
+ )
+
+ # Only allow processing reviews if execution is paused for review
+ # or incomplete (partial execution with some reviews already processed)
+ if graph_exec_meta.status not in (
+ ExecutionStatus.REVIEW,
+ ExecutionStatus.INCOMPLETE,
+ ):
+ raise HTTPException(
+ status_code=status.HTTP_409_CONFLICT,
+ detail=f"Cannot process reviews while execution status is {graph_exec_meta.status}. "
+ f"Reviews can only be processed when execution is paused (REVIEW status). "
+ f"Current status: {graph_exec_meta.status}",
+ )
+
+ # Build review decisions map and track which reviews requested auto-approval
+ # Auto-approved reviews use original data (no modifications allowed)
review_decisions = {}
+ auto_approve_requests = {} # Map node_exec_id -> auto_approve_future flag
+
for review in request.reviews:
review_status = (
ReviewStatus.APPROVED if review.approved else ReviewStatus.REJECTED
)
+ # If this review requested auto-approval, don't allow data modifications
+ reviewed_data = None if review.auto_approve_future else review.reviewed_data
review_decisions[review.node_exec_id] = (
review_status,
- review.reviewed_data,
+ reviewed_data,
review.message,
)
+ auto_approve_requests[review.node_exec_id] = review.auto_approve_future
# Process all reviews
updated_reviews = await process_all_reviews_for_execution(
@@ -145,6 +208,87 @@ async def process_review_action(
review_decisions=review_decisions,
)
+ # Create auto-approval records for approved reviews that requested it
+ # Deduplicate by node_id to avoid race conditions when multiple reviews
+ # for the same node are processed in parallel
+ async def create_auto_approval_for_node(
+ node_id: str, review_result
+ ) -> tuple[str, bool]:
+ """
+ Create auto-approval record for a node.
+ Returns (node_id, success) tuple for tracking failures.
+ """
+ try:
+ await create_auto_approval_record(
+ user_id=user_id,
+ graph_exec_id=review_result.graph_exec_id,
+ graph_id=review_result.graph_id,
+ graph_version=review_result.graph_version,
+ node_id=node_id,
+ payload=review_result.payload,
+ )
+ return (node_id, True)
+ except Exception as e:
+ logger.error(
+ f"Failed to create auto-approval record for node {node_id}",
+ exc_info=e,
+ )
+ return (node_id, False)
+
+ # Collect node_exec_ids that need auto-approval
+ node_exec_ids_needing_auto_approval = [
+ node_exec_id
+ for node_exec_id, review_result in updated_reviews.items()
+ if review_result.status == ReviewStatus.APPROVED
+ and auto_approve_requests.get(node_exec_id, False)
+ ]
+
+ # Batch-fetch node executions to get node_ids
+ nodes_needing_auto_approval: dict[str, Any] = {}
+ if node_exec_ids_needing_auto_approval:
+ from backend.data.execution import get_node_executions
+
+ node_execs = await get_node_executions(
+ graph_exec_id=graph_exec_id, include_exec_data=False
+ )
+ node_exec_map = {node_exec.node_exec_id: node_exec for node_exec in node_execs}
+
+ for node_exec_id in node_exec_ids_needing_auto_approval:
+ node_exec = node_exec_map.get(node_exec_id)
+ if node_exec:
+ review_result = updated_reviews[node_exec_id]
+ # Use the first approved review for this node (deduplicate by node_id)
+ if node_exec.node_id not in nodes_needing_auto_approval:
+ nodes_needing_auto_approval[node_exec.node_id] = review_result
+ else:
+ logger.error(
+ f"Failed to create auto-approval record for {node_exec_id}: "
+ f"Node execution not found. This may indicate a race condition "
+ f"or data inconsistency."
+ )
+
+ # Execute all auto-approval creations in parallel (deduplicated by node_id)
+ auto_approval_results = await asyncio.gather(
+ *[
+ create_auto_approval_for_node(node_id, review_result)
+ for node_id, review_result in nodes_needing_auto_approval.items()
+ ],
+ return_exceptions=True,
+ )
+
+ # Count auto-approval failures
+ auto_approval_failed_count = 0
+ for result in auto_approval_results:
+ if isinstance(result, Exception):
+ # Unexpected exception during auto-approval creation
+ auto_approval_failed_count += 1
+ logger.error(
+ f"Unexpected exception during auto-approval creation: {result}"
+ )
+ elif isinstance(result, tuple) and len(result) == 2 and not result[1]:
+ # Auto-approval creation failed (returned False)
+ auto_approval_failed_count += 1
+
# Count results
approved_count = sum(
1
@@ -157,30 +301,53 @@ async def process_review_action(
if review.status == ReviewStatus.REJECTED
)
- # Resume execution if we processed some reviews
+ # Resume execution only if ALL pending reviews for this execution have been processed
if updated_reviews:
- # Get graph execution ID from any processed review
- first_review = next(iter(updated_reviews.values()))
- graph_exec_id = first_review.graph_exec_id
-
- # Check if any pending reviews remain for this execution
still_has_pending = await has_pending_reviews_for_graph_exec(graph_exec_id)
if not still_has_pending:
- # Resume execution
+ # Get the graph_id from any processed review
+ first_review = next(iter(updated_reviews.values()))
+
try:
+ # Fetch user and settings to build complete execution context
+ user = await get_user_by_id(user_id)
+ settings = await get_graph_settings(
+ user_id=user_id, graph_id=first_review.graph_id
+ )
+
+ # Preserve user's timezone preference when resuming execution
+ user_timezone = (
+ user.timezone if user.timezone != USER_TIMEZONE_NOT_SET else "UTC"
+ )
+
+ execution_context = ExecutionContext(
+ human_in_the_loop_safe_mode=settings.human_in_the_loop_safe_mode,
+ sensitive_action_safe_mode=settings.sensitive_action_safe_mode,
+ user_timezone=user_timezone,
+ )
+
await add_graph_execution(
graph_id=first_review.graph_id,
user_id=user_id,
graph_exec_id=graph_exec_id,
+ execution_context=execution_context,
)
logger.info(f"Resumed execution {graph_exec_id}")
except Exception as e:
logger.error(f"Failed to resume execution {graph_exec_id}: {str(e)}")
+ # Build error message if auto-approvals failed
+ error_message = None
+ if auto_approval_failed_count > 0:
+ error_message = (
+ f"{auto_approval_failed_count} auto-approval setting(s) could not be saved. "
+ f"You may need to manually approve these reviews in future executions."
+ )
+
return ReviewResponse(
approved_count=approved_count,
rejected_count=rejected_count,
- failed_count=0,
- error=None,
+ failed_count=auto_approval_failed_count,
+ error=error_message,
)
diff --git a/autogpt_platform/backend/backend/api/features/library/db.py b/autogpt_platform/backend/backend/api/features/library/db.py
index 0c775802db..18d535d896 100644
--- a/autogpt_platform/backend/backend/api/features/library/db.py
+++ b/autogpt_platform/backend/backend/api/features/library/db.py
@@ -583,7 +583,13 @@ async def update_library_agent(
)
update_fields["isDeleted"] = is_deleted
if settings is not None:
- update_fields["settings"] = SafeJson(settings.model_dump())
+ existing_agent = await get_library_agent(id=library_agent_id, user_id=user_id)
+ current_settings_dict = (
+ existing_agent.settings.model_dump() if existing_agent.settings else {}
+ )
+ new_settings = settings.model_dump(exclude_unset=True)
+ merged_settings = {**current_settings_dict, **new_settings}
+ update_fields["settings"] = SafeJson(merged_settings)
try:
# If graph_version is provided, update to that specific version
diff --git a/autogpt_platform/backend/backend/api/features/oauth_test.py b/autogpt_platform/backend/backend/api/features/oauth_test.py
index 5f6b85a88a..5fd35f82e7 100644
--- a/autogpt_platform/backend/backend/api/features/oauth_test.py
+++ b/autogpt_platform/backend/backend/api/features/oauth_test.py
@@ -20,6 +20,7 @@ from typing import AsyncGenerator
import httpx
import pytest
+import pytest_asyncio
from autogpt_libs.api_key.keysmith import APIKeySmith
from prisma.enums import APIKeyPermission
from prisma.models import OAuthAccessToken as PrismaOAuthAccessToken
@@ -38,13 +39,13 @@ keysmith = APIKeySmith()
# ============================================================================
[email protected](scope="session")
def test_user_id() -> str:
"""Test user ID for OAuth tests."""
return str(uuid.uuid4())
+@pytest_asyncio.fixture(scope="session", loop_scope="session")
async def test_user(server, test_user_id: str):
"""Create a test user in the database."""
await PrismaUser.prisma().create(
@@ -67,7 +68,7 @@ async def test_user(server, test_user_id: str):
await PrismaUser.prisma().delete(where={"id": test_user_id})
+@pytest_asyncio.fixture
async def test_oauth_app(test_user: str):
"""Create a test OAuth application in the database."""
app_id = str(uuid.uuid4())
@@ -122,7 +123,7 @@ def pkce_credentials() -> tuple[str, str]:
return generate_pkce()
+@pytest_asyncio.fixture
async def client(server, test_user: str) -> AsyncGenerator[httpx.AsyncClient, None]:
"""
Create an async HTTP client that talks directly to the FastAPI app.
@@ -287,7 +288,7 @@ async def test_authorize_invalid_client_returns_error(
assert query_params["error"][0] == "invalid_client"
+@pytest_asyncio.fixture
async def inactive_oauth_app(test_user: str):
"""Create an inactive test OAuth application in the database."""
app_id = str(uuid.uuid4())
@@ -1004,7 +1005,7 @@ async def test_token_refresh_revoked(
assert "revoked" in response.json()["detail"].lower()
+@pytest_asyncio.fixture
async def other_oauth_app(test_user: str):
"""Create a second OAuth application for cross-app tests."""
app_id = str(uuid.uuid4())
diff --git a/autogpt_platform/backend/backend/api/features/store/embeddings.py b/autogpt_platform/backend/backend/api/features/store/embeddings.py
index 3aa2f3bdbb..79a9a4e219 100644
--- a/autogpt_platform/backend/backend/api/features/store/embeddings.py
+++ b/autogpt_platform/backend/backend/api/features/store/embeddings.py
@@ -21,7 +21,6 @@ from backend.util.json import dumps
logger = logging.getLogger(__name__)
-
# OpenAI embedding model configuration
EMBEDDING_MODEL = "text-embedding-3-small"
# Embedding dimension for the model above
diff --git a/autogpt_platform/backend/backend/blocks/basic.py b/autogpt_platform/backend/backend/blocks/basic.py
index 4d452f3b34..a9c77e2b93 100644
--- a/autogpt_platform/backend/backend/blocks/basic.py
+++ b/autogpt_platform/backend/backend/blocks/basic.py
@@ -116,6 +116,7 @@ class PrintToConsoleBlock(Block):
input_schema=PrintToConsoleBlock.Input,
output_schema=PrintToConsoleBlock.Output,
test_input={"text": "Hello, World!"},
+ is_sensitive_action=True,
test_output=[
("output", "Hello, World!"),
("status", "printed"),
diff --git a/autogpt_platform/backend/backend/blocks/helpers/review.py b/autogpt_platform/backend/backend/blocks/helpers/review.py
index 80c28cfd14..4bd85e424b 100644
--- a/autogpt_platform/backend/backend/blocks/helpers/review.py
+++ b/autogpt_platform/backend/backend/blocks/helpers/review.py
@@ -9,7 +9,7 @@ from typing import Any, Optional
from prisma.enums import ReviewStatus
from pydantic import BaseModel
-from backend.data.execution import ExecutionContext, ExecutionStatus
+from backend.data.execution import ExecutionStatus
from backend.data.human_review import ReviewResult
from backend.executor.manager import async_update_node_execution_status
from backend.util.clients import get_database_manager_async_client
@@ -28,6 +28,11 @@ class ReviewDecision(BaseModel):
class HITLReviewHelper:
"""Helper class for Human-In-The-Loop review operations."""
+ @staticmethod
+ async def check_approval(**kwargs) -> Optional[ReviewResult]:
+ """Check if there's an existing approval for this node execution."""
+ return await get_database_manager_async_client().check_approval(**kwargs)
+
@staticmethod
async def get_or_create_human_review(**kwargs) -> Optional[ReviewResult]:
"""Create or retrieve a human review from the database."""
@@ -55,11 +60,11 @@ class HITLReviewHelper:
async def _handle_review_request(
input_data: Any,
user_id: str,
+ node_id: str,
node_exec_id: str,
graph_exec_id: str,
graph_id: str,
graph_version: int,
- execution_context: ExecutionContext,
block_name: str = "Block",
editable: bool = False,
) -> Optional[ReviewResult]:
@@ -69,11 +74,11 @@ class HITLReviewHelper:
Args:
input_data: The input data to be reviewed
user_id: ID of the user requesting the review
+ node_id: ID of the node in the graph definition
node_exec_id: ID of the node execution
graph_exec_id: ID of the graph execution
graph_id: ID of the graph
graph_version: Version of the graph
- execution_context: Current execution context
block_name: Name of the block requesting review
editable: Whether the reviewer can edit the data
@@ -83,15 +88,41 @@ class HITLReviewHelper:
Raises:
Exception: If review creation or status update fails
"""
- # Skip review if safe mode is disabled - return auto-approved result
- if not execution_context.human_in_the_loop_safe_mode:
+ # Note: Safe mode checks (human_in_the_loop_safe_mode, sensitive_action_safe_mode)
+ # are handled by the caller:
+ # - HITL blocks check human_in_the_loop_safe_mode in their run() method
+ # - Sensitive action blocks check sensitive_action_safe_mode in is_block_exec_need_review()
+ # This function only handles checking for existing approvals.
+
+ # Check if this node has already been approved (normal or auto-approval)
+ if approval_result := await HITLReviewHelper.check_approval(
+ node_exec_id=node_exec_id,
+ graph_exec_id=graph_exec_id,
+ node_id=node_id,
+ user_id=user_id,
+ input_data=input_data,
+ ):
logger.info(
- f"Block {block_name} skipping review for node {node_exec_id} - safe mode disabled"
+ f"Block {block_name} skipping review for node {node_exec_id} - "
+ f"found existing approval"
+ )
+ # Return a new ReviewResult with the current node_exec_id but approved status
+ # For auto-approvals, always use current input_data
+ # For normal approvals, use approval_result.data unless it's None
+ is_auto_approval = approval_result.node_exec_id != node_exec_id
+ approved_data = (
+ input_data
+ if is_auto_approval
+ else (
+ approval_result.data
+ if approval_result.data is not None
+ else input_data
+ )
)
return ReviewResult(
- data=input_data,
+ data=approved_data,
status=ReviewStatus.APPROVED,
- message="Auto-approved (safe mode disabled)",
+ message=approval_result.message,
processed=True,
node_exec_id=node_exec_id,
)
@@ -103,7 +134,7 @@ class HITLReviewHelper:
graph_id=graph_id,
graph_version=graph_version,
input_data=input_data,
- message=f"Review required for {block_name} execution",
+ message=block_name, # Use block_name directly as the message
editable=editable,
)
@@ -129,11 +160,11 @@ class HITLReviewHelper:
async def handle_review_decision(
input_data: Any,
user_id: str,
+ node_id: str,
node_exec_id: str,
graph_exec_id: str,
graph_id: str,
graph_version: int,
- execution_context: ExecutionContext,
block_name: str = "Block",
editable: bool = False,
) -> Optional[ReviewDecision]:
@@ -143,11 +174,11 @@ class HITLReviewHelper:
Args:
input_data: The input data to be reviewed
user_id: ID of the user requesting the review
+ node_id: ID of the node in the graph definition
node_exec_id: ID of the node execution
graph_exec_id: ID of the graph execution
graph_id: ID of the graph
graph_version: Version of the graph
- execution_context: Current execution context
block_name: Name of the block requesting review
editable: Whether the reviewer can edit the data
@@ -158,11 +189,11 @@ class HITLReviewHelper:
review_result = await HITLReviewHelper._handle_review_request(
input_data=input_data,
user_id=user_id,
+ node_id=node_id,
node_exec_id=node_exec_id,
graph_exec_id=graph_exec_id,
graph_id=graph_id,
graph_version=graph_version,
- execution_context=execution_context,
block_name=block_name,
editable=editable,
)
diff --git a/autogpt_platform/backend/backend/blocks/human_in_the_loop.py b/autogpt_platform/backend/backend/blocks/human_in_the_loop.py
index b6106843bd..568ac4b33f 100644
--- a/autogpt_platform/backend/backend/blocks/human_in_the_loop.py
+++ b/autogpt_platform/backend/backend/blocks/human_in_the_loop.py
@@ -97,6 +97,7 @@ class HumanInTheLoopBlock(Block):
input_data: Input,
*,
user_id: str,
+ node_id: str,
node_exec_id: str,
graph_exec_id: str,
graph_id: str,
@@ -115,12 +116,12 @@ class HumanInTheLoopBlock(Block):
decision = await self.handle_review_decision(
input_data=input_data.data,
user_id=user_id,
+ node_id=node_id,
node_exec_id=node_exec_id,
graph_exec_id=graph_exec_id,
graph_id=graph_id,
graph_version=graph_version,
- execution_context=execution_context,
- block_name=self.name,
+ block_name=input_data.name, # Use user-provided name instead of block type
editable=input_data.editable,
)
diff --git a/autogpt_platform/backend/backend/conftest.py b/autogpt_platform/backend/backend/conftest.py
index b0b7f0cc67..57481e4b85 100644
--- a/autogpt_platform/backend/backend/conftest.py
+++ b/autogpt_platform/backend/backend/conftest.py
@@ -1,7 +1,7 @@
import logging
import os
-import pytest
+import pytest_asyncio
from dotenv import load_dotenv
from backend.util.logging import configure_logging
@@ -19,7 +19,7 @@ if not os.getenv("PRISMA_DEBUG"):
prisma_logger.setLevel(logging.INFO)
[email protected](scope="session")
+@pytest_asyncio.fixture(scope="session", loop_scope="session")
async def server():
from backend.util.test import SpinTestServer
@@ -27,7 +27,7 @@ async def server():
yield server
[email protected](scope="session", autouse=True)
+@pytest_asyncio.fixture(scope="session", loop_scope="session", autouse=True)
async def graph_cleanup(server):
created_graph_ids = []
original_create_graph = server.agent_server.test_create_graph
diff --git a/autogpt_platform/backend/backend/data/block.py b/autogpt_platform/backend/backend/data/block.py
index 4bfa3892e2..8d9ecfff4c 100644
--- a/autogpt_platform/backend/backend/data/block.py
+++ b/autogpt_platform/backend/backend/data/block.py
@@ -441,6 +441,7 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
static_output: bool = False,
block_type: BlockType = BlockType.STANDARD,
webhook_config: Optional[BlockWebhookConfig | BlockManualWebhookConfig] = None,
+ is_sensitive_action: bool = False,
):
"""
Initialize the block with the given schema.
@@ -473,8 +474,8 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
self.static_output = static_output
self.block_type = block_type
self.webhook_config = webhook_config
+ self.is_sensitive_action = is_sensitive_action
self.execution_stats: NodeExecutionStats = NodeExecutionStats()
- self.is_sensitive_action: bool = False
if self.webhook_config:
if isinstance(self.webhook_config, BlockWebhookConfig):
@@ -622,6 +623,7 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
input_data: BlockInput,
*,
user_id: str,
+ node_id: str,
node_exec_id: str,
graph_exec_id: str,
graph_id: str,
@@ -648,11 +650,11 @@ class Block(ABC, Generic[BlockSchemaInputType, BlockSchemaOutputType]):
decision = await HITLReviewHelper.handle_review_decision(
input_data=input_data,
user_id=user_id,
+ node_id=node_id,
node_exec_id=node_exec_id,
graph_exec_id=graph_exec_id,
graph_id=graph_id,
graph_version=graph_version,
- execution_context=execution_context,
block_name=self.name,
editable=True,
)
diff --git a/autogpt_platform/backend/backend/data/human_review.py b/autogpt_platform/backend/backend/data/human_review.py
index de7a30759e..c70eaa7b64 100644
--- a/autogpt_platform/backend/backend/data/human_review.py
+++ b/autogpt_platform/backend/backend/data/human_review.py
@@ -6,10 +6,10 @@ Handles all database operations for pending human reviews.
import asyncio
import logging
from datetime import datetime, timezone
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
from prisma.enums import ReviewStatus
-from prisma.models import PendingHumanReview
+from prisma.models import AgentNodeExecution, PendingHumanReview
from prisma.types import PendingHumanReviewUpdateInput
from pydantic import BaseModel
@@ -17,8 +17,12 @@ from backend.api.features.executions.review.model import (
PendingHumanReviewModel,
SafeJsonData,
)
+from backend.data.execution import get_graph_execution_meta
from backend.util.json import SafeJson
+if TYPE_CHECKING:
+ pass
+
logger = logging.getLogger(__name__)
@@ -32,6 +36,125 @@ class ReviewResult(BaseModel):
node_exec_id: str
+def get_auto_approve_key(graph_exec_id: str, node_id: str) -> str:
+ """Generate the special nodeExecId key for auto-approval records."""
+ return f"auto_approve_{graph_exec_id}_{node_id}"
+
+
+async def check_approval(
+ node_exec_id: str,
+ graph_exec_id: str,
+ node_id: str,
+ user_id: str,
+ input_data: SafeJsonData | None = None,
+) -> Optional[ReviewResult]:
+ """
+ Check if there's an existing approval for this node execution.
+
+ Checks both:
+ 1. Normal approval by node_exec_id (previous run of the same node execution)
+ 2. Auto-approval by special key pattern "auto_approve_{graph_exec_id}_{node_id}"
+
+ Args:
+ node_exec_id: ID of the node execution
+ graph_exec_id: ID of the graph execution
+ node_id: ID of the node definition (not execution)
+ user_id: ID of the user (for data isolation)
+ input_data: Current input data (used for auto-approvals to avoid stale data)
+
+ Returns:
+ ReviewResult if approval found (either normal or auto), None otherwise
+ """
+ auto_approve_key = get_auto_approve_key(graph_exec_id, node_id)
+
+ # Check for either normal approval or auto-approval in a single query
+ existing_review = await PendingHumanReview.prisma().find_first(
+ where={
+ "OR": [
+ {"nodeExecId": node_exec_id},
+ {"nodeExecId": auto_approve_key},
+ ],
+ "status": ReviewStatus.APPROVED,
+ "userId": user_id,
+ },
+ )
+
+ if existing_review:
+ is_auto_approval = existing_review.nodeExecId == auto_approve_key
+ logger.info(
+ f"Found {'auto-' if is_auto_approval else ''}approval for node {node_id} "
+ f"(exec: {node_exec_id}) in execution {graph_exec_id}"
+ )
+ # For auto-approvals, use current input_data to avoid replaying stale payload
+ # For normal approvals, use the stored payload (which may have been edited)
+ return ReviewResult(
+ data=(
+ input_data
+ if is_auto_approval and input_data is not None
+ else existing_review.payload
+ ),
+ status=ReviewStatus.APPROVED,
+ message=(
+ "Auto-approved (user approved all future actions for this node)"
+ if is_auto_approval
+ else existing_review.reviewMessage or ""
+ ),
+ processed=True,
+ node_exec_id=existing_review.nodeExecId,
+ )
+
+ return None
+
+
+async def create_auto_approval_record(
+ user_id: str,
+ graph_exec_id: str,
+ graph_id: str,
+ graph_version: int,
+ node_id: str,
+ payload: SafeJsonData,
+) -> None:
+ """
+ Create an auto-approval record for a node in this execution.
+
+ This is stored as a PendingHumanReview with a special nodeExecId pattern
+ and status=APPROVED, so future executions of the same node can skip review.
+
+ Raises:
+ ValueError: If the graph execution doesn't belong to the user
+ """
+ # Validate that the graph execution belongs to this user (defense in depth)
+ graph_exec = await get_graph_execution_meta(
+ user_id=user_id, execution_id=graph_exec_id
+ )
+ if not graph_exec:
+ raise ValueError(
+ f"Graph execution {graph_exec_id} not found or doesn't belong to user {user_id}"
+ )
+
+ auto_approve_key = get_auto_approve_key(graph_exec_id, node_id)
+
+ await PendingHumanReview.prisma().upsert(
+ where={"nodeExecId": auto_approve_key},
+ data={
+ "create": {
+ "nodeExecId": auto_approve_key,
+ "userId": user_id,
+ "graphExecId": graph_exec_id,
+ "graphId": graph_id,
+ "graphVersion": graph_version,
+ "payload": SafeJson(payload),
+ "instructions": "Auto-approval record",
+ "editable": False,
+ "status": ReviewStatus.APPROVED,
+ "processed": True,
+ "reviewedAt": datetime.now(timezone.utc),
+ },
+ "update": {}, # Already exists, no update needed
+ },
+ )
+
+
async def get_or_create_human_review(
user_id: str,
node_exec_id: str,
@@ -108,6 +231,87 @@ async def get_or_create_human_review(
)
+async def get_pending_review_by_node_exec_id(
+ node_exec_id: str, user_id: str
+) -> Optional["PendingHumanReviewModel"]:
+ """
+ Get a pending review by its node execution ID.
+
+ Args:
+ node_exec_id: The node execution ID to look up
+ user_id: User ID for authorization (only returns if review belongs to this user)
+
+ Returns:
+ The pending review if found and belongs to user, None otherwise
+ """
+ review = await PendingHumanReview.prisma().find_first(
+ where={
+ "nodeExecId": node_exec_id,
+ "userId": user_id,
+ "status": ReviewStatus.WAITING,
+ }
+ )
+
+ if not review:
+ return None
+
+ # Local import to avoid event loop conflicts in tests
+ from backend.data.execution import get_node_execution
+
+ node_exec = await get_node_execution(review.nodeExecId)
+ node_id = node_exec.node_id if node_exec else review.nodeExecId
+ return PendingHumanReviewModel.from_db(review, node_id=node_id)
+
+
+async def get_pending_reviews_by_node_exec_ids(
+ node_exec_ids: list[str], user_id: str
+) -> dict[str, "PendingHumanReviewModel"]:
+ """
+ Get multiple pending reviews by their node execution IDs in a single batch query.
+
+ Args:
+ node_exec_ids: List of node execution IDs to look up
+ user_id: User ID for authorization (only returns reviews belonging to this user)
+
+ Returns:
+ Dictionary mapping node_exec_id -> PendingHumanReviewModel for found reviews
+ """
+ if not node_exec_ids:
+ return {}
+
+ reviews = await PendingHumanReview.prisma().find_many(
+ where={
+ "nodeExecId": {"in": node_exec_ids},
+ "userId": user_id,
+ "status": ReviewStatus.WAITING,
+ }
+ )
+
+ if not reviews:
+ return {}
+
+ # Batch fetch all node executions to avoid N+1 queries
+ node_exec_ids_to_fetch = [review.nodeExecId for review in reviews]
+ node_execs = await AgentNodeExecution.prisma().find_many(
+ where={"id": {"in": node_exec_ids_to_fetch}},
+ include={"Node": True},
+ )
+
+ # Create mapping from node_exec_id to node_id
+ node_exec_id_to_node_id = {
+ node_exec.id: node_exec.agentNodeId for node_exec in node_execs
+ }
+
+ result = {}
+ for review in reviews:
+ node_id = node_exec_id_to_node_id.get(review.nodeExecId, review.nodeExecId)
+ result[review.nodeExecId] = PendingHumanReviewModel.from_db(
+ review, node_id=node_id
+ )
+
+ return result
+
+
async def has_pending_reviews_for_graph_exec(graph_exec_id: str) -> bool:
"""
Check if a graph execution has any pending reviews.
@@ -137,8 +341,11 @@ async def get_pending_reviews_for_user(
page_size: Number of reviews per page
Returns:
- List of pending review models
+ List of pending review models with node_id included
"""
+ # Local import to avoid event loop conflicts in tests
+ from backend.data.execution import get_node_execution
+
# Calculate offset for pagination
offset = (page - 1) * page_size
@@ -149,7 +356,14 @@ async def get_pending_reviews_for_user(
take=page_size,
)
- return [PendingHumanReviewModel.from_db(review) for review in reviews]
+ # Fetch node_id for each review from NodeExecution
+ result = []
+ for review in reviews:
+ node_exec = await get_node_execution(review.nodeExecId)
+ node_id = node_exec.node_id if node_exec else review.nodeExecId
+ result.append(PendingHumanReviewModel.from_db(review, node_id=node_id))
+
+ return result
async def get_pending_reviews_for_execution(
@@ -163,8 +377,11 @@ async def get_pending_reviews_for_execution(
user_id: User ID for security validation
Returns:
- List of pending review models
+ List of pending review models with node_id included
"""
+ # Local import to avoid event loop conflicts in tests
+ from backend.data.execution import get_node_execution
+
reviews = await PendingHumanReview.prisma().find_many(
where={
"userId": user_id,
@@ -174,7 +391,14 @@ async def get_pending_reviews_for_execution(
order={"createdAt": "asc"},
)
- return [PendingHumanReviewModel.from_db(review) for review in reviews]
+ # Fetch node_id for each review from NodeExecution
+ result = []
+ for review in reviews:
+ node_exec = await get_node_execution(review.nodeExecId)
+ node_id = node_exec.node_id if node_exec else review.nodeExecId
+ result.append(PendingHumanReviewModel.from_db(review, node_id=node_id))
+
+ return result
async def process_all_reviews_for_execution(
@@ -244,11 +468,19 @@ async def process_all_reviews_for_execution(
# Note: Execution resumption is now handled at the API layer after ALL reviews
# for an execution are processed (both approved and rejected)
- # Return as dict for easy access
- return {
- review.nodeExecId: PendingHumanReviewModel.from_db(review)
- for review in updated_reviews
- }
+ # Fetch node_id for each review and return as dict for easy access
+ # Local import to avoid event loop conflicts in tests
+ from backend.data.execution import get_node_execution
+
+ result = {}
+ for review in updated_reviews:
+ node_exec = await get_node_execution(review.nodeExecId)
+ node_id = node_exec.node_id if node_exec else review.nodeExecId
+ result[review.nodeExecId] = PendingHumanReviewModel.from_db(
+ review, node_id=node_id
+ )
+
+ return result
async def update_review_processed_status(node_exec_id: str, processed: bool) -> None:
@@ -256,3 +488,44 @@ async def update_review_processed_status(node_exec_id: str, processed: bool) ->
await PendingHumanReview.prisma().update(
where={"nodeExecId": node_exec_id}, data={"processed": processed}
)
+
+
+async def cancel_pending_reviews_for_execution(graph_exec_id: str, user_id: str) -> int:
+ """
+ Cancel all pending reviews for a graph execution (e.g., when execution is stopped).
+
+ Marks all WAITING reviews as REJECTED with a message indicating the execution was stopped.
+
+ Args:
+ graph_exec_id: The graph execution ID
+ user_id: User ID who owns the execution (for security validation)
+
+ Returns:
+ Number of reviews cancelled
+
+ Raises:
+ ValueError: If the graph execution doesn't belong to the user
+ """
+ # Validate user ownership before cancelling reviews
+ graph_exec = await get_graph_execution_meta(
+ user_id=user_id, execution_id=graph_exec_id
+ )
+ if not graph_exec:
+ raise ValueError(
+ f"Graph execution {graph_exec_id} not found or doesn't belong to user {user_id}"
+ )
+
+ result = await PendingHumanReview.prisma().update_many(
+ where={
+ "graphExecId": graph_exec_id,
+ "userId": user_id,
+ "status": ReviewStatus.WAITING,
+ },
+ data={
+ "status": ReviewStatus.REJECTED,
+ "reviewMessage": "Execution was stopped by user",
+ "processed": True,
+ "reviewedAt": datetime.now(timezone.utc),
+ },
+ )
+ return result
diff --git a/autogpt_platform/backend/backend/data/human_review_test.py b/autogpt_platform/backend/backend/data/human_review_test.py
index c349fdde46..baa5c0c0c4 100644
--- a/autogpt_platform/backend/backend/data/human_review_test.py
+++ b/autogpt_platform/backend/backend/data/human_review_test.py
@@ -36,7 +36,7 @@ def sample_db_review():
return mock_review
[email protected](loop_scope="function")
async def test_get_or_create_human_review_new(
mocker: pytest_mock.MockFixture,
sample_db_review,
@@ -46,8 +46,8 @@ async def test_get_or_create_human_review_new(
sample_db_review.status = ReviewStatus.WAITING
sample_db_review.processed = False
- mock_upsert = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
- mock_upsert.return_value.upsert = AsyncMock(return_value=sample_db_review)
+ mock_prisma = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
+ mock_prisma.return_value.upsert = AsyncMock(return_value=sample_db_review)
result = await get_or_create_human_review(
user_id="test-user-123",
@@ -64,7 +64,7 @@ async def test_get_or_create_human_review_new(
assert result is None
[email protected](loop_scope="function")
async def test_get_or_create_human_review_approved(
mocker: pytest_mock.MockFixture,
sample_db_review,
@@ -75,8 +75,8 @@ async def test_get_or_create_human_review_approved(
sample_db_review.processed = False
sample_db_review.reviewMessage = "Looks good"
- mock_upsert = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
- mock_upsert.return_value.upsert = AsyncMock(return_value=sample_db_review)
+ mock_prisma = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
+ mock_prisma.return_value.upsert = AsyncMock(return_value=sample_db_review)
result = await get_or_create_human_review(
user_id="test-user-123",
@@ -96,7 +96,7 @@ async def test_get_or_create_human_review_approved(
assert result.message == "Looks good"
[email protected](loop_scope="function")
async def test_has_pending_reviews_for_graph_exec_true(
mocker: pytest_mock.MockFixture,
):
@@ -109,7 +109,7 @@ async def test_has_pending_reviews_for_graph_exec_true(
assert result is True
[email protected](loop_scope="function")
async def test_has_pending_reviews_for_graph_exec_false(
mocker: pytest_mock.MockFixture,
):
@@ -122,7 +122,7 @@ async def test_has_pending_reviews_for_graph_exec_false(
assert result is False
[email protected](loop_scope="function")
async def test_get_pending_reviews_for_user(
mocker: pytest_mock.MockFixture,
sample_db_review,
@@ -131,10 +131,19 @@ async def test_get_pending_reviews_for_user(
mock_find_many = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
mock_find_many.return_value.find_many = AsyncMock(return_value=[sample_db_review])
+ # Mock get_node_execution to return node with node_id (async function)
+ mock_node_exec = Mock()
+ mock_node_exec.node_id = "test_node_def_789"
+ mocker.patch(
+ "backend.data.execution.get_node_execution",
+ new=AsyncMock(return_value=mock_node_exec),
+ )
+
result = await get_pending_reviews_for_user("test_user", page=2, page_size=10)
assert len(result) == 1
assert result[0].node_exec_id == "test_node_123"
+ assert result[0].node_id == "test_node_def_789"
# Verify pagination parameters
call_args = mock_find_many.return_value.find_many.call_args
@@ -142,7 +151,7 @@ async def test_get_pending_reviews_for_user(
assert call_args.kwargs["take"] == 10
[email protected](loop_scope="function")
async def test_get_pending_reviews_for_execution(
mocker: pytest_mock.MockFixture,
sample_db_review,
@@ -151,12 +160,21 @@ async def test_get_pending_reviews_for_execution(
mock_find_many = mocker.patch("backend.data.human_review.PendingHumanReview.prisma")
mock_find_many.return_value.find_many = AsyncMock(return_value=[sample_db_review])
+ # Mock get_node_execution to return node with node_id (async function)
+ mock_node_exec = Mock()
+ mock_node_exec.node_id = "test_node_def_789"
+ mocker.patch(
+ "backend.data.execution.get_node_execution",
+ new=AsyncMock(return_value=mock_node_exec),
+ )
+
result = await get_pending_reviews_for_execution(
"test_graph_exec_456", "test-user-123"
)
assert len(result) == 1
assert result[0].graph_exec_id == "test_graph_exec_456"
+ assert result[0].node_id == "test_node_def_789"
# Verify it filters by execution and user
call_args = mock_find_many.return_value.find_many.call_args
@@ -166,7 +184,7 @@ async def test_get_pending_reviews_for_execution(
assert where_clause["status"] == ReviewStatus.WAITING
[email protected](loop_scope="function")
async def test_process_all_reviews_for_execution_success(
mocker: pytest_mock.MockFixture,
sample_db_review,
@@ -201,6 +219,14 @@ async def test_process_all_reviews_for_execution_success(
new=AsyncMock(return_value=[updated_review]),
)
+ # Mock get_node_execution to return node with node_id (async function)
+ mock_node_exec = Mock()
+ mock_node_exec.node_id = "test_node_def_789"
+ mocker.patch(
+ "backend.data.execution.get_node_execution",
+ new=AsyncMock(return_value=mock_node_exec),
+ )
+
result = await process_all_reviews_for_execution(
user_id="test-user-123",
review_decisions={
@@ -211,9 +237,10 @@ async def test_process_all_reviews_for_execution_success(
assert len(result) == 1
assert "test_node_123" in result
assert result["test_node_123"].status == ReviewStatus.APPROVED
+ assert result["test_node_123"].node_id == "test_node_def_789"
[email protected](loop_scope="function")
async def test_process_all_reviews_for_execution_validation_errors(
mocker: pytest_mock.MockFixture,
):
@@ -233,7 +260,7 @@ async def test_process_all_reviews_for_execution_validation_errors(
)
[email protected](loop_scope="function")
async def test_process_all_reviews_edit_permission_error(
mocker: pytest_mock.MockFixture,
sample_db_review,
@@ -259,7 +286,7 @@ async def test_process_all_reviews_edit_permission_error(
)
[email protected](loop_scope="function")
async def test_process_all_reviews_mixed_approval_rejection(
mocker: pytest_mock.MockFixture,
sample_db_review,
@@ -329,6 +356,14 @@ async def test_process_all_reviews_mixed_approval_rejection(
new=AsyncMock(return_value=[approved_review, rejected_review]),
)
+ # Mock get_node_execution to return node with node_id (async function)
+ mock_node_exec = Mock()
+ mock_node_exec.node_id = "test_node_def_789"
+ mocker.patch(
+ "backend.data.execution.get_node_execution",
+ new=AsyncMock(return_value=mock_node_exec),
+ )
+
result = await process_all_reviews_for_execution(
user_id="test-user-123",
review_decisions={
@@ -340,3 +375,5 @@ async def test_process_all_reviews_mixed_approval_rejection(
assert len(result) == 2
assert "test_node_123" in result
assert "test_node_456" in result
+ assert result["test_node_123"].node_id == "test_node_def_789"
+ assert result["test_node_456"].node_id == "test_node_def_789"
diff --git a/autogpt_platform/backend/backend/executor/database.py b/autogpt_platform/backend/backend/executor/database.py
index ac381bbd67..ae7474fc1d 100644
--- a/autogpt_platform/backend/backend/executor/database.py
+++ b/autogpt_platform/backend/backend/executor/database.py
@@ -50,6 +50,8 @@ from backend.data.graph import (
validate_graph_execution_permissions,
)
from backend.data.human_review import (
+ cancel_pending_reviews_for_execution,
+ check_approval,
get_or_create_human_review,
has_pending_reviews_for_graph_exec,
update_review_processed_status,
@@ -190,6 +192,8 @@ class DatabaseManager(AppService):
get_user_notification_preference = _(get_user_notification_preference)
# Human In The Loop
+ cancel_pending_reviews_for_execution = _(cancel_pending_reviews_for_execution)
+ check_approval = _(check_approval)
get_or_create_human_review = _(get_or_create_human_review)
has_pending_reviews_for_graph_exec = _(has_pending_reviews_for_graph_exec)
update_review_processed_status = _(update_review_processed_status)
@@ -313,6 +317,8 @@ class DatabaseManagerAsyncClient(AppServiceClient):
set_execution_kv_data = d.set_execution_kv_data
# Human In The Loop
+ cancel_pending_reviews_for_execution = d.cancel_pending_reviews_for_execution
+ check_approval = d.check_approval
get_or_create_human_review = d.get_or_create_human_review
update_review_processed_status = d.update_review_processed_status
diff --git a/autogpt_platform/backend/backend/executor/utils.py b/autogpt_platform/backend/backend/executor/utils.py
index 7771c3751c..f35bebb125 100644
--- a/autogpt_platform/backend/backend/executor/utils.py
+++ b/autogpt_platform/backend/backend/executor/utils.py
@@ -10,6 +10,7 @@ from pydantic import BaseModel, JsonValue, ValidationError
from backend.data import execution as execution_db
from backend.data import graph as graph_db
+from backend.data import human_review as human_review_db
from backend.data import onboarding as onboarding_db
from backend.data import user as user_db
from backend.data.block import (
@@ -749,9 +750,27 @@ async def stop_graph_execution(
if graph_exec.status in [
ExecutionStatus.QUEUED,
ExecutionStatus.INCOMPLETE,
+ ExecutionStatus.REVIEW,
]:
- # If the graph is still on the queue, we can prevent them from being executed
- # by setting the status to TERMINATED.
+ # If the graph is queued/incomplete/paused for review, terminate immediately
+ # No need to wait for executor since it's not actively running
+
+ # If graph is in REVIEW status, clean up pending reviews before terminating
+ if graph_exec.status == ExecutionStatus.REVIEW:
+ # Use human_review_db if Prisma connected, else database manager
+ review_db = (
+ human_review_db
+ if prisma.is_connected()
+ else get_database_manager_async_client()
+ )
+ # Mark all pending reviews as rejected/cancelled
+ cancelled_count = await review_db.cancel_pending_reviews_for_execution(
+ graph_exec_id, user_id
+ )
+ logger.info(
+ f"Cancelled {cancelled_count} pending review(s) for stopped execution {graph_exec_id}"
+ )
+
graph_exec.status = ExecutionStatus.TERMINATED
await asyncio.gather(
@@ -887,9 +906,28 @@ async def add_graph_execution(
nodes_to_skip=nodes_to_skip,
execution_context=execution_context,
)
- logger.info(f"Publishing execution {graph_exec.id} to execution queue")
+ logger.info(f"Queueing execution {graph_exec.id}")
+
+ # Update execution status to QUEUED BEFORE publishing to prevent race condition
+ # where two concurrent requests could both publish the same execution
+ updated_exec = await edb.update_graph_execution_stats(
+ graph_exec_id=graph_exec.id,
+ status=ExecutionStatus.QUEUED,
+ )
+
+ # Verify the status update succeeded (prevents duplicate queueing in race conditions)
+ # If another request already updated the status, this execution will not be QUEUED
+ if not updated_exec or updated_exec.status != ExecutionStatus.QUEUED:
+ logger.warning(
+ f"Skipping queue publish for execution {graph_exec.id} - "
+ f"status update failed or execution already queued by another request"
+ )
+ return graph_exec
+
+ graph_exec.status = ExecutionStatus.QUEUED
# Publish to execution queue for executor to pick up
+ # This happens AFTER status update to ensure only one request publishes
exec_queue = await get_async_execution_queue()
await exec_queue.publish_message(
routing_key=GRAPH_EXECUTION_ROUTING_KEY,
@@ -897,13 +935,6 @@ async def add_graph_execution(
exchange=GRAPH_EXECUTION_EXCHANGE,
)
logger.info(f"Published execution {graph_exec.id} to RabbitMQ queue")
-
- # Update execution status to QUEUED
- graph_exec.status = ExecutionStatus.QUEUED
- await edb.update_graph_execution_stats(
- graph_exec_id=graph_exec.id,
- status=graph_exec.status,
- )
except BaseException as e:
err = str(e) or type(e).__name__
if not graph_exec:
diff --git a/autogpt_platform/backend/backend/executor/utils_test.py b/autogpt_platform/backend/backend/executor/utils_test.py
index e6e8fcbf60..4761a18c63 100644
--- a/autogpt_platform/backend/backend/executor/utils_test.py
+++ b/autogpt_platform/backend/backend/executor/utils_test.py
@@ -4,6 +4,7 @@ import pytest
from pytest_mock import MockerFixture
from backend.data.dynamic_fields import merge_execution_input, parse_execution_output
+from backend.data.execution import ExecutionStatus
from backend.util.mock import MockObject
@@ -346,6 +347,7 @@ async def test_add_graph_execution_is_repeatable(mocker: MockerFixture):
mock_graph_exec = mocker.MagicMock(spec=GraphExecutionWithNodes)
mock_graph_exec.id = "execution-id-123"
mock_graph_exec.node_executions = [] # Add this to avoid AttributeError
+ mock_graph_exec.status = ExecutionStatus.QUEUED # Required for race condition check
mock_graph_exec.to_graph_execution_entry.return_value = mocker.MagicMock()
# Mock the queue and event bus
@@ -611,6 +613,7 @@ async def test_add_graph_execution_with_nodes_to_skip(mocker: MockerFixture):
mock_graph_exec = mocker.MagicMock(spec=GraphExecutionWithNodes)
mock_graph_exec.id = "execution-id-123"
mock_graph_exec.node_executions = []
+ mock_graph_exec.status = ExecutionStatus.QUEUED # Required for race condition check
# Track what's passed to to_graph_execution_entry
captured_kwargs = {}
@@ -670,3 +673,232 @@ async def test_add_graph_execution_with_nodes_to_skip(mocker: MockerFixture):
# Verify nodes_to_skip was passed to to_graph_execution_entry
assert "nodes_to_skip" in captured_kwargs
assert captured_kwargs["nodes_to_skip"] == nodes_to_skip
+
+
+async def test_stop_graph_execution_in_review_status_cancels_pending_reviews(
+ mocker: MockerFixture,
+):
+ """Test that stopping an execution in REVIEW status cancels pending reviews."""
+ from backend.data.execution import ExecutionStatus, GraphExecutionMeta
+ from backend.executor.utils import stop_graph_execution
+
+ user_id = "test-user"
+ graph_exec_id = "test-exec-123"
+
+ # Mock graph execution in REVIEW status
+ mock_graph_exec = mocker.MagicMock(spec=GraphExecutionMeta)
+ mock_graph_exec.id = graph_exec_id
+ mock_graph_exec.status = ExecutionStatus.REVIEW
+
+ # Mock dependencies
+ mock_get_queue = mocker.patch("backend.executor.utils.get_async_execution_queue")
+ mock_queue_client = mocker.AsyncMock()
+ mock_get_queue.return_value = mock_queue_client
+
+ mock_prisma = mocker.patch("backend.executor.utils.prisma")
+ mock_prisma.is_connected.return_value = True
+
+ mock_human_review_db = mocker.patch("backend.executor.utils.human_review_db")
+ mock_human_review_db.cancel_pending_reviews_for_execution = mocker.AsyncMock(
+ return_value=2 # 2 reviews cancelled
+ )
+
+ mock_execution_db = mocker.patch("backend.executor.utils.execution_db")
+ mock_execution_db.get_graph_execution_meta = mocker.AsyncMock(
+ return_value=mock_graph_exec
+ )
+ mock_execution_db.update_graph_execution_stats = mocker.AsyncMock()
+
+ mock_get_event_bus = mocker.patch(
+ "backend.executor.utils.get_async_execution_event_bus"
+ )
+ mock_event_bus = mocker.MagicMock()
+ mock_event_bus.publish = mocker.AsyncMock()
+ mock_get_event_bus.return_value = mock_event_bus
+
+ mock_get_child_executions = mocker.patch(
+ "backend.executor.utils._get_child_executions"
+ )
+ mock_get_child_executions.return_value = [] # No children
+
+ # Call stop_graph_execution with timeout to allow status check
+ await stop_graph_execution(
+ user_id=user_id,
+ graph_exec_id=graph_exec_id,
+ wait_timeout=1.0, # Wait to allow status check
+ cascade=True,
+ )
+
+ # Verify pending reviews were cancelled
+ mock_human_review_db.cancel_pending_reviews_for_execution.assert_called_once_with(
+ graph_exec_id, user_id
+ )
+
+ # Verify execution status was updated to TERMINATED
+ mock_execution_db.update_graph_execution_stats.assert_called_once()
+ call_kwargs = mock_execution_db.update_graph_execution_stats.call_args[1]
+ assert call_kwargs["graph_exec_id"] == graph_exec_id
+ assert call_kwargs["status"] == ExecutionStatus.TERMINATED
+
+
+async def test_stop_graph_execution_with_database_manager_when_prisma_disconnected(
+ mocker: MockerFixture,
+):
+ """Test that stop uses database manager when Prisma is not connected."""
+ from backend.data.execution import ExecutionStatus, GraphExecutionMeta
+ from backend.executor.utils import stop_graph_execution
+
+ user_id = "test-user"
+ graph_exec_id = "test-exec-456"
+
+ # Mock graph execution in REVIEW status
+ mock_graph_exec = mocker.MagicMock(spec=GraphExecutionMeta)
+ mock_graph_exec.id = graph_exec_id
+ mock_graph_exec.status = ExecutionStatus.REVIEW
+
+ # Mock dependencies
+ mock_get_queue = mocker.patch("backend.executor.utils.get_async_execution_queue")
+ mock_queue_client = mocker.AsyncMock()
+ mock_get_queue.return_value = mock_queue_client
+
+ # Prisma is NOT connected
+ mock_prisma = mocker.patch("backend.executor.utils.prisma")
+ mock_prisma.is_connected.return_value = False
+
+ # Mock database manager client
+ mock_get_db_manager = mocker.patch(
+ "backend.executor.utils.get_database_manager_async_client"
+ )
+ mock_db_manager = mocker.AsyncMock()
+ mock_db_manager.get_graph_execution_meta = mocker.AsyncMock(
+ return_value=mock_graph_exec
+ )
+ mock_db_manager.cancel_pending_reviews_for_execution = mocker.AsyncMock(
+ return_value=3 # 3 reviews cancelled
+ )
+ mock_db_manager.update_graph_execution_stats = mocker.AsyncMock()
+ mock_get_db_manager.return_value = mock_db_manager
+
+ mock_get_event_bus = mocker.patch(
+ "backend.executor.utils.get_async_execution_event_bus"
+ )
+ mock_event_bus = mocker.MagicMock()
+ mock_event_bus.publish = mocker.AsyncMock()
+ mock_get_event_bus.return_value = mock_event_bus
+
+ mock_get_child_executions = mocker.patch(
+ "backend.executor.utils._get_child_executions"
+ )
+ mock_get_child_executions.return_value = [] # No children
+
+ # Call stop_graph_execution with timeout
+ await stop_graph_execution(
+ user_id=user_id,
+ graph_exec_id=graph_exec_id,
+ wait_timeout=1.0,
+ cascade=True,
+ )
+
+ # Verify database manager was used for cancel_pending_reviews
+ mock_db_manager.cancel_pending_reviews_for_execution.assert_called_once_with(
+ graph_exec_id, user_id
+ )
+
+ # Verify execution status was updated via database manager
+ mock_db_manager.update_graph_execution_stats.assert_called_once()
+
+
+async def test_stop_graph_execution_cascades_to_child_with_reviews(
+ mocker: MockerFixture,
+):
+ """Test that stopping parent execution cascades to children and cancels their reviews."""
+ from backend.data.execution import ExecutionStatus, GraphExecutionMeta
+ from backend.executor.utils import stop_graph_execution
+
+ user_id = "test-user"
+ parent_exec_id = "parent-exec"
+ child_exec_id = "child-exec"
+
+ # Mock parent execution in RUNNING status
+ mock_parent_exec = mocker.MagicMock(spec=GraphExecutionMeta)
+ mock_parent_exec.id = parent_exec_id
+ mock_parent_exec.status = ExecutionStatus.RUNNING
+
+ # Mock child execution in REVIEW status
+ mock_child_exec = mocker.MagicMock(spec=GraphExecutionMeta)
+ mock_child_exec.id = child_exec_id
+ mock_child_exec.status = ExecutionStatus.REVIEW
+
+ # Mock dependencies
+ mock_get_queue = mocker.patch("backend.executor.utils.get_async_execution_queue")
+ mock_queue_client = mocker.AsyncMock()
+ mock_get_queue.return_value = mock_queue_client
+
+ mock_prisma = mocker.patch("backend.executor.utils.prisma")
+ mock_prisma.is_connected.return_value = True
+
+ mock_human_review_db = mocker.patch("backend.executor.utils.human_review_db")
+ mock_human_review_db.cancel_pending_reviews_for_execution = mocker.AsyncMock(
+ return_value=1 # 1 child review cancelled
+ )
+
+ # Mock execution_db to return different status based on which execution is queried
+ mock_execution_db = mocker.patch("backend.executor.utils.execution_db")
+
+ # Track call count to simulate status transition
+ call_count = {"count": 0}
+
+ async def get_exec_meta_side_effect(execution_id, user_id):
+ call_count["count"] += 1
+ if execution_id == parent_exec_id:
+ # After a few calls (child processing happens), transition parent to TERMINATED
+ # This simulates the executor service processing the stop request
+ if call_count["count"] > 3:
+ mock_parent_exec.status = ExecutionStatus.TERMINATED
+ return mock_parent_exec
+ elif execution_id == child_exec_id:
+ return mock_child_exec
+ return None
+
+ mock_execution_db.get_graph_execution_meta = mocker.AsyncMock(
+ side_effect=get_exec_meta_side_effect
+ )
+ mock_execution_db.update_graph_execution_stats = mocker.AsyncMock()
+
+ mock_get_event_bus = mocker.patch(
+ "backend.executor.utils.get_async_execution_event_bus"
+ )
+ mock_event_bus = mocker.MagicMock()
+ mock_event_bus.publish = mocker.AsyncMock()
+ mock_get_event_bus.return_value = mock_event_bus
+
+ # Mock _get_child_executions to return the child
+ mock_get_child_executions = mocker.patch(
+ "backend.executor.utils._get_child_executions"
+ )
+
+ def get_children_side_effect(parent_id):
+ if parent_id == parent_exec_id:
+ return [mock_child_exec]
+ return []
+
+ mock_get_child_executions.side_effect = get_children_side_effect
+
+ # Call stop_graph_execution on parent with cascade=True
+ await stop_graph_execution(
+ user_id=user_id,
+ graph_exec_id=parent_exec_id,
+ wait_timeout=1.0,
+ cascade=True,
+ )
+
+ # Verify child reviews were cancelled
+ mock_human_review_db.cancel_pending_reviews_for_execution.assert_called_once_with(
+ child_exec_id, user_id
+ )
+
+ # Verify both parent and child status updates
+ assert mock_execution_db.update_graph_execution_stats.call_count >= 1
diff --git a/autogpt_platform/backend/backend/util/test.py b/autogpt_platform/backend/backend/util/test.py
index 1e8244ff8e..0a539644ee 100644
--- a/autogpt_platform/backend/backend/util/test.py
+++ b/autogpt_platform/backend/backend/util/test.py
@@ -1,3 +1,4 @@
+import asyncio
import inspect
import logging
import time
@@ -58,6 +59,11 @@ class SpinTestServer:
self.db_api.__exit__(exc_type, exc_val, exc_tb)
self.notif_manager.__exit__(exc_type, exc_val, exc_tb)
+ # Give services time to fully shut down
+ # This prevents event loop issues where services haven't fully cleaned up
+ # before the next test starts
+ await asyncio.sleep(0.5)
+
def setup_dependency_overrides(self):
# Override get_user_id for testing
self.agent_server.set_test_dependency_overrides(
diff --git a/autogpt_platform/backend/migrations/20260121200000_remove_node_execution_fk_from_pending_human_review/migration.sql b/autogpt_platform/backend/migrations/20260121200000_remove_node_execution_fk_from_pending_human_review/migration.sql
new file mode 100644
index 0000000000..c43cb0b1e0
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260121200000_remove_node_execution_fk_from_pending_human_review/migration.sql
@@ -0,0 +1,7 @@
+-- Remove NodeExecution foreign key from PendingHumanReview
+-- The nodeExecId column remains as the primary key, but we remove the FK constraint
+-- to AgentNodeExecution since PendingHumanReview records can persist after node
+-- execution records are deleted.
+
+-- Drop foreign key constraint that linked PendingHumanReview.nodeExecId to AgentNodeExecution.id
+ALTER TABLE "PendingHumanReview" DROP CONSTRAINT IF EXISTS "PendingHumanReview_nodeExecId_fkey";
diff --git a/autogpt_platform/backend/schema.prisma b/autogpt_platform/backend/schema.prisma
index 4a2a7b583a..de94600820 100644
--- a/autogpt_platform/backend/schema.prisma
+++ b/autogpt_platform/backend/schema.prisma
@@ -517,8 +517,6 @@ model AgentNodeExecution {
stats Json?
- PendingHumanReview PendingHumanReview?
-
@@index([agentGraphExecutionId, agentNodeId, executionStatus])
@@index([agentNodeId, executionStatus])
@@index([addedTime, queuedTime])
@@ -567,6 +565,7 @@ enum ReviewStatus {
}
// Pending human reviews for Human-in-the-loop blocks
+// Also stores auto-approval records with special nodeExecId patterns (e.g., "auto_approve_{graph_exec_id}_{node_id}")
model PendingHumanReview {
nodeExecId String @id
userId String
@@ -585,7 +584,6 @@ model PendingHumanReview {
reviewedAt DateTime?
User User @relation(fields: [userId], references: [id], onDelete: Cascade)
- NodeExecution AgentNodeExecution @relation(fields: [nodeExecId], references: [id], onDelete: Cascade)
GraphExecution AgentGraphExecution @relation(fields: [graphExecId], references: [id], onDelete: Cascade)
@@unique([nodeExecId]) // One pending review per node execution
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/FloatingSafeModeToogle.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/FloatingSafeModeToogle.tsx
index 6c8cbb1a86..227d892fff 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/FloatingSafeModeToogle.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/FloatingSafeModeToogle.tsx
@@ -86,7 +86,6 @@ export function FloatingSafeModeToggle({
const {
currentHITLSafeMode,
showHITLToggle,
- isHITLStateUndetermined,
handleHITLToggle,
currentSensitiveActionSafeMode,
showSensitiveActionToggle,
@@ -99,16 +98,9 @@ export function FloatingSafeModeToggle({
return null;
}
- const showHITL = showHITLToggle && !isHITLStateUndetermined;
- const showSensitive = showSensitiveActionToggle;
-
- if (!showHITL && !showSensitive) {
- return null;
- }
-
return (
<div className={cn("fixed z-50 flex flex-col gap-2", className)}>
- {showHITL && (
+ {showHITLToggle && (
<SafeModeButton
isEnabled={currentHITLSafeMode}
label="Human in the loop block approval"
@@ -119,7 +111,7 @@ export function FloatingSafeModeToggle({
fullWidth={fullWidth}
/>
)}
- {showSensitive && (
+ {showSensitiveActionToggle && (
<SafeModeButton
isEnabled={currentSensitiveActionSafeMode}
label="Sensitive actions blocks approval"
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx
index d5ba9142ee..aff06d79c5 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx
@@ -14,6 +14,10 @@ import {
import { Dialog } from "@/components/molecules/Dialog/Dialog";
import { useEffect, useRef, useState } from "react";
import { ScheduleAgentModal } from "../ScheduleAgentModal/ScheduleAgentModal";
+import {
+ AIAgentSafetyPopup,
+ useAIAgentSafetyPopup,
+} from "./components/AIAgentSafetyPopup/AIAgentSafetyPopup";
import { ModalHeader } from "./components/ModalHeader/ModalHeader";
import { ModalRunSection } from "./components/ModalRunSection/ModalRunSection";
import { RunActions } from "./components/RunActions/RunActions";
@@ -83,8 +87,18 @@ export function RunAgentModal({
const [isScheduleModalOpen, setIsScheduleModalOpen] = useState(false);
const [hasOverflow, setHasOverflow] = useState(false);
+ const [isSafetyPopupOpen, setIsSafetyPopupOpen] = useState(false);
+ const [pendingRunAction, setPendingRunAction] = useState<(() => void) | null>(
+ null,
+ );
const contentRef = useRef<HTMLDivElement>(null);
+ const { shouldShowPopup, dismissPopup } = useAIAgentSafetyPopup(
+ agent.id,
+ agent.has_sensitive_action,
+ agent.has_human_in_the_loop,
+ );
+
const hasAnySetupFields =
Object.keys(agentInputFields || {}).length > 0 ||
Object.keys(agentCredentialsInputFields || {}).length > 0;
@@ -165,6 +179,24 @@ export function RunAgentModal({
onScheduleCreated?.(schedule);
}
+ function handleRunWithSafetyCheck() {
+ if (shouldShowPopup) {
+ setPendingRunAction(() => handleRun);
+ setIsSafetyPopupOpen(true);
+ } else {
+ handleRun();
+ }
+ }
+
+ function handleSafetyPopupAcknowledge() {
+ setIsSafetyPopupOpen(false);
+ dismissPopup();
+ if (pendingRunAction) {
+ pendingRunAction();
+ setPendingRunAction(null);
+ }
+ }
+
return (
<>
<Dialog
@@ -248,7 +280,7 @@ export function RunAgentModal({
)}
<RunActions
defaultRunType={defaultRunType}
- onRun={handleRun}
+ onRun={handleRunWithSafetyCheck}
isExecuting={isExecuting}
isSettingUpTrigger={isSettingUpTrigger}
isRunReady={allRequiredInputsAreSet}
@@ -266,6 +298,12 @@ export function RunAgentModal({
</div>
</Dialog.Content>
</Dialog>
+
+ <AIAgentSafetyPopup
+ agentId={agent.id}
+ isOpen={isSafetyPopupOpen}
+ onAcknowledge={handleSafetyPopupAcknowledge}
+ />
</>
);
}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AIAgentSafetyPopup/AIAgentSafetyPopup.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AIAgentSafetyPopup/AIAgentSafetyPopup.tsx
new file mode 100644
index 0000000000..f2d178b33d
--- /dev/null
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AIAgentSafetyPopup/AIAgentSafetyPopup.tsx
@@ -0,0 +1,108 @@
+"use client";
+
+import { Button } from "@/components/atoms/Button/Button";
+import { Text } from "@/components/atoms/Text/Text";
+import { Dialog } from "@/components/molecules/Dialog/Dialog";
+import { Key, storage } from "@/services/storage/local-storage";
+import { ShieldCheckIcon } from "@phosphor-icons/react";
+import { useCallback, useEffect, useState } from "react";
+
+interface Props {
+ agentId: string;
+ onAcknowledge: () => void;
+ isOpen: boolean;
+}
+
+export function AIAgentSafetyPopup({ agentId, onAcknowledge, isOpen }: Props) {
+ function handleAcknowledge() {
+ // Add this agent to the list of agents for which popup has been shown
+ const seenAgentsJson = storage.get(Key.AI_AGENT_SAFETY_POPUP_SHOWN);
+ const seenAgents: string[] = seenAgentsJson
+ ? JSON.parse(seenAgentsJson)
+ : [];
+
+ if (!seenAgents.includes(agentId)) {
+ seenAgents.push(agentId);
+ storage.set(Key.AI_AGENT_SAFETY_POPUP_SHOWN, JSON.stringify(seenAgents));
+ }
+
+ onAcknowledge();
+ }
+
+ if (!isOpen) return null;
+
+ return (
+ <Dialog
+ controlled={{ isOpen, set: () => {} }}
+ styling={{ maxWidth: "480px" }}
+ >
+ <Dialog.Content>
+ <div className="flex flex-col items-center p-6 text-center">
+ <div className="mb-6 flex h-16 w-16 items-center justify-center rounded-full bg-blue-50">
+ <ShieldCheckIcon
+ weight="fill"
+ size={32}
+ className="text-blue-600"
+ />
+ </div>
+
+ <Text variant="h3" className="mb-4">
+ Safety Checks Enabled
+ </Text>
+
+ <Text variant="body" className="mb-2 text-zinc-700">
+ AI-generated agents may take actions that affect your data or
+ external systems.
+ </Text>
+
+ <Text variant="body" className="mb-8 text-zinc-700">
+ AutoGPT includes safety checks so you&apos;ll always have the
+ opportunity to review and approve sensitive actions before they
+ happen.
+ </Text>
+
+ <Button
+ variant="primary"
+ size="large"
+ className="w-full"
+ onClick={handleAcknowledge}
+ >
+ Got it
+ </Button>
+ </div>
+ </Dialog.Content>
+ </Dialog>
+ );
+}
+
+export function useAIAgentSafetyPopup(
+ agentId: string,
+ hasSensitiveAction: boolean,
+ hasHumanInTheLoop: boolean,
+) {
+ const [shouldShowPopup, setShouldShowPopup] = useState(false);
+ const [hasChecked, setHasChecked] = useState(false);
+
+ useEffect(() => {
+ if (hasChecked) return;
+
+ const seenAgentsJson = storage.get(Key.AI_AGENT_SAFETY_POPUP_SHOWN);
+ const seenAgents: string[] = seenAgentsJson
+ ? JSON.parse(seenAgentsJson)
+ : [];
+ const hasSeenPopupForThisAgent = seenAgents.includes(agentId);
+ const isRelevantAgent = hasSensitiveAction || hasHumanInTheLoop;
+
+ setShouldShowPopup(!hasSeenPopupForThisAgent && isRelevantAgent);
+ setHasChecked(true);
+ }, [agentId, hasSensitiveAction, hasHumanInTheLoop, hasChecked]);
+
+ const dismissPopup = useCallback(() => {
+ setShouldShowPopup(false);
+ }, []);
+
+ return {
+ shouldShowPopup,
+ dismissPopup,
+ };
+}
diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/SafeModeToggle.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/SafeModeToggle.tsx
index dc0258c768..0fafa67414 100644
--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/SafeModeToggle.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/components/SafeModeToggle.tsx
@@ -69,7 +69,6 @@ export function SafeModeToggle({ graph, className }: Props) {
const {
currentHITLSafeMode,
showHITLToggle,
- isHITLStateUndetermined,
handleHITLToggle,
currentSensitiveActionSafeMode,
showSensitiveActionToggle,
@@ -78,20 +77,13 @@ export function SafeModeToggle({ graph, className }: Props) {
shouldShowToggle,
} = useAgentSafeMode(graph);
- if (!shouldShowToggle || isHITLStateUndetermined) {
- return null;
- }
-
- const showHITL = showHITLToggle && !isHITLStateUndetermined;
- const showSensitive = showSensitiveActionToggle;
-
- if (!showHITL && !showSensitive) {
+ if (!shouldShowToggle) {
return null;
}
return (
<div className={cn("flex gap-1", className)}>
- {showHITL && (
+ {showHITLToggle && (
<SafeModeIconButton
isEnabled={currentHITLSafeMode}
label="Human-in-the-loop"
@@ -101,7 +93,7 @@ export function SafeModeToggle({ graph, className }: Props) {
isPending={isPending}
/>
)}
- {showSensitive && (
+ {showSensitiveActionToggle && (
<SafeModeIconButton
isEnabled={currentSensitiveActionSafeMode}
label="Sensitive actions"
diff --git a/autogpt_platform/frontend/src/app/api/openapi.json b/autogpt_platform/frontend/src/app/api/openapi.json
index 579bc3e454..b4e2bc80bd 100644
--- a/autogpt_platform/frontend/src/app/api/openapi.json
+++ b/autogpt_platform/frontend/src/app/api/openapi.json
@@ -8809,6 +8809,12 @@
"title": "Node Exec Id",
"description": "Node execution ID (primary key)"
},
+ "node_id": {
+ "type": "string",
+ "title": "Node Id",
+ "description": "Node definition ID (for grouping)",
+ "default": ""
+ },
"user_id": {
"type": "string",
"title": "User Id",
@@ -8908,7 +8914,7 @@
"created_at"
],
"title": "PendingHumanReviewModel",
- "description": "Response model for pending human review data.\n\nRepresents a human review request that is awaiting user action.\nContains all necessary information for a user to review and approve\nor reject data from a Human-in-the-Loop block execution.\n\nAttributes:\n id: Unique identifier for the review record\n user_id: ID of the user who must perform the review\n node_exec_id: ID of the node execution that created this review\n graph_exec_id: ID of the graph execution containing the node\n graph_id: ID of the graph template being executed\n graph_version: Version number of the graph template\n payload: The actual data payload awaiting review\n instructions: Instructions or message for the reviewer\n editable: Whether the reviewer can edit the data\n status: Current review status (WAITING, APPROVED, or REJECTED)\n review_message: Optional message from the reviewer\n created_at: Timestamp when review was created\n updated_at: Timestamp when review was last modified\n reviewed_at: Timestamp when review was completed (if applicable)"
+ "description": "Response model for pending human review data.\n\nRepresents a human review request that is awaiting user action.\nContains all necessary information for a user to review and approve\nor reject data from a Human-in-the-Loop block execution.\n\nAttributes:\n id: Unique identifier for the review record\n user_id: ID of the user who must perform the review\n node_exec_id: ID of the node execution that created this review\n node_id: ID of the node definition (for grouping reviews from same node)\n graph_exec_id: ID of the graph execution containing the node\n graph_id: ID of the graph template being executed\n graph_version: Version number of the graph template\n payload: The actual data payload awaiting review\n instructions: Instructions or message for the reviewer\n editable: Whether the reviewer can edit the data\n status: Current review status (WAITING, APPROVED, or REJECTED)\n review_message: Optional message from the reviewer\n created_at: Timestamp when review was created\n updated_at: Timestamp when review was last modified\n reviewed_at: Timestamp when review was completed (if applicable)"
},
"PostmarkBounceEnum": {
"type": "integer",
@@ -9411,6 +9417,12 @@
],
"title": "Reviewed Data",
"description": "Optional edited data (ignored if approved=False)"
+ },
+ "auto_approve_future": {
+ "type": "boolean",
+ "title": "Auto Approve Future",
+ "description": "If true and this review is approved, future executions of this same block (node) will be automatically approved. This only affects approved reviews.",
+ "default": false
}
},
"type": "object",
@@ -9430,7 +9442,7 @@
"type": "object",
"required": ["reviews"],
"title": "ReviewRequest",
- "description": "Request model for processing ALL pending reviews for an execution.\n\nThis request must include ALL pending reviews for a graph execution.\nEach review will be either approved (with optional data modifications)\nor rejected (data ignored). The execution will resume only after ALL reviews are processed."
+ "description": "Request model for processing ALL pending reviews for an execution.\n\nThis request must include ALL pending reviews for a graph execution.\nEach review will be either approved (with optional data modifications)\nor rejected (data ignored). The execution will resume only after ALL reviews are processed.\n\nEach review item can individually specify whether to auto-approve future executions\nof the same block via the `auto_approve_future` field on ReviewItem."
},
"ReviewResponse": {
"properties": {
diff --git a/autogpt_platform/frontend/src/components/organisms/FloatingReviewsPanel/FloatingReviewsPanel.tsx b/autogpt_platform/frontend/src/components/organisms/FloatingReviewsPanel/FloatingReviewsPanel.tsx
index 2b04c0ed9a..4805508054 100644
--- a/autogpt_platform/frontend/src/components/organisms/FloatingReviewsPanel/FloatingReviewsPanel.tsx
+++ b/autogpt_platform/frontend/src/components/organisms/FloatingReviewsPanel/FloatingReviewsPanel.tsx
@@ -31,6 +31,29 @@ export function FloatingReviewsPanel({
query: {
enabled: !!(graphId && executionId),
select: okData,
+ // Poll while execution is in progress to detect status changes
+ refetchInterval: (q) => {
+ // Note: refetchInterval callback receives raw data before select transform
+ const rawData = q.state.data as
+ | { status: number; data?: { status?: string } }
+ | undefined;
+ if (rawData?.status !== 200) return false;
+
+ const status = rawData?.data?.status;
+ if (!status) return false;
+
+ // Poll every 2 seconds while running or in review
+ if (
+ status === AgentExecutionStatus.RUNNING ||
+ status === AgentExecutionStatus.QUEUED ||
+ status === AgentExecutionStatus.INCOMPLETE ||
+ status === AgentExecutionStatus.REVIEW
+ ) {
+ return 2000;
+ }
+ return false;
+ },
+ refetchIntervalInBackground: true,
},
},
);
@@ -40,28 +63,47 @@ export function FloatingReviewsPanel({
useShallow((state) => state.graphExecutionStatus),
);
+ // Determine if we should poll for pending reviews
+ const isInReviewStatus =
+ executionDetails?.status === AgentExecutionStatus.REVIEW ||
+ graphExecutionStatus === AgentExecutionStatus.REVIEW;
+
const { pendingReviews, isLoading, refetch } = usePendingReviewsForExecution(
executionId || "",
+ {
+ enabled: !!executionId,
+ // Poll every 2 seconds when in REVIEW status to catch new reviews
+ refetchInterval: isInReviewStatus ? 2000 : false,
+ },
);
+ // Refetch pending reviews when execution status changes
useEffect(() => {
- if (executionId) {
+ if (executionId && executionDetails?.status) {
refetch();
}
}, [executionDetails?.status, executionId, refetch]);
- // Refetch when graph execution status changes to REVIEW
- useEffect(() => {
- if (graphExecutionStatus === AgentExecutionStatus.REVIEW && executionId) {
- refetch();
- }
- }, [graphExecutionStatus, executionId, refetch]);
+ // Hide panel if:
+ // 1. No execution ID
+ // 2. No pending reviews and not in REVIEW status
+ // 3. Execution is RUNNING or QUEUED (hasn't paused for review yet)
+ if (!executionId) {
+ return null;
+ }
+
+ if (
+ !isLoading &&
+ pendingReviews.length === 0 &&
+ executionDetails?.status !== AgentExecutionStatus.REVIEW
+ ) {
+ return null;
+ }
+ // Don't show panel while execution is still running/queued (not paused for review)
if (
- !executionId ||
- (!isLoading &&
- pendingReviews.length === 0 &&
- executionDetails?.status !== AgentExecutionStatus.REVIEW)
+ executionDetails?.status === AgentExecutionStatus.RUNNING ||
+ executionDetails?.status === AgentExecutionStatus.QUEUED
) {
return null;
}
diff --git a/autogpt_platform/frontend/src/components/organisms/PendingReviewCard/PendingReviewCard.tsx b/autogpt_platform/frontend/src/components/organisms/PendingReviewCard/PendingReviewCard.tsx
index 3ac636060c..bd456ce771 100644
--- a/autogpt_platform/frontend/src/components/organisms/PendingReviewCard/PendingReviewCard.tsx
+++ b/autogpt_platform/frontend/src/components/organisms/PendingReviewCard/PendingReviewCard.tsx
@@ -1,10 +1,8 @@
import { PendingHumanReviewModel } from "@/app/api/__generated__/models/pendingHumanReviewModel";
import { Text } from "@/components/atoms/Text/Text";
-import { Button } from "@/components/atoms/Button/Button";
import { Input } from "@/components/atoms/Input/Input";
import { Switch } from "@/components/atoms/Switch/Switch";
-import { TrashIcon, EyeSlashIcon } from "@phosphor-icons/react";
-import { useState } from "react";
+import { useEffect, useState } from "react";
interface StructuredReviewPayload {
data: unknown;
@@ -40,37 +38,49 @@ function extractReviewData(payload: unknown): {
interface PendingReviewCardProps {
review: PendingHumanReviewModel;
onReviewDataChange: (nodeExecId: string, data: string) => void;
- reviewMessage?: string;
- onReviewMessageChange?: (nodeExecId: string, message: string) => void;
- isDisabled?: boolean;
- onToggleDisabled?: (nodeExecId: string) => void;
+ autoApproveFuture?: boolean;
+ onAutoApproveFutureChange?: (nodeExecId: string, enabled: boolean) => void;
+ externalDataValue?: string;
+ showAutoApprove?: boolean;
+ nodeId?: string;
}
export function PendingReviewCard({
review,
onReviewDataChange,
- reviewMessage = "",
- onReviewMessageChange,
- isDisabled = false,
- onToggleDisabled,
+ autoApproveFuture = false,
+ onAutoApproveFutureChange,
+ externalDataValue,
+ showAutoApprove = true,
+ nodeId,
}: PendingReviewCardProps) {
const extractedData = extractReviewData(review.payload);
const isDataEditable = review.editable;
- const instructions = extractedData.instructions || review.instructions;
+
+ let instructions = review.instructions;
+
+ const isHITLBlock = instructions && !instructions.includes("Block");
+
+ if (instructions && !isHITLBlock) {
+ instructions = undefined;
+ }
+
const [currentData, setCurrentData] = useState(extractedData.data);
+ useEffect(() => {
+ if (externalDataValue !== undefined) {
+ try {
+ const parsedData = JSON.parse(externalDataValue);
+ setCurrentData(parsedData);
+ } catch {}
+ }
+ }, [externalDataValue]);
+
const handleDataChange = (newValue: unknown) => {
setCurrentData(newValue);
onReviewDataChange(review.node_exec_id, JSON.stringify(newValue, null, 2));
};
- const handleMessageChange = (newMessage: string) => {
- onReviewMessageChange?.(review.node_exec_id, newMessage);
- };
-
- // Show simplified view when no toggle functionality is provided (Screenshot 1 mode)
- const showSimplified = !onToggleDisabled;
-
const renderDataInput = () => {
const data = currentData;
@@ -137,97 +147,59 @@ export function PendingReviewCard({
}
};
- // Helper function to get proper field label
- const getFieldLabel = (instructions?: string) => {
- if (instructions)
- return instructions.charAt(0).toUpperCase() + instructions.slice(1);
- return "Data to Review";
+ const getShortenedNodeId = (id: string) => {
+ if (id.length <= 8) return id;
+ return `${id.slice(0, 4)}...${id.slice(-4)}`;
};
- // Use the existing HITL review interface
return (
<div className="space-y-4">
- {!showSimplified && (
- <div className="flex items-start justify-between">
- <div className="flex-1">
- {isDisabled && (
- <Text variant="small" className="text-muted-foreground">
- This item will be rejected
- </Text>
- )}
- </div>
- <Button
- onClick={() => onToggleDisabled!(review.node_exec_id)}
- variant={isDisabled ? "primary" : "secondary"}
- size="small"
- leftIcon={
- isDisabled ? <EyeSlashIcon size={14} /> : <TrashIcon size={14} />
- }
- >
- {isDisabled ? "Include" : "Exclude"}
- </Button>
- </div>
+ {nodeId && (
+ <Text variant="small" className="text-gray-500">
+ Node #{getShortenedNodeId(nodeId)}
+ </Text>
)}
- {/* Show instructions as field label */}
- {instructions && (
- <div className="space-y-3">
+ <div className="space-y-3">
+ {instructions && (
<Text variant="body" className="font-semibold text-gray-900">
- {getFieldLabel(instructions)}
+ {instructions}
</Text>
- {isDataEditable && !isDisabled ? (
- renderDataInput()
- ) : (
- <div className="rounded-lg border border-gray-200 bg-white p-3">
- <Text variant="small" className="text-gray-600">
- {JSON.stringify(currentData, null, 2)}
- </Text>
- </div>
- )}
- </div>
- )}
-
- {/* If no instructions, show data directly */}
- {!instructions && (
- <div className="space-y-3">
- <Text variant="body" className="font-semibold text-gray-900">
- Data to Review
- {!isDataEditable && (
- <span className="ml-2 text-xs text-muted-foreground">
- (Read-only)
- </span>
- )}
- </Text>
- {isDataEditable && !isDisabled ? (
- renderDataInput()
- ) : (
- <div className="rounded-lg border border-gray-200 bg-white p-3">
- <Text variant="small" className="text-gray-600">
- {JSON.stringify(currentData, null, 2)}
- </Text>
- </div>
+ )}
+
+ {isDataEditable && !autoApproveFuture ? (
+ renderDataInput()
+ ) : (
+ <div className="rounded-lg border border-gray-200 bg-white p-3">
+ <Text variant="small" className="text-gray-600">
+ {JSON.stringify(currentData, null, 2)}
+ </Text>
+ </div>
+ )}
+ </div>
+
+ {/* Auto-approve toggle for this review */}
+ {showAutoApprove && onAutoApproveFutureChange && (
+ <div className="space-y-2 pt-2">
+ <div className="flex items-center gap-3">
+ <Switch
+ checked={autoApproveFuture}
+ onCheckedChange={(enabled: boolean) =>
+ onAutoApproveFutureChange(review.node_exec_id, enabled)
+ }
+ />
+ <Text variant="small" className="text-gray-700">
+ Auto-approve future executions of this block
+ </Text>
+ </div>
+ {autoApproveFuture && (
+ <Text variant="small" className="pl-11 text-gray-500">
+ Original data will be used for this and all future reviews from
+ this block.
+ </Text>
)}
</div>
)}
-
- {!showSimplified && isDisabled && (
- <div>
- <Text variant="body" className="mb-2 font-semibold">
- Rejection Reason (Optional):
- </Text>
- <Input
- id="rejection-reason"
- label="Rejection Reason"
- hideLabel
- size="small"
- type="textarea"
- rows={3}
- value={reviewMessage}
- onChange={(e) => handleMessageChange(e.target.value)}
- placeholder="Add any notes about why you're rejecting this..."
- />
- </div>
- )}
</div>
);
}
diff --git a/autogpt_platform/frontend/src/components/organisms/PendingReviewsList/PendingReviewsList.tsx b/autogpt_platform/frontend/src/components/organisms/PendingReviewsList/PendingReviewsList.tsx
index 3253b0ee6d..5adb3919b6 100644
--- a/autogpt_platform/frontend/src/components/organisms/PendingReviewsList/PendingReviewsList.tsx
+++ b/autogpt_platform/frontend/src/components/organisms/PendingReviewsList/PendingReviewsList.tsx
@@ -1,10 +1,16 @@
-import { useState } from "react";
+import { useMemo, useState } from "react";
import { PendingHumanReviewModel } from "@/app/api/__generated__/models/pendingHumanReviewModel";
import { PendingReviewCard } from "@/components/organisms/PendingReviewCard/PendingReviewCard";
import { Text } from "@/components/atoms/Text/Text";
import { Button } from "@/components/atoms/Button/Button";
+import { Switch } from "@/components/atoms/Switch/Switch";
import { useToast } from "@/components/molecules/Toast/use-toast";
-import { ClockIcon, WarningIcon } from "@phosphor-icons/react";
+import {
+ ClockIcon,
+ WarningIcon,
+ CaretDownIcon,
+ CaretRightIcon,
+} from "@phosphor-icons/react";
import { usePostV2ProcessReviewAction } from "@/app/api/__generated__/endpoints/executions/executions";
interface PendingReviewsListProps {
@@ -32,16 +38,34 @@ export function PendingReviewsList({
},
);
- const [reviewMessageMap, setReviewMessageMap] = useState<
- Record<string, string>
- >({});
-
const [pendingAction, setPendingAction] = useState<
"approve" | "reject" | null
>(null);
+ const [autoApproveFutureMap, setAutoApproveFutureMap] = useState<
+ Record<string, boolean>
+ >({});
+
+ const [collapsedGroups, setCollapsedGroups] = useState<
+ Record<string, boolean>
+ >({});
+
const { toast } = useToast();
+ const groupedReviews = useMemo(() => {
+ return reviews.reduce(
+ (acc, review) => {
+ const nodeId = review.node_id || "unknown";
+ if (!acc[nodeId]) {
+ acc[nodeId] = [];
+ }
+ acc[nodeId].push(review);
+ return acc;
+ },
+ {} as Record<string, PendingHumanReviewModel[]>,
+ );
+ }, [reviews]);
+
const reviewActionMutation = usePostV2ProcessReviewAction({
mutation: {
onSuccess: (res) => {
@@ -88,8 +112,33 @@ export function PendingReviewsList({
setReviewDataMap((prev) => ({ ...prev, [nodeExecId]: data }));
}
- function handleReviewMessageChange(nodeExecId: string, message: string) {
- setReviewMessageMap((prev) => ({ ...prev, [nodeExecId]: message }));
+ function handleAutoApproveFutureToggle(nodeId: string, enabled: boolean) {
+ setAutoApproveFutureMap((prev) => ({
+ ...prev,
+ [nodeId]: enabled,
+ }));
+
+ if (enabled) {
+ const nodeReviews = groupedReviews[nodeId] || [];
+ setReviewDataMap((prev) => {
+ const updated = { ...prev };
+ nodeReviews.forEach((review) => {
+ updated[review.node_exec_id] = JSON.stringify(
+ review.payload,
+ null,
+ 2,
+ );
+ });
+ return updated;
+ });
+ }
+ }
+
+ function toggleGroupCollapse(nodeId: string) {
+ setCollapsedGroups((prev) => ({
+ ...prev,
+ [nodeId]: !prev[nodeId],
+ }));
}
function processReviews(approved: boolean) {
@@ -107,22 +156,25 @@ export function PendingReviewsList({
for (const review of reviews) {
const reviewData = reviewDataMap[review.node_exec_id];
- const reviewMessage = reviewMessageMap[review.node_exec_id];
+ const autoApproveThisNode = autoApproveFutureMap[review.node_id || ""];
- let parsedData: any = review.payload; // Default to original payload
+ let parsedData: any = undefined;
- // Parse edited data if available and editable
- if (review.editable && reviewData) {
- try {
- parsedData = JSON.parse(reviewData);
- } catch (error) {
- toast({
- title: "Invalid JSON",
- description: `Please fix the JSON format in review for node ${review.node_exec_id}: ${error instanceof Error ? error.message : "Invalid syntax"}`,
- variant: "destructive",
- });
- setPendingAction(null);
- return;
+ if (!autoApproveThisNode) {
+ if (review.editable && reviewData) {
+ try {
+ parsedData = JSON.parse(reviewData);
+ } catch (error) {
+ toast({
+ title: "Invalid JSON",
+ description: `Please fix the JSON format in review for node ${review.node_exec_id}: ${error instanceof Error ? error.message : "Invalid syntax"}`,
+ variant: "destructive",
+ });
+ setPendingAction(null);
+ return;
+ }
+ } else {
+ parsedData = review.payload;
}
}
@@ -130,7 +182,7 @@ export function PendingReviewsList({
node_exec_id: review.node_exec_id,
approved,
reviewed_data: parsedData,
- message: reviewMessage || undefined,
+ auto_approve_future: autoApproveThisNode && approved,
});
}
@@ -158,7 +210,6 @@ export function PendingReviewsList({
return (
<div className="space-y-7 rounded-xl border border-yellow-150 bg-yellow-25 p-6">
- {/* Warning Box Header */}
<div className="space-y-6">
<div className="flex items-start gap-2">
<WarningIcon
@@ -180,23 +231,76 @@ export function PendingReviewsList({
</div>
<div className="space-y-7">
- {reviews.map((review) => (
- <PendingReviewCard
- key={review.node_exec_id}
- review={review}
- onReviewDataChange={handleReviewDataChange}
- onReviewMessageChange={handleReviewMessageChange}
- reviewMessage={reviewMessageMap[review.node_exec_id] || ""}
- />
- ))}
- </div>
+ {Object.entries(groupedReviews).map(([nodeId, nodeReviews]) => {
+ const isCollapsed = collapsedGroups[nodeId] ?? nodeReviews.length > 1;
+ const reviewCount = nodeReviews.length;
- <div className="space-y-7">
- <Text variant="body" className="text-textGrey">
- Note: Changes you make here apply only to this task
- </Text>
+ const firstReview = nodeReviews[0];
+ const blockName = firstReview?.instructions;
+ const reviewTitle = `Review required for ${blockName}`;
+
+ const getShortenedNodeId = (id: string) => {
+ if (id.length <= 8) return id;
+ return `${id.slice(0, 4)}...${id.slice(-4)}`;
+ };
+
+ return (
+ <div key={nodeId} className="space-y-4">
+ <button
+ onClick={() => toggleGroupCollapse(nodeId)}
+ className="flex w-full items-center gap-2 text-left"
+ >
+ {isCollapsed ? (
+ <CaretRightIcon size={20} className="text-gray-600" />
+ ) : (
+ <CaretDownIcon size={20} className="text-gray-600" />
+ )}
+ <div className="flex-1">
+ <Text variant="body" className="font-semibold text-gray-900">
+ {reviewTitle}
+ </Text>
+ <Text variant="small" className="text-gray-500">
+ Node #{getShortenedNodeId(nodeId)}
+ </Text>
+ </div>
+ <span className="text-xs text-gray-600">
+ {reviewCount} {reviewCount === 1 ? "review" : "reviews"}
+ </span>
+ </button>
+
+ {!isCollapsed && (
+ <div className="space-y-4">
+ {nodeReviews.map((review) => (
+ <PendingReviewCard
+ key={review.node_exec_id}
+ review={review}
+ onReviewDataChange={handleReviewDataChange}
+ autoApproveFuture={autoApproveFutureMap[nodeId] || false}
+ externalDataValue={reviewDataMap[review.node_exec_id]}
+ showAutoApprove={false}
+ />
+ ))}
- <div className="flex gap-2">
+ <div className="flex items-center gap-3 pt-2">
+ <Switch
+ checked={autoApproveFutureMap[nodeId] || false}
+ onCheckedChange={(enabled: boolean) =>
+ handleAutoApproveFutureToggle(nodeId, enabled)
+ }
+ />
+ <Text variant="small" className="text-gray-700">
+ Auto-approve future executions of this node
+ </Text>
+ </div>
+ </div>
+ )}
+ </div>
+ );
+ })}
+ </div>
+
+ <div className="space-y-4">
+ <div className="flex flex-wrap gap-2">
<Button
onClick={() => processReviews(true)}
disabled={reviewActionMutation.isPending || reviews.length === 0}
@@ -220,6 +324,11 @@ export function PendingReviewsList({
Reject
</Button>
</div>
+
+ <Text variant="small" className="text-textGrey">
+ You can turn auto-approval on or off using the toggle above for each
+ node.
+ </Text>
</div>
</div>
);
diff --git a/autogpt_platform/frontend/src/hooks/usePendingReviews.ts b/autogpt_platform/frontend/src/hooks/usePendingReviews.ts
index 8257814fcf..b9d7d711a1 100644
--- a/autogpt_platform/frontend/src/hooks/usePendingReviews.ts
+++ b/autogpt_platform/frontend/src/hooks/usePendingReviews.ts
@@ -15,8 +15,22 @@ export function usePendingReviews() {
};
}
-export function usePendingReviewsForExecution(graphExecId: string) {
- const query = useGetV2GetPendingReviewsForExecution(graphExecId);
+interface UsePendingReviewsForExecutionOptions {
+ enabled?: boolean;
+ refetchInterval?: number | false;
+}
+
+export function usePendingReviewsForExecution(
+ graphExecId: string,
+ options?: UsePendingReviewsForExecutionOptions,
+) {
+ const query = useGetV2GetPendingReviewsForExecution(graphExecId, {
+ query: {
+ enabled: options?.enabled ?? !!graphExecId,
+ refetchInterval: options?.refetchInterval,
+ refetchIntervalInBackground: !!options?.refetchInterval,
+ },
+ });
return {
pendingReviews: okData(query.data) || [],
diff --git a/autogpt_platform/frontend/src/services/storage/local-storage.ts b/autogpt_platform/frontend/src/services/storage/local-storage.ts
index 494ddc3ccc..a1aa63741a 100644
--- a/autogpt_platform/frontend/src/services/storage/local-storage.ts
+++ b/autogpt_platform/frontend/src/services/storage/local-storage.ts
@@ -10,6 +10,7 @@ export enum Key {
LIBRARY_AGENTS_CACHE = "library-agents-cache",
CHAT_SESSION_ID = "chat_session_id",
COOKIE_CONSENT = "autogpt_cookie_consent",
+ AI_AGENT_SAFETY_POPUP_SHOWN = "ai-agent-safety-popup-shown",
}
function get(key: Key) {