mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-03-06 20:58:04 +01:00
fix zenslider rep pen range for TextCompletions
This commit is contained in:
parent
91e1281208
commit
fcca1b1260
@ -1194,8 +1194,8 @@
|
|||||||
</div>
|
</div>
|
||||||
<div data-forAphro=False class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
|
<div data-forAphro=False class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
|
||||||
<small data-i18n="rep.pen range">Repetition Penalty Range</small>
|
<small data-i18n="rep.pen range">Repetition Penalty Range</small>
|
||||||
<input class="neo-range-slider" type="range" id="rep_pen_range_textgenerationwebui" name="volume" min="-1" max="4096" step="1">
|
<input class="neo-range-slider" type="range" id="rep_pen_range_textgenerationwebui" name="volume" min="-1" max="8192" step="1">
|
||||||
<input class="neo-range-input" type="number" min="-1" max="4096" step="1" data-for="rep_pen_range_textgenerationwebui" id="rep_pen_range_counter_textgenerationwebui">
|
<input class="neo-range-input" type="number" min="-1" max="8192" step="1" data-for="rep_pen_range_textgenerationwebui" id="rep_pen_range_counter_textgenerationwebui">
|
||||||
</div>
|
</div>
|
||||||
<div data-forAphro=False data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
|
<div data-forAphro=False data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
|
||||||
<small data-i18n="Encoder Rep. Pen.">Encoder Penalty</small>
|
<small data-i18n="Encoder Rep. Pen.">Encoder Penalty</small>
|
||||||
@ -4898,4 +4898,4 @@
|
|||||||
</script>
|
</script>
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
@ -50,9 +50,9 @@ export {
|
|||||||
|
|
||||||
export const MAX_CONTEXT_DEFAULT = 8192;
|
export const MAX_CONTEXT_DEFAULT = 8192;
|
||||||
const MAX_CONTEXT_UNLOCKED = 65536;
|
const MAX_CONTEXT_UNLOCKED = 65536;
|
||||||
const unlockedMaxContextStep = 256;
|
const unlockedMaxContextStep = 1;
|
||||||
const maxContextMin = 512;
|
const maxContextMin = 512;
|
||||||
const maxContextStep = 64;
|
const maxContextStep = 1;
|
||||||
|
|
||||||
const defaultStoryString = "{{#if system}}{{system}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}";
|
const defaultStoryString = "{{#if system}}{{system}}\n{{/if}}{{#if description}}{{description}}\n{{/if}}{{#if personality}}{{char}}'s personality: {{personality}}\n{{/if}}{{#if scenario}}Scenario: {{scenario}}\n{{/if}}{{#if persona}}{{persona}}\n{{/if}}";
|
||||||
const defaultExampleSeparator = '***';
|
const defaultExampleSeparator = '***';
|
||||||
@ -544,6 +544,23 @@ async function CreateZenSliders(elmnt) {
|
|||||||
sliderValue = steps.indexOf(Number(sliderValue))
|
sliderValue = steps.indexOf(Number(sliderValue))
|
||||||
if (sliderValue === -1) { sliderValue = 4 } // default to '200' if origSlider has value we can't use
|
if (sliderValue === -1) { sliderValue = 4 } // default to '200' if origSlider has value we can't use
|
||||||
}
|
}
|
||||||
|
if (sliderID == 'rep_pen_range_textgenerationwebui') {
|
||||||
|
if (power_user.max_context_unlocked) {
|
||||||
|
var steps = [-1, 0, 256, 512, 768, 1024, 2048, 4096, 8192, 16355, 24576, 32768, 49152, 65536];
|
||||||
|
numSteps = 14
|
||||||
|
} else {
|
||||||
|
var steps = [-1, 0, 256, 512, 768, 1024, 2048, 4096, 8192];
|
||||||
|
numSteps = 9
|
||||||
|
}
|
||||||
|
decimals = 0
|
||||||
|
offVal = 0
|
||||||
|
sliderMin = 0
|
||||||
|
sliderMax = steps.length - 1
|
||||||
|
stepScale = 1;
|
||||||
|
|
||||||
|
sliderValue = steps.indexOf(Number(sliderValue))
|
||||||
|
if (sliderValue === -1) { sliderValue = 1 } // default to '-1 (off)' if origSlider has value we can't use
|
||||||
|
}
|
||||||
//customize decimals
|
//customize decimals
|
||||||
if (sliderID == 'max_context' ||
|
if (sliderID == 'max_context' ||
|
||||||
sliderID == 'mirostat_mode_textgenerationwebui' ||
|
sliderID == 'mirostat_mode_textgenerationwebui' ||
|
||||||
@ -573,9 +590,6 @@ async function CreateZenSliders(elmnt) {
|
|||||||
if (sliderID == 'max_context') {
|
if (sliderID == 'max_context') {
|
||||||
numSteps = 15
|
numSteps = 15
|
||||||
}
|
}
|
||||||
if (sliderID == 'rep_pen_range_textgenerationwebui') {
|
|
||||||
numSteps = 16
|
|
||||||
}
|
|
||||||
if (sliderID == 'mirostat_tau_textgenerationwebui' ||
|
if (sliderID == 'mirostat_tau_textgenerationwebui' ||
|
||||||
sliderID == 'top_k_textgenerationwebui' ||
|
sliderID == 'top_k_textgenerationwebui' ||
|
||||||
sliderID == 'num_beams_textgenerationwebui' ||
|
sliderID == 'num_beams_textgenerationwebui' ||
|
||||||
@ -607,7 +621,6 @@ async function CreateZenSliders(elmnt) {
|
|||||||
sliderID == 'penalty_alpha_textgenerationwebui' ||
|
sliderID == 'penalty_alpha_textgenerationwebui' ||
|
||||||
sliderID == 'length_penalty_textgenerationwebui' ||
|
sliderID == 'length_penalty_textgenerationwebui' ||
|
||||||
sliderID == 'epsilon_cutoff_textgenerationwebui' ||
|
sliderID == 'epsilon_cutoff_textgenerationwebui' ||
|
||||||
sliderID == 'rep_pen_range_textgenerationwebui' ||
|
|
||||||
sliderID == 'rep_pen_range' ||
|
sliderID == 'rep_pen_range' ||
|
||||||
sliderID == 'eta_cutoff_textgenerationwebui' ||
|
sliderID == 'eta_cutoff_textgenerationwebui' ||
|
||||||
sliderID == 'top_a_textgenerationwebui' ||
|
sliderID == 'top_a_textgenerationwebui' ||
|
||||||
@ -638,7 +651,7 @@ async function CreateZenSliders(elmnt) {
|
|||||||
numSteps = 78
|
numSteps = 78
|
||||||
}
|
}
|
||||||
//customize amt gen steps
|
//customize amt gen steps
|
||||||
if (sliderID !== 'amount_gen') {
|
if (sliderID !== 'amount_gen' && sliderID !== 'rep_pen_range_textgenerationwebui') {
|
||||||
var stepScale = sliderRange / numSteps
|
var stepScale = sliderRange / numSteps
|
||||||
}
|
}
|
||||||
var newSlider = $("<div>")
|
var newSlider = $("<div>")
|
||||||
@ -652,14 +665,31 @@ async function CreateZenSliders(elmnt) {
|
|||||||
max: sliderMax,
|
max: sliderMax,
|
||||||
create: function () {
|
create: function () {
|
||||||
var handle = $(this).find(".ui-slider-handle");
|
var handle = $(this).find(".ui-slider-handle");
|
||||||
//handling creaetion of amt_gen
|
|
||||||
|
//handling creation of amt_gen
|
||||||
if (newSlider.attr('id') == 'amount_gen_zenslider') {
|
if (newSlider.attr('id') == 'amount_gen_zenslider') {
|
||||||
|
//console.log(`using custom process for ${newSlider.attr('id')}`)
|
||||||
var handleText = steps[sliderValue]
|
var handleText = steps[sliderValue]
|
||||||
var stepNumber = sliderValue
|
var stepNumber = sliderValue
|
||||||
var leftMargin = ((stepNumber) / numSteps) * 50 * -1
|
var leftMargin = ((stepNumber) / numSteps) * 50 * -1
|
||||||
handle.text(handleText)
|
handle.text(handleText)
|
||||||
.css('margin-left', `${leftMargin}px`)
|
.css('margin-left', `${leftMargin}px`)
|
||||||
//console.log(`initial value:${handleText}, stepNum:${stepNumber}, numSteps:${numSteps}, left-margin:${leftMargin}`)
|
//console.log(`${newSlider.attr('id')} initial value:${handleText}, stepNum:${stepNumber}, numSteps:${numSteps}, left-margin:${leftMargin}`)
|
||||||
|
|
||||||
|
//handling creation of rep_pen_range for ooba
|
||||||
|
} else if (newSlider.attr('id') == 'rep_pen_range_textgenerationwebui_zenslider') {
|
||||||
|
if ($('#rep_pen_range_textgenerationwebui_zensliders').length !== 0) {
|
||||||
|
console.log('removing previous rep pen slider')
|
||||||
|
$('#rep_pen_range_textgenerationwebui_zensliders').remove()
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`using custom process for ${newSlider.attr('id')}`)
|
||||||
|
var handleText = steps[sliderValue]
|
||||||
|
var stepNumber = sliderValue
|
||||||
|
var leftMargin = ((stepNumber) / numSteps) * 50 * -1
|
||||||
|
handle.text(handleText)
|
||||||
|
.css('margin-left', `${leftMargin}px`)
|
||||||
|
console.log(`${newSlider.attr('id')} initial value:${handleText}, stepNum:${stepNumber}, numSteps:${numSteps}, left-margin:${leftMargin}`)
|
||||||
} else {
|
} else {
|
||||||
//handling creation for all other sliders
|
//handling creation for all other sliders
|
||||||
var numVal = Number(sliderValue).toFixed(decimals)
|
var numVal = Number(sliderValue).toFixed(decimals)
|
||||||
@ -722,7 +752,7 @@ async function CreateZenSliders(elmnt) {
|
|||||||
var handle = $(this).find(".ui-slider-handle");
|
var handle = $(this).find(".ui-slider-handle");
|
||||||
var numVal = Number(ui.value).toFixed(decimals);
|
var numVal = Number(ui.value).toFixed(decimals);
|
||||||
offVal = Number(offVal).toFixed(decimals);
|
offVal = Number(offVal).toFixed(decimals);
|
||||||
//console.log(numVal, sliderMin, sliderMax, numVal > sliderMax, numVal < sliderMin)
|
console.log(numVal, sliderMin, sliderMax, numVal > sliderMax, numVal < sliderMin)
|
||||||
if (numVal > sliderMax) {
|
if (numVal > sliderMax) {
|
||||||
//console.log('clamping numVal to sliderMax')
|
//console.log('clamping numVal to sliderMax')
|
||||||
numVal = sliderMax
|
numVal = sliderMax
|
||||||
@ -738,7 +768,7 @@ async function CreateZenSliders(elmnt) {
|
|||||||
var percentOfMax = Number((ui.value / sliderMax)) //what % our value is of the max
|
var percentOfMax = Number((ui.value / sliderMax)) //what % our value is of the max
|
||||||
var perStepPercent = 1 / numSteps //how far in % each step should be on the slider
|
var perStepPercent = 1 / numSteps //how far in % each step should be on the slider
|
||||||
var leftPos = newSlider.width() * (stepNumber * perStepPercent) //how big of a left margin to give the slider for manual inputs
|
var leftPos = newSlider.width() * (stepNumber * perStepPercent) //how big of a left margin to give the slider for manual inputs
|
||||||
/* console.log(`
|
console.log(`
|
||||||
numVal: ${numVal},
|
numVal: ${numVal},
|
||||||
sliderMax: ${sliderMax}
|
sliderMax: ${sliderMax}
|
||||||
sliderMin: ${sliderMin}
|
sliderMin: ${sliderMin}
|
||||||
@ -750,13 +780,20 @@ async function CreateZenSliders(elmnt) {
|
|||||||
left-margin: ${leftMargin}
|
left-margin: ${leftMargin}
|
||||||
width: ${newSlider.width()}
|
width: ${newSlider.width()}
|
||||||
percent of max: ${percentOfMax}
|
percent of max: ${percentOfMax}
|
||||||
left: ${leftPos}`) */
|
left: ${leftPos}`)
|
||||||
//special handling for response length slider, pulls text aliases for step values from an array
|
//special handling for response length slider, pulls text aliases for step values from an array
|
||||||
if (newSlider.attr('id') == 'amount_gen_zenslider') {
|
if (newSlider.attr('id') == 'amount_gen_zenslider') {
|
||||||
handleText = steps[stepNumber]
|
handleText = steps[stepNumber]
|
||||||
handle.text(handleText);
|
handle.text(handleText);
|
||||||
newSlider.val(stepNumber)
|
newSlider.val(stepNumber)
|
||||||
}
|
}
|
||||||
|
else if (newSlider.attr('id') == 'rep_pen_range_textgenerationwebui_zenslider') {
|
||||||
|
handleText = steps[stepNumber]
|
||||||
|
handle.text(handleText);
|
||||||
|
newSlider.val(stepNumber)
|
||||||
|
if (numVal === offVal) { handle.text('Off').css('color', 'rgba(128,128,128,0.5'); }
|
||||||
|
else { handle.css('color', ''); }
|
||||||
|
}
|
||||||
//everything else uses the flat slider value
|
//everything else uses the flat slider value
|
||||||
else {
|
else {
|
||||||
//show 'off' if disabled value is set
|
//show 'off' if disabled value is set
|
||||||
@ -1489,7 +1526,7 @@ function switchMaxContextSize() {
|
|||||||
const maxValue = power_user.max_context_unlocked ? MAX_CONTEXT_UNLOCKED : MAX_CONTEXT_DEFAULT;
|
const maxValue = power_user.max_context_unlocked ? MAX_CONTEXT_UNLOCKED : MAX_CONTEXT_DEFAULT;
|
||||||
const minValue = power_user.max_context_unlocked ? maxContextMin : maxContextMin;
|
const minValue = power_user.max_context_unlocked ? maxContextMin : maxContextMin;
|
||||||
const steps = power_user.max_context_unlocked ? unlockedMaxContextStep : maxContextStep;
|
const steps = power_user.max_context_unlocked ? unlockedMaxContextStep : maxContextStep;
|
||||||
|
$("#rep_pen_range_textgenerationwebui_zenslider").remove()
|
||||||
for (const element of elements) {
|
for (const element of elements) {
|
||||||
const id = element.attr('id');
|
const id = element.attr('id');
|
||||||
element.attr('max', maxValue);
|
element.attr('max', maxValue);
|
||||||
@ -1507,6 +1544,10 @@ function switchMaxContextSize() {
|
|||||||
if (power_user.enableZenSliders) {
|
if (power_user.enableZenSliders) {
|
||||||
$("#max_context_zenslider").remove()
|
$("#max_context_zenslider").remove()
|
||||||
CreateZenSliders($("#max_context"))
|
CreateZenSliders($("#max_context"))
|
||||||
|
console.log('removing rep pen range for unlock')
|
||||||
|
$("#rep_pen_range_textgenerationwebui_zenslider").remove()
|
||||||
|
console.log('recreating rep pen range with new unlock')
|
||||||
|
CreateZenSliders($("#rep_pen_range_textgenerationwebui"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user