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

Browse Source 
Prompt manager hotfix
This commit is contained in:
Cohee
2023-08-20 21:27:25 +03:00
committed by GitHub
parent 7676409197 cb5b410daf
commit db9e9342fa
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/scripts/PromptManager.js
View File

@@ -1164,7 +1164,6 @@ PromptManagerModule.prototype.setChatCompletion = function (chatCompletion) {
this.setMessages(messages); this.setMessages(messages);
this.populateTokenCounts(messages); this.populateTokenCounts(messages);
this.populateLegacyTokenCounts(messages);
} }
/** /**
@@ -1194,7 +1193,7 @@ PromptManagerModule.prototype.populateTokenCounts = function (messages) {
PromptManagerModule.prototype.populateLegacyTokenCounts = function (messages) { PromptManagerModule.prototype.populateLegacyTokenCounts = function (messages) {
// Update general token counts // Update general token counts
const chatHistory = messages.getItemByIdentifier('chatHistory'); const chatHistory = messages.getItemByIdentifier('chatHistory');
const startChat = chatHistory?.getCollection()[0].getTokens() || 0; const startChat = chatHistory?.getCollection()[0]?.getTokens() || 0;
const continueNudge = chatHistory?.getCollection().find(message => message.identifier === 'continueNudge')?.getTokens() || 0; const continueNudge = chatHistory?.getCollection().find(message => message.identifier === 'continueNudge')?.getTokens() || 0;
this.tokenHandler.counts = { this.tokenHandler.counts = {

2
public/scripts/openai.js
View File

@@ -489,7 +489,7 @@ function populateChatHistory(prompts, chatCompletion, type = null, cyclePrompt =
// Reserve budget for group nudge // Reserve budget for group nudge
let groupNudgeMessage = null; let groupNudgeMessage = null;
if (selected_group) { if (selected_group) {
const groupNudgeMessage = new Message.fromPrompt(prompts.get('groupNudge')); const groupNudgeMessage = Message.fromPrompt(prompts.get('groupNudge'));
chatCompletion.reserveBudget(groupNudgeMessage); chatCompletion.reserveBudget(groupNudgeMessage);
} }