Skip to content

Commit 4ada33e

Browse files
committed
feat: markdown extension (#3663)
* feat: markdown extension * media cros * rerank test * default price * perf: default model * fix: cannot custom provider * fix: default model select * update bg * perf: default model selector * fix: usage export * i18n * fix: rerank * update init extension * perf: ip limit check * doubao model order * web default modle * perf: tts selector * perf: tts error * qrcode package
1 parent 3683ac4 commit 4ada33e

File tree

49 files changed

+693
-280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+693
-280
lines changed

docSite/content/zh-cn/docs/development/upgrading/4820.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,6 @@ curl --location --request POST 'https://{{host}}/api/admin/initv4820' \
3232

3333
1. 新增 - 可视化模型参数配置。预设超过 100 个模型配置。同时支持所有类型模型的一键测试。(预计下个版本会完全支持在页面上配置渠道)。
3434
2. 新增 - 使用记录导出和仪表盘。
35-
3. 优化 - 页面组件抽离,减少页面组件路由。
36-
4. 优化 - 全文检索,忽略大小写。
35+
3. 新增 - markdown 语法扩展,支持音视频(代码块 audio 和 video)。
36+
4. 优化 - 页面组件抽离,减少页面组件路由。
37+
5. 优化 - 全文检索,忽略大小写。

packages/service/common/middle/reqFrequencyLimit.ts

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { ApiRequestProps } from '../../type/next';
22
import requestIp from 'request-ip';
3-
import { ERROR_ENUM } from '@fastgpt/global/common/error/errorCode';
43
import { authFrequencyLimit } from '../system/frequencyLimit/utils';
54
import { addSeconds } from 'date-fns';
65
import { NextApiResponse } from 'next';
@@ -9,22 +8,32 @@ import { jsonRes } from '../response';
98
// unit: times/s
109
// how to use?
1110
// export default NextAPI(useQPSLimit(10), handler); // limit 10 times per second for a ip
12-
export function useIPFrequencyLimit(seconds: number, limit: number, force = false) {
11+
export function useIPFrequencyLimit({
12+
id,
13+
seconds,
14+
limit,
15+
force = false
16+
}: {
17+
id: string;
18+
seconds: number;
19+
limit: number;
20+
force?: boolean;
21+
}) {
1322
return async (req: ApiRequestProps, res: NextApiResponse) => {
1423
const ip = requestIp.getClientIp(req);
1524
if (!ip || (process.env.USE_IP_LIMIT !== 'true' && !force)) {
1625
return;
1726
}
1827
try {
1928
await authFrequencyLimit({
20-
eventId: 'ip-qps-limit' + ip,
29+
eventId: `ip-qps-limit-${id}-` + ip,
2130
maxAmount: limit,
2231
expiredTime: addSeconds(new Date(), seconds)
2332
});
2433
} catch (_) {
2534
jsonRes(res, {
2635
code: 429,
27-
error: ERROR_ENUM.tooManyRequest
36+
error: `Too many request, request ${limit} times every ${seconds} seconds`
2837
});
2938
}
3039
};

packages/service/common/response/index.ts

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,15 @@ export const jsonRes = <T = any>(
3333

3434
addLog.error(`Api response error: ${url}`, ERROR_RESPONSE[errResponseKey]);
3535

36-
return res.status(code).json(ERROR_RESPONSE[errResponseKey]);
36+
res.status(code);
37+
38+
if (message) {
39+
res.send(message);
40+
} else {
41+
res.json(ERROR_RESPONSE[errResponseKey]);
42+
}
43+
44+
return;
3745
}
3846

3947
// another error

packages/service/core/ai/config/provider/Doubao.json

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"provider": "Doubao",
33
"list": [
44
{
5-
"model": "Doubao-lite-128k",
6-
"name": "Doubao-lite-128k",
7-
"maxContext": 128000,
5+
"model": "Doubao-lite-4k",
6+
"name": "Doubao-lite-4k",
7+
"maxContext": 4000,
88
"maxResponse": 4000,
9-
"quoteMaxToken": 120000,
9+
"quoteMaxToken": 4000,
1010
"maxTemperature": 1,
1111
"vision": false,
1212
"toolChoice": true,
@@ -46,11 +46,11 @@
4646
"type": "llm"
4747
},
4848
{
49-
"model": "Doubao-lite-4k",
50-
"name": "Doubao-lite-4k",
51-
"maxContext": 4000,
49+
"model": "Doubao-lite-128k",
50+
"name": "Doubao-lite-128k",
51+
"maxContext": 128000,
5252
"maxResponse": 4000,
53-
"quoteMaxToken": 4000,
53+
"quoteMaxToken": 120000,
5454
"maxTemperature": 1,
5555
"vision": false,
5656
"toolChoice": true,
@@ -68,14 +68,14 @@
6868
"type": "llm"
6969
},
7070
{
71-
"model": "Doubao-pro-128k",
72-
"name": "Doubao-pro-128k",
73-
"maxContext": 128000,
71+
"model": "Doubao-vision-lite-32k",
72+
"name": "Doubao-vision-lite-32k",
73+
"maxContext": 32000,
7474
"maxResponse": 4000,
75-
"quoteMaxToken": 120000,
75+
"quoteMaxToken": 32000,
7676
"maxTemperature": 1,
77-
"vision": false,
78-
"toolChoice": true,
77+
"vision": true,
78+
"toolChoice": false,
7979
"functionCall": false,
8080
"defaultSystemChatPrompt": "",
8181
"datasetProcess": true,
@@ -90,11 +90,11 @@
9090
"type": "llm"
9191
},
9292
{
93-
"model": "Doubao-pro-32k",
94-
"name": "Doubao-pro-32k",
95-
"maxContext": 32000,
93+
"model": "Doubao-pro-4k",
94+
"name": "Doubao-pro-4k",
95+
"maxContext": 4000,
9696
"maxResponse": 4000,
97-
"quoteMaxToken": 32000,
97+
"quoteMaxToken": 4000,
9898
"maxTemperature": 1,
9999
"vision": false,
100100
"toolChoice": true,
@@ -112,11 +112,11 @@
112112
"type": "llm"
113113
},
114114
{
115-
"model": "Doubao-pro-4k",
116-
"name": "Doubao-pro-4k",
117-
"maxContext": 4000,
115+
"model": "Doubao-pro-32k",
116+
"name": "Doubao-pro-32k",
117+
"maxContext": 32000,
118118
"maxResponse": 4000,
119-
"quoteMaxToken": 4000,
119+
"quoteMaxToken": 32000,
120120
"maxTemperature": 1,
121121
"vision": false,
122122
"toolChoice": true,
@@ -134,14 +134,14 @@
134134
"type": "llm"
135135
},
136136
{
137-
"model": "Doubao-vision-lite-32k",
138-
"name": "Doubao-vision-lite-32k",
139-
"maxContext": 32000,
137+
"model": "Doubao-pro-128k",
138+
"name": "Doubao-pro-128k",
139+
"maxContext": 128000,
140140
"maxResponse": 4000,
141-
"quoteMaxToken": 32000,
141+
"quoteMaxToken": 120000,
142142
"maxTemperature": 1,
143-
"vision": true,
144-
"toolChoice": false,
143+
"vision": false,
144+
"toolChoice": true,
145145
"functionCall": false,
146146
"defaultSystemChatPrompt": "",
147147
"datasetProcess": true,
@@ -192,4 +192,4 @@
192192
"type": "embedding"
193193
}
194194
]
195-
}
195+
}

0 commit comments

Comments
 (0)