eac2e3d8 · permissionBRICK/SillyTavern

public/css/extensions-panel.css+2 -1 Viewed

@@ -7,7 +7,8 @@
7	background-color: green;	7	background-color: green;
8	}	8	}
9		9
10	.extensions_block input[type="checkbox"] {	10	.extensions_block input[type="checkbox"],
		11	.extensions_block input[type="radio"] {
11	margin-left: 10px;	12	margin-left: 10px;
12	margin-right: 10px;	13	margin-right: 10px;
13	}	14	}

public/css/tags.css+6 -6 Viewed

@@ -209,20 +209,20 @@
209	opacity: 1;	209	opacity: 1;
210	}	210	}
211		211
212	.tag_as_folder {	212	.tag_as_folder.right_menu_button {
213	filter: brightness(75%) saturate(0.6);	213	filter: brightness(75%) saturate(0.6);
214	}	214	}
215		215
216	.tag_as_folder:hover,	216	.tag_as_folder.right_menu_button:hover,
217	.tag_as_folder.flash {	217	.tag_as_folder.right_menu_button.flash {
218	filter: brightness(150%) saturate(0.6) !important;	218	filter: brightness(150%) saturate(0.6);
219	}	219	}
220		220
221	.tag_as_folder.no_folder {	221	.tag_as_folder.right_menu_button.no_folder {
222	filter: brightness(25%) saturate(0.25);	222	filter: brightness(25%) saturate(0.25);
223	}	223	}
224		224
225	.tag_as_folder .tag_folder_indicator {	225	.tag_as_folder.right_menu_button .tag_folder_indicator {
226	position: absolute;	226	position: absolute;
227	top: calc(var(--mainFontSize) * -0.5);	227	top: calc(var(--mainFontSize) * -0.5);
228	right: calc(var(--mainFontSize) * -0.5);	228	right: calc(var(--mainFontSize) * -0.5);

public/index.html+1 -1 Viewed

                                     <input type="range" id="smooth_streaming_speed" name="smooth_streaming_speed" min="0" max="100" step="10" value="50">
                                     <div class="slider_hint">
                                         <span data-i18n="Slow">Slow</span>
-                                        <span data-i18n=""></span>
+                                        <span></span>
                                         <span data-i18n="Fast">Fast</span>
                                     </div>
                                 </div>

public/locales/zh-cn.json+17 -3 Viewed

     "Character Names Behavior": "角色名称行为",
     "Helps the model to associate messages with characters.": "有助于模型将消息与角色关联起来。",
     "None": "无",
+    "character_names_none": "不添加角色名称前缀。在群聊中可能导致错误行为，谨慎勾选。",
+    "Never add character names.": "不添加角色名称。",
     "character_names_default": "群聊和过去的角色除外。否则，请确保在提示词中提供了姓名。",
-    "Don't add character names.": "不添加角色名称。",
+    "Don't add character names unless necessary.": "如非必要，否则不添加角色名称。",
-    "Completion": "补全对象",
+    "Completion Object": "补全对象",
     "character_names_completion": "适用限制：仅限拉丁字母数字和下划线。不适用于所有补全源，尤其是：Claude、MistralAI、Google。",
     "Add character names to completion objects.": "在补全对象中添加角色名称。",
     "Message Content": "消息内容",

     "First Assistant Prefix": "第一个助理前缀",
     "instruct_last_output_sequence": "插入到最后一条助手消息之前或作为生成 AI 回复时的最后一行提示词（中立/系统角色除外）。",
     "Last Assistant Prefix": "最后一个助理前缀",
+    "Inserted before the first User's message.": "插入在第一个用户的消息之前。",
+    "First User Prefix": "第一个用户前缀",
+    "instruct_last_input_sequence": "插入到最后一条用户消息之前。",
+    "Last User Prefix": "上次用户前缀",
     "Will be inserted as a last prompt line when using system/neutral generation.": "当使用系统/中性生成时将作为最后的一行提示词插入。",
     "System Instruction Prefix": "系统指令前缀",
     "If a stop sequence is generated, everything past it will be removed from the output (inclusive).": "如果生成了停止序列，则该序列之后的所有内容都将从输出中删除（包括在内）。",

     "Close all Entries": "关闭所有条目",
     "New Entry": "新条目",
     "Fill empty Memo/Titles with Keywords": "使用关键字填充空的备忘录/标题",
-    "Apply custom sorting as Order": "应用自定义排序作为顺序",
+    "Apply current sorting as Order": "应用当前排序作为顺序",
     "Import World Info": "导入世界书",
     "Export World Info": "导出世界书",
     "Duplicate World Info": "复制世界书",

     "Bind user name to that avatar": "将用户名称绑定到该头像",
     "Change persona image": "更改用户角色头像",
     "Select this as default persona for the new chats.": "选择此项作为新聊天的默认用户角色。",
+    "Duplicate persona": "复制用户角色",
     "Delete persona": "删除用户角色",
     "These characters are the winners of character design contests and have outstandable quality.": "这些角色都是角色设计大赛的获奖者，品质非常出色。",
     "Contest Winners": "比赛获胜者",

     "ext_sum_injection_template": "插入模板",
     "ext_sum_memory_template_placeholder": "{{summary}} 将解析当前摘要内容。",
     "ext_sum_injection_position": "插入位置",
+    "ext_sum_include_wi_scan_desc": "在 WI 扫描中包括最新摘要。",
+    "ext_sum_include_wi_scan": "纳入世界信息扫描",
+    "None (not injected)": "无（未注入）",
+    "ext_sum_injection_position_none": "摘要不会被注入到提示中。您仍然可以通过 {{summary}} 宏访问它。",
     "How many messages before the current end of the chat.": "当前聊天结束前还有多少条消息。",
     "Labels and Message": "标签和信息",
     "Label": "标签",

     "help_macros_56": "指示系统指令前缀",
     "help_macros_57": "指示第一个用户消息填充器",
     "help_macros_58": "指示停止顺序",
+    "help_macros_first_user": "指示用户第一个输入序列",
+    "help_macros_last_user": "指示用户最后输入序列",
     "Chat variables Macros:": "聊天变量宏：",
     "Local variables = unique to the current chat": "局部变量 = 当前聊天所独有",
     "Global variables = works in any chat for any character": "全局变量 = 适用于任何角色的任何聊天",

     "Record a snapshot of your current settings.": "记录当前设置的快照。",
     "Make a Snapshot": "制作快照",
     "Restore this snapshot": "恢复此快照",
+    "Download Model": "下载模型",
     "Downloader Options": "下载器选项",
     "Extra parameters for downloading/HuggingFace API": "下载/HuggingFace API 的额外参数。如果不确定，请将其留空。",
     "Revision": "修订",

public/script.js+30 -120 Viewed

  * @enum {number} Extension prompt types
  */
 export const extension_prompt_types = {
+    NONE: -1,
     IN_PROMPT: 0,
     IN_CHAT: 1,
     BEFORE_PROMPT: 2,

     initCfg();
     initLogprobs();
     doDailyExtensionUpdatesCheck();
-    hideLoader();
+    await hideLoader();
+    await fixViewport();
     await eventSource.emit(event_types.APP_READY);
+}
+async function fixViewport() {
+    document.body.style.position = 'absolute';
+    await delay(1);
+    document.body.style.position = '';
+}
 function cancelStatusCheck() {
     abortStatusCheck?.abort();
     abortStatusCheck = new AbortController();

 };
 const CONNECT_API_MAP = {
+    // Default APIs not contined inside text gen / chat gen
     'kobold': {
         selected: 'kobold',
         button: '#api_button',

         selected: 'novel',
         button: '#api_button_novel',
     },
-    'ooba': {
+    // KoboldCpp alias
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.OOBA,
-    },
-    'tabby': {
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.TABBY,
-    },
-    'llamacpp': {
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.LLAMACPP,
-    },
-    'ollama': {
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.OLLAMA,
-    },
-    'mancer': {
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.MANCER,
-    },
-    'vllm': {
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.VLLM,
-    },
-    'aphrodite': {
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.APHRODITE,
-    },
-    'koboldcpp': {
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.KOBOLDCPP,
-    },
     'kcpp': {
         selected: 'textgenerationwebui',
         button: '#api_button_textgenerationwebui',
         type: textgen_types.KOBOLDCPP,
     },
-    'togetherai': {
+    // OpenAI alias
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.TOGETHERAI,
-    },
-    'openai': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.OPENAI,
-    },
     'oai': {
         selected: 'openai',
         button: '#api_button_openai',
         source: chat_completion_sources.OPENAI,
     },
-    'claude': {
+    // OpenRouter special naming, to differentiate between chat comp and text comp
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.CLAUDE,
-    },
-    'windowai': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.WINDOWAI,
-    },
     'openrouter': {
         selected: 'openai',
         button: '#api_button_openai',
         source: chat_completion_sources.OPENROUTER,
     },
-    'scale': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.SCALE,
-    },
-    'ai21': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.AI21,
-    },
-    'makersuite': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.MAKERSUITE,
-    },
-    'mistralai': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.MISTRALAI,
-    },
-    'custom': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.CUSTOM,
-    },
-    'cohere': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.COHERE,
-    },
-    'perplexity': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.PERPLEXITY,
-    },
-    'groq': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.GROQ,
-    },
-    '01ai': {
-        selected: 'openai',
-        button: '#api_button_openai',
-        source: chat_completion_sources.ZEROONEAI,
-    },
-    'infermaticai': {
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.INFERMATICAI,
-    },
-    'dreamgen': {
-        selected: 'textgenerationwebui',
-        button: '#api_button_textgenerationwebui',
-        type: textgen_types.DREAMGEN,
-    },
     'openrouter-text': {
         selected: 'textgenerationwebui',
         button: '#api_button_textgenerationwebui',
         type: textgen_types.OPENROUTER,
     },
