rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-10 09:00:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2742 from SillyTavern/xtc-ooba

Browse Source 
Enable XTC for TextGen WebUI
This commit is contained in:
Cohee 2024-09-28 14:00:16 +03:00 committed by GitHub
commit c47e198664
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
public/index.html
View File

@ -1310,7 +1310,7 @@
</div> </div>
</div> </div>
<div data-tg-type="koboldcpp, aphrodite, tabby" id="xtc_block" class="wide100p"> <div data-tg-type="koboldcpp, aphrodite, tabby, ooba" id="xtc_block" class="wide100p">
<h4 class="wide100p textAlignCenter"> <h4 class="wide100p textAlignCenter">
<label data-i18n="Exclude Top Choices (XTC)">Exclude Top Choices (XTC)</label> <label data-i18n="Exclude Top Choices (XTC)">Exclude Top Choices (XTC)</label>
<a href="https://github.com/oobabooga/text-generation-webui/pull/6335" target="_blank"> <a href="https://github.com/oobabooga/text-generation-webui/pull/6335" target="_blank">
@ -1679,6 +1679,10 @@
Ooba only. Determines the order of samplers. Ooba only. Determines the order of samplers.
</div> </div>
<div id="sampler_priority_container" class="prompt_order"> <div id="sampler_priority_container" class="prompt_order">
<div data-name="repetition_penalty" draggable="true"><span>Repetition Penalty</span><small></small></div>
<div data-name="presence_penalty" draggable="true"><span>Presence Penalty</span><small></small></div>
<div data-name="frequency_penalty" draggable="true"><span>Frequency Penalty</span><small></small></div>
<div data-name="dry" draggable="true"><span>DRY</span><small></small></div>
<div data-name="temperature" draggable="true"><span>Temperature</span><small></small></div> <div data-name="temperature" draggable="true"><span>Temperature</span><small></small></div>
<div data-name="dynamic_temperature" draggable="true"><span>Dynamic Temperature</span><small></small></div> <div data-name="dynamic_temperature" draggable="true"><span>Dynamic Temperature</span><small></small></div>
<div data-name="quadratic_sampling" draggable="true"><span>Quadratic / Smooth Sampling</span><small></small></div> <div data-name="quadratic_sampling" draggable="true"><span>Quadratic / Smooth Sampling</span><small></small></div>
@ -1691,6 +1695,9 @@
<div data-name="top_a" draggable="true"><span>Top A</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="min_p" draggable="true"><span>Min P</span><small></small></div>
<div data-name="mirostat" draggable="true"><span>Mirostat</span><small></small></div> <div data-name="mirostat" draggable="true"><span>Mirostat</span><small></small></div>
<div data-name="xtc" draggable="true"><span>XTC</span><small></small></div>
<div data-name="encoder_repetition_penalty" draggable="true"><span>Encoder Repetition Penalty</span><small></small></div>
<div data-name="no_repeat_ngram" draggable="true"><span>No Repeat Ngram</span><small></small></div>
</div> </div>
<div id="textgenerationwebui_default_order" class="menu_button menu_button_icon"> <div id="textgenerationwebui_default_order" class="menu_button menu_button_icon">
<span data-i18n="Load default order">Load default order</span> <span data-i18n="Load default order">Load default order</span>

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

@ -68,6 +68,10 @@ const LLAMACPP_DEFAULT_ORDER = [
'temperature', 'temperature',
]; ];
const OOBA_DEFAULT_ORDER = [ const OOBA_DEFAULT_ORDER = [
'repetition_penalty',
'presence_penalty',
'frequency_penalty',
'dry',
'temperature', 'temperature',
'dynamic_temperature', 'dynamic_temperature',
'quadratic_sampling', 'quadratic_sampling',
@ -80,6 +84,9 @@ const OOBA_DEFAULT_ORDER = [
'top_a', 'top_a',
'min_p', 'min_p',
'mirostat', 'mirostat',
'xtc',
'encoder_repetition_penalty',
'no_repeat_ngram',
]; ];
const BIAS_KEY = '#textgenerationwebui_api-settings'; const BIAS_KEY = '#textgenerationwebui_api-settings';
@ -798,6 +805,25 @@ function showTypeSpecificControls(type) {
}); });
} }
/**
* Inserts missing items from the source array into the target array.
* @param {any[]} source - Source array
* @param {any[]} target - Target array
* @returns {void}
*/
function insertMissingArrayItems(source, target) {
if (source === target || !Array.isArray(source) || !Array.isArray(target)) {
return;
}
for (const item of source) {
if (!target.includes(item)) {
const index = source.indexOf(item);
target.splice(index, 0, item);
}
}
}
function setSettingByName(setting, value, trigger) { function setSettingByName(setting, value, trigger) {
if (value === null || value === undefined) { if (value === null || value === undefined) {
return; return;
@ -812,6 +838,7 @@ function setSettingByName(setting, value, trigger) {
if ('sampler_priority' === setting) { if ('sampler_priority' === setting) {
value = Array.isArray(value) ? value : OOBA_DEFAULT_ORDER; value = Array.isArray(value) ? value : OOBA_DEFAULT_ORDER;
insertMissingArrayItems(OOBA_DEFAULT_ORDER, value);
sortOobaItemsByOrder(value); sortOobaItemsByOrder(value);
settings.sampler_priority = value; settings.sampler_priority = value;
return; return;