diff --git a/packages/service/core/dataset/collection/controller.ts b/packages/service/core/dataset/collection/controller.ts index 1091b8f96..07605516e 100644 --- a/packages/service/core/dataset/collection/controller.ts +++ b/packages/service/core/dataset/collection/controller.ts @@ -37,7 +37,6 @@ import { } from '@fastgpt/global/core/dataset/training/utils'; import { DatasetDataIndexTypeEnum } from '@fastgpt/global/core/dataset/data/constants'; import { clearCollectionImages, removeDatasetImageExpiredTime } from '../image/utils'; -import { MongoDatasetCollectionTags } from '../tag/schema'; export const createCollectionAndInsertData = async ({ dataset, @@ -280,7 +279,7 @@ export async function createOneCollection({ session, ...props }: CreateOneCollec teamId, parentId, datasetId, - tags: tagIdList, + tags, fileId, rawLink, @@ -288,15 +287,9 @@ export async function createOneCollection({ session, ...props }: CreateOneCollec externalFileUrl, apiFileId } = props; - // Create collection tags - const tags = await MongoDatasetCollectionTags.find({ - teamId, - datasetId, - _id: { $in: tagIdList } - }); const collectionTags = await createOrGetCollectionTags({ - tags: tags.map((item) => item.tag), + tags, teamId, datasetId, session diff --git a/packages/service/core/dataset/collection/utils.ts b/packages/service/core/dataset/collection/utils.ts index 1dac1882c..4eb964587 100644 --- a/packages/service/core/dataset/collection/utils.ts +++ b/packages/service/core/dataset/collection/utils.ts @@ -194,7 +194,11 @@ export const syncCollection = async (collection: CollectionWithDatasetType) => { createCollectionParams: { ...collection, name: title || collection.name, - updateTime: new Date() + updateTime: new Date(), + tags: await collectionTagsToTagLabel({ + datasetId: collection.datasetId, + tags: collection.tags + }) } }); }); diff --git a/projects/app/src/pages/api/core/dataset/collection/create/reTrainingCollection.ts b/projects/app/src/pages/api/core/dataset/collection/create/reTrainingCollection.ts index 0a7bb573c..88e2955a0 100644 --- a/projects/app/src/pages/api/core/dataset/collection/create/reTrainingCollection.ts +++ b/projects/app/src/pages/api/core/dataset/collection/create/reTrainingCollection.ts @@ -10,6 +10,7 @@ import { WritePermissionVal } from '@fastgpt/global/support/permission/constant' import { addAuditLog } from '@fastgpt/service/support/user/audit/util'; import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants'; import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util'; +import { collectionTagsToTagLabel } from '@fastgpt/service/core/dataset/collection/utils'; type RetrainingCollectionResponse = { collectionId: string; @@ -47,7 +48,11 @@ async function handler( createCollectionParams: { ...collection, ...data, - updateTime: new Date() + updateTime: new Date(), + tags: await collectionTagsToTagLabel({ + datasetId: collection.datasetId, + tags: collection.tags + }) } });