rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-15 11:40:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reset token counters when switching characters. Put main prompt at the beginning

Browse Source
This commit is contained in:
SillyLossy 2023-06-07 20:04:15 +03:00 committed by maver
parent 14a66ec937
commit e309e18e97
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/scripts/PromptManager.js
View File

@ -445,6 +445,8 @@ PromptManagerModule.prototype.handleCharacterSelected = function (event) {
if (0 === promptList.length) this.addPromptListForCharacter(this.activeCharacter, openAiDefaultPromptList) if (0 === promptList.length) this.addPromptListForCharacter(this.activeCharacter, openAiDefaultPromptList)
// Check whether the referenced prompts are present. // Check whether the referenced prompts are present.
if (0 === this.serviceSettings.prompts.length) this.setPrompts(openAiDefaultPrompts.prompts); if (0 === this.serviceSettings.prompts.length) this.setPrompts(openAiDefaultPrompts.prompts);
this.updatePrompts(this.getChatCompletion().getPromptsWithTokenCount());
} }
PromptManagerModule.prototype.handleGroupSelected = function (event) { PromptManagerModule.prototype.handleGroupSelected = function (event) {
@ -454,6 +456,8 @@ PromptManagerModule.prototype.handleGroupSelected = function (event) {
if (0 === promptList.length) this.addPromptListForCharacter(characterDummy, openAiDefaultPromptList) if (0 === promptList.length) this.addPromptListForCharacter(characterDummy, openAiDefaultPromptList)
if (0 === this.serviceSettings.prompts.length) this.setPrompts(openAiDefaultPrompts.prompts); if (0 === this.serviceSettings.prompts.length) this.setPrompts(openAiDefaultPrompts.prompts);
this.updatePrompts(this.getChatCompletion().getPromptsWithTokenCount());
} }
PromptManagerModule.prototype.getActiveGroupCharacters = function() { PromptManagerModule.prototype.getActiveGroupCharacters = function() {
@ -901,6 +905,10 @@ const openAiDefaultPromptLists = {
}; };
const openAiDefaultPromptList = [ const openAiDefaultPromptList = [
{
"identifier": "main",
"enabled": true
},
{ {
"identifier": "worldInfoBefore", "identifier": "worldInfoBefore",
"enabled": true "enabled": true
@ -937,10 +945,6 @@ const openAiDefaultPromptList = [
"identifier": "chatHistory", "identifier": "chatHistory",
"enabled": true "enabled": true
}, },
{
"identifier": "main",
"enabled": true
},
{ {
"identifier": "jailbreak", "identifier": "jailbreak",
"enabled": false "enabled": false