-    'huggingface': {
+};
+// Fill connections map from textgen_types and chat_completion_sources
+for (const textGenType of Object.values(textgen_types)) {
+    if (CONNECT_API_MAP[textGenType]) continue;
+    CONNECT_API_MAP[textGenType] = {
         selected: 'textgenerationwebui',
         button: '#api_button_textgenerationwebui',
-        type: textgen_types.HUGGINGFACE,
+        type: textGenType,
-    },
+    };
-};
+}
+for (const chatCompletionSource of Object.values(chat_completion_sources)) {
+    if (CONNECT_API_MAP[chatCompletionSource]) continue;
+    CONNECT_API_MAP[chatCompletionSource] = {
+        selected: 'openai',
+        button: '#api_button_openai',
+        source: chatCompletionSource,
+    };
+}
 async function selectContextCallback(_, name) {
     if (!name) {

public/scripts/extensions/memory/index.js+13 -2 Viewed

     substituteParamsExtended,
     generateRaw,
     getMaxContextSize,
+    setExtensionPrompt,
 } from '../../../script.js';
 import { is_group_generating, selected_group } from '../../group-chats.js';
 import { loadMovingUIState } from '../../power-user.js';

     template: defaultTemplate,
     position: extension_prompt_types.IN_PROMPT,
     role: extension_prompt_roles.SYSTEM,
+    scan: false,
     depth: 2,
     promptWords: 200,
     promptMinWords: 25,

     $(`input[name="memory_prompt_builder"][value="${extension_settings.memory.prompt_builder}"]`).prop('checked', true).trigger('input');
     $('#memory_override_response_length').val(extension_settings.memory.overrideResponseLength).trigger('input');
     $('#memory_max_messages_per_request').val(extension_settings.memory.maxMessagesPerRequest).trigger('input');
+    $('#memory_include_wi_scan').prop('checked', extension_settings.memory.scan).trigger('input');
     switchSourceControls(extension_settings.memory.source);
+}

     saveSettingsDebounced();
