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

Let oai prompt manager handle enhanced definitions

Browse Source
This commit is contained in:
maver
2023-06-02 19:29:34 +02:00
parent 5996697fce
commit a041230a99
3 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
public/scripts/openai.js
View File

@ -125,7 +125,6 @@ const default_settings = {
stream_openai: false,
openai_max_context: max_4k,
openai_max_tokens: 300,
enhance_definitions: false,
wrap_in_quotes: false,
...openAiDefaultPrompts,
...openAiDefaultPromptLists,
@ -160,7 +159,6 @@ const oai_settings = {
stream_openai: false,
openai_max_context: max_4k,
openai_max_tokens: 300,
enhance_definitions: false,
wrap_in_quotes: false,
...openAiDefaultPrompts,
...openAiDefaultPromptLists,
@ -364,7 +362,6 @@ async function prepareOpenAIMessages({ systemPrompt, name2, storyString, worldIn
const chatCompletion = promptManager.getChatCompletion();
// Prepare messages
const enhanceDefinitionMessage = chatCompletion.makeSystemMessage(substituteParams('If you have more knowledge of {{char}}, add to the character\'s lore and personality to enhance them but keep the Character Sheet\'s definitions absolute.'));
const worldInfoBeforeMessage = chatCompletion.makeSystemMessage(formatWorldInfo(worldInfoBefore));
const worldInfoAfterMessage = chatCompletion.makeSystemMessage(formatWorldInfo(worldInfoAfter));
const characterInfoMessages = chatCompletion.makeSystemMessage(substituteParams(storyString));
@ -390,9 +387,6 @@ async function prepareOpenAIMessages({ systemPrompt, name2, storyString, worldIn
chatCompletion.insertAfter('newMainChat', 'groupNudgeMessage', groupNudgeMessage);
}
// Handle enhanced definitions
if (oai_settings.enhance_definitions) chatCompletion.insertAfter('characterInfo', 'enhancedDefinitions', enhanceDefinitionMessage);
// Handle extension prompt
if (extensionPrompt) chatCompletion.insertAfter('worldInfoAfter', 'extensionPrompt', extensionPrompt);
@ -1143,7 +1137,6 @@ function loadOpenAISettings(data, settings) {
if (settings.nsfw_toggle !== undefined) oai_settings.nsfw_toggle = !!settings.nsfw_toggle;
if (settings.keep_example_dialogue !== undefined) oai_settings.keep_example_dialogue = !!settings.keep_example_dialogue;
if (settings.enhance_definitions !== undefined) oai_settings.enhance_definitions = !!settings.enhance_definitions;
if (settings.wrap_in_quotes !== undefined) oai_settings.wrap_in_quotes = !!settings.wrap_in_quotes;
if (settings.nsfw_first !== undefined) oai_settings.nsfw_first = !!settings.nsfw_first;
if (settings.openai_model !== undefined) oai_settings.openai_model = settings.openai_model;
@ -1168,7 +1161,6 @@ function loadOpenAISettings(data, settings) {
$('#nsfw_toggle').prop('checked', oai_settings.nsfw_toggle);
$('#keep_example_dialogue').prop('checked', oai_settings.keep_example_dialogue);
$('#enhance_definitions').prop('checked', oai_settings.enhance_definitions);
$('#wrap_in_quotes').prop('checked', oai_settings.wrap_in_quotes);
$('#nsfw_first').prop('checked', oai_settings.nsfw_first);
$('#jailbreak_system').prop('checked', oai_settings.jailbreak_system);
@ -1336,7 +1328,6 @@ async function saveOpenAIPreset(name, settings) {
openai_max_context: settings.openai_max_context,
openai_max_tokens: settings.openai_max_tokens,
nsfw_toggle: settings.nsfw_toggle,
enhance_definitions: settings.enhance_definitions,
wrap_in_quotes: settings.wrap_in_quotes,
send_if_empty: settings.send_if_empty,
nsfw_first: settings.nsfw_first,
@ -1671,7 +1662,6 @@ function onSettingsPresetChange() {
openai_max_context: ['#openai_max_context', 'openai_max_context', false],
openai_max_tokens: ['#openai_max_tokens', 'openai_max_tokens', false],
nsfw_toggle: ['#nsfw_toggle', 'nsfw_toggle', true],
enhance_definitions: ['#enhance_definitions', 'enhance_definitions', true],
wrap_in_quotes: ['#wrap_in_quotes', 'wrap_in_quotes', true],
send_if_empty: ['#send_if_empty_textarea', 'send_if_empty', false],
jailbreak_system: ['#jailbreak_system', 'jailbreak_system', true],
@ -2083,11 +2073,6 @@ $(document).ready(function () {
saveSettingsDebounced();
});
$('#enhance_definitions').on('change', function () {
oai_settings.enhance_definitions = !!$('#enhance_definitions').prop('checked');
saveSettingsDebounced();
});
$('#wrap_in_quotes').on('change', function () {
oai_settings.wrap_in_quotes = !!$('#wrap_in_quotes').prop('checked');
saveSettingsDebounced();