rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-04-03 13:41:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2767 from SillyTavern/af-verbiage

Browse Source 
Update Advanced Formatting verbiage
This commit is contained in:
Cohee 2024-09-03 23:23:39 +03:00 committed by GitHub
commit 7040f640f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 64 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
public/index.html
View File

@ -3073,15 +3073,15 @@
</h4> </h4>
<div class="flex-container justifyCenter"> <div class="flex-container justifyCenter">
<input type="file" hidden data-preset-manager-file="context" accept=".json, .settings"> <input type="file" hidden data-preset-manager-file="context" accept=".json, .settings">
<i id="context_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this preset for Instruct Mode." data-i18n="[title]Auto-select this preset for Instruct Mode"></i> <i id="context_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this template for Instruct Mode." data-i18n="[title]Auto-select this template for Instruct Mode"></i>
<i data-preset-manager-update="context" class="menu_button fa-solid fa-save" title="Update current preset" data-i18n="[title]Update current preset"></i> <i data-preset-manager-update="context" class="menu_button fa-solid fa-save" title="Update current template" data-i18n="[title]Update current template"></i>
<i data-preset-manager-new="context" class="menu_button fa-solid fa-file-circle-plus" title="Save preset as" data-i18n="[title]Save preset as"></i> <i data-preset-manager-new="context" class="menu_button fa-solid fa-file-circle-plus" title="Save template as" data-i18n="[title]Save template as"></i>
<i data-preset-manager-import="context" class="menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i> <i data-preset-manager-import="context" class="menu_button fa-solid fa-file-import" title="Import template" data-i18n="[title]Import template"></i>
<i data-preset-manager-export="context" class="menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i> <i data-preset-manager-export="context" class="menu_button fa-solid fa-file-export" title="Export template" data-i18n="[title]Export template"></i>
<i data-preset-manager-restore="context" class="menu_button fa-solid fa-recycle" title="Restore current preset" data-i18n="[title]Restore current preset"></i> <i data-preset-manager-restore="context" class="menu_button fa-solid fa-recycle" title="Restore current template" data-i18n="[title]Restore current template"></i>
<i id="context_delete_preset" data-preset-manager-delete="context" class="menu_button fa-solid fa-trash-can" title="Delete the preset" data-i18n="[title]Delete the preset"></i> <i id="context_delete_preset" data-preset-manager-delete="context" class="menu_button fa-solid fa-trash-can" title="Delete the template" data-i18n="[title]Delete the template"></i>
</div> </div>
<div class="flex-container"> <div class="flex-container" title="Select your current Context Template" data-i18n="[title]Select your current Context Template">
<select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select> <select id="context_presets" data-preset-manager-for="context" class="flex1 text_pole"></select>
</div> </div>
<div> <div>
@ -3196,7 +3196,7 @@
<div id="instructSettingsBlock"> <div id="instructSettingsBlock">
<h4 class="standoutHeader title_restorable justifySpaceBetween"> <h4 class="standoutHeader title_restorable justifySpaceBetween">
<div class="flex-container"> <div class="flex-container">
<span data-i18n="Instruct Mode">Instruct Mode</span> <span data-i18n="Instruct Template">Instruct Template</span>
<a href="https://docs.sillytavern.app/usage/core-concepts/instructmode/" class="notes-link" target="_blank"> <a href="https://docs.sillytavern.app/usage/core-concepts/instructmode/" class="notes-link" target="_blank">
<span class="fa-solid fa-circle-question note-link-span"></span> <span class="fa-solid fa-circle-question note-link-span"></span>
</a> </a>
@ -3214,22 +3214,22 @@
</h4> </h4>
<div class="flex-container margin0 justifyCenter"> <div class="flex-container margin0 justifyCenter">
<input type="file" hidden data-preset-manager-file="instruct" accept=".json, .settings"> <input type="file" hidden data-preset-manager-file="instruct" accept=".json, .settings">
<i id="instruct_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this preset on API connection." data-i18n="[title]Auto-select this preset on API connection"></i> <i id="instruct_set_default" class="menu_button fa-solid fa-heart" title="Auto-select this template on API connection." data-i18n="[title]Auto-select this template on API connection"></i>
<i data-preset-manager-update="instruct" class="menu_button fa-solid fa-save" title="Update current preset" data-i18n="[title]Update current preset"></i> <i data-preset-manager-update="instruct" class="menu_button fa-solid fa-save" title="Update current template" data-i18n="[title]Update current template"></i>
<i data-preset-manager-new="instruct" class="menu_button fa-solid fa-file-circle-plus" title="Save preset as" data-i18n="[title]Save preset as"></i> <i data-preset-manager-new="instruct" class="menu_button fa-solid fa-file-circle-plus" title="Save template as" data-i18n="[title]Save template as"></i>
<i data-preset-manager-import="instruct" class=" menu_button fa-solid fa-file-import" title="Import preset" data-i18n="[title]Import preset"></i> <i data-preset-manager-import="instruct" class=" menu_button fa-solid fa-file-import" title="Import template" data-i18n="[title]Import template"></i>
<i data-preset-manager-export="instruct" class=" menu_button fa-solid fa-file-export" title="Export preset" data-i18n="[title]Export preset"></i> <i data-preset-manager-export="instruct" class=" menu_button fa-solid fa-file-export" title="Export template" data-i18n="[title]Export template"></i>
<i data-preset-manager-restore="instruct" class=" menu_button fa-solid fa-recycle" title="Restore current preset" data-i18n="[title]Restore current preset"></i> <i data-preset-manager-restore="instruct" class=" menu_button fa-solid fa-recycle" title="Restore current template" data-i18n="[title]Restore current template"></i>
<i data-preset-manager-delete="instruct" class=" menu_button fa-solid fa-trash-can" title="Delete the preset" data-i18n="[title]Delete the preset"></i> <i data-preset-manager-delete="instruct" class=" menu_button fa-solid fa-trash-can" title="Delete template" data-i18n="[title]Delete template"></i>
</div> </div>
<div class="flex-container"> <div class="flex-container" title="Select your current Instruct Template" data-i18n="[title]Select your current Instruct Template">
<select id="instruct_presets" data-preset-manager-for="instruct" class="flex1 text_pole"></select> <select id="instruct_presets" data-preset-manager-for="instruct" class="flex1 text_pole"></select>
</div> </div>
<label> <label>
<small> <small>
<span data-i18n="Activation Regex">Activation Regex</span> <span data-i18n="Activation Regex">Activation Regex</span>
<span class="fa-solid fa-circle-question" title="When connecting to an API or choosing a model, automatically activate this Instruct Mode template if the model name matches the provided regular expression."></span> <span class="fa-solid fa-circle-question" title="When connecting to an API or choosing a model, automatically activate this Instruct Template if the model name matches the provided regular expression."></span>
</small> </small>
</label> </label>
<div> <div>

