ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-10-15 07:31:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix collection tags create (#5117)

Browse Source
This commit is contained in:
heheer
2025-06-30 13:15:45 +08:00
committed by GitHub
parent 1eb98ef0fe
commit 58160409a9
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/service/core/dataset/collection/controller.ts
View File

@@ -37,7 +37,6 @@ import {
} from '@fastgpt/global/core/dataset/training/utils'; } from '@fastgpt/global/core/dataset/training/utils';
import { DatasetDataIndexTypeEnum } from '@fastgpt/global/core/dataset/data/constants'; import { DatasetDataIndexTypeEnum } from '@fastgpt/global/core/dataset/data/constants';
import { clearCollectionImages, removeDatasetImageExpiredTime } from '../image/utils'; import { clearCollectionImages, removeDatasetImageExpiredTime } from '../image/utils';
import { MongoDatasetCollectionTags } from '../tag/schema';
export const createCollectionAndInsertData = async ({ export const createCollectionAndInsertData = async ({
dataset, dataset,
@@ -280,7 +279,7 @@ export async function createOneCollection({ session, ...props }: CreateOneCollec
teamId, teamId,
parentId, parentId,
datasetId, datasetId,
tags: tagIdList, tags,
fileId, fileId,
rawLink, rawLink,
@@ -288,15 +287,9 @@ export async function createOneCollection({ session, ...props }: CreateOneCollec
externalFileUrl, externalFileUrl,
apiFileId apiFileId
} = props; } = props;
// Create collection tags
const tags = await MongoDatasetCollectionTags.find({
teamId,
datasetId,
_id: { $in: tagIdList }
});
const collectionTags = await createOrGetCollectionTags({ const collectionTags = await createOrGetCollectionTags({
tags: tags.map((item) => item.tag), tags,
teamId, teamId,
datasetId, datasetId,
session session

6
packages/service/core/dataset/collection/utils.ts
View File

@@ -194,7 +194,11 @@ export const syncCollection = async (collection: CollectionWithDatasetType) => {
createCollectionParams: { createCollectionParams: {
...collection, ...collection,
name: title || collection.name, name: title || collection.name,
updateTime: new Date() updateTime: new Date(),
tags: await collectionTagsToTagLabel({
datasetId: collection.datasetId,
tags: collection.tags
})
} }
}); });
}); });

7
projects/app/src/pages/api/core/dataset/collection/create/reTrainingCollection.ts
View File

@@ -10,6 +10,7 @@ import { WritePermissionVal } from '@fastgpt/global/support/permission/constant'
import { addAuditLog } from '@fastgpt/service/support/user/audit/util'; import { addAuditLog } from '@fastgpt/service/support/user/audit/util';
import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants'; import { AuditEventEnum } from '@fastgpt/global/support/user/audit/constants';
import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util'; import { getI18nDatasetType } from '@fastgpt/service/support/user/audit/util';
import { collectionTagsToTagLabel } from '@fastgpt/service/core/dataset/collection/utils';
type RetrainingCollectionResponse = { type RetrainingCollectionResponse = {
collectionId: string; collectionId: string;
@@ -47,7 +48,11 @@ async function handler(
createCollectionParams: { createCollectionParams: {
...collection, ...collection,
...data, ...data,
updateTime: new Date() updateTime: new Date(),
tags: await collectionTagsToTagLabel({
datasetId: collection.datasetId,
tags: collection.tags
})
} }
}); });