rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

(Fix) "squash sys. messages" processed empty messages, adding \n

Browse Source
This commit is contained in:
DonMoralez
2023-12-16 00:24:48 +02:00
parent 1f36a3eaae
commit 6b59014892
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/openai.js
View File

@ -1960,7 +1960,7 @@ class ChatCompletion {
for (let message of this.messages.collection) { for (let message of this.messages.collection) {
if (!excludeList.includes(message.identifier) && message.role === 'system' && !message.name) { if (!excludeList.includes(message.identifier) && message.role === 'system' && !message.name) {
if (lastMessage && lastMessage.role === 'system') { if (lastMessage && message.content && lastMessage.role === 'system') {
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 });
} }

4
src/endpoints/prompt-converters.js
View File

@ -18,7 +18,7 @@ function convertClaudePrompt(messages, addAssistantPostfix, addAssistantPrefill,
if (addAssistantPostfix) { if (addAssistantPostfix) {
messages.push({ messages.push({
role: 'assistant', role: 'assistant',
content: addAssistantPrefill || '', content: addAssistantPrefill || '4',
}); });
} }
// Find the index of the first message with an assistant role and check for a "'user' role/Human:" before it. // Find the index of the first message with an assistant role and check for a "'user' role/Human:" before it.
@ -63,7 +63,7 @@ function convertClaudePrompt(messages, addAssistantPostfix, addAssistantPrefill,
'user': '\n\nHuman: ', 'user': '\n\nHuman: ',
'system': i === 0 ? '' : v.name === 'example_assistant' ? '\n\nA: ' : v.name === 'example_user' ? '\n\nH: ' : '\n\n', 'system': i === 0 ? '' : v.name === 'example_assistant' ? '\n\nA: ' : v.name === 'example_user' ? '\n\nH: ' : '\n\n',
'FixHumMsg': '\n\nFirst message: ', 'FixHumMsg': '\n\nFirst message: ',
}[v.role] ?? '\n\n'; }[v.role] ?? '\n\n4';
return prefix + v.content; return prefix + v.content;
}).join(''); }).join('');