mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-02-01 11:56:48 +01:00
Prevent duplicate messages
By removing obsolete example message assignments
This commit is contained in:
parent
9a7bbd4ffb
commit
7411ca1154
@ -497,32 +497,7 @@ function prepareExampleMessages(messages, exampleMessages, includeAll = false, )
|
|||||||
examples_tosend.push(example);
|
examples_tosend.push(example);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// go from newest message to oldest, because we want to delete the older ones from the context
|
|
||||||
for (let j = messages.length - 1; j >= 0; j--) {
|
|
||||||
let item = messages[j];
|
|
||||||
let item_count = countTokens(item);
|
|
||||||
// If we have enough space for this message, also account for the max assistant reply size
|
|
||||||
if ((total_count + item_count) < (oai_settings.openai_max_context - oai_settings.openai_max_tokens)) {
|
|
||||||
messages.push(item);
|
|
||||||
} else {
|
|
||||||
// early break since if we still have more messages, they just won't fit anyway
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
for (let j = messages.length - 1; j >= 0; j--) {
|
|
||||||
let item = messages[j];
|
|
||||||
let item_count = countTokens(item);
|
|
||||||
// If we have enough space for this message, also account for the max assistant reply size
|
|
||||||
if ((total_count + item_count) < (oai_settings.openai_max_context - oai_settings.openai_max_tokens)) {
|
|
||||||
messages.push(item);
|
|
||||||
} else {
|
|
||||||
// early break since if we still have more messages, they just won't fit anyway
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// each example block contains multiple user/bot messages
|
// each example block contains multiple user/bot messages
|
||||||
for (let example_block of exampleMessages) {
|
for (let example_block of exampleMessages) {
|
||||||
if (example_block.length == 0) {
|
if (example_block.length == 0) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user