Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
赵月辉
/
fastgpt-migrated
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Unverified
Commit
647f7016
authored
Apr 17, 2023
by
archer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
perf: 去除内容截取
parent
0db413ab
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
29 deletions
+15
-29
public/docs/chatProblem.md
+1
-1
src/pages/api/chat/chatGpt.ts
+3
-5
src/pages/api/chat/vectorGpt.ts
+5
-7
src/pages/api/openapi/chat/chatGpt.ts
+2
-7
src/pages/api/openapi/chat/vectorGpt.ts
+4
-9
No files found.
public/docs/chatProblem.md
View file @
647f7016
## 常见问题
## 常见问题
**内容长度**
**内容长度**
单次最长 4000 tokens, 上下文最长 8000 tokens, 上下文超长时会被截断
。
chatgpt 上下文最长 4096 tokens, 上下文超长时会报错
。
**删除和复制**
**删除和复制**
点击对话头像,可以选择复制或删除该条内容。
点击对话头像,可以选择复制或删除该条内容。
...
...
src/pages/api/chat/chatGpt.ts
View file @
647f7016
...
@@ -61,7 +61,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -61,7 +61,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
}
}
// 控制在 tokens 数量,防止超出
// 控制在 tokens 数量,防止超出
const
filterPrompts
=
openaiChatFilter
(
prompts
,
modelConstantsData
.
contextMaxToken
);
//
const filterPrompts = openaiChatFilter(prompts, modelConstantsData.contextMaxToken);
// 格式化文本内容成 chatgpt 格式
// 格式化文本内容成 chatgpt 格式
const
map
=
{
const
map
=
{
...
@@ -69,12 +69,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -69,12 +69,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
AI
:
ChatCompletionRequestMessageRoleEnum
.
Assistant
,
AI
:
ChatCompletionRequestMessageRoleEnum
.
Assistant
,
SYSTEM
:
ChatCompletionRequestMessageRoleEnum
.
System
SYSTEM
:
ChatCompletionRequestMessageRoleEnum
.
System
};
};
const
formatPrompts
:
ChatCompletionRequestMessage
[]
=
filterPrompts
.
map
(
const
formatPrompts
:
ChatCompletionRequestMessage
[]
=
prompts
.
map
((
item
:
ChatItemType
)
=>
({
(
item
:
ChatItemType
)
=>
({
role
:
map
[
item
.
obj
],
role
:
map
[
item
.
obj
],
content
:
item
.
value
content
:
item
.
value
})
}));
);
// console.log(formatPrompts);
// console.log(formatPrompts);
// 计算温度
// 计算温度
const
temperature
=
modelConstantsData
.
maxTemperature
*
(
model
.
temperature
/
10
);
const
temperature
=
modelConstantsData
.
maxTemperature
*
(
model
.
temperature
/
10
);
...
...
src/pages/api/chat/vectorGpt.ts
View file @
647f7016
...
@@ -116,8 +116,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -116,8 +116,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
});
});
}
else
{
}
else
{
// 有匹配情况下,添加知识库内容。
// 有匹配情况下,添加知识库内容。
// 系统提示词过滤,最多 2
0
00 tokens
// 系统提示词过滤,最多 2
5
00 tokens
const
systemPrompt
=
systemPromptFilter
(
formatRedisPrompt
,
2
0
00
);
const
systemPrompt
=
systemPromptFilter
(
formatRedisPrompt
,
2
5
00
);
prompts
.
unshift
({
prompts
.
unshift
({
obj
:
'SYSTEM'
,
obj
:
'SYSTEM'
,
...
@@ -128,7 +128,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -128,7 +128,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
}
}
// 控制在 tokens 数量,防止超出
// 控制在 tokens 数量,防止超出
const
filterPrompts
=
openaiChatFilter
(
prompts
,
modelConstantsData
.
contextMaxToken
);
//
const filterPrompts = openaiChatFilter(prompts, modelConstantsData.contextMaxToken);
// 格式化文本内容成 chatgpt 格式
// 格式化文本内容成 chatgpt 格式
const
map
=
{
const
map
=
{
...
@@ -136,12 +136,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -136,12 +136,10 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
AI
:
ChatCompletionRequestMessageRoleEnum
.
Assistant
,
AI
:
ChatCompletionRequestMessageRoleEnum
.
Assistant
,
SYSTEM
:
ChatCompletionRequestMessageRoleEnum
.
System
SYSTEM
:
ChatCompletionRequestMessageRoleEnum
.
System
};
};
const
formatPrompts
:
ChatCompletionRequestMessage
[]
=
filterPrompts
.
map
(
const
formatPrompts
:
ChatCompletionRequestMessage
[]
=
prompts
.
map
((
item
:
ChatItemType
)
=>
({
(
item
:
ChatItemType
)
=>
({
role
:
map
[
item
.
obj
],
role
:
map
[
item
.
obj
],
content
:
item
.
value
content
:
item
.
value
})
}));
);
// console.log(formatPrompts);
// console.log(formatPrompts);
// 计算温度
// 计算温度
const
temperature
=
modelConstantsData
.
maxTemperature
*
(
model
.
temperature
/
10
);
const
temperature
=
modelConstantsData
.
maxTemperature
*
(
model
.
temperature
/
10
);
...
...
src/pages/api/openapi/chat/chatGpt.ts
View file @
647f7016
...
@@ -74,21 +74,16 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -74,21 +74,16 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
});
});
}
}
// 控制在 tokens 数量,防止超出
const
filterPrompts
=
openaiChatFilter
(
prompts
,
modelConstantsData
.
contextMaxToken
);
// 格式化文本内容成 chatgpt 格式
// 格式化文本内容成 chatgpt 格式
const
map
=
{
const
map
=
{
Human
:
ChatCompletionRequestMessageRoleEnum
.
User
,
Human
:
ChatCompletionRequestMessageRoleEnum
.
User
,
AI
:
ChatCompletionRequestMessageRoleEnum
.
Assistant
,
AI
:
ChatCompletionRequestMessageRoleEnum
.
Assistant
,
SYSTEM
:
ChatCompletionRequestMessageRoleEnum
.
System
SYSTEM
:
ChatCompletionRequestMessageRoleEnum
.
System
};
};
const
formatPrompts
:
ChatCompletionRequestMessage
[]
=
filterPrompts
.
map
(
const
formatPrompts
:
ChatCompletionRequestMessage
[]
=
prompts
.
map
((
item
:
ChatItemType
)
=>
({
(
item
:
ChatItemType
)
=>
({
role
:
map
[
item
.
obj
],
role
:
map
[
item
.
obj
],
content
:
item
.
value
content
:
item
.
value
})
}));
);
// console.log(formatPrompts);
// console.log(formatPrompts);
// 计算温度
// 计算温度
const
temperature
=
modelConstantsData
.
maxTemperature
*
(
model
.
temperature
/
10
);
const
temperature
=
modelConstantsData
.
maxTemperature
*
(
model
.
temperature
/
10
);
...
...
src/pages/api/openapi/chat/vectorGpt.ts
View file @
647f7016
...
@@ -140,8 +140,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -140,8 +140,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
});
});
}
else
{
}
else
{
// 有匹配或者低匹配度模式情况下,添加知识库内容。
// 有匹配或者低匹配度模式情况下,添加知识库内容。
// 系统提示词过滤,最多 2
8
00 tokens
// 系统提示词过滤,最多 2
5
00 tokens
const
systemPrompt
=
systemPromptFilter
(
formatRedisPrompt
,
2
8
00
);
const
systemPrompt
=
systemPromptFilter
(
formatRedisPrompt
,
2
5
00
);
prompts
.
unshift
({
prompts
.
unshift
({
obj
:
'SYSTEM'
,
obj
:
'SYSTEM'
,
...
@@ -151,21 +151,16 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
...
@@ -151,21 +151,16 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
});
});
}
}
// 控制在 tokens 数量,防止超出
const
filterPrompts
=
openaiChatFilter
(
prompts
,
modelConstantsData
.
contextMaxToken
);
// 格式化文本内容成 chatgpt 格式
// 格式化文本内容成 chatgpt 格式
const
map
=
{
const
map
=
{
Human
:
ChatCompletionRequestMessageRoleEnum
.
User
,
Human
:
ChatCompletionRequestMessageRoleEnum
.
User
,
AI
:
ChatCompletionRequestMessageRoleEnum
.
Assistant
,
AI
:
ChatCompletionRequestMessageRoleEnum
.
Assistant
,
SYSTEM
:
ChatCompletionRequestMessageRoleEnum
.
System
SYSTEM
:
ChatCompletionRequestMessageRoleEnum
.
System
};
};
const
formatPrompts
:
ChatCompletionRequestMessage
[]
=
filterPrompts
.
map
(
const
formatPrompts
:
ChatCompletionRequestMessage
[]
=
prompts
.
map
((
item
:
ChatItemType
)
=>
({
(
item
:
ChatItemType
)
=>
({
role
:
map
[
item
.
obj
],
role
:
map
[
item
.
obj
],
content
:
item
.
value
content
:
item
.
value
})
}));
);
// console.log(formatPrompts);
// console.log(formatPrompts);
// 计算温度
// 计算温度
const
temperature
=
modelConstantsData
.
maxTemperature
*
(
model
.
temperature
/
10
);
const
temperature
=
modelConstantsData
.
maxTemperature
*
(
model
.
temperature
/
10
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment