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 data operations and gate Run (#21363)
Sbaaoui Idriss6193ca3d961c
diff --git a/internal/agent/component/data_operations.go b/internal/agent/component/data_operations.goindex d5ff158bf3..ca57a4ec55 100644--- a/internal/agent/component/data_operations.go+++ b/internal/agent/component/data_operations.go@@ -166,6 +166,9 @@ type DataOperationsComponent struct {// NewDataOperationsComponent constructs a DataOperations from the// DSL param map.func NewDataOperationsComponent(params map[string]any) (Component, error) {+ if err := validateDataOperationsParams(componentNameDataOperations, params, false); err != nil {+ return nil, runtime.NewUserFacingError(err.Error())+ }p := &dataOperationsParam{}if err := p.Update(params); err != nil {return nil, fmt.Errorf("DataOperations: param update: %w", err)diff --git a/internal/agent/component/dynamic_params.go b/internal/agent/component/dynamic_params.goindex 33dddc5cd0..15f555ac7a 100644--- a/internal/agent/component/dynamic_params.go+++ b/internal/agent/component/dynamic_params.go@@ -15,7 +15,8 @@ func ValidateDynamicEntries(dsl map[string]any) error {return validateDynamicEntries(dsl, false)}-// ValidateDraftDynamicEntries allows unfinished Message content in saved drafts.+// ValidateDraftDynamicEntries allows unfinished Message content and+// DataOperations entries in saved drafts.// All other component checks remain the same as ValidateDynamicEntries.func ValidateDraftDynamicEntries(dsl map[string]any) error {return validateDynamicEntries(dsl, true)@@ -72,19 +73,7 @@ func validateDynamicParams(component string, params map[string]any, draft bool)return fmt.Errorf("[%s] %w", component, err)}case "dataoperations":- for _, field := range []string{"select_keys", "remove_keys"} {- if values, ok := params[field].([]any); ok && containsBlank(values) {- return fmt.Errorf("[%s] %s does not support empty entries", component, field)- }- }- for field, required := range map[string][]string{- "updates": {"key", "value"}, "rename_keys": {"old_key", "new_key"},- "filter_values": {"key", "operator", "value"},- } {- if err := validateRows(component, params, field, required); err != nil {- return err- }- }+ 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)@@ -296,3 +285,62 @@ func containsEmpty(values []any) bool {}return false}++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]+ if raw == nil {+ continue+ }+ var rows []any+ switch values := raw.(type) {+ case []any:+ rows = values+ case []string:+ for _, value := range values {+ rows = append(rows, value)+ }+ case []map[string]any:+ for _, value := range values {+ rows = append(rows, value)+ }+ default:+ return fmt.Errorf("[%s] %s must be an array", component, field)+ }+ for index, rawRow := range rows {+ if field == "select_keys" || field == "remove_keys" {+ value, ok := rawRow.(string)+ if !ok {+ return fmt.Errorf("[%s] %s[%d] must be a string", component, field, index)+ }+ if !draft && strings.TrimSpace(value) == "" {+ return fmt.Errorf("[%s] %s does not support empty entries", component, field)+ }+ continue+ }+ row, ok := rawRow.(map[string]any)+ if !ok || row == nil {+ return fmt.Errorf("[%s] %s[%d] must be an object", component, field, index)+ }+ required := []string{"key", "value"}+ if field == "rename_keys" {+ required = []string{"old_key", "new_key"}+ }+ if field == "filter_values" {+ required = []string{"key", "operator", "value"}+ }+ for _, key := range required {+ value := row[key]+ if key != "value" && value != nil {+ if _, ok := value.(string); !ok {+ return fmt.Errorf("[%s] %s[%d].%s must be a string", component, field, index, key)+ }+ }+ if !draft && (value == nil || isBlank(value)) {+ return fmt.Errorf("[%s] %s[%d] is incomplete", component, field, index)+ }+ }+ }+ }+ return nil+}diff --git a/internal/agent/component/dynamic_params_test.go b/internal/agent/component/dynamic_params_test.goindex 081193902b..413216ac3a 100644--- a/internal/agent/component/dynamic_params_test.go+++ b/internal/agent/component/dynamic_params_test.go@@ -96,9 +96,9 @@ func TestValidateDynamicEntries(t *testing.T) {for _, test := range tests {t.Run(test.name, func(t *testing.T) {draftErr := ValidateDraftDynamicEntries(dslWithComponents(test.component))- if test.component["component_name"] == "Message" {+ if test.component["component_name"] == "Message" || test.component["component_name"] == "DataOperations" {if draftErr != nil {- t.Fatalf("draft rejected Message: %v", draftErr)+ t.Fatalf("draft rejected unfinished entries: %v", draftErr)}} else if draftErr == nil || !strings.Contains(draftErr.Error(), test.want) {t.Fatalf("draft validation changed: %v, want %q", draftErr, test.want)diff --git a/web/src/locales/en.ts b/web/src/locales/en.tsindex 6c54b257e6..e09691aa1d 100644--- a/web/src/locales/en.ts+++ b/web/src/locales/en.ts@@ -2892,6 +2892,8 @@ Best for: Documents with flowing, contextually connected content — such as boo'Output the variable content of the upstream component or the text entered by yourself.',messagePlaceholder: `Please enter your message content, use '/' to quickly insert variables.`,messageMsg: 'Message cannot be empty',+ dataOperationsEntriesIncomplete:+ 'Complete all data operation entries before running',addField: 'Add option',addMessage: 'Add message',loop: 'Loop',diff --git a/web/src/pages/agent/utils/canvas-checklist.ts b/web/src/pages/agent/utils/canvas-checklist.tsindex e743950b69..db8ca3c8b9 100644--- a/web/src/pages/agent/utils/canvas-checklist.ts+++ b/web/src/pages/agent/utils/canvas-checklist.ts@@ -516,6 +516,38 @@ export function collectCanvasIssues({});}+ if (label === Operator.DataOperations) {+ const blank = (value: unknown) =>+ value == null || (typeof value === 'string' && !value.trim());+ const incompleteKeys = ['select_keys', 'remove_keys'].some(+ (field) =>+ Array.isArray(form?.[field]) &&+ form[field].some((row: any) =>+ blank(typeof row === 'string' ? row : row?.name),+ ),+ );+ const requiredFields: Record<string, string[]> = {+ updates: ['key', 'value'],+ rename_keys: ['old_key', 'new_key'],+ filter_values: ['key', 'operator', 'value'],+ };+ const incompleteRows = Object.entries(requiredFields).some(+ ([field, required]) =>+ Array.isArray(form?.[field]) &&+ form[field].some((row: any) =>+ required.some((key) => blank(row?.[key])),+ ),+ );+ if (incompleteKeys || incompleteRows) {+ issues.push({+ ...target,+ type: CanvasIssueType.MissingRequired,+ messageKey: 'flow.dataOperationsEntriesIncomplete',+ blocksRun: true,+ });+ }+ }+if (ApiKeyRequiredOperators.includes(label) && !form?.api_key) {issues.push({...target,