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

Add message and example counts to itemization templates

Browse Source
This commit is contained in:
Cohee
2025-04-27 02:26:43 +03:00
parent 37c97db969
commit 3e11a90b3c
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/script.js
View File

@ -4864,6 +4864,8 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
userPersona: (power_user.persona_description_position == persona_description_positions.IN_PROMPT ? (persona || '') : ''), userPersona: (power_user.persona_description_position == persona_description_positions.IN_PROMPT ? (persona || '') : ''),
tokenizer: getFriendlyTokenizerName(main_api).tokenizerName || '', tokenizer: getFriendlyTokenizerName(main_api).tokenizerName || '',
presetName: getPresetManager()?.getSelectedPresetName() || '', presetName: getPresetManager()?.getSelectedPresetName() || '',
messagesCount: main_api !== 'openai' ? mesSend.length : oaiMessages.length,
examplesCount: main_api !== 'openai' ? (pinExmString ? mesExamplesArray.length : count_exm_add) : oaiMessageExamples.length,
}; };
//console.log(additionalPromptStuff); //console.log(additionalPromptStuff);
@ -5547,6 +5549,8 @@ export async function itemizedParams(itemizedPrompts, thisPromptSet, incomingMes
modelUsed: chat[incomingMesId]?.extra?.model, modelUsed: chat[incomingMesId]?.extra?.model,
apiUsed: chat[incomingMesId]?.extra?.api, apiUsed: chat[incomingMesId]?.extra?.api,
presetName: itemizedPrompts[thisPromptSet].presetName || t`(Unknown)`, presetName: itemizedPrompts[thisPromptSet].presetName || t`(Unknown)`,
messagesCount: String(itemizedPrompts[thisPromptSet].messagesCount ?? ''),
examplesCount: String(itemizedPrompts[thisPromptSet].examplesCount ?? ''),
}; };
const getFriendlyName = (value) => $(`#rm_api_block select option[value="${value}"]`).first().text() || value; const getFriendlyName = (value) => $(`#rm_api_block select option[value="${value}"]`).first().text() || value;

10
public/scripts/templates/itemizationChat.html
View File

@ -83,7 +83,10 @@
<div class="tokenItemizingSubclass">{{scenarioTextTokens}}</div> <div class="tokenItemizingSubclass">{{scenarioTextTokens}}</div>
</div> </div>
<div class="flex-container "> <div class="flex-container ">
<div class=" flex1 tokenItemizingSubclass">-- Examples:</div> <div class=" flex1 tokenItemizingSubclass">
<span>-- Examples:</span>
{{#if examplesCount}}<small>({{examplesCount}})</small>{{/if}}
</div>
<div class="tokenItemizingSubclass">{{examplesStringTokens}}</div> <div class="tokenItemizingSubclass">{{examplesStringTokens}}</div>
</div> </div>
<div class="flex-container "> <div class="flex-container ">
@ -96,7 +99,10 @@
<div class="">{{worldInfoStringTokens}}</div> <div class="">{{worldInfoStringTokens}}</div>
</div> </div>
<div class="wide100p flex-container"> <div class="wide100p flex-container">
<div class="flex1" style="color: palegreen;"><span data-i18n="Chat History:">Chat History:</span></div> <div class="flex1" style="color: palegreen;">
<span data-i18n="Chat History:">Chat History:</span>
{{#if messagesCount}}<small>({{messagesCount}})</small>{{/if}}
</div>
<div class="">{{ActualChatHistoryTokens}}</div> <div class="">{{ActualChatHistoryTokens}}</div>
</div> </div>
<div class="wide100p flex-container flexNoGap flexFlowColumn"> <div class="wide100p flex-container flexNoGap flexFlowColumn">

10
public/scripts/templates/itemizationText.html
View File

@ -51,7 +51,10 @@
<div class="tokenItemizingSubclass">{{scenarioTextTokens}}</div> <div class="tokenItemizingSubclass">{{scenarioTextTokens}}</div>
</div> </div>
<div class="flex-container"> <div class="flex-container">
<div class=" flex1 tokenItemizingSubclass">-- Examples:</div> <div class=" flex1 tokenItemizingSubclass">
<span>-- Examples:</span>
{{#if examplesCount}}<small>({{examplesCount}})</small>{{/if}}
</div>
<div class="tokenItemizingSubclass"> {{examplesStringTokens}}</div> <div class="tokenItemizingSubclass"> {{examplesStringTokens}}</div>
</div> </div>
<div class="flex-container"> <div class="flex-container">
@ -68,7 +71,10 @@
<div class="">{{worldInfoStringTokens}}</div> <div class="">{{worldInfoStringTokens}}</div>
</div> </div>
<div class="wide100p flex-container"> <div class="wide100p flex-container">
<div class="flex1" style="color: palegreen;">Chat History:</div> <div class="flex1" style="color: palegreen;">
<span data-i18n="Chat History:">Chat History:</span>
{{#if messagesCount}}<small>({{messagesCount}})</small>{{/if}}
</div>
<div class=""> {{ActualChatHistoryTokens}}</div> <div class=""> {{ActualChatHistoryTokens}}</div>
</div> </div>
<div class="wide100p flex-container flexNoGap flexFlowColumn"> <div class="wide100p flex-container flexNoGap flexFlowColumn">