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

use strings instead of IDs

Browse Source
This commit is contained in:
AlpinDale
2024-12-03 01:46:51 +00:00
parent 86b4247767
commit 80c8e83f09
3 changed files with 76 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
public/index.html
View File

@@ -1718,73 +1718,6 @@
<span data-i18n="Load default order">Load default order</span> <span data-i18n="Load default order">Load default order</span>
</div> </div>
</div> </div>
<div id="sampler_oder_block_aphrodite" data-tg-type="aphrodite" class="range-block flexFlowColumn wide100p">
<hr class="wide100p">
<div class="range-block-title">
<span data-i18n="Sampler Order">Sampler Order</span>
</div>
<div class="toggle-description widthUnset" data-i18n="Samplers will be applied in a top-down order. Use with caution.">
Aphrodite only. Samplers will be applied in a top-down order. Use with caution.
</div>
<div id="aphrodite_order" class="prompt_order">
<div data-id="0">
<span data-i18n="Top P & Top K">Top P & Top K</span>
<small>0</small>
</div>
<div data-id="1">
<span data-i18n="Top A">Top A</span>
<small>1</small>
</div>
<div data-id="2">
<span data-i18n="Min P">Min P</span>
<small>2</small>
</div>
<div data-id="3">
<span data-i18n="Tail Free Sampling">Tail Free Sampling</span>
<small>3</small>
</div>
<div data-id="4">
<span data-i18n="Typical P">Typical P</span>
<small>4</small>
</div>
<div data-id="5">
<span data-i18n="Dynatemp & Temperature">Dynatemp & Temperature</span>
<small>5</small>
</div>
<div data-id="6">
<span data-i18n="Penalties">Penalties</span>
<small>6</small>
</div>
<div data-id="7">
<span data-i18n="DRY">DRY</span>
<small>7</small>
</div>
<div data-id="8">
<span data-i18n="No Repeat Ngram">No Repeat Ngram</span>
<small>8</small>
</div>
<div data-id="9">
<span data-i18n="Top Nsigma">Top Nsigma</span>
<small>9</small>
</div>
<div data-id="10">
<span data-i18n="Eta Cutoff">Eta Cutoff</span>
<small>10</small>
</div>
<div data-id="11">
<span data-i18n="Epsilon Cutoff">Epsilon Cutoff</span>
<small>11</small>
</div>
<div data-id="12">
<span data-i18n="Cubic & Quadratic Sampling">Cubic & Quadratic Sampling</span>
<small>12</small>
</div>
<div data-id="13">
<span data-i18n="XTC">XTC</span>
<small>13</small>
</div>
</div>
</div>
<div id="sampler_order_block_lcpp" data-tg-type="llamacpp" class="range-block flexFlowColumn wide100p"> <div id="sampler_order_block_lcpp" data-tg-type="llamacpp" class="range-block flexFlowColumn wide100p">
<hr class="wide100p"> <hr class="wide100p">
<h4 class="range-block-title justifyCenter"> <h4 class="range-block-title justifyCenter">
@@ -1841,6 +1774,35 @@
<span data-i18n="Load default order">Load default order</span> <span data-i18n="Load default order">Load default order</span>
</div> </div>
</div> </div>
<div id="sampler_priority_block_aphrodite" data-tg-type="aphrodite" class="range-block flexFlowColumn wide100p">
<hr class="wide100p">
<h4 class="range-block-title justifyCenter">
<span data-i18n="Sampler Order">Sampler Order</span>
<div class="margin5 fa-solid fa-circle-info opacity50p" title="Aphrodite only. Determines the order of samplers. Skew is always applied post-softmax, so it's not included here." data-i18n="[title]Aphrodite only. Determines the order of samplers. Skew is always applied post-softmax, so it's not included here."></div>
</h4>
<div class="toggle-description widthUnset" data-i18n="Aphrodite only. Determines the order of samplers. Skew is always applied post-softmax, so it's not included here.">
Aphrodite only. Determines the order of samplers.
</div>
<div id="sampler_priority_container" class="prompt_order">
<div data-name="dry" draggable="true"><span>DRY</span><small></small></div>
<div data-name="penalties" draggable="true"><span>Penalties</span><small></small></div>
<div data-name="no_repeat_ngram" draggable="true"><span>No Repeat Ngram</span><small></small></div>
<div data-name="temperature" draggable="true"><span>Dynatemp & Temperature</span><small></small></div>
<div data-name="top_nsigma" draggable="true"><span>Top Nsigma</span><small></small></div>
<div data-name="top_p_top_k" draggable="true"><span>Top P & Top K</span><small></small></div>
<div data-name="top_a" draggable="true"><span>Top A</span><small></small></div>
<div data-name="min_p" draggable="true"><span>Min P</span><small></small></div>
<div data-name="tfs" draggable="true"><span>Tail-Free Sampling</span><small></small></div>
<div data-name="eta_cutoff" draggable="true"><span>Eta Cutoff</span><small></small></div>
<div data-name="epsilon_cutoff" draggable="true"><span>Epsilon Cutoff</span><small></small></div>
<div data-name="typical_p" draggable="true"><span>Typical P</span><small></small></div>
<div data-name="quadratic" draggable="true"><span>Cubic and Quadratic Sampling</span><small></small></div>
<div data-name="xtc" draggable="true"><span>XTC</span><small></small></div>
</div>
<div id="aphrodite_default_order" class="menu_button menu_button_icon">
<span data-i18n="Load default order">Load default order</span>
</div>
</div>
</div> </div>
</div><!-- end of textgen settings--> </div><!-- end of textgen settings-->
<div id="openai_settings"> <div id="openai_settings">

13
public/scripts/samplerSelect.js
View File

