RAGFlow is an agent-native database: a Retrieval-Augmented Generation (RAG) engine that grew into context infrastructure.
Go agent-harnessagent-native-databaseagentic-aiagentic-retrievalagentic-searchaiai-agentscontext-enginecontext-engineeringcontext-managementharness-engineeringknowledge-compilationragretrieval-augmented-generationretrieval-harnesssearch-harness
Fix: keep all user agent versions (#21343)
Wang Qia8d39e1fd198
diff --git a/internal/dao/user_canvas_version.go b/internal/dao/user_canvas_version.goindex 8715bf793f..ec2717488d 100644--- a/internal/dao/user_canvas_version.go+++ b/internal/dao/user_canvas_version.go@@ -36,14 +36,13 @@ type UserCanvasVersionDAO struct{}// SaveOrReplaceLatestVersionOptions controls a version-history save.type SaveOrReplaceLatestVersionOptions struct {- NewID string- UserCanvasID string- Title *string- Description *string- DSL entity.JSONMap- Release bool- KeepUnpublished int- SameDSL func(entity.JSONMap) bool+ NewID string+ UserCanvasID string+ Title *string+ Description *string+ DSL entity.JSONMap+ Release bool+ SameDSL func(entity.JSONMap) bool}// NewUserCanvasVersionDAO returns a zero-value DAO. The struct is stateless@@ -160,9 +159,6 @@ func (dao *UserCanvasVersionDAO) CreateTx(ctx context.Context, tx *gorm.DB, v *e// SaveOrReplaceLatestTx inserts or refreshes a version using the caller's// transaction.func (dao *UserCanvasVersionDAO) SaveOrReplaceLatestTx(ctx context.Context, tx *gorm.DB, opts SaveOrReplaceLatestVersionOptions) (*entity.UserCanvasVersion, error) {- if opts.KeepUnpublished <= 0 {- opts.KeepUnpublished = 20- }var parent struct {ID string}@@ -207,7 +203,7 @@ func (dao *UserCanvasVersionDAO) SaveOrReplaceLatestTx(ctx context.Context, tx *if opts.Description != nil {latest.Description = opts.Description}- return &latest, dao.deleteAllUnpublishedExcessTx(ctx, tx, opts.UserCanvasID, opts.KeepUnpublished)+ return &latest, nil}}row := &entity.UserCanvasVersion{@@ -221,7 +217,7 @@ func (dao *UserCanvasVersionDAO) SaveOrReplaceLatestTx(ctx context.Context, tx *if err = tx.WithContext(ctx).Create(row).Error; err != nil {return nil, err}- return row, dao.deleteAllUnpublishedExcessTx(ctx, tx, opts.UserCanvasID, opts.KeepUnpublished)+ return row, nil}func (opts SaveOrReplaceLatestVersionOptions) sameDSL(dsl entity.JSONMap) bool {@@ -230,21 +226,3 @@ func (opts SaveOrReplaceLatestVersionOptions) sameDSL(dsl entity.JSONMap) bool {}return reflect.DeepEqual(dsl, opts.DSL)}--func (dao *UserCanvasVersionDAO) deleteAllUnpublishedExcessTx(ctx context.Context, tx *gorm.DB, canvasID string, keep int) error {- if keep < 0 {- keep = 0- }- var ids []string- if err := tx.WithContext(ctx).Model(&entity.UserCanvasVersion{}).- Where(map[string]interface{}{"user_canvas_id": canvasID, "release": false}).- Order("create_time DESC").- Pluck("id", &ids).Error; err != nil {- return err- }- if len(ids) <= keep {- return nil- }- ids = ids[keep:]- return tx.WithContext(ctx).Where("id IN ?", ids).Delete(&entity.UserCanvasVersion{}).Error-}diff --git a/internal/dao/user_canvas_version_test.go b/internal/dao/user_canvas_version_test.goindex f956389231..a36b799904 100644--- a/internal/dao/user_canvas_version_test.go+++ b/internal/dao/user_canvas_version_test.go@@ -19,6 +19,7 @@ package daoimport ("context""errors"+ "fmt""testing""ragflow/internal/entity"@@ -85,3 +86,60 @@ func TestUserCanvasVersionDAO_InterfaceSatisfied(t *testing.T) {d := NewUserCanvasVersionDAO()_ = daoInterface(d)}++func TestUserCanvasVersionDAOKeepsAllVersions(t *testing.T) {+ db := setupUserCanvasTestDB(t)+ if err := db.AutoMigrate(&entity.UserCanvasVersion{}); err != nil {+ t.Fatalf("failed to migrate versions: %v", err)+ }+ ctx := t.Context()+ if err := db.WithContext(ctx).Create(&entity.UserCanvas{ID: "canvas-1", UserID: "user-1"}).Error; err != nil {+ t.Fatalf("failed to create canvas: %v", err)+ }+ dao := NewUserCanvasVersionDAO()+ opts := SaveOrReplaceLatestVersionOptions{UserCanvasID: "canvas-1"}+ const versionCount = 35+ for i := 0; i < versionCount; i++ {+ opts.NewID = fmt.Sprintf("version-%02d", i)+ opts.DSL = entity.JSONMap{"revision": fmt.Sprint(i)}+ if err := db.Transaction(func(tx *gorm.DB) error {+ _, err := dao.SaveOrReplaceLatestTx(ctx, tx, opts)+ return err+ }); err != nil {+ t.Fatalf("failed to save version %d: %v", i, err)+ }+ }+ for _, stage := range []string{"insert", "refresh", "publish"} {+ t.Run(stage, func(t *testing.T) {+ if stage != "insert" {+ opts.NewID = "unused-version-id"+ opts.Release = stage == "publish"+ if err := db.Transaction(func(tx *gorm.DB) error {+ row, err := dao.SaveOrReplaceLatestTx(ctx, tx, opts)+ if err == nil && (row.ID != "version-34" || row.Release != opts.Release) {+ t.Errorf("unexpected refreshed version: id=%q release=%v", row.ID, row.Release)+ }+ return err+ }); err != nil {+ t.Fatalf("failed to save latest version: %v", err)+ }+ }+ versions, err := dao.ListByCanvasID(ctx, db, opts.UserCanvasID)+ if err != nil {+ t.Fatalf("failed to list versions: %v", err)+ }+ if len(versions) != versionCount {+ t.Fatalf("version count = %d, want %d", len(versions), versionCount)+ }+ ids := make(map[string]bool, len(versions))+ for _, version := range versions {+ ids[version.ID] = true+ }+ for i := 0; i < versionCount; i++ {+ if id := fmt.Sprintf("version-%02d", i); !ids[id] {+ t.Errorf("saved version %q was deleted", id)+ }+ }+ })+ }+}diff --git a/internal/service/agent.go b/internal/service/agent.goindex 7e1944a5f4..fa5a287128 100644--- a/internal/service/agent.go+++ b/internal/service/agent.go@@ -1338,13 +1338,12 @@ func (s *AgentService) saveOrReplaceVersionOptions(ctx context.Context, userID,}versionTitle := buildVersionTitle(nickname, title, time.Now())return dao.SaveOrReplaceLatestVersionOptions{- NewID: common.GenerateUUID(),- UserCanvasID: canvasID,- Title: &versionTitle,- Description: description,- DSL: dsl,- Release: release,- KeepUnpublished: 20,+ NewID: common.GenerateUUID(),+ UserCanvasID: canvasID,+ Title: &versionTitle,+ Description: description,+ DSL: dsl,+ Release: release,SameDSL: func(latestDSL entity.JSONMap) bool {return reflect.DeepEqual(entity.JSONMap(dslpkg.NormalizeForCanvas(latestDSL)),