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

fix: destroy后仍有push流

Browse Source
This commit is contained in:
archer
2023-03-24 14:35:33 +08:00
parent 6ce727f9ea
commit 30678d8ebf
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/pages/api/chat/chatGpt.ts
View File

@@ -121,7 +121,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
if (!content) return; if (!content) return;
responseContent += content; responseContent += content;
// console.log('content:', content) // console.log('content:', content)
stream.push(content.replace(/\n/g, '<br/>')); !stream.destroyed && stream.push(content.replace(/\n/g, '<br/>'));
} catch (error) { } catch (error) {
error; error;
} }
@@ -140,7 +140,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
} catch (error) { } catch (error) {
console.log('pipe error', error); console.log('pipe error', error);
} }
stream.push(null); // close stream
stream.destroy();
const promptsLen = formatPrompts.reduce((sum, item) => sum + item.content.length, 0); const promptsLen = formatPrompts.reduce((sum, item) => sum + item.content.length, 0);
console.log(`responseLen: ${responseContent.length}`, `promptLen: ${promptsLen}`); console.log(`responseLen: ${responseContent.length}`, `promptLen: ${promptsLen}`);
@@ -154,8 +155,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
}); });
} catch (err: any) { } catch (err: any) {
if (step === 1) { if (step === 1) {
console.log('error，结束');
// 直接结束流 // 直接结束流
console.log('error，结束');
stream.destroy(); stream.destroy();
} else { } else {
res.status(500); res.status(500);

6
src/service/events/bill.ts
View File

@@ -14,15 +14,9 @@ export const pushBill = async ({
}) => { }) => {
await connectToDatabase(); await connectToDatabase();
const modelItem = modelList.find((item) => item.model === modelName);
if (!modelItem) return;
let billId; let billId;
try { try {
await connectToDatabase();
const modelItem = modelList.find((item) => item.model === modelName); const modelItem = modelList.find((item) => item.model === modelName);
if (!modelItem) return; if (!modelItem) return;