mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Fixing getCompletionPresetByName, removing openai option from getSelectedPresetName
This commit is contained in:
@@ -350,11 +350,7 @@ class PresetManager {
|
|||||||
* @returns {string} Selected preset name
|
* @returns {string} Selected preset name
|
||||||
*/
|
*/
|
||||||
getSelectedPresetName() {
|
getSelectedPresetName() {
|
||||||
if (this.apiId === 'openai') {
|
return $(this.select).find('option:selected').text();
|
||||||
return oai_settings.preset_settings_openai
|
|
||||||
} else {
|
|
||||||
return $(this.select).find('option:selected').text();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -616,30 +612,26 @@ class PresetManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
getCompletionPresetByName(name) {
|
getCompletionPresetByName(name) {
|
||||||
// Retrieve a completion preset by name
|
// Retrieve a completion preset by name. Return undefined if not found.
|
||||||
let { presets, preset_names } = this.getPresetList();
|
let { presets, preset_names } = this.getPresetList();
|
||||||
let preset;
|
let preset;
|
||||||
|
|
||||||
// Some APIs use an array of names, others use an object of {name: index}
|
// Some APIs use an array of names, others use an object of {name: index}
|
||||||
if (Array.isArray(preset_names)) { // array of names
|
if (Array.isArray(preset_names)) { // array of names
|
||||||
if (!preset_names.includes(name)) {
|
if (preset_names.includes(name)) {
|
||||||
preset = undefined;
|
|
||||||
} else {
|
|
||||||
preset = presets[preset_names.indexOf(name)];
|
preset = presets[preset_names.indexOf(name)];
|
||||||
}
|
}
|
||||||
} else { // object of {names: index}
|
} else { // object of {names: index}
|
||||||
if (preset_names[name] === undefined) {
|
if (preset_names[name] !== undefined) {
|
||||||
preset = undefined;
|
|
||||||
} else {
|
|
||||||
preset = presets[preset_names[name]];
|
preset = presets[preset_names[name]];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if the preset isn't found, return null
|
|
||||||
if (preset === undefined) {
|
if (preset === undefined) {
|
||||||
console.error(`Preset ${name} not found`);
|
console.error(`Preset ${name} not found`);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if the preset isn't found, returns undefined
|
||||||
return preset;
|
return preset;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user