+}
+function onMemoryIncludeWIScanInput() {
+    const value = !!$(this).prop('checked');
+    extension_settings.memory.scan = value;
+    reinsertMemory();
+    saveSettingsDebounced();
+}
 function onMemoryPromptWordsForceInput() {
     const value = $(this).val();
     extension_settings.memory.promptForceWords = Number(value);

  * @param {number|null} index Index of the chat message to save the summary to. If null, the pre-last message is used.
  */
 function setMemoryContext(value, saveToMessage, index = null) {
-    const context = getContext();
+    setExtensionPrompt(MODULE_NAME, formatMemoryValue(value), extension_settings.memory.position, extension_settings.memory.depth, extension_settings.memory.scan, extension_settings.memory.role);
-    context.setExtensionPrompt(MODULE_NAME, formatMemoryValue(value), extension_settings.memory.position, extension_settings.memory.depth, false, extension_settings.memory.role);
     $('#memory_contents').val(value);
     const summaryLog = value

         : 'Summary has no content';
     console.debug(summaryLog);
+    const context = getContext();
     if (saveToMessage && context.chat.length) {
         const idx = index ?? context.chat.length - 2;
         const mes = context.chat[idx < 0 ? 0 : idx];

     $('#memory_prompt_words_auto').off('click').on('click', onPromptForceWordsAutoClick);
     $('#memory_override_response_length').off('click').on('input', onOverrideResponseLengthInput);
     $('#memory_max_messages_per_request').off('click').on('input', onMaxMessagesPerRequestInput);
+    $('#memory_include_wi_scan').off('input').on('input', onMemoryIncludeWIScanInput);
     $('#summarySettingsBlockToggle').off('click').on('click', function () {
         console.log('saw settings button click');
         $('#summarySettingsBlock').slideToggle(200, 'swing'); //toggleClass("hidden");

public/scripts/extensions/memory/settings.html+9 -0 Viewed

                         <textarea id="memory_template" class="text_pole textarea_compact" rows="2" data-i18n="[placeholder]ext_sum_memory_template_placeholder" placeholder="&lcub;&lcub;summary&rcub;&rcub; will resolve to the current summary contents."></textarea>
                     </div>
                     <label for="memory_position" data-i18n="ext_sum_injection_position">Injection Position</label>
+                    <label class="checkbox_label" for="memory_include_wi_scan" data-i18n="[title]ext_sum_include_wi_scan_desc" title="Include the latest summary in the WI scan.">
+                        <input id="memory_include_wi_scan" type="checkbox" />
+                        <span data-i18n="ext_sum_include_wi_scan">Include in World Info Scanning</span>
+                    </label>
                     <div class="radio_group">
                         <label>
+                            <input type="radio" name="memory_position" value="-1" />
+                            <span data-i18n="None (not injected)">None (not injected)</span>
+                            <i class="fa-solid fa-info-circle" title="The summary will not be injected into the prompt. You can still access it via the &lcub;&lcub;summary&rcub;&rcub; macro." data-i18n="[title]ext_sum_injection_position_none"></i>
+                        </label>
+                        <label>
                             <input type="radio" name="memory_position" value="2" />
                             <span data-i18n="Before Main Prompt / Story String">Before Main Prompt / Story String</span>
                         </label>

public/scripts/power-user.js+30 -7 Viewed

     return '';
+}
-async function setThemeCallback(_, text) {
+async function setThemeCallback(_, themeName) {
+    if (!themeName) {
+        // allow reporting of the theme name if called without args
+        // for use in ST Scripts via pipe
+        return power_user.theme;
+    }
     // @ts-ignore
     const fuse = new Fuse(themes, {
         keys: [

         ],
     });
-    const results = fuse.search(text);
+    const results = fuse.search(themeName);
-    console.debug('Theme fuzzy search results for ' + text, results);
+    console.debug('Theme fuzzy search results for ' + themeName, results);
     const theme = results[0]?.item;
     if (!theme) {
-        toastr.warning(`Could not find theme with name: ${text}`);
+        toastr.warning(`Could not find theme with name: ${themeName}`);
         return;
+    }

         callback: setThemeCallback,
         unnamedArgumentList: [
             SlashCommandArgument.fromProps({
-                description: 'name',
+                description: 'theme name',
                 typeList: [ARGUMENT_TYPE.STRING],
-                isRequired: true,
                 enumProvider: () => themes.map(theme => new SlashCommandEnumValue(theme.name)),
             }),
         ],
-        helpString: 'sets a UI theme by name',
+        helpString: `
+        <div>
+            Sets a UI theme by name.
+        </div>
+        <div>
+            If no theme name is is provided, this will return the currently active theme.
+        </div>
+        <div>
+            <strong>Example:</strong>
+            <ul>
+                <li>
+                    <pre><code>/theme Cappuccino</code></pre>
+                </li>
+                <li>
+                    <pre><code>/theme</code></pre>
+                </li>
+            </ul>
+        </div>
+    `,
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'movingui',

public/scripts/slash-commands.js+16 -5 Viewed

         returns: 'the current background',
         unnamedArgumentList: [
             SlashCommandArgument.fromProps({
-                description: 'filename',
+                description: 'background filename',
                 typeList: [ARGUMENT_TYPE.STRING],
-                isRequired: true,
                 enumProvider: () => [...document.querySelectorAll('.bg_example')]
                     .map(it => new SlashCommandEnumValue(it.getAttribute('bgfile')))
                     .filter(it => it.value?.length),

             Sets a background according to the provided filename. Partial names allowed.
         </div>
         <div>
+            If no background is provided, this will return the currently selected background.
+        </div>
+        <div>
             <strong>Example:</strong>
             <ul>
                 <li>
                     <pre><code>/bg beach.jpg</code></pre>
                 </li>
+                <li>
+                    <pre><code>/bg</code></pre>
+                </li>
             </ul>
         </div>
     `,

                 enumProvider: commonEnumProviders.injects,
             }),
             new SlashCommandNamedArgument(
-                'position', 'injection position', [ARGUMENT_TYPE.STRING], false, false, 'after', ['before', 'after', 'chat'],
+                'position', 'injection position', [ARGUMENT_TYPE.STRING], false, false, 'after', ['before', 'after', 'chat', 'none'],
             ),
             new SlashCommandNamedArgument(
                 'depth', 'injection depth', [ARGUMENT_TYPE.NUMBER], false, false, '4',

                 'text', [ARGUMENT_TYPE.STRING], false,
             ),
         ],
-        helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID. Positions: "before" main prompt, "after" main prompt, in-"chat" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false).',
+        helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID. Positions: "before" main prompt, "after" main prompt, in-"chat", hidden with "none" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false). Hidden injects in "none" position are not inserted into the prompt but can be used for triggering WI entries.',
     }));
     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'listinjects',

         'before': extension_prompt_types.BEFORE_PROMPT,
         'after': extension_prompt_types.IN_PROMPT,
         'chat': extension_prompt_types.IN_CHAT,
+        'none': extension_prompt_types.NONE,
     };
     const roles = {
         'system': extension_prompt_roles.SYSTEM,

     if (args.name) {
         name = args.name.trim();
-        mesText = text.trim();
         if (!name && !text) {
             toastr.warning('You must specify a name and text to send as');

             localStorage.setItem(namelessWarningKey, 'true');
+        }
         name = name2;
+        if (!text) {
+            toastr.warning('You must specify text to send as');
+            return '';
+        }
+    }
+    mesText = text.trim();
     // Requires a regex check after the slash command is pushed to output
     mesText = getRegexedString(mesText, regex_placement.SLASH_COMMAND, { characterOverride: name });

public/scripts/tags.js+0 -19 Viewed

             const id = $(tagElement).attr('id');
             const tag = tags.find(x => x.id === id);
-            // Fix the defined colors, because if there is no color set, they seem to get automatically set to black
-            // based on the color picker after drag&drop, even if there was no color chosen. We just set them back.
-            const color = $(tagElement).find('.tagColorPickerHolder .tag-color').attr('color');
-            const color2 = $(tagElement).find('.tagColorPicker2Holder .tag-color2').attr('color');
-            if (color === '' || color === undefined) {
-                tag.color = '';
-                fixColor('background-color', tag.color);
-            }
-            if (color2 === '' || color2 === undefined) {
-                tag.color2 = '';
-                fixColor('color', tag.color2);
-            }
             // Update the sort order
             tag.sort_order = i;
-            function fixColor(property, color) {
-                $(tagElement).find('.tag_view_name').css(property, color);
-                $(`.tag[id="${id}"]`).css(property, color);
-                $(`.bogus_folder_select[tagid="${id}"] .avatar`).css(property, color);
-            }
         });
         // If tags were dragged manually, we have to disable auto sorting

public/scripts/templates/tabbyDownloader.html+2 -2 Viewed

 <div id="tabby_downloader_popup">
     <div>
-        <h3><strong data-i18n="">Download Model</strong>
+        <h3><strong data-i18n="Download Model">Download Model</strong>
             <a href="https://github.com/theroyallab/async-hf-downloader" class="notes-link" target="_blank">
                 <span class="note-link-span">?</span>
             </a>

             <textarea class="text_pole textarea_compact" name="tabby_download_exclude" placeholder="Ex. *.txt"></textarea>
         </div>
     </div>
-</div>
 \ No newline at end of file
+</div>

public/scripts/templates/welcome.html+1 -1 Viewed

 <h3 data-i18n="Confused or lost?">Confused or lost?</h3>
 <ul>
     <li>
-        <span class="note-link-span"><a class="fa-solid fa-circle-question" target="_blank" href="https://docs.sillytavern.app/" data-i18n=""></a></span> - <span data-i18n="click these icons!">click these icons!</span>
+        <span class="note-link-span"><a class="fa-solid fa-circle-question" target="_blank" href="https://docs.sillytavern.app/"></a></span> - <span data-i18n="click these icons!">click these icons!</span>
     </li>
     <li>
         <span data-i18n="Enter">Enter </span><code>/?</code><span data-i18n="in the chat bar"> in the chat bar</span>

Merge pull request #2580 from SillyTavern/staging Staging