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 branch 'dev' of https://github.com/Cohee1207/SillyTavern into dev

Browse Source
This commit is contained in:
RossAscends
2023-05-15 02:31:26 +09:00
parent 291e23e2f5 afd2e810a8
commit a25b333f91
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
public/script.js
View File

@ -408,18 +408,21 @@ async function getClientVersion() {
} }
} }
function getTokenCount(str, padding = 0) { function getTokenCount(str, padding = undefined) {
let tokenizerType = power_user.tokenizer; let tokenizerType = power_user.tokenizer;
if (main_api === 'openai') { if (main_api === 'openai') {
// For main prompt building if (padding === power_user.token_padding) {
if (padding == power_user.token_padding) { // For main "shadow" prompt building
tokenizerType = tokenizers.NONE; tokenizerType = tokenizers.NONE;
// For extensions and WI
} else { } else {
// For extensions and WI
return getTokenCountOpenAI(str); return getTokenCountOpenAI(str);
} }
}
if (padding === undefined) {
padding = 0;
} }
switch (tokenizerType) { switch (tokenizerType) {
@ -2190,7 +2193,6 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
if (main_api == 'openai') { if (main_api == 'openai') {
let [prompt, counts] = await prepareOpenAIMessages(name2, storyString, worldInfoBefore, worldInfoAfter, afterScenarioAnchor, promptBias, type); let [prompt, counts] = await prepareOpenAIMessages(name2, storyString, worldInfoBefore, worldInfoAfter, afterScenarioAnchor, promptBias, type);
// counts will return false if the user has not enabled the token breakdown feature // counts will return false if the user has not enabled the token breakdown feature
if (counts) { if (counts) {
@ -2198,7 +2200,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
const breakdown_bar = $('#token_breakdown div:first-child'); const breakdown_bar = $('#token_breakdown div:first-child');
breakdown_bar.empty(); breakdown_bar.empty();
const total = Object.values(counts).reduce((acc, val) => acc + val, 0); const total = Object.values(counts).filter(x => !Number.isNaN(x)).reduce((acc, val) => acc + val, 0);
console.log(`oai start tokens: ${Object.entries(counts)[0][1]}`); console.log(`oai start tokens: ${Object.entries(counts)[0][1]}`);
thisPromptBits.push({ thisPromptBits.push({
@ -2519,8 +2521,10 @@ function promptItemize(itemizedPrompts, requestedMesId) {
allAnchorsTokens + allAnchorsTokens +
worldInfoStringTokens + worldInfoStringTokens +
examplesStringTokens; examplesStringTokens;
// OAI doesn't use padding
thisPrompt_padding = 0;
// Max context size - max completion tokens
thisPrompt_max_context = (oai_settings.openai_max_context - oai_settings.openai_max_tokens);
} else { } else {
//for non-OAI APIs //for non-OAI APIs
//console.log('-- Counting non-OAI Tokens'); //console.log('-- Counting non-OAI Tokens');
@ -2549,9 +2553,7 @@ function promptItemize(itemizedPrompts, requestedMesId) {
var promptBiasTokensPercentage = ((oaiBiasTokens / (finalPromptTokens)) * 100).toFixed(2); var promptBiasTokensPercentage = ((oaiBiasTokens / (finalPromptTokens)) * 100).toFixed(2);
var worldInfoStringTokensPercentage = ((worldInfoStringTokens / (finalPromptTokens)) * 100).toFixed(2); var worldInfoStringTokensPercentage = ((worldInfoStringTokens / (finalPromptTokens)) * 100).toFixed(2);
var allAnchorsTokensPercentage = ((allAnchorsTokens / (finalPromptTokens)) * 100).toFixed(2); var allAnchorsTokensPercentage = ((allAnchorsTokens / (finalPromptTokens)) * 100).toFixed(2);
var selectedTokenizer = $("#tokenizer").find(':selected').text(); var selectedTokenizer = `tiktoken (${oai_settings.openai_model})`;
var oaiSystemTokens = oaiStartTokens + oaiImpersonateTokens + oaiNudgeTokens + oaiJailbreakTokens;
var oaiSystemTokensPercentage = ((oaiSystemTokens / (finalPromptTokens)) * 100).toFixed(2);
} else { } else {
//console.log('-- applying % on non-OAI tokens'); //console.log('-- applying % on non-OAI tokens');
@ -2668,7 +2670,7 @@ function promptItemize(itemizedPrompts, requestedMesId) {
<div class="flex1">Total Tokens in Prompt:</div><div class=""> ${finalPromptTokens}</div> <div class="flex1">Total Tokens in Prompt:</div><div class=""> ${finalPromptTokens}</div>
</div> </div>
<div class="flex-container wide100p"> <div class="flex-container wide100p">
<div class="flex1">Max Context:</div><div class="">${thisPrompt_max_context}</div> <div class="flex1">Max Context (Context Size - Response Length):</div><div class="">${thisPrompt_max_context}</div>
</div> </div>
</div> </div>
</div> </div>