File tree 3 files changed +16
-12
lines changed
packages/service/core/dataset
projects/app/src/pages/api/core/dataset
3 files changed +16
-12
lines changed Original file line number Diff line number Diff line change @@ -90,15 +90,6 @@ export async function delDatasetRelevantData({
90
90
'_id teamId datasetId fileId metadata'
91
91
) . lean ( ) ;
92
92
93
- const removeJobScheduler = async ( ) => {
94
- await Promise . all (
95
- datasets . map ( ( dataset ) => {
96
- if ( dataset . type === DatasetTypeEnum . websiteDataset )
97
- return removeWebsiteSyncJobScheduler ( String ( dataset . _id ) ) ;
98
- } )
99
- ) ;
100
- } ;
101
-
102
93
await retryFn ( async ( ) => {
103
94
await Promise . all ( [
104
95
// delete training data
@@ -116,9 +107,7 @@ export async function delDatasetRelevantData({
116
107
// Delete Image and file
117
108
delCollectionRelatedSource ( { collections } ) ,
118
109
// Delete vector data
119
- deleteDatasetDataVector ( { teamId, datasetIds } ) ,
120
- // Remove job scheduler
121
- removeJobScheduler ( )
110
+ deleteDatasetDataVector ( { teamId, datasetIds } )
122
111
] ) ;
123
112
} ) ;
124
113
Original file line number Diff line number Diff line change @@ -9,6 +9,8 @@ import { OwnerPermissionVal } from '@fastgpt/global/support/permission/constant'
9
9
import { CommonErrEnum } from '@fastgpt/global/common/error/code/common' ;
10
10
import { MongoDatasetCollectionTags } from '@fastgpt/service/core/dataset/tag/schema' ;
11
11
import { removeImageByPath } from '@fastgpt/service/common/file/image/controller' ;
12
+ import { DatasetTypeEnum } from '@fastgpt/global/core/dataset/constants' ;
13
+ import { removeWebsiteSyncJobScheduler } from '@fastgpt/service/core/dataset/websiteSync' ;
12
14
13
15
async function handler ( req : NextApiRequest ) {
14
16
const { id : datasetId } = req . query as {
@@ -40,6 +42,13 @@ async function handler(req: NextApiRequest) {
40
42
datasetId : { $in : datasetIds }
41
43
} ) ;
42
44
45
+ await Promise . all (
46
+ datasets . map ( ( dataset ) => {
47
+ if ( dataset . type === DatasetTypeEnum . websiteDataset )
48
+ return removeWebsiteSyncJobScheduler ( String ( dataset . _id ) ) ;
49
+ } )
50
+ ) ;
51
+
43
52
// delete all dataset.data and pg data
44
53
await mongoSessionRun ( async ( session ) => {
45
54
// delete dataset data
Original file line number Diff line number Diff line change @@ -35,6 +35,7 @@ import {
35
35
removeWebsiteSyncJobScheduler ,
36
36
upsertWebsiteSyncJobScheduler
37
37
} from '@fastgpt/service/core/dataset/websiteSync' ;
38
+ import { delDatasetRelevantData } from '@fastgpt/service/core/dataset/controller' ;
38
39
39
40
export type DatasetUpdateQuery = { } ;
40
41
export type DatasetUpdateResponse = any ;
@@ -119,6 +120,11 @@ async function handler(
119
120
} ) ;
120
121
121
122
const onUpdate = async ( session : ClientSession ) => {
123
+ if ( dataset . type === DatasetTypeEnum . websiteDataset && chunkSettings ) {
124
+ // clean up dataset
125
+ await delDatasetRelevantData ( { datasets : [ dataset ] , session } ) ;
126
+ }
127
+
122
128
await MongoDataset . findByIdAndUpdate (
123
129
id ,
124
130
{
You can’t perform that action at this time.
0 commit comments