Merge branch 'staging' into connection-manager

This commit is contained in:
Cohee
2024-09-07 23:23:26 +03:00
14 changed files with 248 additions and 44 deletions

View File

@ -8504,22 +8504,23 @@ for (const chatCompletionSource of Object.values(chat_completion_sources)) {
};
}
async function selectContextCallback(_, name) {
async function selectContextCallback(args, name) {
if (!name) {
return power_user.context.preset;
}
const quiet = isTrueBoolean(args?.quiet);
const contextNames = context_presets.map(preset => preset.name);
const fuse = new Fuse(contextNames);
const result = fuse.search(name);
if (result.length === 0) {
toastr.warning(`Context template "${name}" not found`);
!quiet && toastr.warning(`Context template "${name}" not found`);
return '';
}
const foundName = result[0].item;
selectContextPreset(foundName);
selectContextPreset(foundName, quiet);
return foundName;
}
@ -8528,16 +8529,16 @@ async function selectInstructCallback(args, name) {
return power_user.instruct.preset;
}
const quiet = isTrueBoolean(args?.quiet);
const instructNames = instruct_presets.map(preset => preset.name);
const fuse = new Fuse(instructNames);
const result = fuse.search(name);
if (result.length === 0) {
toastr.warning(`Instruct template "${name}" not found`);
!quiet && toastr.warning(`Instruct template "${name}" not found`);
return '';
}
const quiet = isTrueBoolean(args?.quiet);
const foundName = result[0].item;
selectInstructPreset(foundName, quiet);
return foundName;
@ -9283,6 +9284,15 @@ jQuery(async function () {
name: 'context',
callback: selectContextCallback,
returns: 'template name',
namedArgumentList: [
SlashCommandNamedArgument.fromProps({
name: 'quiet',
description: 'Suppress the toast message on template change',
typeList: [ARGUMENT_TYPE.BOOLEAN],
defaultValue: 'false',
enumList: commonEnumProviders.boolean('trueFalse')(),
}),
],
unnamedArgumentList: [
SlashCommandArgument.fromProps({
description: 'context template name',