16
public/script.js
View File

@ -8511,7 +8511,7 @@ async function selectContextCallback(_, name) {
const result = fuse.search(name); const result = fuse.search(name);
if (result.length === 0) { if (result.length === 0) {
toastr.warning(`Context preset "${name}" not found`); toastr.warning(`Context template "${name}" not found`);
return ''; return '';
} }
@ -8530,7 +8530,7 @@ async function selectInstructCallback(_, name) {
const result = fuse.search(name); const result = fuse.search(name);
if (result.length === 0) { if (result.length === 0) {
toastr.warning(`Instruct preset "${name}" not found`); toastr.warning(`Instruct template "${name}" not found`);
return ''; return '';
} }
@ -9054,8 +9054,8 @@ API: ${getSettingsContents.main_api}
API Type: ${getSettingsContents[getSettingsContents.main_api + '_settings'].type} API Type: ${getSettingsContents[getSettingsContents.main_api + '_settings'].type}
API server: ${getSettingsContents.api_server} API server: ${getSettingsContents.api_server}
Model: ${getContextContents.onlineStatus} Model: ${getContextContents.onlineStatus}
Context Preset: ${power_user.context.preset} Context Template: ${power_user.context.preset}
Instruct Preset: ${power_user.instruct.preset} Instruct Template: ${power_user.instruct.preset}
API Settings: ${JSON.stringify(getSettingsContents[getSettingsContents.main_api + '_settings'], null, 2)} API Settings: ${JSON.stringify(getSettingsContents[getSettingsContents.main_api + '_settings'], null, 2)}
\`\`\` \`\`\`
`; `;
@ -9193,17 +9193,17 @@ jQuery(async function () {
SlashCommandParser.addCommandObject(SlashCommand.fromProps({ SlashCommandParser.addCommandObject(SlashCommand.fromProps({
name: 'instruct', name: 'instruct',
callback: selectInstructCallback, callback: selectInstructCallback,
returns: 'current preset', returns: 'current template',
unnamedArgumentList: [ unnamedArgumentList: [
SlashCommandArgument.fromProps({ SlashCommandArgument.fromProps({
description: 'instruct preset name', description: 'instruct template name',
typeList: [ARGUMENT_TYPE.STRING], typeList: [ARGUMENT_TYPE.STRING],
enumProvider: () => instruct_presets.map(preset => new SlashCommandEnumValue(preset.name, null, enumTypes.enum, enumIcons.preset)), enumProvider: () => instruct_presets.map(preset => new SlashCommandEnumValue(preset.name, null, enumTypes.enum, enumIcons.preset)),
}), }),
], ],
helpString: ` helpString: `
<div> <div>
Selects instruct mode preset by name. Gets the current instruct if no name is provided. Selects instruct mode template by name. Gets the current instruct template if no name is provided.
</div> </div>
<div> <div>
<strong>Example:</strong> <strong>Example:</strong>
@ -9231,7 +9231,7 @@ jQuery(async function () {
returns: 'template name', returns: 'template name',
unnamedArgumentList: [ unnamedArgumentList: [
SlashCommandArgument.fromProps({ SlashCommandArgument.fromProps({
description: 'context preset name', description: 'context template name',
typeList: [ARGUMENT_TYPE.STRING], typeList: [ARGUMENT_TYPE.STRING],
enumProvider: () => context_presets.map(preset => new SlashCommandEnumValue(preset.name, null, enumTypes.enum, enumIcons.preset)), enumProvider: () => context_presets.map(preset => new SlashCommandEnumValue(preset.name, null, enumTypes.enum, enumIcons.preset)),
}), }),

6
public/scripts/instruct-mode.js
View File

@ -156,7 +156,7 @@ export function selectInstructPreset(preset) {
// If instruct preset is not already selected, select it // If instruct preset is not already selected, select it
if (preset !== power_user.instruct.preset) { if (preset !== power_user.instruct.preset) {
$('#instruct_presets').val(preset).trigger('change'); $('#instruct_presets').val(preset).trigger('change');
toastr.info(`Instruct Mode: preset "${preset}" auto-selected`); toastr.info(`Instruct Mode: template "${preset}" auto-selected`);
} }
// If instruct mode is disabled, enable it // If instruct mode is disabled, enable it
@ -596,11 +596,11 @@ jQuery(() => {
if (power_user.instruct.preset === power_user.default_instruct) { if (power_user.instruct.preset === power_user.default_instruct) {
power_user.default_instruct = null; power_user.default_instruct = null;
$(this).removeClass('default'); $(this).removeClass('default');
toastr.info('Default instruct preset cleared'); toastr.info('Default instruct template cleared');
} else { } else {
power_user.default_instruct = power_user.instruct.preset; power_user.default_instruct = power_user.instruct.preset;
$(this).addClass('default'); $(this).addClass('default');
toastr.info(`Default instruct preset set to ${power_user.default_instruct}`); toastr.info(`Default instruct template set to ${power_user.default_instruct}`);
} }
saveSettingsDebounced(); saveSettingsDebounced();

51
public/scripts/preset-manager.js
View File

@ -160,20 +160,25 @@ class PresetManager {
const name = selected.text(); const name = selected.text();
await this.savePreset(name); await this.savePreset(name);
toastr.success('Preset updated');
const successToast = !this.isAdvancedFormatting() ? 'Preset updated' : 'Template updated';
toastr.success(successToast);
} }
async savePresetAs() { async savePresetAs() {
const inputValue = this.getSelectedPresetName(); const inputValue = this.getSelectedPresetName();
const popupText = !this.isNonGenericApi() ? '<h4>Hint: Use a character/group name to bind preset to a specific chat.</h4>' : ''; const popupText = !this.isAdvancedFormatting() ? '<h4>Hint: Use a character/group name to bind preset to a specific chat.</h4>' : '';
const name = await Popup.show.input('Preset name:', popupText, inputValue); const headerText = !this.isAdvancedFormatting() ? 'Preset name:' : 'Template name:';
const name = await Popup.show.input(headerText, popupText, inputValue);
if (!name) { if (!name) {
console.log('Preset name not provided'); console.log('Preset name not provided');
return; return;
} }
await this.savePreset(name); await this.savePreset(name);
toastr.success('Preset saved');
const successToast = !this.isAdvancedFormatting() ? 'Preset saved' : 'Template saved';
toastr.success(successToast);
} }
async savePreset(name, settings) { async savePreset(name, settings) {
@ -234,7 +239,7 @@ class PresetManager {
return this.apiId == 'textgenerationwebui' || this.apiId == 'context' || this.apiId == 'instruct'; return this.apiId == 'textgenerationwebui' || this.apiId == 'context' || this.apiId == 'instruct';
} }
isNonGenericApi() { isAdvancedFormatting() {
return this.apiId == 'context' || this.apiId == 'instruct'; return this.apiId == 'context' || this.apiId == 'instruct';
} }
@ -342,7 +347,7 @@ class PresetManager {
} }
} }
if (!this.isNonGenericApi()) { if (!this.isAdvancedFormatting()) {
settings['genamt'] = amount_gen; settings['genamt'] = amount_gen;
settings['max_length'] = max_context; settings['max_length'] = max_context;
} }
@ -394,7 +399,8 @@ class PresetManager {
}); });
if (!response.ok) { if (!response.ok) {
toastr.error('Failed to restore default preset'); const errorToast = !this.isAdvancedFormatting() ? 'Failed to restore default preset' : 'Failed to restore default template';
toastr.error(errorToast);
return; return;
} }
@ -580,7 +586,8 @@ export async function initPresetManager() {
data['name'] = name; data['name'] = name;
await presetManager.savePreset(name, data); await presetManager.savePreset(name, data);
toastr.success('Preset imported'); const successToast = !presetManager.isAdvancedFormatting() ? 'Preset imported' : 'Template imported';
toastr.success(successToast);
e.target.value = null; e.target.value = null;
}); });
@ -598,7 +605,8 @@ export async function initPresetManager() {
return; return;
} }
const confirm = await Popup.show.confirm('Delete the preset?', 'This action is irreversible and your current settings will be overwritten.'); const headerText = !presetManager.isAdvancedFormatting() ? 'Delete this preset?' : 'Delete this template?';
const confirm = await Popup.show.confirm(headerText, 'This action is irreversible and your current settings will be overwritten.');
if (!confirm) { if (!confirm) {
return; return;
} }
@ -606,9 +614,11 @@ export async function initPresetManager() {
const result = await presetManager.deleteCurrentPreset(); const result = await presetManager.deleteCurrentPreset();
if (result) { if (result) {
toastr.success('Preset deleted'); const successToast = !presetManager.isAdvancedFormatting() ? 'Preset deleted' : 'Template deleted';
toastr.success(successToast);
} else { } else {
toastr.warning('Preset was not deleted from server'); const warningToast = !presetManager.isAdvancedFormatting() ? 'Preset was not deleted from server' : 'Template was not deleted from server';
toastr.warning(warningToast);
} }
saveSettingsDebounced(); saveSettingsDebounced();
@ -637,11 +647,15 @@ export async function initPresetManager() {
if (data.isDefault) { if (data.isDefault) {
if (Object.keys(data.preset).length === 0) { if (Object.keys(data.preset).length === 0) {
toastr.error('Default preset cannot be restored'); const errorToast = !presetManager.isAdvancedFormatting() ? 'Default preset cannot be restored' : 'Default template cannot be restored';
toastr.error(errorToast);
return; return;
} }
const confirm = await Popup.show.confirm('Are you sure?', 'Resetting a <b>default preset</b> will restore the default settings.'); const confirmText = !presetManager.isAdvancedFormatting()
? 'Resetting a <b>default preset</b> will restore the default settings.'
: 'Resetting a <b>default template</b> will restore the default settings.';
const confirm = await Popup.show.confirm('Are you sure?', confirmText);
if (!confirm) { if (!confirm) {
return; return;
} }
@ -650,16 +664,21 @@ export async function initPresetManager() {
await presetManager.savePreset(name, data.preset); await presetManager.savePreset(name, data.preset);
const option = presetManager.findPreset(name); const option = presetManager.findPreset(name);
presetManager.selectPreset(option); presetManager.selectPreset(option);
toastr.success('Default preset restored'); const successToast = !presetManager.isAdvancedFormatting() ? 'Default preset restored' : 'Default template restored';
toastr.success(successToast);
} else { } else {
const confirm = await Popup.show.confirm('Are you sure?', 'Resetting a <b>custom preset</b> will restore to the last saved state.'); const confirmText = !presetManager.isAdvancedFormatting()
? 'Resetting a <b>custom preset</b> will restore to the last saved state.'
: 'Resetting a <b>custom template</b> will restore to the last saved state.';
const confirm = await Popup.show.confirm('Are you sure?', confirmText);
if (!confirm) { if (!confirm) {
return; return;
} }
const option = presetManager.findPreset(name); const option = presetManager.findPreset(name);
presetManager.selectPreset(option); presetManager.selectPreset(option);
toastr.success('Preset restored'); const successToast = !presetManager.isAdvancedFormatting() ? 'Preset restored' : 'Template restored';
toastr.success(successToast);
} }
}); });
} }