Skip to content

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

fix(agent): flatten scalar-list values in DataOperations combine (#19111)

WOLIKIMCHENG440c2c646bab
diff --git a/internal/agent/component/data_operations.go b/internal/agent/component/data_operations.go
index 12c35344c7..e5c2679dbf 100644
--- a/internal/agent/component/data_operations.go
+++ b/internal/agent/component/data_operations.go
@@ -397,7 +397,7 @@ func (d *DataOperationsComponent) opCombine(items []map[string]any) map[string]a
}
default:
if vl, ok := v.([]any); ok {
- out[k] = []any{ex, vl}
+ out[k] = append([]any{ex}, vl...)
} else {
out[k] = []any{ex, v}
}
diff --git a/internal/agent/component/data_operations_test.go b/internal/agent/component/data_operations_test.go
index b10a5e9052..230103793c 100644
--- a/internal/agent/component/data_operations_test.go
+++ b/internal/agent/component/data_operations_test.go
@@ -87,16 +87,25 @@ func TestDataOperations_SelectKeys(t *testing.T) {
}
}
-// TestDataOperations_Combine: merge 2 dicts; key conflict on "k":
-// first=[1], second=[2,3] → result has "k"=[1,2,3].
+// TestDataOperations_Combine merges duplicate keys for every scalar/list shape.
func TestDataOperations_Combine(t *testing.T) {
c, _ := NewDataOperationsComponent(map[string]any{
"query": []string{"cpn_0@d1", "cpn_1@d2"},
"operations": "combine",
})
state := canvas.NewCanvasState("run-2", "task-2")
- state.Outputs["cpn_0"] = map[string]any{"d1": map[string]any{"k": []any{1}}}
- state.Outputs["cpn_1"] = map[string]any{"d2": map[string]any{"k": []any{2, 3}}}
+ state.Outputs["cpn_0"] = map[string]any{"d1": map[string]any{
+ "scalar_list": 1,
+ "scalar_scalar": "a",
+ "list_list": []any{2},
+ "list_scalar": []any{4},
+ }}
+ state.Outputs["cpn_1"] = map[string]any{"d2": map[string]any{
+ "scalar_list": []any{2, 3},
+ "scalar_scalar": "b",
+ "list_list": []any{3, 4},
+ "list_scalar": 5,
+ }}
ctx := canvas.WithState(t.Context(), state)
out, err := c.Invoke(ctx, nil, nil)
@@ -107,8 +116,15 @@ func TestDataOperations_Combine(t *testing.T) {
if merged == nil {
t.Fatalf("expected map result, got %T", out["result"])
}
- if got, want := merged["k"], []any{1, 2, 3}; !reflect.DeepEqual(got, want) {
- t.Errorf("k: got %v, want %v", got, want)
+ for key, want := range map[string][]any{
+ "scalar_list": {1, 2, 3},
+ "scalar_scalar": {"a", "b"},
+ "list_list": {2, 3, 4},
+ "list_scalar": {4, 5},
+ } {
+ if got := merged[key]; !reflect.DeepEqual(got, want) {
+ t.Errorf("%s: got %v, want %v", key, got, want)
+ }
}
}