ChatGPT/FastGPT
1
0
Fork 0
mirror of https://github.com/labring/FastGPT.git synced 2025-10-19 10:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: prompts filter

Browse Source
This commit is contained in:
archer
2023-05-30 21:27:09 +08:00
parent 0cde9a10a8
commit 176c5a4d79
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/pages/api/chat/chat.ts
View File

@@ -129,7 +129,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
); );
// 发出 chat 请求 // 发出 chat 请求
const { streamResponse } = await modelServiceToolMap[model.chat.chatModel].chatCompletion({ const { streamResponse, responseMessages } = await modelServiceToolMap[
model.chat.chatModel
].chatCompletion({
apiKey: userOpenAiKey || systemAuthKey, apiKey: userOpenAiKey || systemAuthKey,
temperature: +temperature, temperature: +temperature,
messages: prompts, messages: prompts,
@@ -147,7 +149,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
model: model.chat.chatModel, model: model.chat.chatModel,
res, res,
chatResponse: streamResponse, chatResponse: streamResponse,
prompts prompts: responseMessages
}); });
// save chat // save chat

6
src/pages/api/chat/shareChat/chat.ts
View File

@@ -88,7 +88,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
); );
// 发出请求 // 发出请求
const { streamResponse } = await modelServiceToolMap[model.chat.chatModel].chatCompletion({ const { streamResponse, responseMessages } = await modelServiceToolMap[
model.chat.chatModel
].chatCompletion({
apiKey: userOpenAiKey || systemAuthKey, apiKey: userOpenAiKey || systemAuthKey,
temperature: +temperature, temperature: +temperature,
messages: prompts, messages: prompts,
@@ -106,7 +108,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
model: model.chat.chatModel, model: model.chat.chatModel,
res, res,
chatResponse: streamResponse, chatResponse: streamResponse,
prompts prompts: responseMessages
}); });
res.end(); res.end();

2
src/pages/api/openapi/chat/chat.ts
View File

@@ -140,7 +140,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
model: model.chat.chatModel, model: model.chat.chatModel,
res, res,
chatResponse: streamResponse, chatResponse: streamResponse,
prompts prompts: responseMessages
}); });
res.end(); res.end();
return { return {

1
src/service/utils/chat/openai.ts
View File

@@ -104,6 +104,7 @@ export const openAiStreamResponse = async ({
obj: ChatRoleEnum.AI, obj: ChatRoleEnum.AI,
value: responseContent value: responseContent
}); });
const totalTokens = modelToolMap[model].countTokens({ const totalTokens = modelToolMap[model].countTokens({
messages: finishMessages messages: finishMessages
}); });