diff --git a/public/script.js b/public/script.js index 29f5c5ce6..dc50a6e69 100644 --- a/public/script.js +++ b/public/script.js @@ -4941,7 +4941,7 @@ async function duplicateCharacter() { return ''; } -export async function itemizedParams(itemizedPrompts, thisPromptSet) { +export async function itemizedParams(itemizedPrompts, thisPromptSet, incomingMesId) { const params = { charDescriptionTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].charDescription), charPersonalityTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].charPersonality), @@ -4960,8 +4960,20 @@ export async function itemizedParams(itemizedPrompts, thisPromptSet) { chatInjects: await getTokenCountAsync(itemizedPrompts[thisPromptSet].chatInjects), chatVectorsStringTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].chatVectorsString), dataBankVectorsStringTokens: await getTokenCountAsync(itemizedPrompts[thisPromptSet].dataBankVectorsString), + modelUsed: chat[incomingMesId]?.extra?.model, + apiUsed: chat[incomingMesId]?.extra?.api, }; + const getFriendlyName = (value) => $(`#rm_api_block select option[value="${value}"]`).first().text() || value; + + if (params.apiUsed) { + params.apiUsed = getFriendlyName(params.apiUsed); + } + + if (params.this_main_api) { + params.mainApiFriendlyName = getFriendlyName(params.this_main_api); + } + if (params.chatInjects) { params.ActualChatHistoryTokens = params.ActualChatHistoryTokens - params.chatInjects; } @@ -5076,7 +5088,7 @@ async function promptItemize(itemizedPrompts, requestedMesId) { return null; } - const params = await itemizedParams(itemizedPrompts, thisPromptSet); + const params = await itemizedParams(itemizedPrompts, thisPromptSet, incomingMesId); const flatten = (rawPrompt) => Array.isArray(rawPrompt) ? rawPrompt.map(x => x.content).join('\n') : rawPrompt; const template = params.this_main_api == 'openai' diff --git a/public/scripts/templates/itemizationChat.html b/public/scripts/templates/itemizationChat.html index ea1390d4f..038cdaf40 100644 --- a/public/scripts/templates/itemizationChat.html +++ b/public/scripts/templates/itemizationChat.html @@ -4,8 +4,8 @@ +API/Model Used: {{mainApiFriendlyName}} {{#if apiUsed}}({{apiUsed}}){{/if}} {{#if modelUsed}}– {{modelUsed}}{{/if}}
Tokenizer: {{selectedTokenizer}}
-API Used: {{this_main_api}}
Only the white numbers really matter. All numbers are estimates. Grey color items may not have been included in the context due to certain prompt format settings. diff --git a/public/scripts/templates/itemizationText.html b/public/scripts/templates/itemizationText.html index 1f986083b..1fbf46959 100644 --- a/public/scripts/templates/itemizationText.html +++ b/public/scripts/templates/itemizationText.html @@ -4,8 +4,8 @@ +API/Model Used: {{mainApiFriendlyName}} {{#if apiUsed}}({{apiUsed}}){{/if}} {{#if modelUsed}}– {{modelUsed}}{{/if}}
Tokenizer: {{selectedTokenizer}}
-API Used: {{this_main_api}}
Only the white numbers really matter. All numbers are estimates. Grey color items may not have been included in the context due to certain prompt format settings.