Merge branch 'feat/support-agent-sandbox' into sandboxed-agent-rebase

api/dify_graph/nodes/agent/agent_node.py

@@ -4,7 +4,6 @@ import json
 from collections.abc import Generator, Mapping, Sequence
 from typing import TYPE_CHECKING, Any, cast
 
-from dify_graph.nodes.agent.entities import AgentNodeData, AgentOldVersionModelFeatures, ParamsAutoGenerated
 from packaging.version import Version
 from pydantic import ValidationError
 from sqlalchemy import select
@@ -26,6 +25,16 @@ from core.tools.entities.tool_entities import (
 )
 from core.tools.tool_manager import ToolManager
 from core.tools.utils.message_transformer import ToolFileMessageTransformer
+from core.workflow.nodes.agent.entities import AgentNodeData, AgentOldVersionModelFeatures, ParamsAutoGenerated
+from core.workflow.nodes.agent.exceptions import (
+    AgentInputTypeError,
+    AgentInvocationError,
+    AgentMessageTransformError,
+    AgentNodeError,
+    AgentVariableNotFoundError,
+    AgentVariableTypeError,
+    ToolFileNotFoundError,
+)
 from dify_graph.enums import (
     NodeType,
     SystemVariableKey,
@@ -60,16 +69,6 @@ from models import ToolFile
 from models.model import Conversation
 from services.tools.builtin_tools_manage_service import BuiltinToolManageService
 
-from .exc import (
-    AgentInputTypeError,
-    AgentInvocationError,
-    AgentMessageTransformError,
-    AgentNodeError,
-    AgentVariableNotFoundError,
-    AgentVariableTypeError,
-    ToolFileNotFoundError,
-)
-
 if TYPE_CHECKING:
     from core.agent.strategy.plugin import PluginAgentStrategy
     from core.plugin.entities.request import InvokeCredentials
@@ -387,10 +386,9 @@ class AgentNode(Node[AgentNodeData]):
         *,
         graph_config: Mapping[str, Any],
         node_id: str,
-        node_data: Mapping[str, Any],
+        node_data: AgentNodeData,
     ) -> Mapping[str, Sequence[str]]:
-        # Create typed NodeData from dict
-        typed_node_data = AgentNodeData.model_validate(node_data)
+        typed_node_data = node_data
 
         result: dict[str, Any] = {}
         for parameter_name in typed_node_data.agent_parameters: