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

Collapse newlines in prompt

Browse Source
This commit is contained in:
SillyLossy
2023-03-18 22:42:41 +02:00
parent bf5b2a5c40
commit 92d4a7f19e
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/script.js
View File

@ -34,6 +34,7 @@ import {
import { import {
force_pygmalion_formatting, force_pygmalion_formatting,
collapse_newlines, collapse_newlines,
collapseNewlines,
} from "./scripts/power-user.js"; } from "./scripts/power-user.js";
import { debounce, delay } from "./scripts/utils.js"; import { debounce, delay } from "./scripts/utils.js";
@ -1336,6 +1337,10 @@ async function Generate(type, automatic_trigger) {//encode("dsfs").length
} }
finalPromt = worldInfoBefore + storyString + worldInfoAfter + extension_prompt + mesExmString + mesSendString + generatedPromtCache + promptBias; finalPromt = worldInfoBefore + storyString + worldInfoAfter + extension_prompt + mesExmString + mesSendString + generatedPromtCache + promptBias;
finalPromt = finalPromt.replace(/\r/gm, ''); finalPromt = finalPromt.replace(/\r/gm, '');
if (collapse_newlines) {
finalPromt = collapseNewlines(finalPromt);
}
//console.log('final prompt decided'); //console.log('final prompt decided');
//if we aren't using the kobold GUI settings... //if we aren't using the kobold GUI settings...
@ -1493,7 +1498,7 @@ async function Generate(type, automatic_trigger) {//encode("dsfs").length
} }
if (collapse_newlines) { if (collapse_newlines) {
getMessage = getMessage.replaceAll(/\n+/g, "\n"); getMessage = collapseNewlines(getMessage);
} }
//Pygmalion run again // to make it continue generating so long as it's under max_amount and hasn't signaled //Pygmalion run again // to make it continue generating so long as it's under max_amount and hasn't signaled

5
public/scripts/power-user.js
View File

@ -1,4 +1,5 @@
export { export {
collapseNewlines,
collapse_newlines, collapse_newlines,
force_pygmalion_formatting, force_pygmalion_formatting,
}; };
@ -11,6 +12,10 @@ const storage_keys = {
force_pygmalion_formatting: "TavernAI_force_pygmalion_formatting", force_pygmalion_formatting: "TavernAI_force_pygmalion_formatting",
}; };
function collapseNewlines(x) {
return x.replaceAll(/\n+/g, "\n");
}
function loadPowerUserSettings() { function loadPowerUserSettings() {
collapse_newlines = localStorage.getItem(storage_keys.collapse_newlines) == "true"; collapse_newlines = localStorage.getItem(storage_keys.collapse_newlines) == "true";
force_pygmalion_formatting = localStorage.getItem(storage_keys.force_pygmalion_formatting) == "true"; force_pygmalion_formatting = localStorage.getItem(storage_keys.force_pygmalion_formatting) == "true";

4
public/style.css
View File

@ -88,6 +88,10 @@ body {
text-align: right; text-align: right;
} }
.mes_text br {
content: ' ';
}
.mes_bias { .mes_bias {
display: block; display: block;
font-size: 0.9rem; font-size: 0.9rem;