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

Streamline token counting

Browse Source 
By using TokenHandler instead of custom token handling
This commit is contained in:
maver
2023-06-10 18:13:59 +02:00
parent 4d8d4cd262
commit d65a03d75d
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/scripts/PromptManager.js
View File

@@ -491,7 +491,7 @@ PromptManagerModule.prototype.getPromptListEntry = function (character, identifi
* @returns {Object|null} The prompt object, or null if not found * @returns {Object|null} The prompt object, or null if not found
*/ */
PromptManagerModule.prototype.getPromptById = function (identifier) { PromptManagerModule.prototype.getPromptById = function (identifier) {
return this.serviceSettings.prompts.find(item => item.identifier === identifier) ?? null; return this.serviceSettings.prompts.find(item => item && item.identifier === identifier) ?? null;
} }
/** /**
@@ -576,6 +576,7 @@ PromptManagerModule.prototype.renderPromptManager = function () {
const showAdvancedSettings = this.serviceSettings.prompt_manager_settings.showAdvancedSettings; const showAdvancedSettings = this.serviceSettings.prompt_manager_settings.showAdvancedSettings;
const checkSpanClass = showAdvancedSettings ? 'fa-solid fa-toggle-on' : 'fa-solid fa-toggle-off'; const checkSpanClass = showAdvancedSettings ? 'fa-solid fa-toggle-on' : 'fa-solid fa-toggle-off';
const totalActiveTokens = this.tokenHandler?.getTotal();
promptManagerDiv.insertAdjacentHTML('beforeend', ` promptManagerDiv.insertAdjacentHTML('beforeend', `
<div class="range-block-title" data-i18n="Prompts"> <div class="range-block-title" data-i18n="Prompts">
@@ -590,7 +591,7 @@ PromptManagerModule.prototype.renderPromptManager = function () {
<span class="${checkSpanClass}"></span> <span class="${checkSpanClass}"></span>
<span class="checkbox_label" data-i18n="Show advanced options">Show advanced options</span> <span class="checkbox_label" data-i18n="Show advanced options">Show advanced options</span>
</div> </div>
<div>Total Tokens: ${this.totalActiveTokens}</div> <div>Total Tokens: ${totalActiveTokens}</div>
</div> </div>
<ul id="${this.configuration.prefix}prompt_manager_list" class="text_pole"></ul> <ul id="${this.configuration.prefix}prompt_manager_list" class="text_pole"></ul>
</div> </div>
@@ -603,7 +604,7 @@ PromptManagerModule.prototype.renderPromptManager = function () {
if (null !== this.activeCharacter) { if (null !== this.activeCharacter) {
const prompts = [...this.serviceSettings.prompts] const prompts = [...this.serviceSettings.prompts]
.filter(prompt => !prompt.system_prompt) .filter(prompt => !prompt?.system_prompt)
.sort((promptA, promptB) => promptA.name.localeCompare(promptB.name)) .sort((promptA, promptB) => promptA.name.localeCompare(promptB.name))
.reduce((acc, prompt) => acc + `<option value="${prompt.identifier}">${prompt.name}</option>`, ''); .reduce((acc, prompt) => acc + `<option value="${prompt.identifier}">${prompt.name}</option>`, '');
@@ -663,7 +664,7 @@ PromptManagerModule.prototype.renderPromptManagerListItems = function () {
const enabledClass = listEntry.enabled ? '' : `${prefix}prompt_manager_prompt_disabled`; const enabledClass = listEntry.enabled ? '' : `${prefix}prompt_manager_prompt_disabled`;
const draggableClass = draggableEnabled ? 'draggable' : prompt.marker ? 'droppable' : ''; const draggableClass = draggableEnabled ? 'draggable' : prompt.marker ? 'droppable' : '';
const markerClass = prompt.marker ? `${prefix}prompt_manager_marker` : ''; const markerClass = prompt.marker ? `${prefix}prompt_manager_marker` : '';
const calculatedTokens = this.tokenHandler?.getCounts()[prompt.identifier]; const calculatedTokens = this.tokenHandler?.getCounts()[prompt.identifier] ?? '';
let detachSpanHtml = ''; let detachSpanHtml = '';
if (this.isPromptDeletionAllowed(prompt)) { if (this.isPromptDeletionAllowed(prompt)) {