Skip to content

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

fix(memory): stabilize filter option ordering (#19925)

Sbaaoui Idriss408d1f289796
diff --git a/internal/service/memory.go b/internal/service/memory.go
index 0a6178c0d3..0154c633be 100644
--- a/internal/service/memory.go
+++ b/internal/service/memory.go
@@ -17,6 +17,7 @@
package service
import (
+ "cmp"
"context"
"errors"
"fmt"
@@ -25,6 +26,7 @@ import (
"ragflow/internal/entity"
models "ragflow/internal/entity/models"
"ragflow/internal/utility"
+ "slices"
"strconv"
"strings"
"time"
@@ -410,12 +412,19 @@ func (s *MemoryService) ListMemoryFilters(ctx context.Context, userID string) (*
for id, count := range ownerCounts {
resp.Filter.Owner = append(resp.Filter.Owner, MemoryFilterOption{ID: id, Label: ownerLabels[id], Count: count})
}
- for id, count := range typeCounts {
- resp.Filter.MemoryType = append(resp.Filter.MemoryType, MemoryFilterOption{ID: id, Label: id, Count: count})
+ for _, id := range []string{"raw", "semantic", "episodic", "procedural"} {
+ if count := typeCounts[id]; count > 0 {
+ resp.Filter.MemoryType = append(resp.Filter.MemoryType, MemoryFilterOption{ID: id, Label: id, Count: count})
+ }
}
- for id, count := range storageCounts {
- resp.Filter.StorageType = append(resp.Filter.StorageType, MemoryFilterOption{ID: id, Label: id, Count: count})
+ for _, id := range []string{"table", "graph"} {
+ if count := storageCounts[id]; count > 0 {
+ resp.Filter.StorageType = append(resp.Filter.StorageType, MemoryFilterOption{ID: id, Label: id, Count: count})
+ }
}
+ slices.SortFunc(resp.Filter.Owner, func(a, b MemoryFilterOption) int {
+ return cmp.Or(cmp.Compare(strings.ToLower(a.Label), strings.ToLower(b.Label)), cmp.Compare(a.ID, b.ID))
+ })
resp.Total = int64(len(memories))
return resp, nil
}
diff --git a/internal/service/memory_message_test.go b/internal/service/memory_message_test.go
index cb59378fec..0b885c8acc 100644
--- a/internal/service/memory_message_test.go
+++ b/internal/service/memory_message_test.go
@@ -191,12 +191,22 @@ func setupMemoryMessageTestDB(t *testing.T) {
func TestListMemoryFiltersUsesAccessibleMemoryAggregates(t *testing.T) {
setupMemoryMessageTestDB(t)
- if err := dao.DB.Create(&entity.User{ID: "user-1", Nickname: "Owner"}).Error; err != nil {
+ if err := dao.DB.Create(&[]*entity.User{
+ {ID: "user-1", Nickname: "Owner"},
+ {ID: "user-2", Nickname: "Alpha"},
+ }).Error; err != nil {
t.Fatalf("seed user: %v", err)
}
+ status := "1"
+ if err := dao.DB.Create(&entity.UserTenant{
+ ID: "ut-1", UserID: "user-1", TenantID: "user-2", Role: "normal", InvitedBy: "user-2", Status: &status,
+ }).Error; err != nil {
+ t.Fatalf("seed user tenant: %v", err)
+ }
for _, memory := range []*entity.Memory{
- {ID: "mem-1", Name: "one", TenantID: "user-1", MemoryType: dao.MemoryTypeRaw | dao.MemoryTypeSemantic, StorageType: "table", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionMe), ForgettingPolicy: string(ForgettingPolicyFIFO)},
+ {ID: "mem-1", Name: "one", TenantID: "user-1", MemoryType: dao.MemoryTypeRaw | dao.MemoryTypeSemantic | dao.MemoryTypeEpisodic | dao.MemoryTypeProcedural, StorageType: "table", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionMe), ForgettingPolicy: string(ForgettingPolicyFIFO)},
{ID: "mem-2", Name: "two", TenantID: "user-1", MemoryType: dao.MemoryTypeRaw, StorageType: "graph", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionMe), ForgettingPolicy: string(ForgettingPolicyFIFO)},
+ {ID: "mem-3", Name: "three", TenantID: "user-2", MemoryType: dao.MemoryTypeSemantic, StorageType: "table", EmbdID: "embd", LLMID: "llm", Permissions: string(entity.TenantPermissionTeam), ForgettingPolicy: string(ForgettingPolicyFIFO)},
} {
if err := dao.DB.Create(memory).Error; err != nil {
t.Fatalf("seed memory: %v", err)
@@ -207,14 +217,36 @@ func TestListMemoryFiltersUsesAccessibleMemoryAggregates(t *testing.T) {
if err != nil {
t.Fatalf("ListMemoryFilters: %v", err)
}
- if filters.Total != 2 || len(filters.Filter.Owner) != 1 {
+ if filters.Total != 3 {
t.Fatalf("unexpected owner aggregate: %+v", filters)
}
- if filters.Filter.Owner[0].Label != "Owner" || filters.Filter.Owner[0].Count != 2 {
- t.Fatalf("owner filter = %+v", filters.Filter.Owner)
+ if got, want := filters.Filter.Owner, []MemoryFilterOption{
+ {ID: "user-2", Label: "Alpha", Count: 1},
+ {ID: "user-1", Label: "Owner", Count: 2},
+ }; !reflect.DeepEqual(got, want) {
+ t.Fatalf("owner filter = %+v, want %+v", got, want)
+ }
+ if got, want := filters.Filter.MemoryType, []MemoryFilterOption{
+ {ID: "raw", Label: "raw", Count: 2},
+ {ID: "semantic", Label: "semantic", Count: 2},
+ {ID: "episodic", Label: "episodic", Count: 1},
+ {ID: "procedural", Label: "procedural", Count: 1},
+ }; !reflect.DeepEqual(got, want) {
+ t.Fatalf("memory type filter = %+v, want %+v", got, want)
+ }
+ if got, want := filters.Filter.StorageType, []MemoryFilterOption{
+ {ID: "table", Label: "table", Count: 2},
+ {ID: "graph", Label: "graph", Count: 1},
+ }; !reflect.DeepEqual(got, want) {
+ t.Fatalf("storage type filter = %+v, want %+v", got, want)
+ }
+
+ refreshed, err := NewMemoryService().ListMemoryFilters(t.Context(), "user-1")
+ if err != nil {
+ t.Fatalf("ListMemoryFilters refresh: %v", err)
}
- if len(filters.Filter.MemoryType) != 2 || len(filters.Filter.StorageType) != 2 {
- t.Fatalf("unexpected type/storage filters: %+v", filters)
+ if !reflect.DeepEqual(refreshed, filters) {
+ t.Fatalf("refreshed filters = %+v, want %+v", refreshed, filters)
}
}