From 04a5d8390d4d6d74b99323133d40caac28786940 Mon Sep 17 00:00:00 2001
From: Alexander Abushady <44341163+AAbushady@users.noreply.github.com>
Date: Mon, 8 Jan 2024 23:58:06 -0500
Subject: [PATCH] Dynatemp UI v3.1

fixes for html positioning as well as api settings.
---
 public/index.html                  | 47 +++++++++++++++---------------
 public/scripts/textgen-settings.js |  4 +--
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/public/index.html b/public/index.html
index 48ccb4037..f88ad0d04 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1270,6 +1270,30 @@
                                             <input class="neo-range-input" type="number" min="0" max="5" step="1" data-for="prompt_log_probs_aphrodite" id="prompt_log_probs_aphrodite_counter_textgenerationwebui">
                                         </div>
                                     -->
+                                    <div data-newbie-hidden name="dynaTempBlock" class="wide100p">
+                                        <h4 class="wide100p textAlignCenter" data-i18n="DynaTemp">
+                                            <div class="flex-container alignitemscenter" style="justify-content: center;">
+                                                <div class="checkbox_label" for="dynatemp_textgenerationwebui">
+                                                    <input type="checkbox" id="dynatemp_textgenerationwebui" />
+                                                    <small data-i18n="dynatemp"></small>
+                                                </div>
+                                                <span style="text-align: center;">Dynamic Temperature</span>
+                                                <div class="fa-solid fa-circle-info opacity50p" title="Scales Temperature dynamically per token (based on the variation of probabilities.)"></div>
+                                            </div>
+                                        </h4>
+                                        <div class="flex-container flexFlowRow alignitemscenter gap10px flexShrink">
+                                            <div class="alignitemscenter flex-container marginBot5 flexFlowColumn flexGrow flexShrink gap0">
+                                                <small data-i18n="Minimum Temp">Minimum Temp</small>
+                                                <input class="neo-range-slider" type="range" id="min_temp_textgenerationwebui" name="volume" min="0" max="5" step="0.1" />
+                                                <input class="neo-range-input" type="number" min="0" max="5" step="0.1" data-for="min_temp_textgenerationwebui" id="min_temp_counter_textgenerationwebui">
+                                            </div>
+                                            <div class="alignitemscenter flex-container marginBot5 flexFlowColumn flexGrow flexShrink gap0">
+                                                <small data-i18n="Maximum Temp">Maximum Temp</small>
+                                                <input class="neo-range-slider" type="range" id="max_temp_textgenerationwebui" name="volume" min="0" max="5" step="0.1" />
+                                                <input class="neo-range-input" type="number" min="0" max="5" step="0.1" data-for="max_temp_textgenerationwebui" id="max_temp_counter_textgenerationwebui">
+                                            </div>
+                                        </div>
+                                    </div>
                                     <div data-newbie-hidden name="miroStatBlock" class="wide100p">
                                         <h4 class="wide100p textAlignCenter" data-i18n="Mirostat (mode=1 is only for llama.cpp)">Mirostat
                                             <div class=" fa-solid fa-circle-info opacity50p " title="Mode=1 is only for llama.cpp&#13;More helpful tips coming soon."></div>
@@ -1315,29 +1339,6 @@
                                             </div>
                                         </div>
                                     </div>
-                                    <div data-newbie-hidden name="dynaTempBlock" class="wide100p">
-                                        <h4 class="wide100p textAlignCenter" data-i18n="DynaTemp">DynaTemp
-                                            <div class=" fa-solid fa-circle-info opacity50p " title="Helpful tip coming soon."></div>
-                                        </h4>
-                                        <div class="flex-container flexFlowRow alignitemscenter gap10px flexShrink">
-                                            <div class="">
-                                                <label class="checkbox_label" for="dynatemp_textgenerationwebui">
-                                                    <input type="checkbox" id="dynatemp_textgenerationwebui" />
-                                                    <small data-i18n="dynatemp">Activate</small>
-                                                </label>
-                                            </div>
-                                            <div class="alignitemscenter flex-container marginBot5 flexFlowColumn flexGrow flexShrink gap0">
-                                                <small data-i18n="Min Temp">Min Temp</small>
-                                                <input class="neo-range-slider" type="range" id="min_temp_textgenerationwebui" name="volume" min="0" max="5" step="0.1" />
-                                                <input class="neo-range-input" type="number" min="0" max="5" step="0.1" data-for="min_temp_textgenerationwebui" id="min_temp_counter_textgenerationwebui">
-                                            </div>
-                                            <div class="alignitemscenter flex-container marginBot5 flexFlowColumn flexGrow flexShrink gap0">
-                                                <small data-i18n="Max Temp">Max Temp</small>
-                                                <input class="neo-range-slider" type="range" id="max_temp_textgenerationwebui" name="volume" min="0" max="5" step="0.1" />
-                                                <input class="neo-range-input" type="number" min="0" max="5" step="0.1" data-for="max_temp_textgenerationwebui" id="max_temp_counter_textgenerationwebui">
-                                            </div>
-                                        </div>
-                                    </div>
                                     <div data-forAphro=False data-newbie-hidden name="contrastiveSearchBlock" class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
                                         <h4 class="textAlignCenter" data-i18n="Contrastive search">Contrast Search
                                             <div class=" fa-solid fa-circle-info opacity50p " title="Helpful tip coming soon."></div>
diff --git a/public/scripts/textgen-settings.js b/public/scripts/textgen-settings.js
index 61cafad5e..42385ec0a 100644
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@@ -710,7 +710,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
         'model': getModel(),
         'max_new_tokens': maxTokens,
         'max_tokens': maxTokens,
-        'temperature': settings.temp,
+        'temperature': settings.dynatemp ? (settings.min_temp + settings.max_temp) / 2 : settings.temp,
         'top_p': settings.top_p,
         'typical_p': settings.typical_p,
         'min_p': settings.min_p,
@@ -727,7 +727,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
         'dynatemp': settings.dynatemp,
         'dynatemp_low': settings.min_temp,
         'dynatemp_high': settings.max_temp,
-        'dynatemp_range': (settings.min_temp + settings.max_temp) / 2,
+        'dynatemp_range': (settings.max_temp - settings.min_temp) / 2,
         'stopping_strings': getStoppingStrings(isImpersonate, isContinue),
         'stop': getStoppingStrings(isImpersonate, isContinue),
         'truncation_length': max_context,