Merge branch 'staging' into cli-args-refactor

d5056a556313da8d09ef459f5fe7edda885a3cb0

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 02ab882e63c8a64b9b0dbe6685e94862722f74c3 ae51c39c0981be72dee69c8b9700971912b272c1
9 files changed, +70 -31Ignore whitespace
public/index.html+4 -4
@@ -1294,8 +1294,8 @@
12941294 <span data-i18n="TFS">TFS</span>
12951295 <div class="fa-solid fa-circle-info opacity50p" data-i18n="[title]Tail_Free_Sampling_desc" title="Tail-Free Sampling (TFS) searches for a tail of low-probability tokens in the distribution,&#13;by analyzing the rate of change in token probabilities using derivatives. It retains tokens up to a threshold (e.g., 0.3) based on the normalized second derivative.&#13;The closer to 0, the more discarded tokens. Set to 1.0 to disable."></div>
12961296 </small>
12971297 <input class="neo-range-slider" type="range" id="tfs_textgenerationwebui" name="volume" min="0" max="1" step="0.01001">
12981298 <input class="neo-range-input" type="number" min="0" max="1" step="0.01001" data-for="tfs_textgenerationwebui" id="tfs_counter_textgenerationwebui">
12991299 </div>
13001300 <div data-tg-type="ooba,mancer,aphrodite" class="alignitemscenter flex-container flexFlowColumn flexBasis30p flexGrow flexShrink gap0">
13011301 <small>
@@ -1477,8 +1477,8 @@
14771477 </div>
14781478 <div class="alignitemscenter flex-container marginBot5 flexFlowColumn flexGrow flexShrink gap0">
14791479 <small data-i18n="Exponent">Exponent</small>
14801480 <input class="neo-range-slider" type="range" id="dynatemp_exponent_textgenerationwebui" name="volume" min="0.01001" max="10" step="0.01001" />
14811481 <input class="neo-range-input" type="number" min="0.01001" max="10" step="0.01001" data-for="dynatemp_exponent_textgenerationwebui" id="dynatemp_exponent_counter_textgenerationwebui">
14821482 </div>
14831483 </div>
14841484 </div>
public/script.js+0 -9
@@ -606,7 +606,6 @@ export const printCharactersDebounced = debounce(() => { printCharacters(false);
606606export const system_message_types = {
607607 HELP: 'help',
608608 WELCOME: 'welcome',
609- GROUP: 'group',
610609 EMPTY: 'empty',
611610 GENERIC: 'generic',
612611 NARRATOR: 'narrator',
@@ -699,14 +698,6 @@ async function getSystemMessages() {
699698 uses_system_ui: true,
700699 mes: await renderTemplateAsync('welcome', { displayVersion }),
701700 },
702- group: {
703- name: systemUserName,
704- force_avatar: system_avatar,
705- is_user: false,
706- is_system: true,
707- is_group: true,
708- mes: 'Group chat created. Say \'Hi\' to lovely people!',
709- },
710701 empty: {
711702 name: systemUserName,
712703 force_avatar: system_avatar,
public/scripts/bookmarks.js+0 -10
@@ -318,16 +318,6 @@ export async function convertSoloToGroupChat() {
318318 const groupChat = chat.slice();
319319 const genIdFirst = Date.now();
320320
321- // Add something if the chat is empty
322- if (groupChat.length === 0) {
323- const newMessage = {
324- ...system_messages[system_message_types.GROUP],
325- send_date: getMessageTimeStamp(),
326- extra: { type: system_message_types.GROUP },
327- };
328- groupChat.push(newMessage);
329- }
330-
331321 for (let index = 0; index < groupChat.length; index++) {
332322 const message = groupChat[index];
333323
public/scripts/extensions.js+38 -2
@@ -7,7 +7,7 @@ import { renderTemplate, renderTemplateAsync } from './templates.js';
77import { delay, isSubsetOf, sanitizeSelector, setValueByPath } from './utils.js';
88import { getContext } from './st-context.js';
99import { isAdmin } from './user.js';
1010import { addLocaleData, getCurrentLocale, t } from './i18n.js';
1111import { debounce_timeout } from './constants.js';
1212import { accountStorage } from './util/AccountStorage.js';
1313
@@ -384,7 +384,7 @@ async function activateExtensions() {
384384 if (meetsModuleRequirements && !isDisabled) {
385385 try {
386386 console.debug('Activating extension', name);
387387 const promise = addExtensionLocale(name, manifest).finally(() => Promise.all([addExtensionScript(name, manifest), addExtensionStyle(name, manifest)]));
388388 await promise
389389 .then(() => activeExtensions.add(name))
390390 .catch(err => console.log('Could not activate extension', name, err));
@@ -577,6 +577,42 @@ function addExtensionScript(name, manifest) {
577577}
578578
579579/**
580+ * Adds a localization data for an extension.
581+ * @param {string} name Extension name
582+ * @param {object} manifest Manifest object
583+ */
584+function addExtensionLocale(name, manifest) {
585+ // No i18n data in the manifest
586+ if (!manifest.i18n || typeof manifest.i18n !== 'object') {
587+ return Promise.resolve();
588+ }
589+
590+ const currentLocale = getCurrentLocale();
591+ const localeFile = manifest.i18n[currentLocale];
592+
593+ // Manifest doesn't provide a locale file for the current locale
594+ if (!localeFile) {
595+ return Promise.resolve();
596+ }
597+
598+ return fetch(`/scripts/extensions/${name}/${localeFile}`)
599+ .then(async response => {
600+ if (!response.ok) {
601+ throw new Error(`HTTP ${response.status}: ${response.statusText}`);
602+ }
603+
604+ const data = await response.json();
605+
606+ if (data && typeof data === 'object') {
607+ addLocaleData(currentLocale, data);
608+ }
609+ })
610+ .catch(err => {
611+ console.log('Could not load extension locale data for ' + name, err);
612+ });
613+}
614+
615+/**
580616 * Generates HTML string for displaying an extension in the UI.
581617 *
582618 * @param {string} name - The name of the extension.
public/scripts/group-chats.js+0 -3
@@ -228,9 +228,6 @@ export async function getGroupChat(groupId, reload = false) {
228228 chat.splice(0, chat.length, ...data);
229229 await printMessages();
230230 } else {
231- sendSystemMessage(system_message_types.GROUP, '', { isSmallSys: true });
232- await eventSource.emit(event_types.MESSAGE_RECEIVED, (chat.length - 1));
233- await eventSource.emit(event_types.CHARACTER_MESSAGE_RENDERED, (chat.length - 1));
234231 if (group && Array.isArray(group.members)) {
235232 for (let member of group.members) {
236233 const character = characters.find(x => x.avatar === member || x.name === member);
public/scripts/i18n.js+24 -0
@@ -12,6 +12,30 @@ var localeData;
1212export const getCurrentLocale = () => localeFile;
1313
1414/**
15+ * Adds additional localization data to the current locale file.
16+ * @param {string} localeId Locale ID (e.g. 'fr-fr' or 'zh-cn')
17+ * @param {Record<string, string>} data Localization data to add
18+ */
19+export function addLocaleData(localeId, data) {
20+ if (!localeData) {
21+ console.warn('Localization data not loaded yet. Additional data will not be added.');
22+ return;
23+ }
24+
25+ if (localeId !== localeFile) {
26+ console.debug('Ignoring addLocaleData call for different locale', localeId);
27+ return;
28+ }
29+
30+ for (const [key, value] of Object.entries(data)) {
31+ // Overrides for default locale data are not allowed
32+ if (!Object.hasOwn(localeData, key)) {
33+ localeData[key] = value;
34+ }
35+ }
36+}
37+
38+/**
1539 * An observer that will check if any new i18n elements are added to the document
1640 * @type {MutationObserver}
1741 */
public/scripts/power-user.js+0 -1
@@ -644,7 +644,6 @@ async function CreateZenSliders(elmnt) {
644644 }
645645 if (sliderID == 'min_temp_textgenerationwebui' ||
646646 sliderID == 'max_temp_textgenerationwebui' ||
647- sliderID == 'dynatemp_exponent_textgenerationwebui' ||
648647 sliderID == 'smoothing_curve_textgenerationwebui' ||
649648 sliderID == 'smoothing_factor_textgenerationwebui' ||
650649 sliderID == 'dry_multiplier_textgenerationwebui' ||
public/scripts/st-context.js+3 -1
@@ -54,7 +54,7 @@ import {
5454 writeExtensionField,
5555} from './extensions.js';
5656import { groups, openGroupChat, selected_group } from './group-chats.js';
5757import { addLocaleData, getCurrentLocale, t, translate } from './i18n.js';
5858import { hideLoader, showLoader } from './loader.js';
5959import { MacrosParser } from './macros.js';
6060import { getChatCompletionModel, oai_settings } from './openai.js';
@@ -165,6 +165,8 @@ export function getContext() {
165165 isMobile,
166166 t,
167167 translate,
168+ getCurrentLocale,
169+ addLocaleData,
168170 tags,
169171 tagMap: tag_map,
170172 menuType: menu_type,
src/endpoints/extensions.js+1 -1
@@ -323,7 +323,7 @@ router.get('/discover', jsonParser, function (request, response) {
323323
324324 // Combine all extensions
325325 const allExtensions = [...builtInExtensions, ...userExtensions, ...globalExtensions];
326326 console.infodebug('Extensions available for', request.user.profile.handle, allExtensions);
327327
328328 return response.send(allExtensions);
329329});