From 45776de1d5d02839806b09e4cf7876a3169df4ef Mon Sep 17 00:00:00 2001
From: kalomaze <66376113+kalomaze@users.noreply.github.com>
Date: Fri, 1 Mar 2024 00:06:34 -0600
Subject: [PATCH] Smoothing curve support for ooba

---
 public/index.html                  | 21 ++++++++++++++++-----
 public/scripts/power-user.js       |  2 ++
 public/scripts/textgen-settings.js |  4 ++++
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/public/index.html b/public/index.html
index 3e535ac6e..ac91277c9 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1276,16 +1276,27 @@
                                         <input class="neo-range-slider" type="range" id="min_length_textgenerationwebui" name="volume" min="0" max="2000" step="1" />
                                         <input class="neo-range-input" type="number" min="0" max="2000" step="1" data-for="min_length_textgenerationwebui" id="min_length_counter_textgenerationwebui">
                                     </div>
-                                    <div data-newbie-hidden data-tg-type="ooba, koboldcpp, aphrodite, tabby" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
-                                        <small data-i18n="Smoothing Factor">Smoothing Factor</small>
-                                        <input class="neo-range-slider" type="range" id="smoothing_factor_textgenerationwebui" name="volume" min="0" max="10" step="0.01" />
-                                        <input class="neo-range-input" type="number" min="0" max="10" step="0.01" data-for="smoothing_factor_textgenerationwebui" id="smoothing_factor_counter_textgenerationwebui">
-                                    </div>
                                     <div data-newbie-hidden data-tg-type="ooba" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
                                         <small data-i18n="Max Tokens Second">Maximum tokens/second</small>
                                         <input class="neo-range-slider" type="range" id="max_tokens_second_textgenerationwebui" name="volume" min="0" max="20" step="1" />
                                         <input class="neo-range-input" type="number" min="0" max="20" step="1" data-for="max_tokens_second_textgenerationwebui" id="max_tokens_second_counter_textgenerationwebui">
                                     </div>
+                                    <div data-newbie-hidden name="smoothingBlock" class="wide100p">
+                                        <h4 class="wide100p textAlignCenter">
+                                            <label data-i18n="Smooth Sampling">Smooth Sampling</label>
+                                            <div class=" fa-solid fa-circle-info opacity50p " data-i18n="[title]Smooth Sampling" title="Allows you to use quadratic/cubic transformations to adjust the distribution. Lower Smoothing Factor values will be more creative, usually between 0.2-0.3 is the sweetspot (assuming the curve = 1). Higher Smoothing Curve values will make the curve steeper, which will punish low probability choices more aggressively. 1.0 curve is equivalent to only using Smoothing Factor."></div>
+                                        </h4>
+                                        <div data-newbie-hidden data-tg-type="ooba, koboldcpp, aphrodite, tabby" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                            <small data-i18n="Smoothing Factor">Smoothing Factor</small>
+                                            <input class="neo-range-slider" type="range" id="smoothing_factor_textgenerationwebui" name="volume" min="0" max="10" step="0.01" />
+                                            <input class="neo-range-input" type="number" min="0" max="10" step="0.01" data-for="smoothing_factor_textgenerationwebui" id="smoothing_factor_counter_textgenerationwebui">
+                                        </div>
+                                        <div data-newbie-hidden data-tg-type="ooba, koboldcpp, aphrodite, tabby" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
+                                            <small data-i18n="Smoothing Curve">Smoothing Curve</small>
+                                            <input class="neo-range-slider" type="range" id="smoothing_curve_textgenerationwebui" name="volume" min="1" max="10" step="0.01" />
+                                            <input class="neo-range-input" type="number" min="1" max="10" step="0.01" data-for="smoothing_curve_textgenerationwebui" id="smoothing_curve_counter_textgenerationwebui">
+                                        </div>
+                                    </div>
                                     <!--
                                         <div data-tg-type="aphrodite" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0" data-i18n="Responses">
                                             <small>Responses</small>
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index ab043466d..aef592366 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -624,6 +624,7 @@ async function CreateZenSliders(elmnt) {
     if (sliderID == 'min_temp_textgenerationwebui' ||
         sliderID == 'max_temp_textgenerationwebui' ||
         sliderID == 'dynatemp_exponent_textgenerationwebui' ||
+        sliderID == 'smoothing_curve_textgenerationwebui' ||
         sliderID == 'smoothing_factor_textgenerationwebui') {
         decimals = 2;
     }
@@ -684,6 +685,7 @@ async function CreateZenSliders(elmnt) {
         sliderID == 'top_k' ||
         sliderID == 'rep_pen_slope' ||
         sliderID == 'smoothing_factor_textgenerationwebui' ||
+        sliderID == 'smoothing_curve_textgenerationwebui' ||
         sliderID == 'min_length_textgenerationwebui') {
         offVal = 0;
     }
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index 921cb911e..7f86102d9 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -111,6 +111,7 @@ const settings = {
     max_temp: 2.0,
     dynatemp_exponent: 1.0,
     smoothing_factor: 0.0,
+    smoothing_curve: 1.0,
     max_tokens_second: 0,
     seed: -1,
     preset: 'Default',
@@ -179,6 +180,7 @@ const setting_names = [
     'max_temp',
     'dynatemp_exponent',
     'smoothing_factor',
+    'smoothing_curve',
     'max_tokens_second',
     'encoder_rep_pen',
     'freq_pen',
@@ -647,6 +649,7 @@ jQuery(function () {
             'typical_p_textgenerationwebui': 1, // Added entry
             'guidance_scale_textgenerationwebui': 1,
             'smoothing_factor_textgenerationwebui': 0,
+            'smoothing_curve_textgenerationwebui': 1,
         };
 
         for (const [id, value] of Object.entries(inputs)) {
@@ -986,6 +989,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
         'dynatemp_range': settings.dynatemp ? (settings.max_temp - settings.min_temp) / 2 : 0,
         'dynatemp_exponent': settings.dynatemp ? settings.dynatemp_exponent : 1,
         'smoothing_factor': settings.smoothing_factor,
+        'smoothing_curve': settings.smoothing_curve,
         'max_tokens_second': settings.max_tokens_second,
         'sampler_priority': settings.type === OOBA ? settings.sampler_priority : undefined,
         'samplers': settings.type === LLAMACPP ? settings.samplers : undefined,