Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit 62ee28b1 by archer
Options

configmap

parent c46a3754
Showing with 143 additions and 253 deletions
client/data/FeConfig.json deleted 100644 → 0
{
"show_emptyChat": true,
"show_register": true,
"show_appStore": true,
"show_userDetail": true,
"show_git": true,
"systemTitle": "FastAI",
"authorText": "Made by FastAI Team."
}
client/data/QAModels.json deleted 100644 → 0
{
"FastAI-16k": {
"model": "gpt-3.5-turbo-16k",
"name": "FastAI-16k",
"maxToken": 16000,
"price": 3
}
}
client/data/SystemParams.json deleted 100644 → 0
{
"vectorMaxProcess": 15,
"qaMaxProcess": 15,
"pgIvfflatProbe": 20,
"sensitiveCheck": false
}
client/data/VectorModels.json deleted 100644 → 0
{
"text-embedding-ada-002": {
"model": "text-embedding-ada-002",
"name": "Embedding-2",
"price": 0.2
}
}
client/data/ChatModels.json → client/data/config.json
{ {
"FastAI-4k": { "FeConfig": {
"model": "gpt-3.5-turbo", "show_emptyChat": true,
"name": "FastAI-4k", "show_register": true,
"contextMaxToken": 4000, "show_appStore": true,
"systemMaxToken": 2400, "show_userDetail": true,
"maxTemperature": 1.2, "show_git": true,
"price": 1.5 "systemTitle": "FastAI",
"authorText": "Made by FastAI Team."
}, },
"FastAI-16k": { "SystemParams": {
"model": "gpt-3.5-turbo-16k", "beianText": "",
"name": "FastAI-16k", "googleVerKey": "",
"contextMaxToken": 16000, "baiduTongji": "",
"systemMaxToken": 8000, "vectorMaxProcess": 15,
"maxTemperature": 1.2, "qaMaxProcess": 15,
"price": 3 "pgIvfflatProbe": 20,
"sensitiveCheck": false
}, },
"FastAI-Plus": { "ChatModels": [
"model": "gpt-4", {
"name": "FastAI-Plus", "model": "gpt-3.5-turbo",
"contextMaxToken": 8000, "name": "FastAI-4k",
"systemMaxToken": 4000, "contextMaxToken": 4000,
"maxTemperature": 1.2, "systemMaxToken": 2400,
"price": 45 "maxTemperature": 1.2,
} "price": 1.5
},
{
"model": "gpt-3.5-turbo-16k",
"name": "FastAI-16k",
"contextMaxToken": 16000,
"systemMaxToken": 8000,
"maxTemperature": 1.2,
"price": 3
},
{
"model": "gpt-4",
"name": "FastAI-Plus",
"contextMaxToken": 8000,
"systemMaxToken": 4000,
"maxTemperature": 1.2,
"price": 45
}
],
"QAModels": [
{
"model": "gpt-3.5-turbo-16k",
"name": "FastAI-16k",
"maxToken": 16000,
"price": 3
}
],
"VectorModels": [
{
"model": "text-embedding-ada-002",
"name": "Embedding-2",
"price": 0.2
}
]
} }
client/src/components/Layout/navbar.tsx
...@@ -19,50 +19,47 @@ const Navbar = ({ unread }: { unread: number }) => { ...@@ -19,50 +19,47 @@ const Navbar = ({ unread }: { unread: number }) => {
const router = useRouter(); const router = useRouter();
const { userInfo } = useUserStore(); const { userInfo } = useUserStore();
const { lastChatAppId, lastChatId } = useChatStore(); const { lastChatAppId, lastChatId } = useChatStore();
const navbarList = useMemo( const navbarList = [
() => [ {
{ label: '聊天',
label: '聊天', icon: 'chatLight',
icon: 'chatLight', activeIcon: 'chatFill',
activeIcon: 'chatFill', link: `/chat?appId=${lastChatAppId}&chatId=${lastChatId}`,
link: `/chat?appId=${lastChatAppId}&chatId=${lastChatId}`, activeLink: ['/chat']
activeLink: ['/chat'] },
}, {
{ label: '应用',
label: '应用', icon: 'appLight',
icon: 'appLight', activeIcon: 'appFill',
activeIcon: 'appFill', link: `/app/list`,
link: `/app/list`, activeLink: ['/app/list', '/app/detail']
activeLink: ['/app/list', '/app/detail'] },
}, {
{ label: '知识库',
label: '知识库', icon: 'dbLight',
icon: 'dbLight', activeIcon: 'dbFill',
activeIcon: 'dbFill', link: `/kb/list`,
link: `/kb/list`, activeLink: ['/kb/list', '/kb/detail']
activeLink: ['/kb/list', '/kb/detail'] },
}, ...(feConfigs?.show_appStore
...(feConfigs?.show_appStore ? [
? [ {
{ label: '市场',
label: '市场', icon: 'appStoreLight',
icon: 'appStoreLight', activeIcon: 'appStoreFill',
activeIcon: 'appStoreFill', link: '/appStore',
link: '/appStore', activeLink: ['/appStore']
activeLink: ['/appStore'] }
} ]
] : []),
: []), {
{ label: '账号',
label: '账号', icon: 'meLight',
icon: 'meLight', activeIcon: 'meFill',
activeIcon: 'meFill', link: '/number',
link: '/number', activeLink: ['/number']
activeLink: ['/number'] }
} ];
],
[lastChatId, lastChatAppId]
);
const itemStyles: any = { const itemStyles: any = {
my: 3, my: 3,
......
client/src/pages/_app.tsx
...@@ -41,7 +41,9 @@ function App({ Component, pageProps, isPc }: AppProps & { isPc?: boolean; respon ...@@ -41,7 +41,9 @@ function App({ Component, pageProps, isPc }: AppProps & { isPc?: boolean; respon
useEffect(() => { useEffect(() => {
(async () => { (async () => {
const { googleVerKey, baiduTongji } = await clientInitData(); const {
systemEnv: { googleVerKey, baiduTongji }
} = await clientInitData();
setGoogleVerKey(googleVerKey); setGoogleVerKey(googleVerKey);
setBaiduTongji(baiduTongji); setBaiduTongji(baiduTongji);
})(); })();
......
client/src/pages/api/system/getInitData.ts
// Next.js API route support: https://nextjs.org/docs/api-routes/introduction import type { FeConfigsType, SystemEnvType } from '@/types';
import type { NextApiRequest, NextApiResponse } from 'next'; import type { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@/service/response'; import { jsonRes } from '@/service/response';
import { readFileSync } from 'fs';
import { import {
type QAModelItemType, type QAModelItemType,
type ChatModelItemType, type ChatModelItemType,
type VectorModelItemType type VectorModelItemType
} from '@/types/model'; } from '@/types/model';
import type { FeConfigsType } from '@/types';
export type InitDateResponse = { export type InitDateResponse = {
beianText: string;
googleVerKey: string;
baiduTongji: string;
chatModels: ChatModelItemType[]; chatModels: ChatModelItemType[];
qaModels: QAModelItemType[]; qaModels: QAModelItemType[];
vectorModels: VectorModelItemType[]; vectorModels: VectorModelItemType[];
systemEnv: SystemEnvType;
feConfigs: FeConfigsType; feConfigs: FeConfigsType;
}; };
export default async function handler(req: NextApiRequest, res: NextApiResponse) { export default async function handler(req: NextApiRequest, res: NextApiResponse) {
const envs = {
beianText: process.env.SAFE_BEIAN_TEXT || '',
googleVerKey: process.env.CLIENT_GOOGLE_VER_TOKEN || '',
baiduTongji: process.env.BAIDU_TONGJI || ''
};
jsonRes<InitDateResponse>(res, { jsonRes<InitDateResponse>(res, {
data: { data: {
...envs, systemEnv: global.systemEnv,
feConfigs: global.feConfigs,
chatModels: global.chatModels, chatModels: global.chatModels,
qaModels: global.qaModels, qaModels: global.qaModels,
vectorModels: global.vectorModels, vectorModels: global.vectorModels
feConfigs: global.feConfigs
} }
}); });
} }
export async function getInitConfig() {
try {
const res = JSON.parse(readFileSync('data/config.json', 'utf-8'));
console.log(res);
global.systemEnv = res.SystemParams;
global.feConfigs = res.FeConfig;
global.chatModels = res.ChatModels;
global.qaModels = res.QAModels;
global.vectorModels = res.VectorModels;
} catch (error) {
console.log('get init config error');
}
}
client/src/pages/api/system/updateEnv.ts deleted 100644 → 0
import type { NextApiRequest, NextApiResponse } from 'next';
import { jsonRes } from '@/service/response';
import { authUser } from '@/service/utils/auth';
import { readFileSync } from 'fs';
import {
type QAModelItemType,
type ChatModelItemType,
type VectorModelItemType
} from '@/types/model';
export default async function handler(req: NextApiRequest, res: NextApiResponse) {
await authUser({ req, authRoot: true });
updateSystemEnv();
jsonRes(res);
}
export async function updateSystemEnv() {
try {
const res = JSON.parse(readFileSync('data/SystemParams.json', 'utf-8'));
global.systemEnv = {
...global.systemEnv,
...res
};
console.log(global.systemEnv);
} catch (error) {
console.log('update system env error');
}
}
const defaultmodels = {
'FastAI-4k': {
model: 'gpt-3.5-turbo',
name: 'FastAI-4k',
contextMaxToken: 4000,
systemMaxToken: 2400,
maxTemperature: 1.2,
price: 1.5
},
'FastAI-16k': {
model: 'gpt-3.5-turbo',
name: 'FastAI-16k',
contextMaxToken: 16000,
systemMaxToken: 8000,
maxTemperature: 1.2,
price: 3
},
'FastAI-Plus': {
model: 'gpt-4',
name: 'FastAI-Plus',
contextMaxToken: 8000,
systemMaxToken: 4000,
maxTemperature: 1.2,
price: 45
}
};
const defaultQaModels = {
'FastAI-16k': {
model: 'gpt-3.5-turbo',
name: 'FastAI-16k',
maxToken: 16000,
price: 3
}
};
const defaultVectorModels = {
'text-embedding-ada-002': {
model: 'text-embedding-ada-002',
name: 'Embedding-2',
price: 0.2
}
};
export function initSystemModels() {
const { chatModels, qaModels, vectorModels } = (() => {
try {
const chatModels = Object.values(JSON.parse(readFileSync('data/ChatModels.json', 'utf-8')));
const qaModels = Object.values(JSON.parse(readFileSync('data/QAModels.json', 'utf-8')));
const vectorModels = Object.values(
JSON.parse(readFileSync('data/VectorModels.json', 'utf-8'))
);
return {
chatModels,
qaModels,
vectorModels
};
} catch (error) {
console.log(error);
return {
chatModels: Object.values(defaultmodels),
qaModels: Object.values(defaultQaModels),
vectorModels: Object.values(defaultVectorModels)
};
}
})() as {
chatModels: ChatModelItemType[];
qaModels: QAModelItemType[];
vectorModels: VectorModelItemType[];
};
global.chatModels = chatModels;
global.qaModels = qaModels;
global.vectorModels = vectorModels;
console.log({
chatModels,
qaModels,
vectorModels
});
return {
chatModels,
qaModels,
vectorModels
};
}
export function initFeConfig() {
const feConfig = JSON.parse(readFileSync('data/FeConfig.json', 'utf-8'));
global.feConfigs = feConfig;
console.log(feConfig);
return feConfig;
}
client/src/pages/number/index.tsx
...@@ -147,7 +147,7 @@ const NumberSetting = ({ tableType }: { tableType: `${TableEnum}` }) => { ...@@ -147,7 +147,7 @@ const NumberSetting = ({ tableType }: { tableType: `${TableEnum}` }) => {
); );
return ( return (
<> <Box h={'100%'} overflow={'overlay'}>
<Box py={[5, 10]} px={'5vw'}> <Box py={[5, 10]} px={'5vw'}>
<Grid gridTemplateColumns={['1fr', '3fr 300px']} gridGap={4}> <Grid gridTemplateColumns={['1fr', '3fr 300px']} gridGap={4}>
<Card px={6} py={4}> <Card px={6} py={4}>
...@@ -257,7 +257,7 @@ const NumberSetting = ({ tableType }: { tableType: `${TableEnum}` }) => { ...@@ -257,7 +257,7 @@ const NumberSetting = ({ tableType }: { tableType: `${TableEnum}` }) => {
{isOpenPayModal && <PayModal onClose={onClosePayModal} />} {isOpenPayModal && <PayModal onClose={onClosePayModal} />}
{isOpenWxConcat && <WxConcat onClose={onCloseWxConcat} />} {isOpenWxConcat && <WxConcat onClose={onCloseWxConcat} />}
<File onSelect={onSelectFile} /> <File onSelect={onSelectFile} />
</> </Box>
); );
}; };
......
client/src/service/mongo.ts
import mongoose from 'mongoose'; import mongoose from 'mongoose';
import tunnel from 'tunnel'; import tunnel from 'tunnel';
import { startQueue } from './utils/tools'; import { startQueue } from './utils/tools';
import { updateSystemEnv, initSystemModels, initFeConfig } from '@/pages/api/system/updateEnv'; import { getInitConfig } from '@/pages/api/system/getInitData';
/** /**
* 连接 MongoDB 数据库 * 连接 MongoDB 数据库
...@@ -23,7 +23,6 @@ export async function connectToDatabase(): Promise<void> { ...@@ -23,7 +23,6 @@ export async function connectToDatabase(): Promise<void> {
}; };
global.sendInformQueue = []; global.sendInformQueue = [];
global.sendInformQueueLen = 0; global.sendInformQueueLen = 0;
global.feConfigs = {};
// proxy obj // proxy obj
if (process.env.AXIOS_PROXY_HOST && process.env.AXIOS_PROXY_PORT) { if (process.env.AXIOS_PROXY_HOST && process.env.AXIOS_PROXY_PORT) {
global.httpsAgent = tunnel.httpsOverHttp({ global.httpsAgent = tunnel.httpsOverHttp({
...@@ -35,9 +34,7 @@ export async function connectToDatabase(): Promise<void> { ...@@ -35,9 +34,7 @@ export async function connectToDatabase(): Promise<void> {
} }
// init function // init function
initSystemModels(); getInitConfig();
initFeConfig();
updateSystemEnv();
try { try {
mongoose.set('strictQuery', true); mongoose.set('strictQuery', true);
......
client/src/store/static.ts
...@@ -8,9 +8,9 @@ import { getInitData } from '@/api/system'; ...@@ -8,9 +8,9 @@ import { getInitData } from '@/api/system';
import { delay } from '@/utils/tools'; import { delay } from '@/utils/tools';
import { FeConfigsType } from '@/types'; import { FeConfigsType } from '@/types';
export let beianText = ''; export let beianText: string | undefined;
export let googleVerKey = ''; export let googleVerKey: string | undefined;
export let baiduTongji = ''; export let baiduTongji: string | undefined;
export let chatModelList: ChatModelItemType[] = []; export let chatModelList: ChatModelItemType[] = [];
export let qaModelList: QAModelItemType[] = []; export let qaModelList: QAModelItemType[] = [];
export let vectorModelList: VectorModelItemType[] = []; export let vectorModelList: VectorModelItemType[] = [];
...@@ -26,9 +26,10 @@ export const clientInitData = async (): Promise<InitDateResponse> => { ...@@ -26,9 +26,10 @@ export const clientInitData = async (): Promise<InitDateResponse> => {
qaModelList = res.qaModels; qaModelList = res.qaModels;
vectorModelList = res.vectorModels; vectorModelList = res.vectorModels;
feConfigs = res.feConfigs; feConfigs = res.feConfigs;
beianText = res.beianText; beianText = res.systemEnv.beianText;
googleVerKey = res.googleVerKey; googleVerKey = res.systemEnv.googleVerKey;
baiduTongji = res.baiduTongji; baiduTongji = res.systemEnv.baiduTongji;
console.log(res);
return res; return res;
} catch (error) { } catch (error) {
......
client/src/types/index.d.ts
...@@ -22,6 +22,15 @@ export type FeConfigsType = { ...@@ -22,6 +22,15 @@ export type FeConfigsType = {
systemTitle?: string; systemTitle?: string;
authorText?: string; authorText?: string;
}; };
export type SystemEnvType = {
beianText?: string;
googleVerKey?: string;
baiduTongji?: string;
vectorMaxProcess: number;
qaMaxProcess: number;
pgIvfflatProbe: number;
sensitiveCheck: boolean;
};
declare global { declare global {
var mongodb: Mongoose | string | null; var mongodb: Mongoose | string | null;
...@@ -32,12 +41,7 @@ declare global { ...@@ -32,12 +41,7 @@ declare global {
var OpenAiEncMap: Tiktoken; var OpenAiEncMap: Tiktoken;
var sendInformQueue: (() => Promise<void>)[]; var sendInformQueue: (() => Promise<void>)[];
var sendInformQueueLen: number; var sendInformQueueLen: number;
var systemEnv: { var systemEnv: SystemEnvType;
vectorMaxProcess: number;
qaMaxProcess: number;
pgIvfflatProbe: number;
sensitiveCheck: boolean;
};
var chatModels: ChatModelItemType[]; var chatModels: ChatModelItemType[];
var qaModels: QAModelItemType[]; var qaModels: QAModelItemType[];
var vectorModels: VectorModelItemType[]; var vectorModels: VectorModelItemType[];
......
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