@@ -129,6 +129,10 @@ function setSamplerListListeners() {
relatedDOMElement = $('#sampler_priority_block_ooba'); relatedDOMElement = $('#sampler_priority_block_ooba');
} }
if (samplerName === 'samplers_priorities') { //this is for aphrodite's sampler priority
relatedDOMElement = $('#sampler_priority_block_aphrodite');
}
if (samplerName === 'penalty_alpha') { //contrastive search only has one sampler, does it need its own block? if (samplerName === 'penalty_alpha') { //contrastive search only has one sampler, does it need its own block?
relatedDOMElement = $('#contrastiveSearchBlock'); relatedDOMElement = $('#contrastiveSearchBlock');
} }
@@ -237,6 +241,11 @@ async function listSamplers(main_api, arrayOnly = false) {
displayname = 'Ooba Sampler Priority Block'; displayname = 'Ooba Sampler Priority Block';
} }
if (sampler === 'samplers_priorities') { //this is for aphrodite's sampler priority
targetDOMelement = $('#sampler_priority_block_aphrodite');
displayname = 'Aphrodite Sampler Priority Block';
}
if (sampler === 'penalty_alpha') { //contrastive search only has one sampler, does it need its own block? if (sampler === 'penalty_alpha') { //contrastive search only has one sampler, does it need its own block?
targetDOMelement = $('#contrastiveSearchBlock'); targetDOMelement = $('#contrastiveSearchBlock');
displayname = 'Contrast Search Block'; displayname = 'Contrast Search Block';
@@ -373,6 +382,10 @@ export async function validateDisabledSamplers(redraw = false) {
relatedDOMElement = $('#sampler_priority_block_ooba'); relatedDOMElement = $('#sampler_priority_block_ooba');
} }
if (sampler === 'samplers_priorities') { //this is for aphrodite's sampler priority
relatedDOMElement = $('#sampler_priority_block_aphrodite');
}
if (sampler === 'dry_multiplier') { if (sampler === 'dry_multiplier') {
relatedDOMElement = $('#dryBlock'); relatedDOMElement = $('#dryBlock');
targetDisplayType = 'block'; targetDisplayType = 'block';

34
public/scripts/textgen-settings.js
View File

@@ -89,6 +89,22 @@ const OOBA_DEFAULT_ORDER = [
'encoder_repetition_penalty', 'encoder_repetition_penalty',
'no_repeat_ngram', 'no_repeat_ngram',
]; ];
const APHRODITE_DEFAULT_ORDER = [
'dry',
'penalties',
'no_repeat_ngram',
'temperature',
'top_nsigma',
'top_p_top_k',
'top_a',
'min_p',
'tfs',
'eta_cutoff',
'epsilon_cutoff',
'typical_p',
'quadratic',
'xtc'
];
const BIAS_KEY = '#textgenerationwebui_api-settings'; const BIAS_KEY = '#textgenerationwebui_api-settings';
// Maybe let it be configurable in the future? // Maybe let it be configurable in the future?
@@ -170,6 +186,7 @@ const settings = {
banned_tokens: '', banned_tokens: '',
sampler_priority: OOBA_DEFAULT_ORDER, sampler_priority: OOBA_DEFAULT_ORDER,
samplers: LLAMACPP_DEFAULT_ORDER, samplers: LLAMACPP_DEFAULT_ORDER,
samplers_priorties: APHRODITE_DEFAULT_ORDER,
ignore_eos_token: false, ignore_eos_token: false,
spaces_between_special_tokens: true, spaces_between_special_tokens: true,
speculative_ngram: false, speculative_ngram: false,
@@ -259,6 +276,7 @@ export const setting_names = [
'sampler_order', 'sampler_order',
'sampler_priority', 'sampler_priority',
'samplers', 'samplers',
'samplers_priorities',
'n', 'n',
'logit_bias', 'logit_bias',
'custom_model', 'custom_model',
@@ -627,6 +645,13 @@ jQuery(function () {
saveSettingsDebounced(); saveSettingsDebounced();
}); });
$('#aphrodite_default_order').on('click', function () {
sortOobaItemsByOrder(APHRODITE_DEFAULT_ORDER);
settings.samplers_priorties = APHRODITE_DEFAULT_ORDER;
console.log('Default samplers order loaded:', settings.samplers_priorties);
saveSettingsDebounced();
});
$('#textgen_type').on('change', function () { $('#textgen_type').on('change', function () {
const type = String($(this).val()); const type = String($(this).val());
settings.type = type; settings.type = type;
@@ -835,6 +860,14 @@ function setSettingByName(setting, value, trigger) {
return; return;
} }
if ('samplers_priority' === setting) {
value = Array.isArray(value) ? value : APHRODITE_DEFAULT_ORDER;
insertMissingArrayItems(APHRODITE_DEFAULT_ORDER, value);
sortOobaItemsByOrder(value);
settings.samplers_priorties = value;
return;
}
if ('samplers' === setting) { if ('samplers' === setting) {
value = Array.isArray(value) ? value : LLAMACPP_DEFAULT_ORDER; value = Array.isArray(value) ? value : LLAMACPP_DEFAULT_ORDER;
insertMissingArrayItems(LLAMACPP_DEFAULT_ORDER, value); insertMissingArrayItems(LLAMACPP_DEFAULT_ORDER, value);
@@ -1259,6 +1292,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
'nsigma': settings.nsigma, 'nsigma': settings.nsigma,
'custom_token_bans': toIntArray(banned_tokens), 'custom_token_bans': toIntArray(banned_tokens),
'no_repeat_ngram_size': settings.no_repeat_ngram_size, 'no_repeat_ngram_size': settings.no_repeat_ngram_size,
'sampler_priority': settings.samplers_priorties,
}; };
if (settings.type === OPENROUTER) { if (settings.type === OPENROUTER) {