RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
fix(agent): save incomplete Loop settings and gate Run (#21367)
Sbaaoui Idriss68bb332f9e34
diff --git a/internal/agent/canvas/loop_subgraph.go b/internal/agent/canvas/loop_subgraph.goindex d74762fcf8..36c3a717cd 100644--- a/internal/agent/canvas/loop_subgraph.go+++ b/internal/agent/canvas/loop_subgraph.go@@ -86,6 +86,10 @@ func buildLoopExpansion(ctx context.Context, c *Canvas, loopID string) (*loopExp}loopComp := c.Components[loopID]+ // Loop expansion bypasses normal node construction; validate its params here.+ if _, err := buildNodeBody(ctx, loopID, "Loop", "", loopComp.Obj.Params); err != nil {+ return nil, fmt.Errorf("agent: loop %q: %w", loopID, err)+ }members := collectLoopMembers(c, loopID)diff --git a/internal/agent/component/dynamic_params.go b/internal/agent/component/dynamic_params.goindex 74ba9079a1..736d8e0c06 100644--- a/internal/agent/component/dynamic_params.go+++ b/internal/agent/component/dynamic_params.go@@ -17,7 +17,8 @@ func ValidateDynamicEntries(dsl map[string]any) error {}// ValidateDraftDynamicEntries allows unfinished Message content, DataOperations-// entries, Invoke mappings, Compiler configuration, and input options in saved drafts.+// entries, Invoke mappings, Compiler configuration, input options, and Loop settings+// in saved drafts.// All other checks remain unchanged.func ValidateDraftDynamicEntries(dsl map[string]any) error {return validateDynamicEntries(dsl, true)@@ -84,11 +85,28 @@ func validateDynamicParams(component string, params map[string]any, draft bool)return err}case "loop":- if err := validateRows(component, params, "loop_variables", []string{"variable"}); err != nil {- return err- }- if err := validateRows(component, params, "loop_termination_condition", []string{"variable", "operator", "value"}); err != nil {- return err+ for field, required := range map[string][]string{+ "loop_variables": {"variable"}, "loop_termination_condition": {"variable", "operator", "value"},+ } {+ raw := params[field]+ if raw == nil {+ continue+ }+ rows, ok := raw.([]any)+ if !ok {+ return fmt.Errorf("[%s] %s must be an array", component, field)+ }+ for i, raw := range rows {+ row, ok := raw.(map[string]any)+ if !ok || row == nil {+ return fmt.Errorf("[%s] %s[%d] must be an object", component, field, i)+ }+ for _, key := range required {+ if !draft && (row[key] == nil || isBlank(row[key])) {+ return fmt.Errorf("[%s] %s[%d] is incomplete", component, field, i)+ }+ }+ }}case "iteration":return validateIterationOutputs(component, params)diff --git a/internal/agent/component/dynamic_params_test.go b/internal/agent/component/dynamic_params_test.goindex 9399d1ec7d..d953fa3c79 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" || invokeDraft || test.name == "input option" {+ if test.component["component_name"] == "Message" || test.component["component_name"] == "DataOperations" || test.component["component_name"] == "Compiler" || test.component["component_name"] == "Loop" || invokeDraft || test.name == "input option" {if draftErr != nil {t.Fatalf("draft rejected unfinished entries: %v", draftErr)}diff --git a/internal/agent/component/loop.go b/internal/agent/component/loop.goindex d6bc771a06..54199d9569 100644--- a/internal/agent/component/loop.go+++ b/internal/agent/component/loop.go@@ -47,6 +47,8 @@ package componentimport ("context"+ "ragflow/internal/agent/runtime"+"gorm.io/gorm")@@ -216,6 +218,9 @@ func toAnyMapSlice(raw any) []map[string]any {// when it sees a Loop cpn in the DSL.func init() {Register(componentNameLoop, func(params map[string]any) (Component, error) {+ if err := validateDynamicParams(componentNameLoop, params, false); err != nil {+ return nil, runtime.NewUserFacingError(err.Error())+ }var p loopParamif err := p.Update(params); err != nil {return nil, errdiff --git a/internal/agent/dsl/testdata/all.json b/internal/agent/dsl/testdata/all.jsonindex 7835ee82e3..68a943e55d 100644--- a/internal/agent/dsl/testdata/all.json+++ b/internal/agent/dsl/testdata/all.json@@ -236,7 +236,7 @@"input_mode": "constant","type": "string","value": "",- "variable": ""+ "variable": "loop_input"}],"maximum_loop_count": 50,@@ -2290,7 +2290,7 @@"input_mode": "constant","type": "string","value": "",- "variable": ""+ "variable": "loop_input"}],"maximum_loop_count": 50,@@ -3848,4 +3848,4 @@"value": 0}}-}\ No newline at end of file+}diff --git a/web/src/locales/en.ts b/web/src/locales/en.tsindex 3728deba24..4be62d2d69 100644--- a/web/src/locales/en.ts+++ b/web/src/locales/en.ts@@ -3614,6 +3614,8 @@ This process aggregates variables from multiple branches into a single variablechecklist: 'Checklist',checklistEmpty: 'No issues found',checklistTitle: 'The following issues may affect running or publishing',+ loopRowsIncomplete:+ 'Complete the loop variables and termination conditions',issueNotConnected: 'This step is not connected to anything',issueVariableInvalid: 'Invalid variable: {{variable}}',memoryUnavailable:diff --git a/web/src/locales/zh.ts b/web/src/locales/zh.tsindex dc681f55f8..28c26d0b0d 100644--- a/web/src/locales/zh.ts+++ b/web/src/locales/zh.ts@@ -3130,6 +3130,7 @@ NER:使用 spaCy NER 和基于规则的关键词提取来抽取 Entities 和 Rchecklist: '检查清单',checklistEmpty: '未发现问题',checklistTitle: '以下问题可能影响运行或发布',+ loopRowsIncomplete: '请完善循环变量和终止条件',issueNotConnected: '该步骤未与任何算子连接',issueVariableInvalid: '变量失效:{{variable}}',memoryUnavailable: '所选记忆不可用(已删除),请重新选择',diff --git a/web/src/pages/agent/utils/canvas-checklist.ts b/web/src/pages/agent/utils/canvas-checklist.tsindex 9bca9cf434..0203ddf9db 100644--- a/web/src/pages/agent/utils/canvas-checklist.ts+++ b/web/src/pages/agent/utils/canvas-checklist.ts@@ -587,6 +587,27 @@ export function collectCanvasIssues({}}+ if (+ label === Operator.Loop &&+ (form?.loop_variables?.some(+ (row: Record<string, any>) => !row?.variable?.trim(),+ ) ||+ form?.loop_termination_condition?.some(+ (row: Record<string, any>) =>+ !row?.variable?.trim() ||+ !row?.operator?.trim() ||+ row.value == null ||+ (typeof row.value === 'string' && !row.value.trim()),+ ))+ ) {+ issues.push({+ ...target,+ type: CanvasIssueType.MissingRequired,+ messageKey: 'flow.loopRowsIncomplete',+ blocksRun: true,+ });+ }+if (ApiKeyRequiredOperators.includes(label) && !form?.api_key) {issues.push({...target,