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

Placeholders are not working in A/N / some extra suggestions about it SillyLossy/TavernAI#18

Browse Source
This commit is contained in:
SillyLossy
2023-03-31 20:56:41 +03:00
parent 374d7ddcb6
commit 3acb43a7a4
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/script.js
View File

@ -1025,6 +1025,7 @@ function getExtensionPrompt(position = 0, depth = undefined, separator = "\n") {
if (extension_prompt.length && !extension_prompt.endsWith(separator)) { if (extension_prompt.length && !extension_prompt.endsWith(separator)) {
extension_prompt = extension_prompt + separator; extension_prompt = extension_prompt + separator;
} }
extension_prompt = substituteParams(extension_prompt);
return extension_prompt; return extension_prompt;
} }

12
public/scripts/extensions/floating-prompt/index.js
View File

@ -5,8 +5,8 @@ const MODULE_NAME = '2_floating_prompt'; // <= Deliberate, for sorting lower tha
const UPDATE_INTERVAL = 1000; const UPDATE_INTERVAL = 1000;
let lastMessageNumber = null; let lastMessageNumber = null;
let promptInsertionInterval = 0; let promptInsertionInterval = 1;
let promptInsertionPosition = 0; let promptInsertionPosition = 1;
let promptInsertionDepth = 0; let promptInsertionDepth = 0;
function onExtensionFloatingPromptInput() { function onExtensionFloatingPromptInput() {
@ -49,8 +49,8 @@ function getLocalStorageKeys() {
function loadSettings() { function loadSettings() {
const keys = getLocalStorageKeys(); const keys = getLocalStorageKeys();
const prompt = localStorage.getItem(keys.prompt) ?? ''; const prompt = localStorage.getItem(keys.prompt) ?? '';
const interval = localStorage.getItem(keys.interval) ?? 0; const interval = localStorage.getItem(keys.interval) ?? 1;
const position = localStorage.getItem(keys.position) ?? 0; const position = localStorage.getItem(keys.position) ?? 1;
const depth = localStorage.getItem(keys.depth) ?? 0; const depth = localStorage.getItem(keys.depth) ?? 0;
$('#extension_floating_prompt').val(prompt).trigger('input'); $('#extension_floating_prompt').val(prompt).trigger('input');
$('#extension_floating_interval').val(interval).trigger('input'); $('#extension_floating_interval').val(interval).trigger('input');
@ -113,9 +113,9 @@ async function moduleWorker() {
In-chat In-chat
</label> </label>
<label for="extension_floating_interval">Every N messages <b>you</b> send (set to 0 to disable):</label> <label for="extension_floating_interval">Every N messages <b>you</b> send (set to 0 to disable):</label>
<input id="extension_floating_interval" class="text_pole" type="number" value="0" min="0" max="999" /> <input id="extension_floating_interval" class="text_pole" type="number" min="0" max="999" />
<label for="extension_floating_interval">Insertion depth (for in-chat positioning):</label> <label for="extension_floating_interval">Insertion depth (for in-chat positioning):</label>
<input id="extension_floating_depth" class="text_pole" type="number" value="0" min="0" max="99" /> <input id="extension_floating_depth" class="text_pole" type="number" min="0" max="99" />
<span>Appending to the prompt in next: <span id="extension_floating_counter">No</span> message(s)</span> <span>Appending to the prompt in next: <span id="extension_floating_counter">No</span> message(s)</span>
</div> </div>
`; `;

2
public/scripts/openai.js
View File

@ -286,7 +286,7 @@ async function prepareOpenAIMessages(name2, storyString, worldInfoBefore, worldI
} }
if (oai_settings.jailbreak_system) { if (oai_settings.jailbreak_system) {
const jailbreakMessage = { "role": "system", "content": `[System note: ${oai_settings.nsfw_prompt}]` }; const jailbreakMessage = { "role": "system", "content": substituteParams(`[System note: ${oai_settings.nsfw_prompt}]`) };
openai_msgs.push(jailbreakMessage); openai_msgs.push(jailbreakMessage);
total_count += countTokens([jailbreakMessage], true); total_count += countTokens([jailbreakMessage], true);