Commit 58160409 by heheer Committed by GitHub

fix collection tags create (#5117)

parent 1eb98ef0
...@@ -37,7 +37,6 @@ import { ...@@ -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 ...@@ -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 ...@@ -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
......
...@@ -194,7 +194,11 @@ export const syncCollection = async (collection: CollectionWithDatasetType) => { ...@@ -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
})
} }
}); });
}); });
......
...@@ -10,6 +10,7 @@ import { WritePermissionVal } from '@fastgpt/global/support/permission/constant' ...@@ -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( ...@@ -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
})
} }
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment