rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into erew123/release

This commit is contained in:
Cohee 2024-01-18 02:35:26 +02:00
parent 3af2164187 9aa4b50a86
commit 05d292e055
5 changed files with 57 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/index.html
View File

@ -1302,7 +1302,7 @@
<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">
<div data-newbie-hidden data-tg-type="ooba, koboldcpp" 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">

6
public/scripts/extensions/quick-reply/api/QuickReplyApi.js
View File

@ -248,9 +248,9 @@ export class QuickReplyApi {
if (!qr) {
throw new Error(`No quick reply with label "${label}" in set "${setName}" found.`);
}
qr.label = newLabel ?? qr.label;
qr.message = message ?? qr.message;
qr.title = title ?? qr.title;
qr.updateLabel(newLabel ?? qr.label);
qr.updateMessage(message ?? qr.message);
qr.updateTitle(title ?? qr.title);
qr.isHidden = isHidden ?? qr.isHidden;
qr.executeOnStartup = executeOnStartup ?? qr.executeOnStartup;
qr.executeOnUser = executeOnUser ?? qr.executeOnUser;

33
public/scripts/extensions/quick-reply/index.js
View File

@ -58,6 +58,10 @@ const defaultSettings = {
};
/** @type {Boolean}*/
let isReady = false;
/** @type {Function[]}*/
let executeQueue = [];
/** @type {QuickReplySettings}*/
let settings;
/** @type {SettingsUi} */
@ -144,6 +148,16 @@ const loadSettings = async () => {
}
};
const executeIfReadyElseQueue = async (functionToCall, args) => {
if (isReady) {
log('calling', { functionToCall, args });
await functionToCall(...args);
} else {
log('queueing', { functionToCall, args });
executeQueue.push(async()=>await functionToCall(...args));
}
};
@ -183,9 +197,20 @@ const init = async () => {
slash.init();
autoExec = new AutoExecuteHandler(settings);
log('executing startup');
await autoExec.handleStartup();
log('/executing startup');
log(`executing queue (${executeQueue.length} items)`);
while (executeQueue.length > 0) {
const func = executeQueue.shift();
await func();
}
log('/executing queue');
isReady = true;
log('READY');
};
eventSource.on(event_types.APP_READY, init);
init();
const onChatChanged = async (chatIdx) => {
log('CHAT_CHANGED', chatIdx);
@ -199,14 +224,14 @@ const onChatChanged = async (chatIdx) => {
await autoExec.handleChatChanged();
};
eventSource.on(event_types.CHAT_CHANGED, onChatChanged);
eventSource.on(event_types.CHAT_CHANGED, (...args)=>executeIfReadyElseQueue(onChatChanged, args));
const onUserMessage = async () => {
await autoExec.handleUser();
};
eventSource.on(event_types.USER_MESSAGE_RENDERED, onUserMessage);
eventSource.on(event_types.USER_MESSAGE_RENDERED, (...args)=>executeIfReadyElseQueue(onUserMessage, args));
const onAiMessage = async () => {
await autoExec.handleAi();
};
eventSource.on(event_types.CHARACTER_MESSAGE_RENDERED, onAiMessage);
eventSource.on(event_types.CHARACTER_MESSAGE_RENDERED, (...args)=>executeIfReadyElseQueue(onAiMessage, args));

45
public/scripts/extensions/quick-reply/src/SlashCommandHandler.js
View File

@ -1,4 +1,5 @@
import { registerSlashCommand } from '../../../slash-commands.js';
import { isTrueBoolean } from '../../../utils.js';
// eslint-disable-next-line no-unused-vars
import { QuickReplyApi } from '../api/QuickReplyApi.js';
@ -35,7 +36,7 @@ export class SlashCommandHandler {
user - bool - auto execute on user message, e.g., user=true
bot - bool - auto execute on AI message, e.g., bot=true
load - bool - auto execute on chat load, e.g., load=true
title - bool - title / tooltip to be shown on button, e.g., title="My Fancy Button"
title - string - title / tooltip to be shown on button, e.g., title="My Fancy Button"
`.trim();
const qrUpdateArgs = `
newlabel - string - new text for the button, e.g. newlabel=MyRenamedButton
@ -90,14 +91,14 @@ export class SlashCommandHandler {
toggleGlobalSet(name, args = {}) {
try {
this.api.toggleGlobalSet(name, JSON.parse(args.visible ?? 'true') === true);
this.api.toggleGlobalSet(name, isTrueBoolean(args.visible ?? 'true'));
} catch (ex) {
toastr.error(ex.message);
}
}
addGlobalSet(name, args = {}) {
try {
this.api.addGlobalSet(name, JSON.parse(args.visible ?? 'true') === true);
this.api.addGlobalSet(name, isTrueBoolean(args.visible ?? 'true'));
} catch (ex) {
toastr.error(ex.message);
}
@ -113,14 +114,14 @@ export class SlashCommandHandler {
toggleChatSet(name, args = {}) {
try {
this.api.toggleChatSet(name, JSON.parse(args.visible ?? 'true') === true);
this.api.toggleChatSet(name, isTrueBoolean(args.visible ?? 'true'));
} catch (ex) {
toastr.error(ex.message);
}
}
addChatSet(name, args = {}) {
try {
this.api.addChatSet(name, JSON.parse(args.visible ?? 'true') === true);
this.api.addChatSet(name, isTrueBoolean(args.visible ?? 'true'));
} catch (ex) {
toastr.error(ex.message);
}
@ -142,11 +143,11 @@ export class SlashCommandHandler {
{
message: message ?? '',
title: args.title,
isHidden: JSON.parse(args.hidden ?? 'false') === true,
executeOnStartup: JSON.parse(args.startup ?? 'false') === true,
executeOnUser: JSON.parse(args.user ?? 'false') === true,
executeOnAi: JSON.parse(args.bot ?? 'false') === true,
executeOnChatChange: JSON.parse(args.load ?? 'false') === true,
isHidden: isTrueBoolean(args.hidden),
executeOnStartup: isTrueBoolean(args.startup),
executeOnUser: isTrueBoolean(args.user),
executeOnAi: isTrueBoolean(args.bot),
executeOnChatChange: isTrueBoolean(args.load),
},
);
} catch (ex) {
@ -162,11 +163,11 @@ export class SlashCommandHandler {
newLabel: args.newlabel,
message: (message ?? '').trim().length > 0 ? message : undefined,
title: args.title,
isHidden: args.hidden,
executeOnStartup: args.startup,
executeOnUser: args.user,
executeOnAi: args.bot,
executeOnChatChange: args.load,
isHidden: args.hidden === undefined ? undefined : isTrueBoolean(args.hidden),
executeOnStartup: args.startup === undefined ? undefined : isTrueBoolean(args.startup),
executeOnUser: args.user === undefined ? undefined : isTrueBoolean(args.user),
executeOnAi: args.bot === undefined ? undefined : isTrueBoolean(args.bot),
executeOnChatChange: args.load === undefined ? undefined : isTrueBoolean(args.load),
},
);
} catch (ex) {
@ -188,7 +189,7 @@ export class SlashCommandHandler {
args.set,
args.label,
name,
JSON.parse(args.chain ?? 'false') === true,
isTrueBoolean(args.chain),
);
} catch (ex) {
toastr.error(ex.message);
@ -215,9 +216,9 @@ export class SlashCommandHandler {
this.api.createSet(
args.name ?? name ?? '',
{
disableSend: JSON.parse(args.nosend ?? 'false') === true,
placeBeforeInput: JSON.parse(args.before ?? 'false') === true,
injectInput: JSON.parse(args.inject ?? 'false') === true,
disableSend: isTrueBoolean(args.nosend),
placeBeforeInput: isTrueBoolean(args.before),
injectInput: isTrueBoolean(args.inject),
},
);
} catch (ex) {
@ -229,9 +230,9 @@ export class SlashCommandHandler {
this.api.updateSet(
args.name ?? name ?? '',
{
disableSend: args.nosend !== undefined ? JSON.parse(args.nosend ?? 'false') === true : undefined,
placeBeforeInput: args.before !== undefined ? JSON.parse(args.before ?? 'false') === true : undefined,
injectInput: args.inject !== undefined ? JSON.parse(args.inject ?? 'false') === true : undefined,
disableSend: args.nosend !== undefined ? isTrueBoolean(args.nosend) : undefined,
placeBeforeInput: args.before !== undefined ? isTrueBoolean(args.before) : undefined,
injectInput: args.inject !== undefined ? isTrueBoolean(args.inject) : undefined,
},
);
} catch (ex) {

2
public/scripts/variables.js
View File

@ -116,7 +116,7 @@ function addLocalVariable(name, value) {
const parsedValue = JSON.parse(currentValue);
if (Array.isArray(parsedValue)) {
parsedValue.push(value);
setGlobalVariable(name, JSON.stringify(parsedValue));
setLocalVariable(name, JSON.stringify(parsedValue));
return parsedValue;
}
} catch {