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 oobabooga

Browse Source
This commit is contained in:
SillyLossy
2023-04-21 14:38:38 +03:00
parent b180aeaae5
commit 50526a16b9
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
public/script.js
View File

@ -1028,7 +1028,7 @@ function getStoppingStrings(isImpersonate, addSpace) {
const charString = `\n${name2}:`; const charString = `\n${name2}:`;
const userString = is_pygmalion ? `\nYou:` : `\n${name1}:`; const userString = is_pygmalion ? `\nYou:` : `\n${name1}:`;
const result = isImpersonate ? charString : userString; const result = isImpersonate ? charString : userString;
return addSpace ? `${result} ` : result; return [addSpace ? `${result} ` : result];
} }
function getSlashCommand(message, type) { function getSlashCommand(message, type) {
@ -1879,7 +1879,7 @@ async function Generate(type, automatic_trigger, force_name2) {
'early_stopping': textgenerationwebui_settings.early_stopping, 'early_stopping': textgenerationwebui_settings.early_stopping,
'seed': textgenerationwebui_settings.seed, 'seed': textgenerationwebui_settings.seed,
'add_bos_token': textgenerationwebui_settings.add_bos_token, 'add_bos_token': textgenerationwebui_settings.add_bos_token,
'custom_stopping_strings': JSON.stringify(getStoppingStrings(isImpersonate, false)), 'stopping_strings': getStoppingStrings(isImpersonate, false),
'truncation_length': max_context, 'truncation_length': max_context,
'ban_eos_token': textgenerationwebui_settings.ban_eos_token, 'ban_eos_token': textgenerationwebui_settings.ban_eos_token,
'skip_special_tokens': textgenerationwebui_settings.skip_special_tokens, 'skip_special_tokens': textgenerationwebui_settings.skip_special_tokens,
@ -2177,13 +2177,15 @@ function cleanUpMessage(getMessage, isImpersonate) {
getMessage = getMessage.trim(); getMessage = getMessage.trim();
} }
const stoppingString = getStoppingStrings(isImpersonate, false); const stoppingStrings = getStoppingStrings(isImpersonate, false);
if (stoppingString.length) { for (const stoppingString of stoppingStrings) {
for (let j = stoppingString.length - 1; j > 0; j--) { if (stoppingString.length) {
if (getMessage.slice(-j) === stoppingString.slice(0, j)) { for (let j = stoppingString.length - 1; j > 0; j--) {
getMessage = getMessage.slice(0, -j); if (getMessage.slice(-j) === stoppingString.slice(0, j)) {
break; getMessage = getMessage.slice(0, -j);
break;
}
} }
} }
} }

2
public/scripts/kai-settings.js
View File

@ -85,7 +85,7 @@ function getKoboldGenerationData(finalPromt, this_settings, this_amount_gen, thi
s7: this_settings.sampler_order[6], s7: this_settings.sampler_order[6],
use_world_info: false, use_world_info: false,
singleline: kai_settings.single_line, singleline: kai_settings.single_line,
stop_sequence: kai_settings.use_stop_sequence ? [getStoppingStrings(isImpersonate, false)] : undefined, stop_sequence: kai_settings.use_stop_sequence ? getStoppingStrings(isImpersonate, false) : undefined,
}; };
return generate_data; return generate_data;
} }

4
public/scripts/textgen-settings.js
View File

@ -26,11 +26,11 @@ let textgenerationwebui_settings = {
seed: -1, seed: -1,
preset: 'Default', preset: 'Default',
add_bos_token: true, add_bos_token: true,
custom_stopping_strings: [], stopping_strings: [],
truncation_length: 2048, truncation_length: 2048,
ban_eos_token: false, ban_eos_token: false,
streaming: false, streaming: false,
fn_index: 34, fn_index: 43,
skip_special_tokens: true, skip_special_tokens: true,
}; };

2
server.js
View File

@ -424,7 +424,7 @@ app.post("/generate_textgenerationwebui", jsonParser, async function (request, r
let result = JSON.parse(request.body.data)[0]; let result = JSON.parse(request.body.data)[0];
let prompt = result; let prompt = result;
let stopping_strings = JSON.parse(request.body.data)[1].custom_stopping_strings; let stopping_strings = JSON.parse(request.body.data)[1].stopping_strings;
try { try {
for await (const text of readWebsocket()) { for await (const text of readWebsocket()) {