Merge remote-tracking branch 'upstream/staging' into quad-sample

public/scripts/extensions/translate/index.js

@@ -139,7 +139,7 @@ const languageCodes = {
 };
 
 const KEY_REQUIRED = ['deepl', 'libre'];
-const LOCAL_URL = ['libre', 'oneringtranslator', 'deeplx'];
+const LOCAL_URL = ['libre', 'oneringtranslator', 'deeplx', 'lingva'];
 
 function showKeysButton() {
     const providerRequiresKey = KEY_REQUIRED.includes(extension_settings.translate.provider);
@@ -249,6 +249,27 @@ async function translateProviderGoogle(text, lang) {
     throw new Error(response.statusText);
 }
 
+/**
+ * Translates text using an instance of the Lingva Translate
+ * @param {string} text Text to translate
+ * @param {string} lang Target language code
+ * @returns {Promise<string>} Translated text
+ */
+async function translateProviderLingva(text, lang) {
+    const response = await fetch('/api/translate/lingva', {
+        method: 'POST',
+        headers: getRequestHeaders(),
+        body: JSON.stringify({ text: text, lang: lang }),
+    });
+
+    if (response.ok) {
+        const result = await response.text();
+        return result;
+    }
+
+    throw new Error(response.statusText);
+}
+
 /**
  * Translates text using the DeepL API
  * @param {string} text Text to translate
@@ -355,6 +376,8 @@ async function translate(text, lang) {
                 return await translateProviderLibre(text, lang);
             case 'google':
                 return await chunkedTranslate(text, lang, translateProviderGoogle, 5000);
+            case 'lingva':
+                return await chunkedTranslate(text, lang, translateProviderLingva, 5000);
             case 'deepl':
                 return await translateProviderDeepl(text, lang);
             case 'deeplx':
@@ -507,6 +530,7 @@ jQuery(() => {
                     <select id="translation_provider" name="provider" class="margin0">
                         <option value="libre">Libre</option>
                         <option value="google">Google</option>
+                        <option value="lingva">Lingva</option>
                         <option value="deepl">DeepL</option>
                         <option value="deeplx">DeepLX</option>
                         <option value="bing">Bing</option>
@@ -569,6 +593,7 @@ jQuery(() => {
         const optionText = $('#translation_provider option:selected').text();
         const exampleURLs = {
             'libre': 'http://127.0.0.1:5000/translate',
+            'lingva': 'https://lingva.ml/api/v1',
             'oneringtranslator': 'http://127.0.0.1:4990/translate',
             'deeplx': 'http://127.0.0.1:1188/translate',
         };

public/scripts/personas.js

@@ -640,6 +640,11 @@ export function initPersonas() {
     $('#personas_backup').on('click', onBackupPersonas);
     $('#personas_restore').on('click', () => $('#personas_restore_input').trigger('click'));
     $('#personas_restore_input').on('change', onPersonasRestoreInput);
+    $('#persona_sort_order').val(power_user.persona_sort_order).on('input', function () {
+        power_user.persona_sort_order = String($(this).val());
+        getUserAvatars(true, user_avatar);
+        saveSettingsDebounced();
+    });
     $('#persona_grid_toggle').on('click', () => {
         const state = localStorage.getItem(GRID_STORAGE_KEY) === 'true';
         localStorage.setItem(GRID_STORAGE_KEY, String(!state));

public/scripts/power-user.js

@@ -225,6 +225,7 @@ let power_user = {
     persona_description: '',
     persona_description_position: persona_description_positions.IN_PROMPT,
     persona_show_notifications: true,
+    persona_sort_order: 'asc',
 
     custom_stopping_strings: '',
     custom_stopping_strings_macro: true,
@@ -501,6 +502,11 @@ async function switchLabMode() {
         $('#labModeWarning').removeClass('displayNone');
         //$("#advanced-ai-config-block input[type='range']").hide()
 
+        $('#amount_gen').attr('min', '1')
+            .attr('max', '99999')
+            .attr('step', '1');
+
+
     } else {
         //re apply the original sliders values to each input
         originalSliderValues.forEach(function (slider) {
@@ -512,6 +518,10 @@ async function switchLabMode() {
         });
         $('#advanced-ai-config-block input[type=\'range\']').show();
         $('#labModeWarning').addClass('displayNone');
+
+        $('#amount_gen').attr('min', '16')
+            .attr('max', '2048')
+            .attr('step', '1');
     }
 }
 

public/scripts/tokenizers.js

@@ -35,7 +35,7 @@ export const SENTENCEPIECE_TOKENIZERS = [
     //tokenizers.NERD2,
 ];
 
-export const TEXTGEN_TOKENIZERS = [OOBA, TABBY, KOBOLDCPP, LLAMACPP];
+export const TEXTGEN_TOKENIZERS = [OOBA, TABBY, KOBOLDCPP, LLAMACPP, APHRODITE];
 
 const TOKENIZER_URLS = {
     [tokenizers.GPT2]: {