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

Merge pull request #244 from gidzzz/fix-openai-no-bottom-anchor

Browse Source
This commit is contained in:
Cohee
2023-05-06 11:48:49 +03:00
committed by GitHub
parent 58e45ee926 4795534d27
commit b9fb937052
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/scripts/openai.js
View File

@ -204,8 +204,10 @@ function generateOpenAIPromptCache(charPersonality, topAnchorDepth, anchorTop, b
item = `[${name2} is ${personalityAndAnchor}]\n${item}`;
}
}
if (i === openai_msgs.length - 1 && openai_msgs.length > bottomAnchorThreshold && $.trim(item).substr(0, (name1 + ":").length) == name1 + ":") {//For add anchor in end
item = anchorBottom + "\n" + item;
if (i === openai_msgs.length - 1 && openai_msgs.length > bottomAnchorThreshold && msg.role === "user") {//For add anchor in end
if (anchorBottom) {
item = anchorBottom + "\n" + item;
}
}
msg["content"] = item;
@ -238,14 +240,14 @@ function parseExampleIntoIndividual(messageExampleString) {
let cur_str = tmp[i];
// if it's the user message, switch into user mode and out of bot mode
// yes, repeated code, but I don't care
if (cur_str.indexOf(name1 + ":") === 0) {
if (cur_str.startsWith(name1 + ":")) {
in_user = true;
// we were in the bot mode previously, add the message
if (in_bot) {
add_msg(name2, "system", "example_assistant");
}
in_bot = false;
} else if (cur_str.indexOf(name2 + ":") === 0) {
} else if (cur_str.startsWith(name2 + ":")) {
in_bot = true;
// we were in the user mode previously, add the message
if (in_user) {