Fix OAI context breakdown total calculation

This commit is contained in:
SillyLossy
2023-05-30 19:25:27 +03:00
parent 3a53bc292b
commit 9e6b07e3af

View File

@ -2725,16 +2725,17 @@ function promptItemize(itemizedPrompts, requestedMesId) {
var oaiNudgeTokens = itemizedPrompts[thisPromptSet].oaiNudgeTokens; var oaiNudgeTokens = itemizedPrompts[thisPromptSet].oaiNudgeTokens;
var oaiImpersonateTokens = itemizedPrompts[thisPromptSet].oaiImpersonateTokens; var oaiImpersonateTokens = itemizedPrompts[thisPromptSet].oaiImpersonateTokens;
var finalPromptTokens = var finalPromptTokens =
oaiStartTokens +
oaiPromptTokens +
oaiBiasTokens + oaiBiasTokens +
oaiImpersonateTokens + oaiImpersonateTokens +
oaiJailbreakTokens + oaiJailbreakTokens +
oaiNudgeTokens + oaiNudgeTokens +
oaiPromptTokens +
ActualChatHistoryTokens + ActualChatHistoryTokens +
charDescriptionTokens + //charDescriptionTokens +
charPersonalityTokens + //charPersonalityTokens +
allAnchorsTokens + //allAnchorsTokens +
worldInfoStringTokens + //worldInfoStringTokens +
examplesStringTokens; examplesStringTokens;
// OAI doesn't use padding // OAI doesn't use padding
thisPrompt_padding = 0; thisPrompt_padding = 0;
@ -2799,6 +2800,7 @@ function promptItemize(itemizedPrompts, requestedMesId) {
<div class="flex-container"> <div class="flex-container">
<div class="flex-container flex1 flexFlowColumns flexNoGap wide50p tokenGraph"> <div class="flex-container flex1 flexFlowColumns flexNoGap wide50p tokenGraph">
<div class="wide100p" style="background-color: grey; height: ${oaiSystemTokensPercentage}%;"></div> <div class="wide100p" style="background-color: grey; height: ${oaiSystemTokensPercentage}%;"></div>
<div class="wide100p" style="background-color: salmon; height: ${oaiStartTokensPercentage}%;"></div>
<div class="wide100p" style="background-color: indianred; height: ${storyStringTokensPercentage}%;"></div> <div class="wide100p" style="background-color: indianred; height: ${storyStringTokensPercentage}%;"></div>
<div class="wide100p" style="background-color: gold; height: ${worldInfoStringTokensPercentage}%;"></div> <div class="wide100p" style="background-color: gold; height: ${worldInfoStringTokensPercentage}%;"></div>
<div class="wide100p" style="background-color: palegreen; height: ${ActualChatHistoryTokensPercentage}%;"></div> <div class="wide100p" style="background-color: palegreen; height: ${ActualChatHistoryTokensPercentage}%;"></div>