rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-03 12:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1996 from aisu-wata0/staging

Browse Source 
fix: "Squash system messages" would fail to skip example messages
This commit is contained in:
Cohee 2024-04-02 00:35:57 +03:00 committed by GitHub
commit d498458971
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/scripts/openai.js
View File

@ -2249,8 +2249,12 @@ export class ChatCompletion {
continue; continue;
} }
if (!excludeList.includes(message.identifier) && message.role === 'system' && !message.name) { const shouldSquash = (message) => {
if (lastMessage && lastMessage.role === 'system') { return !excludeList.includes(message.identifier) && message.role === 'system' && !message.name;
}
if (shouldSquash(message)) {
if (lastMessage && shouldSquash(lastMessage)) {
lastMessage.content += '\n' + message.content; lastMessage.content += '\n' + message.content;
lastMessage.tokens = tokenHandler.count({ role: lastMessage.role, content: lastMessage.content }); lastMessage.tokens = tokenHandler.count({ role: lastMessage.role, content: lastMessage.content });
} }