Merge branch 'staging' into tags-as-folders-enhancements

public/scripts/extensions.js

@@ -604,7 +604,7 @@ async function showExtensionsDetails() {
             ${htmlDefault}
             ${htmlExternal}
         `;
-        popupPromise = callPopup(`<div class="extensions_info">${html}</div>`, 'text');
+        popupPromise = callPopup(`<div class="extensions_info">${html}</div>`, 'text', '', { okButton: 'Close', wide: true, large: true });
     } catch (error) {
         toastr.error('Error loading extensions. See browser console for details.');
         console.error(error);

public/scripts/macros.js

@@ -46,6 +46,42 @@ function getLastMessage() {
     return '';
 }
 
+/**
+ * Returns the last message from the user.
+ * @returns {string} The last message from the user.
+ */
+function getLastUserMessage() {
+    if (!Array.isArray(chat) || chat.length === 0) {
+        return '';
+    }
+
+    for (let i = chat.length - 1; i >= 0; i--) {
+        if (chat[i].is_user && !chat[i].is_system) {
+            return chat[i].mes;
+        }
+    }
+
+    return '';
+}
+
+/**
+ * Returns the last message from the bot.
+ * @returns {string} The last message from the bot.
+ */
+function getLastCharMessage() {
+    if (!Array.isArray(chat) || chat.length === 0) {
+        return '';
+    }
+
+    for (let i = chat.length - 1; i >= 0; i--) {
+        if (!chat[i].is_user && !chat[i].is_system) {
+            return chat[i].mes;
+        }
+    }
+
+    return '';
+}
+
 /**
  * Returns the ID of the last swipe.
  * @returns {string} The 1-based ID of the last swipe
@@ -238,6 +274,8 @@ export function evaluateMacros(content, env) {
     content = content.replace(/{{maxPrompt}}/gi, () => String(getMaxContextSize()));
     content = content.replace(/{{lastMessage}}/gi, () => getLastMessage());
     content = content.replace(/{{lastMessageId}}/gi, () => getLastMessageId());
+    content = content.replace(/{{lastUserMessage}}/gi, () => getLastUserMessage());
+    content = content.replace(/{{lastCharMessage}}/gi, () => getLastCharMessage());
     content = content.replace(/{{firstIncludedMessageId}}/gi, () => getFirstIncludedMessageId());
     content = content.replace(/{{lastSwipeId}}/gi, () => getLastSwipeId());
     content = content.replace(/{{currentSwipeId}}/gi, () => getCurrentSwipeId());

public/scripts/power-user.js

@@ -630,6 +630,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;
     }
@@ -690,6 +691,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;
     }

public/scripts/textgen-settings.js

@@ -112,6 +112,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',
@@ -182,6 +183,7 @@ const setting_names = [
     'max_temp',
     'dynatemp_exponent',
     'smoothing_factor',
+    'smoothing_curve',
     'max_tokens_second',
     'encoder_rep_pen',
     'freq_pen',
@@ -658,6 +660,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)) {
@@ -1002,6 +1005,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,