Add message and example counts to itemization templates

3e11a90b3cc29a84d823718bbf14546670078dd6

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 37c97db96980f63357aeca393cfa0d1d553de7b0
3 files changed, +20 -4Ignore whitespace
public/script.js+4 -0
@@ -4864,6 +4864,8 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4864 userPersona: (power_user.persona_description_position == persona_description_positions.IN_PROMPT ? (persona || '') : ''),4864 userPersona: (power_user.persona_description_position == persona_description_positions.IN_PROMPT ? (persona || '') : ''),
4865 tokenizer: getFriendlyTokenizerName(main_api).tokenizerName || '',4865 tokenizer: getFriendlyTokenizerName(main_api).tokenizerName || '',
4866 presetName: getPresetManager()?.getSelectedPresetName() || '',4866 presetName: getPresetManager()?.getSelectedPresetName() || '',
4867 messagesCount: main_api !== 'openai' ? mesSend.length : oaiMessages.length,
4868 examplesCount: main_api !== 'openai' ? (pinExmString ? mesExamplesArray.length : count_exm_add) : oaiMessageExamples.length,
4867 };4869 };
48684870
4869 //console.log(additionalPromptStuff);4871 //console.log(additionalPromptStuff);
@@ -5547,6 +5549,8 @@ export async function itemizedParams(itemizedPrompts, thisPromptSet, incomingMes
5547 modelUsed: chat[incomingMesId]?.extra?.model,5549 modelUsed: chat[incomingMesId]?.extra?.model,
5548 apiUsed: chat[incomingMesId]?.extra?.api,5550 apiUsed: chat[incomingMesId]?.extra?.api,
5549 presetName: itemizedPrompts[thisPromptSet].presetName || t`(Unknown)`,5551 presetName: itemizedPrompts[thisPromptSet].presetName || t`(Unknown)`,
5552 messagesCount: String(itemizedPrompts[thisPromptSet].messagesCount ?? ''),
5553 examplesCount: String(itemizedPrompts[thisPromptSet].examplesCount ?? ''),
5550 };5554 };
55515555
5552 const getFriendlyName = (value) => $(`#rm_api_block select option[value="${value}"]`).first().text() || value;5556 const getFriendlyName = (value) => $(`#rm_api_block select option[value="${value}"]`).first().text() || value;
public/scripts/templates/itemizationChat.html+8 -2
@@ -83,7 +83,10 @@
83 <div class="tokenItemizingSubclass">{{scenarioTextTokens}}</div>83 <div class="tokenItemizingSubclass">{{scenarioTextTokens}}</div>
84 </div>84 </div>
85 <div class="flex-container ">85 <div class="flex-container ">
86 <div class=" flex1 tokenItemizingSubclass">-- Examples:</div>86 <div class=" flex1 tokenItemizingSubclass">
87 <span>-- Examples:</span>
88 {{#if examplesCount}}<small>({{examplesCount}})</small>{{/if}}
89 </div>
87 <div class="tokenItemizingSubclass">{{examplesStringTokens}}</div>90 <div class="tokenItemizingSubclass">{{examplesStringTokens}}</div>
88 </div>91 </div>
89 <div class="flex-container ">92 <div class="flex-container ">
@@ -96,7 +99,10 @@
96 <div class="">{{worldInfoStringTokens}}</div>99 <div class="">{{worldInfoStringTokens}}</div>
97 </div>100 </div>
98 <div class="wide100p flex-container">101 <div class="wide100p flex-container">
99 <div class="flex1" style="color: palegreen;"><span data-i18n="Chat History:">Chat History:</span></div>102 <div class="flex1" style="color: palegreen;">
103 <span data-i18n="Chat History:">Chat History:</span>
104 {{#if messagesCount}}<small>({{messagesCount}})</small>{{/if}}
105 </div>
100 <div class="">{{ActualChatHistoryTokens}}</div>106 <div class="">{{ActualChatHistoryTokens}}</div>
101 </div>107 </div>
102 <div class="wide100p flex-container flexNoGap flexFlowColumn">108 <div class="wide100p flex-container flexNoGap flexFlowColumn">
public/scripts/templates/itemizationText.html+8 -2
@@ -51,7 +51,10 @@
51 <div class="tokenItemizingSubclass">{{scenarioTextTokens}}</div>51 <div class="tokenItemizingSubclass">{{scenarioTextTokens}}</div>
52 </div>52 </div>
53 <div class="flex-container">53 <div class="flex-container">
54 <div class=" flex1 tokenItemizingSubclass">-- Examples:</div>54 <div class=" flex1 tokenItemizingSubclass">
55 <span>-- Examples:</span>
56 {{#if examplesCount}}<small>({{examplesCount}})</small>{{/if}}
57 </div>
55 <div class="tokenItemizingSubclass"> {{examplesStringTokens}}</div>58 <div class="tokenItemizingSubclass"> {{examplesStringTokens}}</div>
56 </div>59 </div>
57 <div class="flex-container">60 <div class="flex-container">
@@ -68,7 +71,10 @@
68 <div class="">{{worldInfoStringTokens}}</div>71 <div class="">{{worldInfoStringTokens}}</div>
69 </div>72 </div>
70 <div class="wide100p flex-container">73 <div class="wide100p flex-container">
71 <div class="flex1" style="color: palegreen;">Chat History:</div>74 <div class="flex1" style="color: palegreen;">
75 <span data-i18n="Chat History:">Chat History:</span>
76 {{#if messagesCount}}<small>({{messagesCount}})</small>{{/if}}
77 </div>
72 <div class=""> {{ActualChatHistoryTokens}}</div>78 <div class=""> {{ActualChatHistoryTokens}}</div>
73 </div>79 </div>
74 <div class="wide100p flex-container flexNoGap flexFlowColumn">80 <div class="wide100p flex-container flexNoGap flexFlowColumn">