mirror of
https://github.com/labring/FastGPT.git
synced 2025-10-16 08:01:18 +00:00

* perf: system toolset & mcp (#5200) * feat: support system toolset * fix: type * fix: system tool config * chore: mcptool config migrate * refactor: mcp toolset * fix: fe type error * fix: type error * fix: show version * chore: support extract tool's secretInputConfig out of inputs * chore: compatible with old version mcp * chore: adjust * deps: update dependency @fastgpt-skd/plugin * fix: version * fix: some bug (#5316) * chore: compatible with old version mcp * fix: version * fix: compatible bug * fix: mcp object params * fix: type error * chore: update test cases * chore: remove log * fix: toolset node name * optimize app logs sort (#5310) * log keys config modal * multiple select * api * fontsize * code * chatid * fix build * fix * fix component * change name * log keys config * fix * delete unused * fix * perf: log code * perf: send auth code modal enter press * fix log (#5328) * perf: mcp toolset comment * perf: log ui * remove log (#5347) * doc * fix: action * remove log * fix: Table Optimization (#5319) * feat: table test: 1 * feat: table test: 2 * feat: table test: 3 * feat: table test: 4 * feat: table test : 5 把maxSize改回chunkSize * feat: table test : 6 都删了,只看maxSize * feat: table test : 7 恢复初始,接下来删除标签功能 * feat: table test : 8 删除标签功能 * feat: table test : 9 删除标签功能成功 * feat: table test : 10 继续调试,修改trainingStates * feat: table test : 11 修改第一步 * feat: table test : 12 修改第二步 * feat: table test : 13 修改了HtmlTable2Md * feat: table test : 14 修改表头分块规则 * feat: table test : 15 前面表格分的太细了 * feat: table test : 16 改着改着表头又不加了 * feat: table test : 17 用CUSTOM_SPLIT_SIGN不行,重新改 * feat: table test : 18 表头仍然还会多加,但现在分块搞的合理了终于 * feat: table test : 19 还是需要搞好表头问题,先保存一下调试情况 * feat: table test : 20 调试结束,看一下replace有没有问题,没问题就pr * feat: table test : 21 先把注释删了 * feat: table test : 21 注释replace都改了,下面切main分支看看情况 * feat: table test : 22 修改旧文件 * feat: table test : 23 修改测试文件 * feat: table test : 24 xlsx表格处理 * feat: table test : 25 刚才没保存先com了 * feat: table test : 26 fix * feat: table test : 27 先com一版调试 * feat: table test : 28 试试放format2csv里 * feat: table test : 29 xlsx解决 * feat: table test : 30 tablesplit解决 * feat: table test : 31 * feat: table test : 32 * perf: table split * perf: mcp old version compatibility (#5342) * fix: system-tool secret inputs * fix: rewrite runtime node i18n for system tool * perf: mcp old version compatibility * fix: splitPluginId * fix: old mcp toolId * fix: filter secret key * feat: support system toolset activation * chore: remove log * perf: mcp update * perf: rewrite toolset * fix:delete variable id (#5335) * perf: variable update * fix: multiple select ui * perf: model config move to plugin * fix: var conflit * perf: variable checker * Avoid empty number * update doc time * fix: test * fix: mcp object * update count app * update count app --------- Co-authored-by: Finley Ge <32237950+FinleyGe@users.noreply.github.com> Co-authored-by: heheer <heheer@sealos.io> Co-authored-by: heheer <zhiyu44@qq.com> Co-authored-by: colnii <1286949794@qq.com> Co-authored-by: dreamer6680 <1468683855@qq.com>
224 lines
6.1 KiB
TypeScript
224 lines
6.1 KiB
TypeScript
import { type AppSchema } from '@fastgpt/global/core/app/type';
|
|
import { NodeInputKeyEnum } from '@fastgpt/global/core/workflow/constants';
|
|
import { FlowNodeTypeEnum } from '@fastgpt/global/core/workflow/node/constant';
|
|
import { AppTypeEnum } from '@fastgpt/global/core/app/constants';
|
|
import { MongoApp } from './schema';
|
|
import type { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/node';
|
|
import { encryptSecretValue, storeSecretValue } from '../../common/secret/utils';
|
|
import { SystemToolInputTypeEnum } from '@fastgpt/global/core/app/systemTool/constants';
|
|
import { type ClientSession } from '../../common/mongo';
|
|
import { MongoEvaluation } from './evaluation/evalSchema';
|
|
import { removeEvaluationJob } from './evaluation/mq';
|
|
import { deleteChatFiles } from '../chat/controller';
|
|
import { MongoChatItem } from '../chat/chatItemSchema';
|
|
import { MongoChat } from '../chat/chatSchema';
|
|
import { MongoOutLink } from '../../support/outLink/schema';
|
|
import { MongoOpenApi } from '../../support/openapi/schema';
|
|
import { MongoAppVersion } from './version/schema';
|
|
import { MongoChatInputGuide } from '../chat/inputGuide/schema';
|
|
import { MongoResourcePermission } from '../../support/permission/schema';
|
|
import { PerResourceTypeEnum } from '@fastgpt/global/support/permission/constant';
|
|
import { removeImageByPath } from '../../common/file/image/controller';
|
|
import { mongoSessionRun } from '../../common/mongo/sessionRun';
|
|
import { MongoAppLogKeys } from './logs/logkeysSchema';
|
|
|
|
export const beforeUpdateAppFormat = ({ nodes }: { nodes?: StoreNodeItemType[] }) => {
|
|
if (!nodes) return;
|
|
|
|
nodes.forEach((node) => {
|
|
// Format header secret
|
|
node.inputs.forEach((input) => {
|
|
if (input.key === NodeInputKeyEnum.headerSecret && typeof input.value === 'object') {
|
|
input.value = storeSecretValue(input.value);
|
|
}
|
|
if (input.key === NodeInputKeyEnum.systemInputConfig && typeof input.value === 'object') {
|
|
input.inputList?.forEach((inputItem) => {
|
|
if (
|
|
inputItem.inputType === 'secret' &&
|
|
input.value?.type === SystemToolInputTypeEnum.manual &&
|
|
input.value?.value
|
|
) {
|
|
input.value.value[inputItem.key] = encryptSecretValue(input.value.value[inputItem.key]);
|
|
}
|
|
});
|
|
}
|
|
});
|
|
|
|
// Format dataset search
|
|
if (node.flowNodeType === FlowNodeTypeEnum.datasetSearchNode) {
|
|
node.inputs.forEach((input) => {
|
|
if (input.key === NodeInputKeyEnum.datasetSelectList) {
|
|
const val = input.value as undefined | { datasetId: string }[] | { datasetId: string };
|
|
if (!val) {
|
|
input.value = [];
|
|
} else if (Array.isArray(val)) {
|
|
// Not rewrite reference value
|
|
if (val.length === 2 && val.every((item) => typeof item === 'string')) {
|
|
return;
|
|
}
|
|
input.value = val
|
|
.map((dataset: { datasetId: string }) => ({
|
|
datasetId: dataset.datasetId
|
|
}))
|
|
.filter((item) => !!item.datasetId);
|
|
} else if (typeof val === 'object' && val !== null) {
|
|
input.value = [
|
|
{
|
|
datasetId: val.datasetId
|
|
}
|
|
];
|
|
}
|
|
}
|
|
});
|
|
}
|
|
});
|
|
};
|
|
|
|
/* Get apps */
|
|
export async function findAppAndAllChildren({
|
|
teamId,
|
|
appId,
|
|
fields
|
|
}: {
|
|
teamId: string;
|
|
appId: string;
|
|
fields?: string;
|
|
}): Promise<AppSchema[]> {
|
|
const find = async (id: string) => {
|
|
const children = await MongoApp.find(
|
|
{
|
|
teamId,
|
|
parentId: id
|
|
},
|
|
fields
|
|
).lean();
|
|
|
|
let apps = children;
|
|
|
|
for (const child of children) {
|
|
const grandChildrenIds = await find(child._id);
|
|
apps = apps.concat(grandChildrenIds);
|
|
}
|
|
|
|
return apps;
|
|
};
|
|
const [app, childDatasets] = await Promise.all([MongoApp.findById(appId, fields), find(appId)]);
|
|
|
|
if (!app) {
|
|
return Promise.reject('Dataset not found');
|
|
}
|
|
|
|
return [app, ...childDatasets];
|
|
}
|
|
|
|
export const getAppBasicInfoByIds = async ({ teamId, ids }: { teamId: string; ids: string[] }) => {
|
|
const apps = await MongoApp.find(
|
|
{
|
|
teamId,
|
|
_id: { $in: ids }
|
|
},
|
|
'_id name avatar'
|
|
).lean();
|
|
|
|
return apps.map((item) => ({
|
|
id: item._id,
|
|
name: item.name,
|
|
avatar: item.avatar
|
|
}));
|
|
};
|
|
|
|
export const onDelOneApp = async ({
|
|
teamId,
|
|
appId,
|
|
session
|
|
}: {
|
|
teamId: string;
|
|
appId: string;
|
|
session?: ClientSession;
|
|
}) => {
|
|
const apps = await findAppAndAllChildren({
|
|
teamId,
|
|
appId,
|
|
fields: '_id avatar'
|
|
});
|
|
|
|
const deletedAppIds = apps
|
|
.filter((app) => app.type !== AppTypeEnum.folder)
|
|
.map((app) => String(app._id));
|
|
|
|
// Remove eval job
|
|
const evalJobs = await MongoEvaluation.find(
|
|
{
|
|
appId: { $in: apps.map((app) => app._id) }
|
|
},
|
|
'_id'
|
|
).lean();
|
|
await Promise.all(evalJobs.map((evalJob) => removeEvaluationJob(evalJob._id)));
|
|
|
|
const del = async (session: ClientSession) => {
|
|
for await (const app of apps) {
|
|
const appId = app._id;
|
|
// Chats
|
|
await deleteChatFiles({ appId });
|
|
await MongoChatItem.deleteMany(
|
|
{
|
|
appId
|
|
},
|
|
{ session }
|
|
);
|
|
await MongoChat.deleteMany(
|
|
{
|
|
appId
|
|
},
|
|
{ session }
|
|
);
|
|
|
|
// 删除分享链接
|
|
await MongoOutLink.deleteMany({
|
|
appId
|
|
}).session(session);
|
|
// Openapi
|
|
await MongoOpenApi.deleteMany({
|
|
appId
|
|
}).session(session);
|
|
|
|
// delete version
|
|
await MongoAppVersion.deleteMany({
|
|
appId
|
|
}).session(session);
|
|
|
|
await MongoChatInputGuide.deleteMany({
|
|
appId
|
|
}).session(session);
|
|
|
|
await MongoResourcePermission.deleteMany({
|
|
resourceType: PerResourceTypeEnum.app,
|
|
teamId,
|
|
resourceId: appId
|
|
}).session(session);
|
|
|
|
await MongoAppLogKeys.deleteMany({
|
|
appId
|
|
}).session(session);
|
|
|
|
// delete app
|
|
await MongoApp.deleteOne(
|
|
{
|
|
_id: appId
|
|
},
|
|
{ session }
|
|
);
|
|
|
|
await removeImageByPath(app.avatar, session);
|
|
}
|
|
};
|
|
|
|
if (session) {
|
|
await del(session);
|
|
return deletedAppIds;
|
|
}
|
|
|
|
await mongoSessionRun(del);
|
|
return deletedAppIds;
|
|
};
|