Skip to content

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

fix error where returns a no dataset found error in a 500 wrapper (#19059)

Sbaaoui Idriss01cf9c428a45
diff --git a/internal/agent/component/agent.go b/internal/agent/component/agent.go
index 1285fe47bc..b65bb2f06c 100644
--- a/internal/agent/component/agent.go
+++ b/internal/agent/component/agent.go
@@ -855,6 +855,9 @@ func (c *AgentComponent) invokeNow(ctx context.Context, db *gorm.DB, inputs map[
var state *runtime.CanvasState
if s, _, err := runtime.GetStateFromContext[*runtime.CanvasState](ctx); err == nil && s != nil {
state = s
+ 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 {
p.SystemPrompt = resolved
if rerr != nil {
diff --git a/internal/agent/component/universe_a_wrappers.go b/internal/agent/component/universe_a_wrappers.go
index e5e77f76eb..bdfc87d12c 100644
--- a/internal/agent/component/universe_a_wrappers.go
+++ b/internal/agent/component/universe_a_wrappers.go
@@ -192,6 +192,25 @@ func (c *retrievalComponent) Outputs() map[string]string {
func (c *retrievalComponent) Invoke(ctx context.Context, db *gorm.DB, inputs map[string]any) (map[string]any, error) {
merged := c.applyDefaults(inputs)
normalizeLegacyRetrievalInputs(ctx, db, merged)
+ query, _ := merged["query"].(string)
+ if state, _, err := runtime.GetStateFromContext[*runtime.CanvasState](ctx); err == nil && state != nil {
+ if resolved, err := runtime.ResolveTemplateAuto(query, state); err == nil {
+ query = resolved
+ }
+ }
+ if query != "" && merged["retrieval_from"] == "dataset" {
+ rawIDs, present := merged["dataset_ids"]
+ emptySelection := !present || rawIDs == nil
+ switch ids := rawIDs.(type) {
+ case []string:
+ emptySelection = len(ids) == 0
+ case []any:
+ emptySelection = len(ids) == 0
+ }
+ if emptySelection {
+ return map[string]any{"_ERROR": "No dataset is selected."}, nil
+ }
+ }
common.Debug("agent retrieval component: invoke",
zap.Any("inputs", inputs),
zap.Any("merged", merged),