mirror of
https://github.com/labring/FastGPT.git
synced 2025-10-18 01:16:01 +00:00
feature: V4.11.1 (#5350)
* 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>
This commit is contained in:
Archer
@@ -1,5 +1,3 @@
|
||||
import path from 'path';
|
||||
import * as fs from 'fs';
|
||||
import { type SystemModelItemType } from '../type';
|
||||
import { ModelTypeEnum } from '@fastgpt/global/core/ai/model';
|
||||
import { MongoSystemModel } from './schema';
|
||||
@@ -11,34 +9,16 @@ import {
|
||||
type RerankModelItemType
|
||||
} from '@fastgpt/global/core/ai/model.d';
|
||||
import { debounce } from 'lodash';
|
||||
import {
|
||||
getModelProvider,
|
||||
type ModelProviderIdType,
|
||||
type ModelProviderType
|
||||
} from '@fastgpt/global/core/ai/provider';
|
||||
import { getModelProvider } from '@fastgpt/global/core/ai/provider';
|
||||
import { findModelFromAlldata } from '../model';
|
||||
import {
|
||||
reloadFastGPTConfigBuffer,
|
||||
updateFastGPTConfigBuffer
|
||||
} from '../../../common/system/config/controller';
|
||||
import { delay } from '@fastgpt/global/common/system/utils';
|
||||
import { pluginClient } from '../../../thirdProvider/fastgptPlugin';
|
||||
import { setCron } from '../../../common/system/cron';
|
||||
|
||||
const getModelConfigBaseUrl = () => {
|
||||
const currentFileUrl = new URL(import.meta.url);
|
||||
const filePath = decodeURIComponent(
|
||||
process.platform === 'win32'
|
||||
? currentFileUrl.pathname.substring(1) // Remove leading slash on Windows
|
||||
: currentFileUrl.pathname
|
||||
);
|
||||
const modelsPath = path.join(path.dirname(filePath), 'provider');
|
||||
return modelsPath;
|
||||
};
|
||||
|
||||
/*
|
||||
TODO: 分优先级读取：
|
||||
1. 有外部挂载目录，则读取外部的
|
||||
2. 没有外部挂载目录，则读取本地的。然后试图拉取云端的进行覆盖。
|
||||
*/
|
||||
export const loadSystemModels = async (init = false) => {
|
||||
const pushModel = (model: SystemModelItemType) => {
|
||||
global.systemModelList.push(model);
|
||||
@@ -108,17 +88,19 @@ export const loadSystemModels = async (init = false) => {
|
||||
global.systemDefaultModel = {};
|
||||
|
||||
try {
|
||||
const dbModels = await MongoSystemModel.find({}).lean();
|
||||
// Get model from db and plugin
|
||||
const [dbModels, systemModels] = await Promise.all([
|
||||
MongoSystemModel.find({}).lean(),
|
||||
pluginClient.model.list().then((res) => {
|
||||
if (res.status === 200) return res.body;
|
||||
console.error('Get fastGPT plugin model error');
|
||||
return [];
|
||||
})
|
||||
]);
|
||||
|
||||
// Load system model from local
|
||||
const modelsPath = getModelConfigBaseUrl();
|
||||
const providerList = await fs.promises.readdir(modelsPath);
|
||||
await Promise.all(
|
||||
providerList.map(async (name) => {
|
||||
const fileContent = (await import(`./provider/${name}`))?.default as {
|
||||
provider: ModelProviderIdType;
|
||||
list: SystemModelItemType[];
|
||||
};
|
||||
systemModels.map(async (model) => {
|
||||
const mergeObject = (obj1: any, obj2: any) => {
|
||||
if (!obj1 && !obj2) return undefined;
|
||||
const formatObj1 = typeof obj1 === 'object' ? obj1 : {};
|
||||
@@ -126,27 +108,24 @@ export const loadSystemModels = async (init = false) => {
|
||||
return { ...formatObj1, ...formatObj2 };
|
||||
};
|
||||
|
||||
fileContent.list.forEach((fileModel) => {
|
||||
const dbModel = dbModels.find((item) => item.model === fileModel.model);
|
||||
const dbModel = dbModels.find((item) => item.model === model.model);
|
||||
|
||||
const modelData: any = {
|
||||
...fileModel,
|
||||
...dbModel?.metadata,
|
||||
// @ts-ignore
|
||||
defaultConfig: mergeObject(fileModel.defaultConfig, dbModel?.metadata?.defaultConfig),
|
||||
// @ts-ignore
|
||||
fieldMap: mergeObject(fileModel.fieldMap, dbModel?.metadata?.fieldMap),
|
||||
provider: getModelProvider(dbModel?.metadata?.provider || fileContent.provider).id,
|
||||
type: dbModel?.metadata?.type || fileModel.type,
|
||||
isCustom: false
|
||||
};
|
||||
|
||||
pushModel(modelData);
|
||||
});
|
||||
const modelData: any = {
|
||||
...model,
|
||||
...dbModel?.metadata,
|
||||
// @ts-ignore
|
||||
defaultConfig: mergeObject(model.defaultConfig, dbModel?.metadata?.defaultConfig),
|
||||
// @ts-ignore
|
||||
fieldMap: mergeObject(model.fieldMap, dbModel?.metadata?.fieldMap),
|
||||
provider: getModelProvider(dbModel?.metadata?.provider || (model.provider as any)).id,
|
||||
type: dbModel?.metadata?.type || model.type,
|
||||
isCustom: false
|
||||
};
|
||||
pushModel(modelData);
|
||||
})
|
||||
);
|
||||
|
||||
// Custom model
|
||||
// Custom model(Not in system config)
|
||||
dbModels.forEach((dbModel) => {
|
||||
if (global.systemModelList.find((item) => item.model === dbModel.model)) return;
|
||||
|
||||
@@ -190,7 +169,18 @@ export const loadSystemModels = async (init = false) => {
|
||||
return providerA.order - providerB.order;
|
||||
});
|
||||
|
||||
console.log('Load models success', JSON.stringify(global.systemActiveModelList, null, 2));
|
||||
console.log(
|
||||
`Load models success, total: ${global.systemModelList.length}, active: ${global.systemActiveModelList.length}`,
|
||||
JSON.stringify(
|
||||
global.systemActiveModelList.map((item) => ({
|
||||
provider: item.provider,
|
||||
model: item.model,
|
||||
name: item.name
|
||||
})),
|
||||
null,
|
||||
2
|
||||
)
|
||||
);
|
||||
} catch (error) {
|
||||
console.error('Load models error', error);
|
||||
// @ts-ignore
|
||||
@@ -205,17 +195,16 @@ export const getSystemModelConfig = async (model: string): Promise<SystemModelIt
|
||||
if (modelData.isCustom) return Promise.reject('Custom model not data');
|
||||
|
||||
// Read file
|
||||
const fileContent = (await import(`./provider/${modelData.provider}`))?.default as {
|
||||
provider: ModelProviderType;
|
||||
list: SystemModelItemType[];
|
||||
};
|
||||
const modelDefaulConfig = await pluginClient.model.list().then((res) => {
|
||||
if (res.status === 200) {
|
||||
return res.body.find((item) => item.model === model) as SystemModelItemType;
|
||||
}
|
||||
|
||||
const config = fileContent.list.find((item) => item.model === model);
|
||||
|
||||
if (!config) return Promise.reject('Model config is not found');
|
||||
return Promise.reject('Can not get model config from plugin');
|
||||
});
|
||||
|
||||
return {
|
||||
...config,
|
||||
...modelDefaulConfig,
|
||||
provider: modelData.provider,
|
||||
isCustom: false
|
||||
};
|
||||
@@ -246,3 +235,11 @@ export const updatedReloadSystemModel = async () => {
|
||||
// 3. 延迟1秒，等待其他节点刷新
|
||||
await delay(1000);
|
||||
};
|
||||
export const cronRefreshModels = async () => {
|
||||
setCron('*/5 * * * *', async () => {
|
||||
// 1. 更新模型（所有节点都会触发）
|
||||
await loadSystemModels(true);
|
||||
// 2. 更新缓存（仅主节点触发）
|
||||
await updateFastGPTConfigBuffer();
|
||||
});
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user