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: scope ingestion documents and reused tasks to the dataset (#20806)
adws6173f1cdde64
diff --git a/internal/service/ingestion_task_service.go b/internal/service/ingestion_task_service.goindex f21e921ddd..1a42483ced 100644--- a/internal/service/ingestion_task_service.go+++ b/internal/service/ingestion_task_service.go@@ -113,7 +113,8 @@ func (s *IngestionTaskService) CreateForDocuments(ctx context.Context, datasetIDresponses := make([]*ParseDocumentResponse, 0, len(uniqueDocIDs))for _, docID := range uniqueDocIDs {- doc, err := s.documentDAO.GetByID(ctx, dao.DB, docID)+ // Validate dataset membership before creating or reusing a task.+ _, err := s.documentDAO.GetByDocumentIDAndDatasetID(ctx, dao.DB, docID, datasetID)if err != nil {responses = append(responses, &ParseDocumentResponse{DocumentID: docID,@@ -121,14 +122,6 @@ func (s *IngestionTaskService) CreateForDocuments(ctx context.Context, datasetID})continue}- if doc == nil {- responses = append(responses, &ParseDocumentResponse{- DocumentID: docID,- Result: "no such document",- })- continue- }-task := &entity.IngestionTask{DocumentID: docID,UserID: userID,@@ -576,6 +569,9 @@ func (s *IngestionTaskService) createAndEnqueueWithKBCache(ctx context.Context,return nil, err}if existing != nil {+ if existing.DatasetID != task.DatasetID {+ return nil, fmt.Errorf("document id %s has an ingestion task in a different dataset", task.DocumentID)+ }switch existing.Status {case common.CREATED:if err = s.ensureRunIdentity(ctx, existing, kbCache); err != nil {diff --git a/internal/service/ingestion_task_service_test.go b/internal/service/ingestion_task_service_test.goindex 5ce16d2d55..bed0337a3c 100644--- a/internal/service/ingestion_task_service_test.go+++ b/internal/service/ingestion_task_service_test.go@@ -3,6 +3,7 @@ package serviceimport ("context""errors"+ "reflect""strings""sync""testing"@@ -106,6 +107,63 @@ func TestIngestionTaskServiceCreateForDocumentsPublishesTaskMessages(t *testing.}}+func TestIngestionTaskServiceCreateForDocumentsRejectsDatasetMismatch(t *testing.T) {+ tests := []struct {+ name, docKB, taskStatus, wantError string+ }{+ {"foreign new task", "kb-2", "", gorm.ErrRecordNotFound.Error()},+ {"foreign created task", "kb-2", common.CREATED, gorm.ErrRecordNotFound.Error()},+ {"foreign failed task", "kb-2", common.FAILED, gorm.ErrRecordNotFound.Error()},+ {"foreign stopped task", "kb-2", common.STOPPED, gorm.ErrRecordNotFound.Error()},+ {"mismatched existing task", "kb-1", common.FAILED, "different dataset"},+ }+ for _, tt := range tests {+ t.Run(tt.name, func(t *testing.T) {+ db := setupServiceTestDB(t)+ pushServiceDB(t, db)+ insertTestKB(t, "kb-1", "tenant-1", 0, 0, 0)+ insertTestKB(t, "kb-2", "tenant-2", 1, 0, 0)+ insertTestDoc(t, "doc-1", tt.docKB, 0, 0)+ if tt.taskStatus != "" {+ insertTestIngestionTaskWithStatus(t, "task-1", "user-2", "doc-1", "kb-2", tt.taskStatus)+ }+ ctx := t.Context()+ taskDAO := dao.NewIngestionTaskDAO()+ before, err := taskDAO.GetByDocumentID(ctx, db, "doc-1")+ if err != nil {+ t.Fatalf("load existing task: %v", err)+ }+ publisher := &recordingTaskPublisher{}+ svc := NewIngestionTaskService()+ svc.taskPublisher = publisher++ responses, err := svc.CreateForDocuments(ctx, "kb-1", "user-1", []string{"doc-1"})+ if err != nil {+ t.Fatalf("expected per-document failure: %v", err)+ }+ if len(responses) != 1 {+ t.Fatalf("responses = %d, want 1", len(responses))+ }+ if responses[0].DocumentID != "doc-1" || !strings.Contains(responses[0].Result, tt.wantError) {+ t.Fatalf("expected dataset rejection, got %+v", responses[0])+ }+ if len(publisher.messages) != 0 {+ t.Fatalf("published rejected document: %+v", publisher.messages)+ }+ after, err := taskDAO.GetByDocumentID(ctx, db, "doc-1")+ if err != nil {+ t.Fatalf("reload existing task: %v", err)+ }+ if !reflect.DeepEqual(before, after) {+ t.Fatalf("task changed: before=%+v, after=%+v", before, after)+ }+ if got := countPipelineLogs(t, db, "doc-1"); got != 0 {+ t.Fatalf("pipeline logs = %d, want 0", got)+ }+ })+ }+}+func TestIngestionTaskServiceCreateForDocumentsRejectsMissingRunMetadata(t *testing.T) {db := setupServiceTestDB(t)pushServiceDB(t, db)