Fix last prompt line not counted toward token limit

9010880b64c4710768b6f16cfc98cc0b10b1247e

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: b21ba850c0e4837a652770c36d83525c05dd1121
1 files changed, +5 -5Showing whitespace changes
public/script.js+5 -5
@@ -3769,10 +3769,10 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
37693769 storyString,
37703770 afterScenarioAnchor,
37713771 examplesString,
3772+ userAlignmentMessage,
37723773 chatString,
3773- quiet_prompt,
3774+ modifyLastPromptLine(''),
37743775 cyclePrompt,
3775- userAlignmentMessage,
37763776 ].join('').replace(/\r/gm, '');
37773777 return getTokenCountAsync(encodeString, power_user.token_padding);
37783778 }
@@ -3803,8 +3803,8 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
38033803 }
38043804
38053805 tokenCount += await getTokenCountAsync(item.replace(/\r/gm, ''));
3806- chatString = item + chatString;
38073806 if (tokenCount < this_max_context) {
3807+ chatString = chatString + item;
38083808 arrMes[index] = item;
38093809 lastAddedIndex = Math.max(lastAddedIndex, index);
38103810 } else {
@@ -3830,8 +3830,8 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
38303830 }
38313831
38323832 tokenCount += await getTokenCountAsync(item.replace(/\r/gm, ''));
3833- chatString = item + chatString;
38343833 if (tokenCount < this_max_context) {
3834+ chatString = chatString + item;
38353835 arrMes[i] = item;
38363836 lastAddedIndex = Math.max(lastAddedIndex, i);
38373837 } else {
@@ -4036,8 +4036,8 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
40364036 mesExmString,
40374037 addChatsPreamble(addChatsSeparator(jointMessages)),
40384038 '\n',
4039+ modifyLastPromptLine(''),
40394040 generatedPromptCache,
4040- quiet_prompt,
40414041 ].join('').replace(/\r/gm, '');
40424042 let thisPromptContextSize = await getTokenCountAsync(prompt, power_user.token_padding);
40434043