Skip to content

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

fix(agent): surface invalid variables and deduplicate errors (#19919)

Sbaaoui Idriss2d6d18d697d1
diff --git a/internal/agent/component/agent.go b/internal/agent/component/agent.go
index 2e650569b5..bdcde1c718 100644
--- a/internal/agent/component/agent.go
+++ b/internal/agent/component/agent.go
@@ -885,17 +885,15 @@ func (c *AgentComponent) invokeNow(ctx context.Context, db *gorm.DB, inputs map[
if inputs["_ERROR"] == "No dataset is selected." {
return map[string]any{"content": "No dataset is selected."}, nil
}
- if resolved, rerr := runtime.ResolveTemplate(p.SystemPrompt, state); resolved != p.SystemPrompt || rerr == nil {
+ if resolved, rerr := runtime.ResolveTemplate(p.SystemPrompt, state); rerr != nil {
+ return nil, rerr
+ } else {
p.SystemPrompt = resolved
- if rerr != nil {
- common.Debug("agent: resolve system_prompt", zap.Error(rerr))
- }
}
- if resolved, rerr := runtime.ResolveTemplate(p.UserPrompt, state); resolved != p.UserPrompt || rerr == nil {
+ if resolved, rerr := runtime.ResolveTemplate(p.UserPrompt, state); rerr != nil {
+ return nil, rerr
+ } else {
p.UserPrompt = resolved
- if rerr != nil {
- common.Debug("agent: resolve user_prompt", zap.Error(rerr))
- }
}
}
if state != nil {
diff --git a/internal/agent/component/agent_test.go b/internal/agent/component/agent_test.go
index d4633db4ff..e092d32146 100644
--- a/internal/agent/component/agent_test.go
+++ b/internal/agent/component/agent_test.go
@@ -585,6 +585,52 @@ func TestAgent_ResolvesUserPromptFromCanvasState(t *testing.T) {
}
}
+func TestAgent_RejectsUnresolvedPromptReferences(t *testing.T) {
+ tests := []string{"missing@value", "sys.missing", "env.missing", "item", "index"}
+ for _, ref := range tests {
+ t.Run(ref, func(t *testing.T) {
+ called := false
+ withAgentRunner(t, func(_ context.Context, _ AgentParam) (*schema.Message, error) {
+ called = true
+ return &schema.Message{Role: schema.Assistant, Content: "unexpected"}, nil
+ })
+
+ state := runtime.NewCanvasState("run-1", "task-1")
+ ctx := runtime.WithState(t.Context(), state)
+ c := NewAgentComponent(AgentParam{ModelID: "stub", UserPrompt: "value {{" + ref + "}}"})
+ _, err := c.Invoke(ctx, nil, nil)
+ if err == nil || err.Error() != "Can't find variable: '"+ref+"'" {
+ t.Fatalf("Invoke error = %v, want missing-variable error", err)
+ }
+ if called {
+ t.Fatal("agent runner called after prompt resolution failed")
+ }
+ })
+ }
+}
+
+func TestAgent_AllowsEmptyPromptReferenceValues(t *testing.T) {
+ withAgentRunner(t, func(_ context.Context, p AgentParam) (*schema.Message, error) {
+ if p.UserPrompt != "value " {
+ return nil, fmt.Errorf("resolved prompt = %q, want %q", p.UserPrompt, "value ")
+ }
+ return &schema.Message{Role: schema.Assistant, Content: "ok"}, nil
+ })
+
+ state := runtime.NewCanvasState("run-1", "task-1")
+ state.SetVar("component", "value", "")
+ state.Sys["empty"] = ""
+ state.Env["empty"] = ""
+ state.Globals["__item__"] = ""
+ state.Globals["__index__"] = ""
+ for _, ref := range []string{"component@value", "sys.empty", "env.empty", "item", "index"} {
+ c := NewAgentComponent(AgentParam{ModelID: "stub", UserPrompt: "value {{" + ref + "}}"})
+ if _, err := c.Invoke(runtime.WithState(t.Context(), state), nil, nil); err != nil {
+ t.Fatalf("Invoke(%q): %v", ref, err)
+ }
+ }
+}
+
func TestAgent_UsesPromptsListForSysQuery(t *testing.T) {
var gotPrompt string
withAgentRunner(t, func(_ context.Context, p AgentParam) (*schema.Message, error) {
diff --git a/web/src/pages/agent/chat/use-send-agent-message.ts b/web/src/pages/agent/chat/use-send-agent-message.ts
index a2e3ad90a3..8b52023127 100644
--- a/web/src/pages/agent/chat/use-send-agent-message.ts
+++ b/web/src/pages/agent/chat/use-send-agent-message.ts
@@ -389,7 +389,12 @@ export const useSendAgentMessage = ({
clearUploadResponseList();
if (receiveMessageError(res)) {
- sonnerMessage.error(res?.data?.message);
+ // useSendMessageBySSE already reports application errors from
+ // streamed code != 0 frames. Only HTTP failures need a second
+ // layer's notification because the SSE hook cannot parse them.
+ if (res?.response?.status !== 200) {
+ sonnerMessage.error(res?.data?.message);
+ }
// cancel loading
setValue(message.content);