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 #951 from SillyTavern/hotfix-prompt-manager

Browse Source 
Hotfix prompt manager
This commit is contained in:
Cohee
2023-08-19 18:05:26 +03:00
committed by GitHub
parent 53dab00abe 0084ea2461
commit 37fffa9930
2 changed files with 93 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/scripts/openai.js
View File

@ -47,7 +47,7 @@ import {
import {
delay,
download,
getFileText,
getFileText, getSortableDelay,
getStringHash,
parseJsonFile,
stringFormat,
@ -341,13 +341,17 @@ function setupChatCompletionPromptManager(openAiSettings) {
containerIdentifier: 'completion_prompt_manager',
listIdentifier: 'completion_prompt_manager_list',
toggleDisabled: ['main'],
draggable: true,
sortableDelay: getSortableDelay(),
defaultPrompts: {
main: default_main_prompt,
nsfw: default_nsfw_prompt,
jailbreak: default_jailbreak_prompt,
enhanceDefinitions: default_enhance_definitions_prompt
}
},
promptOrder: {
strategy: 'global',
dummyId: 100000
},
};
promptManager.saveServiceSettings = () => {
@ -807,8 +811,10 @@ function prepareOpenAIMessages({
promptManager.error = 'The name of at least one character contained whitespaces or special characters. Please check your user and character name.';
} else {
toastr.error('An unknown error occurred while counting tokens. Further information may be available in console.')
chatCompletion.log('Unexpected error:');
chatCompletion.log('----- Unexpected error while preparing prompts -----');
chatCompletion.log(error);
chatCompletion.log(error.stack);
chatCompletion.log('----------------------------------------------------');
}
} finally {
// Pass chat completion to prompt manager for inspection