rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1397 from aisu-wata0/claude_system_order_fix

This commit is contained in:
Cohee 2023-11-24 23:38:02 +02:00 committed by GitHub
parent 8e49ecce49 a6898365d1
commit 2c822f79f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/chat-completion.js
View File

@ -18,14 +18,20 @@ function convertClaudePrompt(messages, addHumanPrefix, addAssistantPostfix, with
let systemPrompt = ''; let systemPrompt = '';
if (withSystemPrompt) { if (withSystemPrompt) {
for (const message of messages) { let lastSystemIdx = -1;
for (let i = 0; i < messages.length - 1; i++) {
const message = messages[i];
if (message.role === "system" && !message.name) { if (message.role === "system" && !message.name) {
systemPrompt += message.content + '\n\n'; systemPrompt += message.content + '\n\n';
messages.splice(messages.indexOf(message), 1);
} else { } else {
lastSystemIdx = i - 1;
break; break;
} }
} }
if (lastSystemIdx >= 0) {
messages.splice(0, lastSystemIdx + 1);
}
} }
let requestPrompt = messages.map((v) => { let requestPrompt = messages.map((v) => {