Skip to content

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

fix(agent): save incomplete search filters and gate Run (#21370)

Sbaaoui Idrissab3cdbd317c0
diff --git a/internal/agent/component/dynamic_params.go b/internal/agent/component/dynamic_params.go
index 5231e86598..7833486f2b 100644
--- a/internal/agent/component/dynamic_params.go
+++ b/internal/agent/component/dynamic_params.go
@@ -5,6 +5,8 @@ import (
"fmt"
"ragflow/internal/agent/runtime"
"strings"
+
+ "ragflow/internal/agent/tool"
)
// ErrCompilationTemplateRequired identifies a Compiler component without a
@@ -18,7 +20,7 @@ func ValidateDynamicEntries(dsl map[string]any) error {
// ValidateDraftDynamicEntries allows unfinished Message content, DataOperations
// entries, Invoke mappings, Compiler configuration, input options, Loop settings,
-// Iteration outputs, and SQL connections in saved drafts.
+// Iteration outputs, SQL connections, and search filters in saved drafts.
// All other checks remain unchanged.
func ValidateDraftDynamicEntries(dsl map[string]any) error {
return validateDynamicEntries(dsl, true)
@@ -50,13 +52,8 @@ func validateDynamicEntries(value any, draft bool) error {
}
func validateDynamicParams(component string, params map[string]any, draft bool) error {
- for _, field := range []string{
- "include_domains", "exclude_domains", "site_include", "site_exclude",
- "country_include", "language_include",
- } {
- if values, ok := params[field].([]any); ok && containsBlank(values) {
- return fmt.Errorf("[%s] %s does not support empty entries", component, field)
- }
+ if err := tool.ValidateSearchFilters(params, draft); err != nil {
+ return fmt.Errorf("[%s] %w", component, err)
}
// Delimiter entries are split tokens, not names: whitespace-only values
// ("\n", "\t") are valid delimiters — the chunker form's default row is a
diff --git a/internal/agent/component/registry.go b/internal/agent/component/registry.go
index 73c775b291..8bd6cf81f8 100644
--- a/internal/agent/component/registry.go
+++ b/internal/agent/component/registry.go
@@ -38,6 +38,7 @@ import (
"fmt"
"ragflow/internal/agent/runtime"
+ "ragflow/internal/agent/tool"
)
// Factory constructs a Component from a params map (loaded from the DSL).
@@ -68,6 +69,9 @@ type Factory func(params map[string]any) (Component, error)
func Register(name string, f Factory) {
if err := runtime.DefaultRegistry.Register(name, runtime.CategoryAgent,
func(_ string, params map[string]any) (runtime.Component, error) {
+ if err := tool.ValidateSearchFilters(params, false); err != nil {
+ return nil, runtime.NewUserFacingError(fmt.Sprintf("[%s] %s", name, err))
+ }
return f(params)
},
runtime.Metadata{Version: "legacy"}); err != nil {
diff --git a/internal/agent/tool/querit.go b/internal/agent/tool/querit.go
index a94d40a0ca..ca651148d4 100644
--- a/internal/agent/tool/querit.go
+++ b/internal/agent/tool/querit.go
@@ -332,6 +332,14 @@ func mergeQueritParams(defaults, runtimeParams queritParams, provided map[string
}
func validateQueritParams(params queritParams) error {
+ if err := ValidateSearchFilters(map[string]any{
+ "site_include": params.SiteInclude,
+ "site_exclude": params.SiteExclude,
+ "country_include": params.CountryInclude,
+ "language_include": params.LanguageInclude,
+ }, false); err != nil {
+ return err
+ }
if params.Count < 1 {
return fmt.Errorf("count must be at least 1")
}
diff --git a/internal/agent/tool/registry.go b/internal/agent/tool/registry.go
index 9797ba39d2..07f1d1a0d9 100644
--- a/internal/agent/tool/registry.go
+++ b/internal/agent/tool/registry.go
@@ -23,6 +23,8 @@ import (
"strconv"
"strings"
+ "ragflow/internal/agent/runtime"
+
einotool "github.com/cloudwego/eino/components/tool"
)
@@ -115,6 +117,9 @@ func BuildByName(name string, params map[string]any) (einotool.BaseTool, error)
if factory == nil {
return nil, fmt.Errorf("agent tool: nil factory for %q", name)
}
+ if err := ValidateSearchFilters(params, false); err != nil {
+ return nil, runtime.NewUserFacingError(fmt.Sprintf("agent tool %s: %s", name, err))
+ }
return factory(params)
}
diff --git a/internal/agent/tool/search_filters.go b/internal/agent/tool/search_filters.go
new file mode 100644
index 0000000000..5ac9facb64
--- /dev/null
+++ b/internal/agent/tool/search_filters.go
@@ -0,0 +1,39 @@
+package tool
+
+import (
+ "fmt"
+ "strings"
+)
+
+// ValidateSearchFilters checks filter shapes while allowing unfinished draft rows.
+func ValidateSearchFilters(params map[string]any, draft bool) error {
+ for _, field := range []string{"include_domains", "exclude_domains", "site_include", "site_exclude", "country_include", "language_include"} {
+ raw, present := params[field]
+ if !present || raw == nil {
+ continue
+ }
+ var values []string
+ switch entries := raw.(type) {
+ case []string:
+ values = entries
+ case []any:
+ for _, entry := range entries {
+ value, ok := entry.(string)
+ if !ok {
+ return fmt.Errorf("%s must contain strings", field)
+ }
+ values = append(values, value)
+ }
+ default:
+ return fmt.Errorf("%s must be an array", field)
+ }
+ if !draft {
+ for _, value := range values {
+ if strings.TrimSpace(value) == "" {
+ return fmt.Errorf("%s does not support empty entries", field)
+ }
+ }
+ }
+ }
+ return nil
+}
diff --git a/internal/agent/tool/tavily.go b/internal/agent/tool/tavily.go
index 3c11e758ff..7dc2930d87 100644
--- a/internal/agent/tool/tavily.go
+++ b/internal/agent/tool/tavily.go
@@ -303,6 +303,12 @@ func (t *TavilyTool) InvokableRun(ctx context.Context, argsJSON string, _ ...too
var provided map[string]json.RawMessage
_ = json.Unmarshal([]byte(argsJSON), &provided)
p = mergeTavilyParams(t.defaults, p, provided)
+ if err := ValidateSearchFilters(map[string]any{
+ "include_domains": p.IncludeDomains,
+ "exclude_domains": p.ExcludeDomains,
+ }, false); err != nil {
+ return tavilyErrJSON(fmt.Errorf("tavily: %w", err)), nil
+ }
apiKey := p.APIKey
if apiKey == "" {
diff --git a/web/src/pages/agent/form/querit-form/utils.ts b/web/src/pages/agent/form/querit-form/utils.ts
index a25cf4a1aa..bc11f4b093 100644
--- a/web/src/pages/agent/form/querit-form/utils.ts
+++ b/web/src/pages/agent/form/querit-form/utils.ts
@@ -23,6 +23,21 @@ export const QueritFormSchema = z.object({
language_include: dynamicStringListSchema,
});
+const draftStringListSchema = z.array(
+ z.object({
+ value: z
+ .string()
+ .transform((value) => (value.trim() ? value.trim() : value)),
+ }),
+);
+
+export const QueritDraftFormSchema = QueritFormSchema.extend({
+ site_include: draftStringListSchema,
+ site_exclude: draftStringListSchema,
+ country_include: draftStringListSchema,
+ language_include: draftStringListSchema,
+});
+
type QueritFormRecord = Record<string, any>;
function toObjectArray(values: unknown) {
@@ -60,7 +75,7 @@ export function serializeQueritFormValues(values: QueritFormRecord) {
export function validateQueritFormValuesForPersistence(
values: QueritFormRecord,
) {
- const result = QueritFormSchema.safeParse(values);
+ const result = QueritDraftFormSchema.safeParse(values);
if (!result.success) {
return undefined;
}
diff --git a/web/src/pages/agent/form/tool-form/querit-form/utils.ts b/web/src/pages/agent/form/tool-form/querit-form/utils.ts
index 29c106cf87..9913269304 100644
--- a/web/src/pages/agent/form/tool-form/querit-form/utils.ts
+++ b/web/src/pages/agent/form/tool-form/querit-form/utils.ts
@@ -1,5 +1,6 @@
import {
QueritFormSchema,
+ QueritDraftFormSchema,
deserializeQueritFormValues,
serializeQueritFormValues,
} from '../../querit-form/utils';
@@ -13,7 +14,7 @@ export function deserializeQueritAgentFormValues(values: Record<string, any>) {
export function validateQueritAgentFormValuesForPersistence(
values: Record<string, any>,
) {
- const result = QueritAgentFormSchema.safeParse(values);
+ const result = QueritDraftFormSchema.omit({ query: true }).safeParse(values);
if (!result.success) {
return undefined;
}
diff --git a/web/src/pages/agent/utils/canvas-checklist.ts b/web/src/pages/agent/utils/canvas-checklist.ts
index b4c23552a4..2e95afaad8 100644
--- a/web/src/pages/agent/utils/canvas-checklist.ts
+++ b/web/src/pages/agent/utils/canvas-checklist.ts
@@ -395,6 +395,36 @@ function findToolCanvasNode(
return toolNodeId ? nodeMap.get(toolNodeId) : undefined;
}
+function collectSearchFilterIssues(
+ params: Record<string, any> | undefined,
+ target: IssueTarget,
+): CanvasIssue[] {
+ const incomplete = [
+ 'include_domains',
+ 'exclude_domains',
+ 'site_include',
+ 'site_exclude',
+ 'country_include',
+ 'language_include',
+ ].some(
+ (field) =>
+ Array.isArray(params?.[field]) &&
+ params[field].some(
+ (value: unknown) => typeof value !== 'string' || !value.trim(),
+ ),
+ );
+ return incomplete
+ ? [
+ {
+ ...target,
+ type: CanvasIssueType.MissingRequired,
+ messageKey: 'flow.nodeFormInvalid',
+ blocksRun: true,
+ },
+ ]
+ : [];
+}
+
export function collectCanvasIssues({
nodes,
edges,
@@ -517,6 +547,8 @@ export function collectCanvasIssues({
});
}
+ issues.push(...collectSearchFilterIssues(form, target));
+
if (
label === Operator.UserFillUp &&
Object.values(form?.inputs ?? {}).some(
@@ -672,9 +704,6 @@ export function collectCanvasIssues({
const needsApiKey = ApiKeyRequiredOperators.includes(
tool?.component_name,
);
- if (!isRetrieval && !needsApiKey) {
- continue;
- }
// Point at the concrete tool under the concrete agent — the Tool
// canvas node's own name is just the operator label (legacy canvases
// even carry the raw i18n key), which says nothing about which tool
@@ -687,6 +716,7 @@ export function collectCanvasIssues({
}`,
operatorLabel: tool.component_name ?? Operator.Tool,
};
+ issues.push(...collectSearchFilterIssues(tool?.params, toolTarget));
if (isRetrieval) {
issues.push(
...collectRetrievalBindingIssues(tool?.params, toolTarget, {