Skip to content

Commit 3b776b6

Browse files
authored
v4.5 (#403)
1 parent dd8f274 commit 3b776b6

File tree

98 files changed

+1524
-982
lines changed

Some content is hidden

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

98 files changed

+1524
-982
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ ARG name
99
# copy packages and one project
1010
COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
1111
COPY ./packages ./packages
12-
COPY ./projects/$name ./projects/$name
12+
COPY ./projects/$name/package.json ./projects/$name/package.json
1313

1414
RUN \
1515
[ -f pnpm-lock.yaml ] && pnpm install || \
1616
(echo "Lockfile not found." && exit 1)
1717

18-
RUN pnpm prune
19-
2018
# Rebuild the source code only when needed
2119
FROM node:current-alpine AS builder
2220
WORKDIR /app
2321

2422
ARG name
2523

2624
# copy common node_modules and one project node_modules
25+
COPY package.json pnpm-workspace.yaml ./
2726
COPY --from=deps /app/node_modules ./node_modules
2827
COPY --from=deps /app/packages ./packages
29-
COPY --from=deps /app/projects/$name ./projects/$name
28+
COPY ./projects/$name ./projects/$name
29+
COPY --from=deps /app/projects/$name/node_modules ./projects/$name/node_modules
3030

3131
# Uncomment the following line in case you want to disable telemetry during the build.
3232
ENV NEXT_TELEMETRY_DISABLED 1

docSite/assets/imgs/v45-1.png

1.25 MB
Loading

docSite/assets/imgs/v45-2.png

286 KB
Loading

docSite/assets/imgs/v45-3.png

382 KB
Loading

docSite/assets/imgs/v45-4.png

289 KB
Loading

docSite/content/docs/custom-models/chatglm2-m3e.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ Authorization 为 sk-aaabbbcccdddeeefffggghhhiiijjjkkk。model 为刚刚在 One
6363

6464
```json
6565
"ChatModels": [
66-
//已有模型
66+
//其他对话模型
6767
{
6868
"model": "chatglm2",
6969
"name": "chatglm2",
70-
"contextMaxToken": 8000,
70+
"maxToken": 8000,
71+
"price": 0,
7172
"quoteMaxToken": 4000,
7273
"maxTemperature": 1.2,
73-
"price": 0,
74-
"defaultSystem": ""
74+
"defaultSystemChatPrompt": ""
7575
}
7676
],
7777
"VectorModels": [

docSite/content/docs/custom-models/chatglm2.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,11 @@ Authorization 为 sk-aaabbbcccdddeeefffggghhhiiijjjkkk。model 为刚刚在 One
107107
{
108108
"model": "chatglm2",
109109
"name": "chatglm2",
110-
"contextMaxToken": 8000,
110+
"maxToken": 8000,
111+
"price": 0,
111112
"quoteMaxToken": 4000,
112113
"maxTemperature": 1.2,
113-
"price": 0,
114-
"defaultSystem": ""
114+
"defaultSystemChatPrompt": ""
115115
}
116116
]
117117
```

docSite/content/docs/development/configuration.md

Lines changed: 53 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -27,31 +27,75 @@ weight: 520
2727
},
2828
"ChatModels": [
2929
{
30-
"model": "gpt-3.5-turbo",
31-
"name": "GPT35-4k",
32-
"contextMaxToken": 4000, // 最大token,均按 gpt35 计算
30+
"model": "gpt-3.5-turbo", // 实际调用的模型
31+
"name": "GPT35-4k", // 展示的名字
32+
"maxToken": 4000, // 最大token,均按 gpt35 计算
3333
"quoteMaxToken": 2000, // 引用内容最大 token
3434
"maxTemperature": 1.2, // 最大温度
3535
"price": 0,
36-
"defaultSystem": ""
36+
"defaultSystemChatPrompt": ""
3737
},
3838
{
3939
"model": "gpt-3.5-turbo-16k",
4040
"name": "GPT35-16k",
41-
"contextMaxToken": 16000,
41+
"maxToken": 16000,
4242
"quoteMaxToken": 8000,
4343
"maxTemperature": 1.2,
4444
"price": 0,
45-
"defaultSystem": ""
45+
"defaultSystemChatPrompt": ""
4646
},
4747
{
4848
"model": "gpt-4",
4949
"name": "GPT4-8k",
50-
"contextMaxToken": 8000,
50+
"maxToken": 8000,
5151
"quoteMaxToken": 4000,
5252
"maxTemperature": 1.2,
5353
"price": 0,
54-
"defaultSystem": ""
54+
"defaultSystemChatPrompt": ""
55+
}
56+
],
57+
"QAModel": [ // QA 拆分模型
58+
{
59+
"model": "gpt-3.5-turbo-16k",
60+
"name": "GPT35-16k",
61+
"maxToken": 16000,
62+
"price": 0
63+
}
64+
],
65+
"ExtractModels": [ // 内容提取模型
66+
{
67+
"model": "gpt-3.5-turbo-16k",
68+
"name": "GPT35-16k",
69+
"maxToken": 16000,
70+
"price": 0,
71+
"functionCall": true, // 是否支持 function call
72+
"functionPrompt": "" // 自定义非 function call 提示词
73+
}
74+
],
75+
"CQModels": [ // Classify Question: 问题分类模型
76+
{
77+
"model": "gpt-3.5-turbo-16k",
78+
"name": "GPT35-16k",
79+
"maxToken": 16000,
80+
"price": 0,
81+
"functionCall": true,
82+
"functionPrompt": ""
83+
},
84+
{
85+
"model": "gpt-4",
86+
"name": "GPT4-8k",
87+
"maxToken": 8000,
88+
"price": 0,
89+
"functionCall": true,
90+
"functionPrompt": ""
91+
}
92+
],
93+
"QGModels": [ // Question Generation: 生成下一步指引模型
94+
{
95+
"model": "gpt-3.5-turbo",
96+
"name": "GPT35-4k",
97+
"maxToken": 4000,
98+
"price": 0
5599
}
56100
],
57101
"VectorModels": [
@@ -62,36 +106,6 @@ weight: 520
62106
"defaultToken": 500,
63107
"maxToken": 3000
64108
}
65-
],
66-
"QAModel": { // QA 拆分模型
67-
"model": "gpt-3.5-turbo-16k",
68-
"name": "GPT35-16k",
69-
"maxToken": 16000,
70-
"price": 0
71-
},
72-
"ExtractModel": { // 内容提取模型
73-
"model": "gpt-3.5-turbo-16k",
74-
"functionCall": true, // 是否使用 functionCall
75-
"name": "GPT35-16k",
76-
"maxToken": 16000,
77-
"price": 0,
78-
"prompt": ""
79-
},
80-
"CQModel": { // Classify Question: 问题分类模型
81-
"model": "gpt-3.5-turbo-16k",
82-
"functionCall": true,
83-
"name": "GPT35-16k",
84-
"maxToken": 16000,
85-
"price": 0,
86-
"prompt": ""
87-
},
88-
"QGModel": { // Question Generation: 生成下一步指引模型
89-
"model": "gpt-3.5-turbo",
90-
"name": "GPT35-4k",
91-
"maxToken": 4000,
92-
"price": 0,
93-
"prompt": "",
94-
"functionCall": false
95-
}
109+
]
96110
}
97111
```

docSite/content/docs/installation/docker.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,21 @@ docker-compose 端口定义为:`映射端口:运行端口`。
139139

140140
(自行补习 docker 基本知识)
141141

142+
### relation "modeldata" does not exist
143+
144+
PG 数据库没有连接上/初始化失败,可以查看日志。FastGPT 会在每次连接上 PG 时进行表初始化,如果报错会有对应日志。
145+
146+
1. 检查数据库容器是否正常启动
147+
2. 非 docker 部署的,需要手动安装 pg vector 插件
148+
3. 查看 fastgpt 日志,有没有相关报错
149+
150+
### Operation `auth_codes.findOne()` buffering timed out after 10000ms
151+
152+
mongo连接失败,检查
153+
1. mongo 服务有没有起来(有些 cpu 不支持 AVX,无法用 mongo5,需要换成 mongo4.x,可以dockerhub找个最新的4.x,修改镜像版本,重新运行)
154+
2. 环境变量(账号密码,注意host和port)
155+
156+
142157
### 错误排查方式
143158

144159
遇到问题先按下面方式排查。

docSite/content/docs/installation/one-api.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,12 @@ CHAT_API_KEY=sk-xxxxxx
9999
{
100100
"model": "ERNIE-Bot", // 这里的模型需要对应 One API 的模型
101101
"name": "文心一言", // 对外展示的名称
102-
"contextMaxToken": 4000, // 最大长下文 token,无论什么模型都按 GPT35 的计算。GPT 外的模型需要自行大致计算下这个值。可以调用官方接口去比对 Token 的倍率,然后在这里粗略计算。
102+
"maxToken": 4000, // 最大长下文 token,无论什么模型都按 GPT35 的计算。GPT 外的模型需要自行大致计算下这个值。可以调用官方接口去比对 Token 的倍率,然后在这里粗略计算。
103103
// 例如:文心一言的中英文 token 基本是 1:1,而 GPT 的中文 Token 是 2:1,如果文心一言官方最大 Token 是 4000,那么这里就可以填 8000,保险点就填 7000.
104+
"price": 0, // 1个token 价格 => 1.5 / 100000 * 1000 = 0.015元/1k token
104105
"quoteMaxToken": 2000, // 引用知识库的最大 Token
105106
"maxTemperature": 1, // 最大温度
106-
"price": 0, // 1个token 价格 => 1.5 / 100000 * 1000 = 0.015元/1k token
107-
"defaultSystem": "" // 默认的系统提示词
107+
"defaultSystemChatPrompt": "" // 默认的系统提示词
108108
}
109109
...
110110
],

0 commit comments

Comments
 (0)