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

Fix raw textgen preset import via master

This commit is contained in:
Cohee 2024-09-21 23:28:38 +03:00
parent c2f945ef88
commit 74a8499e0e
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -148,7 +148,7 @@ class PresetManager {
isValid: (data) => PresetManager.isPossiblySystemPromptData(data), isValid: (data) => PresetManager.isPossiblySystemPromptData(data),
}, },
'preset': { 'preset': {
name: 'Text Completion Settings', name: 'Text Completion Preset',
getData: () => { getData: () => {
const manager = getPresetManager('textgenerationwebui'); const manager = getPresetManager('textgenerationwebui');
const name = manager.getSelectedPresetName(); const name = manager.getSelectedPresetName();
@ -185,7 +185,13 @@ class PresetManager {
return data && textCompletionProps.every(prop => Object.keys(data).includes(prop)); return data && textCompletionProps.every(prop => Object.keys(data).includes(prop));
} }
static async performMasterImport(data) { /**
* Imports master settings from JSON data.
* @param {object} data Data to import
* @param {string} fileName File name
* @returns {Promise<void>}
*/
static async performMasterImport(data, fileName) {
if (!data || typeof data !== 'object') { if (!data || typeof data !== 'object') {
toastr.error('Invalid data provided for master import'); toastr.error('Invalid data provided for master import');
return; return;
@ -213,7 +219,7 @@ class PresetManager {
// 4. Text Completion settings // 4. Text Completion settings
if (this.isPossiblyTextCompletionData(data)) { if (this.isPossiblyTextCompletionData(data)) {
toastr.info('Importing as settings preset...', 'Text Completion settings detected'); toastr.info('Importing as settings preset...', 'Text Completion settings detected');
return await getPresetManager('textgenerationwebui').savePreset(data.name, data); return await getPresetManager('textgenerationwebui').savePreset(fileName, data);
} }
const validSections = []; const validSections = [];
@ -266,6 +272,10 @@ class PresetManager {
toastr.success(`Imported ${importedSections.length} settings: ${importedSections.join(', ')}`); toastr.success(`Imported ${importedSections.length} settings: ${importedSections.join(', ')}`);
} }
/**
* Exports master settings to JSON data.
* @returns {Promise<string>} JSON data
*/
static async performMasterExport() { static async performMasterExport() {
const sectionNames = Object.entries(this.masterSections).reduce((acc, [key, section]) => { const sectionNames = Object.entries(this.masterSections).reduce((acc, [key, section]) => {
acc[key] = section.name; acc[key] = section.name;
@ -907,7 +917,8 @@ export async function initPresetManager() {
} }
const data = await parseJsonFile(file); const data = await parseJsonFile(file);
await PresetManager.performMasterImport(data); const fileName = file.name.replace('.json', '');
await PresetManager.performMasterImport(data, fileName);
}); });
$('#af_master_export').on('click', async () => { $('#af_master_export').on('click', async () => {