mirror of
https://github.com/morgan9e/chatgpt-web
synced 2026-04-14 00:14:04 +09:00
Fix potential infinite loop
This commit is contained in:
@@ -364,8 +364,8 @@ export class ChatRequest {
|
|||||||
let promptSummarySize = countMessageTokens(summaryRequest, model, chat)
|
let promptSummarySize = countMessageTokens(summaryRequest, model, chat)
|
||||||
// Make sure there is enough room to generate the summary, and try to make sure
|
// Make sure there is enough room to generate the summary, and try to make sure
|
||||||
// the last prompt is a user prompt as that seems to work better for summaries
|
// the last prompt is a user prompt as that seems to work better for summaries
|
||||||
while ((topSize + reductionPoolSize + promptSummarySize + maxSummaryTokens) >= maxTokens ||
|
while (rw.length > 2 && ((topSize + reductionPoolSize + promptSummarySize + maxSummaryTokens) >= maxTokens ||
|
||||||
(reductionPoolSize >= 100 && rw[rw.length - 1]?.role !== 'user')) {
|
(reductionPoolSize >= 100 && rw[rw.length - 1]?.role !== 'user'))) {
|
||||||
bottom.unshift(rw.pop() as Message)
|
bottom.unshift(rw.pop() as Message)
|
||||||
reductionPoolSize = countPromptTokens(rw, model, chat)
|
reductionPoolSize = countPromptTokens(rw, model, chat)
|
||||||
maxSummaryTokens = getSS()
|
maxSummaryTokens = getSS()
|
||||||
|
|||||||
Reference in New Issue
Block a user