Commit 176c5a4d by archer

fix: prompts filter

parent 0cde9a10
...@@ -129,7 +129,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) ...@@ -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) ...@@ -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
......
...@@ -88,7 +88,9 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse) ...@@ -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) ...@@ -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();
......
...@@ -140,7 +140,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex ...@@ -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 {
......
...@@ -104,6 +104,7 @@ export const openAiStreamResponse = async ({ ...@@ -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
}); });
......
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