Merge branch 'staging' into talkinghead-talkinganim

2024-12-12 17:36:22 +01:00 · 2024-01-09 19:45:03 +02:00 · 2024-01-09 19:45:03 +02:00 · e4efb3a10a
commit e4efb3a10a
parent 87b05e2e2d 9b651a39eb
10 changed files with 115 additions and 36 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -2413,9 +2413,9 @@
            "dev": true
        },
        "node_modules/follow-redirects": {
-            "version": "1.15.2",
-            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-            "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+            "version": "1.15.4",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
+            "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
            "funding": [
                {
                    "type": "individual",
--- a/package.json
+++ b/package.json
@ -42,6 +42,9 @@
        },
        "vectra": {
            "openai": "^4.17.0"
+        },
+        "axios": {
+            "follow-redirects": "^1.15.4"
        }
    },
    "name": "sillytavern",
--- a/public/index.html
+++ b/public/index.html
@ -1161,8 +1161,8 @@
                                            <span data-i18n="temperature">Temperature</span>
                                            <div class="fa-solid fa-circle-info opacity50p" title="Temperature controls the randomness in token selection:&#13;- low temperature (<1.0) leads to more predictable text, favoring higher probability tokens.&#13;- high temperature (>1.0) increases creativity and diversity in the output by giving lower probability tokens a better chance.&#13;Set to 1.0 for the original probabilities."></div>
                                        </small>
-                                        <input class="neo-range-slider" type="range" id="temp_textgenerationwebui" name="volume" min="0.0" max="4.0" step="0.01" x-setting-id="temp">
-                                        <input class="neo-range-input" type="number" min="0.0" max="4.0" step="0.01" data-for="temp_textgenerationwebui" id="temp_counter_textgenerationwebui">
+                                        <input class="neo-range-slider" type="range" id="temp_textgenerationwebui" name="volume" min="0.0" max="5.0" step="0.01" x-setting-id="temp">
+                                        <input class="neo-range-input" type="number" min="0.0" max="5.0" step="0.01" data-for="temp_textgenerationwebui" id="temp_counter_textgenerationwebui">
                                    </div>
                                    <div data-newbie-hidden class="alignitemscenter flex-container flexFlowColumn flexBasis48p flexGrow flexShrink gap0">
                                        <small>
@ -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,18 +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="Set range to 0 to Deactivate."></div>
-                                        </h4>
-                                        <div class="flex-container flexFlowRow alignitemscenter gap10px flexShrink">
-                                            <div class="alignitemscenter flex-container marginBot5 flexFlowColumn flexGrow flexShrink gap0">
-                                                <small data-i18n="DynaTemp Range">DynaTemp Range</small>
-                                                <input class="neo-range-slider" type="range" id="dynatemp_range_textgenerationwebui" name="volume" min="0" max="2.0" step="0.1" />
-                                                <input class="neo-range-input" type="number" min="0" max="2.0" step="0.1" data-for="dynatemp_range_textgenerationwebui" id="dynatemp_range_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>
@ -2915,6 +2927,7 @@
                            <div id="world_backfill_memos" class="menu_button fa-solid fa-notes-medical" title="Fill empty Memo/Titles with Keywords" data-i18n="[title]Fill empty Memo/Titles with Keywords"></div>
                            <div id="world_import_button" class="menu_button fa-solid fa-file-import" title="Import World Info" data-i18n="[title]Import World Info"></div>
                            <div id="world_popup_export" class="menu_button fa-solid fa-file-export" title="Export World Info" data-i18n="[title]Export World Info"></div>
+                            <div id="world_duplicate" class="menu_button fa-solid fa-paste" title="Duplicate World Info" data-i18n="[title]Duplicate World Info"></div>
                            <div id="world_popup_delete" class="menu_button fa-solid fa-trash-can redWarningBG" title="Delete World Info" data-i18n="[title]Delete World Info"></div>
                            <input type="search" class="text_pole textarea_compact" data-i18n="[placeholder]Search..." id="world_info_search" placeholder="Search...">
                            <select id="world_info_sort_order" class="margin0">
--- a/public/script.js
+++ b/public/script.js
@ -3473,7 +3473,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu
            // need a detection for what the quiet prompt is being asked for...

            // Bail out early?
-            if (quietToLoud !== true) {
+            if (!isInstruct && !quietToLoud) {
                return lastMesString;
            }
        }
@ -3481,7 +3481,7 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu

        // Get instruct mode line
        if (isInstruct && !isContinue) {
-            const name = isImpersonate ? name1 : name2;
+            const name = (quiet_prompt && !quietToLoud) ? 'System' : (isImpersonate ? name1 : name2);
            lastMesString += formatInstructModePrompt(name, isImpersonate, promptBias, name1, name2);
        }

--- a/public/scripts/extensions/gallery/index.js
+++ b/public/scripts/extensions/gallery/index.js
@ -4,7 +4,7 @@ import {
    characters,
    getRequestHeaders,
 } from '../../../script.js';
-import { selected_group } from '../../group-chats.js';
+import { groups, selected_group } from '../../group-chats.js';
 import { loadFileToDocument, delay } from '../../utils.js';
 import { loadMovingUIState } from '../../power-user.js';
 import { dragElement } from '../../RossAscends-mods.js';
@ -416,7 +416,26 @@ function viewWithDragbox(items) {

 // Registers a simple command for opening the char gallery.
 registerSlashCommand('show-gallery', showGalleryCommand, ['sg'], '– shows the gallery', true, true);
+registerSlashCommand('list-gallery', listGalleryCommand, ['lg'], '<span class="monospace">[optional char=charName] [optional group=groupName]</span> – list images in the gallery of the current char / group or a specified char / group', true, true);

 function showGalleryCommand(args) {
    showCharGallery();
 }
+
+async function listGalleryCommand(args) {
+    try {
+        let url = args.char ?? (args.group ? groups.find(it=>it.name == args.group)?.id : null) ?? (selected_group || this_chid);
+        if (!args.char && !args.group && !selected_group && this_chid) {
+            const char = characters[this_chid];
+            url = char.avatar.replace('.png', '');
+        }
+
+        const items = await getGalleryItems(url);
+        return JSON.stringify(items.map(it=>it.src));
+
+    } catch (err) {
+        console.trace();
+        console.error(err);
+    }
+    return JSON.stringify([]);
+}
--- a/public/scripts/power-user.js
+++ b/public/scripts/power-user.js
@ -608,7 +608,8 @@ async function CreateZenSliders(elmnt) {
        sliderID == 'rep_pen_range') {
        decimals = 0;
    }
-    if (sliderID == 'dynatemp_range_textgenerationwebui') {
+    if (sliderID == 'min_temp_textgenerationwebui' ||
+        sliderID == 'max_temp_textgenerationwebui') {
        decimals = 2;
    }
    if (sliderID == 'eta_cutoff_textgenerationwebui' ||
@ -635,13 +636,14 @@ async function CreateZenSliders(elmnt) {
        sliderID == 'tfs_textgenerationwebui' ||
        sliderID == 'min_p_textgenerationwebui' ||
        sliderID == 'temp_textgenerationwebui' ||
-        sliderID == 'temp' ||
-        sliderID == 'dynatemp_range_textgenerationwebui') {
+        sliderID == 'temp') {
        numSteps = 20;
    }
    if (sliderID == 'mirostat_eta_textgenerationwebui' ||
        sliderID == 'penalty_alpha_textgenerationwebui' ||
-        sliderID == 'length_penalty_textgenerationwebui') {
+        sliderID == 'length_penalty_textgenerationwebui' ||
+        sliderID == 'min_temp_textgenerationwebui' ||
+        sliderID == 'max_temp_textgenerationwebui') {
        numSteps = 50;
    }
    //customize off values
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@ -79,7 +79,9 @@ const settings = {
    presence_pen: 0,
    do_sample: true,
    early_stopping: false,
-    dynatemp_range: 0,
+    dynatemp: false,
+    min_temp: 0,
+    max_temp: 2.0,
    seed: -1,
    preset: 'Default',
    add_bos_token: true,
@ -138,7 +140,9 @@ const setting_names = [
    'num_beams',
    'length_penalty',
    'min_length',
-    'dynatemp_range',
+    'dynatemp',
+    'min_temp',
+    'max_temp',
    'encoder_rep_pen',
    'freq_pen',
    'presence_pen',
@ -706,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,
@ -720,7 +724,10 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
        'length_penalty': settings.length_penalty,
        'early_stopping': settings.early_stopping,
        'add_bos_token': settings.add_bos_token,
-        'dynatemp_range': settings.dynatemp_range,
+        'dynamic_temperature': settings.dynatemp,
+        'dynatemp_low': settings.min_temp,
+        'dynatemp_high': settings.max_temp,
+        'dynatemp_range': settings.dynatemp ? (settings.max_temp - settings.min_temp) / 2 : 0,
        'stopping_strings': getStoppingStrings(isImpersonate, isContinue),
        'stop': getStoppingStrings(isImpersonate, isContinue),
        'truncation_length': max_context,
--- a/public/scripts/world-info.js
+++ b/public/scripts/world-info.js
@ -360,6 +360,8 @@ function registerWorldInfoSlashCommands() {
            return '';
        }

+        value = value.replace(/\\([{}|])/g, '$1');
+
        const data = await loadWorldInfoData(file);

        if (!data || !('entries' in data)) {
@ -556,6 +558,7 @@ function displayWorldEntries(name, data, navigation = navigation_option.none) {
        $('#world_popup_name_button').off('click').on('click', nullWorldInfo);
        $('#world_popup_export').off('click').on('click', nullWorldInfo);
        $('#world_popup_delete').off('click').on('click', nullWorldInfo);
+        $('#world_duplicate').off('click').on('click', nullWorldInfo);
        $('#world_popup_entries_list').hide();
        $('#world_info_pagination').html('');
        return;
@ -693,6 +696,23 @@ function displayWorldEntries(name, data, navigation = navigation_option.none) {
        }
    });

+    $('#world_duplicate').off('click').on('click', async () => {
+        const tempName = getFreeWorldName();
+        const finalName = await callPopup('<h3>Create a new World Info?</h3>Enter a name for the new file:', 'input', tempName);
+
+        if (finalName) {
+            await saveWorldInfo(finalName, data, true);
+            await updateWorldInfoList();
+
+            const selectedIndex = world_names.indexOf(finalName);
+            if (selectedIndex !== -1) {
+                $('#world_editor_select').val(selectedIndex).trigger('change');
+            } else {
+                hideWorldEditor();
+            }
+        }
+    });
+
    $('#world_popup_delete').off('click').on('click', async () => {
        const confirmation = await callPopup(`<h3>Delete the World/Lorebook: "${name}"?</h3>This action is irreversible!`, 'confirm');

@ -1896,6 +1916,11 @@ async function checkWorldInfo(chat, maxContext) {
            needsToScan = false;
        }

+        if (newEntries.length === 0) {
+            console.debug('No new entries activated, stopping');
+            needsToScan = false;
+        }
+
        if (needsToScan) {
            const text = newEntries
                .filter(x => !failedProbabilityChecks.has(x))
@ -1997,13 +2022,17 @@ function filterByInclusionGroups(newEntries, allActivatedEntries) {
    for (const [key, group] of Object.entries(grouped)) {
        console.debug(`Checking inclusion group '${key}' with ${group.length} entries`, group);

-        if (!Array.isArray(group) || group.length <= 1) {
-            console.debug('Skipping inclusion group check, only one entry');
+        if (Array.from(allActivatedEntries).some(x => x.group === key)) {
+            console.debug(`Skipping inclusion group check, group already activated '${key}'`);
+            // We need to forcefully deactivate all other entries in the group
+            for (const entry of group) {
+                newEntries.splice(newEntries.indexOf(entry), 1);
+            }
            continue;
        }

-        if (Array.from(allActivatedEntries).some(x => x.group === key)) {
-            console.debug(`Skipping inclusion group check, group already activated '${key}'`);
+        if (!Array.isArray(group) || group.length <= 1) {
+            console.debug('Skipping inclusion group check, only one entry');
            continue;
        }

--- a/src/endpoints/characters.js
+++ b/src/endpoints/characters.js
@ -336,7 +336,7 @@ function charaFormatData(data) {

    if (data.world) {
        try {
-            const file = readWorldInfoFile(data.world);
+            const file = readWorldInfoFile(data.world, false);

            // File was imported - save it to the character book
            if (file && file.originalData) {
--- a/src/endpoints/worldinfo.js
+++ b/src/endpoints/worldinfo.js
@ -7,8 +7,14 @@ const writeFileAtomicSync = require('write-file-atomic').sync;
 const { jsonParser, urlencodedParser } = require('../express-common');
 const { DIRECTORIES, UPLOADS_PATH } = require('../constants');

-function readWorldInfoFile(worldInfoName) {
-    const dummyObject = { entries: {} };
+/**
+ * Reads a World Info file and returns its contents
+ * @param {string} worldInfoName Name of the World Info file
+ * @param {boolean} allowDummy If true, returns an empty object if the file doesn't exist
+ * @returns {object} World Info file contents
+ */
+function readWorldInfoFile(worldInfoName, allowDummy) {
+    const dummyObject = allowDummy ? { entries: {} } : null;

    if (!worldInfoName) {
        return dummyObject;
@ -34,7 +40,7 @@ router.post('/get', jsonParser, (request, response) => {
        return response.sendStatus(400);
    }

-    const file = readWorldInfoFile(request.body.name);
+    const file = readWorldInfoFile(request.body.name, true);

    return response.send(file);
 });