Skip to content

RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.

fix(agent): save incomplete tool entries and gate Run (#21372)

Sbaaoui Idriss74cfcbf4b92b
diff --git a/internal/agent/component/agent.go b/internal/agent/component/agent.go
index 82ffbe3002..fc25c1917d 100644
--- a/internal/agent/component/agent.go
+++ b/internal/agent/component/agent.go
@@ -1851,6 +1851,9 @@ func agentParamFromMap(params map[string]any) AgentParam {
// init registers AgentComponent with the orchestrator-owned registry.
func init() {
Register("Agent", func(params map[string]any) (Component, error) {
+ if err := validateAgentToolEntries(params["tools"], false); err != nil {
+ return nil, runtime.NewUserFacingError(fmt.Sprintf("Agent: %v", err))
+ }
return NewAgentComponent(agentParamFromMap(params)), nil
})
}
diff --git a/internal/agent/component/dynamic_params.go b/internal/agent/component/dynamic_params.go
index c77c28e860..dc27d7edf4 100644
--- a/internal/agent/component/dynamic_params.go
+++ b/internal/agent/component/dynamic_params.go
@@ -21,7 +21,8 @@ func ValidateDynamicEntries(dsl map[string]any) error {
// ValidateDraftDynamicEntries allows unfinished Message content, DataOperations
// entries, Invoke mappings, Compiler configuration, input options, Loop settings,
-// Iteration outputs, SQL connections, search filters, and chunker delimiters in saved drafts.
+// Iteration outputs, SQL connections, search filters, chunker delimiters, and Agent
+// tool entries in saved drafts.
// All other checks remain unchanged.
func ValidateDraftDynamicEntries(dsl map[string]any) error {
return validateDynamicEntries(dsl, true)
@@ -70,8 +71,8 @@ func validateDynamicParams(component string, params map[string]any, draft bool)
case "dataoperations":
return validateDataOperationsParams(component, params, draft)
case "agent":
- if values, ok := params["tools"].([]any); ok && containsBlank(values) {
- return fmt.Errorf("[%s] tools does not support empty entries", component)
+ if err := validateAgentToolEntries(params["tools"], draft); err != nil {
+ return fmt.Errorf("[%s] %w", component, err)
}
case "invoke":
if err := validateInvokeVariables(component, params, draft); err != nil {
@@ -288,6 +289,39 @@ func containsBlank(values []any) bool {
return false
}
+func validateAgentToolEntries(raw any, draft bool) error {
+ if raw == nil {
+ return nil
+ }
+ var values []any
+ switch tools := raw.(type) {
+ case []any:
+ values = tools
+ case []string:
+ for _, tool := range tools {
+ values = append(values, tool)
+ }
+ default:
+ return errors.New("tools must be an array")
+ }
+ for _, raw := range values {
+ incomplete := false
+ switch tool := raw.(type) {
+ case string:
+ incomplete = strings.TrimSpace(tool) == ""
+ case map[string]any:
+ _, _, ok := agentToolObject(tool)
+ incomplete = !ok
+ default:
+ return errors.New("tools entries must be strings or objects")
+ }
+ if incomplete && !draft {
+ return errors.New("tools does not support empty entries")
+ }
+ }
+ return nil
+}
+
func validateDataOperationsParams(component string, params map[string]any, draft bool) error {
for _, field := range []string{"select_keys", "remove_keys", "updates", "rename_keys", "filter_values"} {
raw := params[field]
diff --git a/internal/agent/component/dynamic_params_test.go b/internal/agent/component/dynamic_params_test.go
index 69c15bcc8b..f6f77352f0 100644
--- a/internal/agent/component/dynamic_params_test.go
+++ b/internal/agent/component/dynamic_params_test.go
@@ -101,7 +101,7 @@ func TestValidateDynamicEntries(t *testing.T) {
case "invoke variable row not a map", "invoke variable nil row", "invoke variable with numeric key", "invoke variables not an array", "invoke variables object":
invokeDraft = false
}
- if test.component["component_name"] == "Message" || test.component["component_name"] == "DataOperations" || test.component["component_name"] == "Compiler" || test.component["component_name"] == "Loop" || test.component["component_name"] == "Iteration" || test.component["component_name"] == "TokenChunker" || invokeDraft || test.name == "input option" {
+ if test.component["component_name"] == "Message" || test.component["component_name"] == "Agent" || test.component["component_name"] == "DataOperations" || test.component["component_name"] == "Compiler" || test.component["component_name"] == "Loop" || test.component["component_name"] == "Iteration" || test.component["component_name"] == "TokenChunker" || invokeDraft || test.name == "input option" {
if draftErr != nil {
t.Fatalf("draft rejected unfinished entries: %v", draftErr)
}
diff --git a/internal/service/agent.go b/internal/service/agent.go
index 1d67c98785..20108f4b25 100644
--- a/internal/service/agent.go
+++ b/internal/service/agent.go
@@ -1330,9 +1330,6 @@ func (s *AgentService) PublishAgent(ctx context.Context, userID, canvasID string
if err := component.ValidateIntegerParameters(req.DSL); err != nil {
return nil, fmt.Errorf("publish agent %s: %w", canvasID, err)
}
- if err := component.ValidateDynamicEntries(req.DSL); err != nil {
- return nil, fmt.Errorf("publish agent %s: %w", canvasID, err)
- }
dsl = dslpkg.NormalizeForCanvas(req.DSL)
}
if req.Title != nil {
@@ -1344,6 +1341,9 @@ func (s *AgentService) PublishAgent(ctx context.Context, userID, canvasID string
}
}
+ if err := component.ValidateDynamicEntries(dsl); err != nil {
+ return nil, fmt.Errorf("publish agent %s: %w", canvasID, err)
+ }
canvasInstance.DSL = dsl
canvasInstance.Title = title
canvasInstance.Description = description
@@ -1776,6 +1776,9 @@ func (s *AgentService) RunAgent(ctx context.Context, userID, canvasID, sessionID
if err := validateAgentChatModels(ctx, userID, agentTenantID, dsl); err != nil {
return nil, err
}
+ if err := component.ValidateDynamicEntries(dsl); err != nil {
+ return nil, fmt.Errorf("RunAgent: %w", err)
+ }
// A trusted boundary may allocate the session id before calling RunAgent so
// the effective id is available even when the run emits no events.
if !sessionFound || newSession {
@@ -2004,6 +2007,9 @@ func (s *AgentService) buildRunFunc(canvasID string, versionRow *entity.UserCanv
if err := ctx.Err(); err != nil {
return nil, err
}
+ if err := component.ValidateDynamicEntries(dsl); err != nil {
+ return nil, runtime.NewUserFacingError(err.Error())
+ }
// Install a per-run token usage sink so every LLM call inside
// this turn records its token usage (the sink is read at the end
diff --git a/internal/service/agent_sessions.go b/internal/service/agent_sessions.go
index 7a9abe9904..6b1ef11b14 100644
--- a/internal/service/agent_sessions.go
+++ b/internal/service/agent_sessions.go
@@ -27,6 +27,7 @@ import (
"strings"
"time"
+ "ragflow/internal/agent/component"
"ragflow/internal/common"
"ragflow/internal/dao"
"ragflow/internal/entity"
@@ -700,6 +701,9 @@ func (s *AgentService) CreateAgentSession(ctx context.Context, req *CreateAgentS
}
return nil, common.CodeDataError, err
}
+ if err := component.ValidateDynamicEntries(dsl); err != nil {
+ return nil, common.CodeDataError, err
+ }
// Resolve the latest version title so the session records which version it
// belongs to. GetLatest mirrors the RunAgent path and Python's
diff --git a/web/src/locales/en.ts b/web/src/locales/en.ts
index 55d0036736..cc36818398 100644
--- a/web/src/locales/en.ts
+++ b/web/src/locales/en.ts
@@ -3597,6 +3597,7 @@ This process aggregates variables from multiple branches into a single variable
nodeFormInvalid: 'Invalid settings, please fix them first',
apiKeyRequired: 'Please enter the API Key',
apiKeyMissing: 'No API key configured, please enter one first',
+ agentToolsMissing: 'Agent tools contain an empty entry',
agentModelMissing: 'No model selected, please choose one first',
extractorModelMissing: 'No model selected, please choose one first',
extractorKeywordsTopNMissing:
diff --git a/web/src/pages/agent/utils/canvas-checklist.ts b/web/src/pages/agent/utils/canvas-checklist.ts
index 5b2ed0fd31..d287a27707 100644
--- a/web/src/pages/agent/utils/canvas-checklist.ts
+++ b/web/src/pages/agent/utils/canvas-checklist.ts
@@ -709,6 +709,14 @@ export function collectCanvasIssues({
}
if (label === Operator.Agent) {
+ if (hasIncompleteAgentTools(form?.tools)) {
+ issues.push({
+ ...target,
+ type: CanvasIssueType.MissingRequired,
+ messageKey: 'flow.agentToolsMissing',
+ blocksRun: true,
+ });
+ }
// Not gated on editedNodeFormIds: a canvas loaded from storage with an
// empty model must flag on the very next render, not only after edits.
if (!form?.llm_id) {
@@ -886,3 +894,19 @@ export function collectCanvasIssues({
return issues;
}
+
+function hasIncompleteAgentTools(tools: unknown): boolean {
+ if (!Array.isArray(tools)) return tools != null;
+ return tools.some((tool) => {
+ if (typeof tool === 'string') return !tool.trim();
+ if (!tool || typeof tool !== 'object') return true;
+ const name = [tool.component_name, tool.tool_name, tool.name].find(
+ (value) => typeof value === 'string' && value.trim(),
+ );
+ return (
+ !name ||
+ (name.toLowerCase() === 'agent' &&
+ hasIncompleteAgentTools(tool.params?.tools))
+ );
+ });
+}