From ae2d0f04ed78dfbb939638cc7d898ca4eaf91cc2 Mon Sep 17 00:00:00 2001
From: Cohee <18619528+Cohee1207@users.noreply.github.com>
Date: Sat, 31 Aug 2024 20:18:51 +0300
Subject: [PATCH] Add XTC for koboldcpp

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

diff --git a/public/index.html b/public/index.html
index 021a91f43..4403372bf 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1279,7 +1279,7 @@
                                         </div>
                                     </div>
 
-                                    <div data-newbie-hidden data-tg-type="ooba" id="xtc_block" class="wide100p">
+                                    <div data-newbie-hidden data-tg-type="koboldcpp" id="xtc_block" class="wide100p">
                                         <h4 class="wide100p textAlignCenter">
                                             <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">
@@ -1289,8 +1289,8 @@
                                         <div class="flex-container flexFlowRow gap10px flexShrink">
                                             <div class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
                                                 <small data-i18n="Threshold">Threshold</small>
-                                                <input class="neo-range-slider" type="range" id="xtc_threshold_textgenerationwebui" name="volume" min="0" max="1" step="0.01" />
-                                                <input class="neo-range-input" type="number" min="0" max="1" step="0.01" data-for="xtc_threshold_textgenerationwebui" id="xtc_threshold_counter_textgenerationwebui">
+                                                <input class="neo-range-slider" type="range" id="xtc_threshold_textgenerationwebui" name="volume" min="0" max="0.5" step="0.01" />
+                                                <input class="neo-range-input" type="number" min="0" max="0.5" step="0.01" data-for="xtc_threshold_textgenerationwebui" id="xtc_threshold_counter_textgenerationwebui">
                                             </div>
                                             <div class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
                                                 <small data-i18n="Probability">Probability</small>
@@ -1649,7 +1649,6 @@
                                             <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="mirostat" draggable="true"><span>Mirostat</span><small></small></div>
-                                            <div data-name="xtc" draggable="true"><span>XTC</span><small></small></div>
                                         </div>
                                         <div id="textgenerationwebui_default_order" class="menu_button menu_button_icon">
                                             <span data-i18n="Load default order">Load default order</span>
diff --git a/public/scripts/power-user.js b/public/scripts/power-user.js
index 72f5a046d..ff5e335fb 100644
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@@ -640,20 +640,6 @@ async function CreateZenSliders(elmnt) {
         decimals = 2;
     }
 
-    if (sliderID == 'xtc_threshold_textgenerationwebui') {
-        numSteps = 100;
-        decimals = 2;
-        sliderMin = 0;
-        sliderMax = 1;
-        stepScale = 0.01;
-    }
-    if (sliderID == 'xtc_probability_textgenerationwebui') {
-        numSteps = 100;
-        decimals = 2;
-        sliderMin = 0;
-        sliderMax = 1;
-        stepScale = 0.01;
-    }
     if (sliderID == 'eta_cutoff_textgenerationwebui' ||
         sliderID == 'epsilon_cutoff_textgenerationwebui') {
         numSteps = 50;
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index f0b3d6ce9..161182381 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -80,7 +80,6 @@ const OOBA_DEFAULT_ORDER = [
     'top_a',
     'min_p',
     'mirostat',
-    'xtc',
 ];
 const BIAS_KEY = '#textgenerationwebui_api-settings';
 
@@ -1163,8 +1162,8 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
         'api_server': getTextGenServer(),
         'legacy_api': settings.legacy_api && (settings.type === OOBA || settings.type === APHRODITE),
         'sampler_order': settings.type === textgen_types.KOBOLDCPP ? settings.sampler_order : undefined,
-        'xtc_threshold': settings.type === OOBA ? settings.xtc_threshold : undefined,
-        'xtc_probability': settings.type === OOBA ? settings.xtc_probability : undefined,
+        'xtc_threshold': settings.xtc_threshold,
+        'xtc_probability': settings.xtc_probability,
     };
     const nonAphroditeParams = {
         'rep_pen': settings.rep_pen,