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

Load external API models into OAI list

This commit is contained in:
Cohee 2023-07-21 13:35:39 +03:00
parent 6ccd64c603
commit 500eae40e2
2 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/index.html
View File

@ -1422,6 +1422,9 @@
</select>
<form id="openai_form" data-source="openai" action="javascript:void(null);" method="post" enctype="multipart/form-data">
<h4><span data-i18n="OpenAI API key">OpenAI API key</span></h4>
<div>
<a id="openai_api_usage" href="javascript:void(0);"><span data-i18n="View API Usage Metrics">View API Usage Metrics</span></a>
</div>
<span>
<ol>
<li>
@ -1467,10 +1470,13 @@
<option value="text-ada-001">text-ada-001</option>
<option value="code-davinci-002">code-davinci-002</option>
</optgroup>
<optgroup id="openai_external_category" label="External">
</optgroup>
</select>
</div>
<div>
<a id="openai_api_usage" href="javascript:void(0);"><span data-i18n="View API Usage Metrics">View API Usage Metrics</span></a>
<label for="openai_show_external_models" class="checkbox_label">
<input id="openai_show_external_models" type="checkbox" />
<span data-i18n="Show External models (provided by API)">Show "External" models (provided by API)</span>
</label>
</div>
</form>
<form id="claude_form" data-source="claude" action="javascript:void(null);" method="post" enctype="multipart/form-data">
@ -3684,4 +3690,4 @@
</script>
</body>
</html>
</html>

40
public/scripts/openai.js
View File

@ -141,6 +141,7 @@ const default_settings = {
chat_completion_source: chat_completion_sources.OPENAI,
max_context_unlocked: false,
api_url_scale: '',
show_external_models: false,
};
const oai_settings = {
@ -176,6 +177,7 @@ const oai_settings = {
chat_completion_source: chat_completion_sources.OPENAI,
max_context_unlocked: false,
api_url_scale: '',
show_external_models: false,
};
let openai_setting_names;
@ -687,6 +689,7 @@ function getChatCompletionModel() {
function saveModelList(data) {
model_list = data.map((model) => ({ id: model.id, context_length: model.context_length }));
model_list.sort((a, b) => a?.id && b?.id && a.id.localeCompare(b.id));
if (oai_settings.chat_completion_source == chat_completion_sources.OPENROUTER) {
$('#model_openrouter_select').empty();
@ -703,7 +706,24 @@ function saveModelList(data) {
$('#model_openrouter_select').val(oai_settings.openrouter_model).trigger('change');
}
// TODO Add ability to select OpenAI model from endpoint-provided list
if (oai_settings.chat_completion_source == chat_completion_sources.OPENAI) {
$('#openai_external_category').empty();
model_list.forEach((model) => {
const selected = model.id == oai_settings.openai_model && oai_settings.show_external_models;
$('#openai_external_category').append(
$('<option>', {
value: model.id,
text: model.id,
selected: selected,
}));
});
// If the selected model is not in the list, revert to default
if (oai_settings.show_external_models && model_list.find((model) => model.id == oai_settings.openai_model)) {
$('#model_openai_select').val(oai_settings.openai_model).trigger('change');
} else {
$('#model_openai_select').val(default_settings.openai_model).trigger('change');
}
}
}
async function sendOpenAIRequest(type, openai_msgs_tosend, signal) {
@ -1088,6 +1108,7 @@ function loadOpenAISettings(data, settings) {
oai_settings.openrouter_model = settings.openrouter_model ?? default_settings.openrouter_model;
oai_settings.chat_completion_source = settings.chat_completion_source ?? default_settings.chat_completion_source;
oai_settings.api_url_scale = settings.api_url_scale ?? default_settings.api_url_scale;
oai_settings.show_external_models = settings.show_external_models ?? default_settings.show_external_models;
if (settings.nsfw_toggle !== undefined) oai_settings.nsfw_toggle = !!settings.nsfw_toggle;
if (settings.keep_example_dialogue !== undefined) oai_settings.keep_example_dialogue = !!settings.keep_example_dialogue;
@ -1119,6 +1140,8 @@ function loadOpenAISettings(data, settings) {
$('#nsfw_first').prop('checked', oai_settings.nsfw_first);
$('#jailbreak_system').prop('checked', oai_settings.jailbreak_system);
$('#legacy_streaming').prop('checked', oai_settings.legacy_streaming);
$('#openai_show_external_models').prop('checked', oai_settings.show_external_models);
$('#openai_external_category').toggle(oai_settings.show_external_models);
if (settings.main_prompt !== undefined) oai_settings.main_prompt = settings.main_prompt;
if (settings.nsfw_prompt !== undefined) oai_settings.nsfw_prompt = settings.nsfw_prompt;
@ -1298,6 +1321,7 @@ async function saveOpenAIPreset(name, settings) {
wi_format: settings.wi_format,
stream_openai: settings.stream_openai,
api_url_scale: settings.api_url_scale,
show_external_models: settings.show_external_models,
};
const savePresetSettings = await fetch(`/savepreset_openai?name=${name}`, {
@ -1649,6 +1673,7 @@ function onSettingsPresetChange() {
wi_format: ['#wi_format_textarea', 'wi_format', false],
stream_openai: ['#stream_toggle', 'stream_openai', true],
api_url_scale: ['#api_url_scale', 'api_url_scale', false],
show_external_models: ['#openai_show_external_models', 'show_external_models', true],
};
for (const [key, [selector, setting, isCheckbox]] of Object.entries(settingsToUpdate)) {
@ -1943,7 +1968,12 @@ function toggleChatCompletionForms() {
$('#model_claude_select').trigger('change');
}
else if (oai_settings.chat_completion_source == chat_completion_sources.OPENAI) {
$('#model_openai_select').trigger('change');
if (oai_settings.show_external_models && (!Array.isArray(model_list) || model_list.length == 0)) {
// Wait until the models list is loaded so that we could show a proper saved model
}
else {
$('#model_openai_select').trigger('change');
}
}
else if (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI) {
$('#model_windowai_select').trigger('change');
@ -2185,6 +2215,12 @@ $(document).ready(function () {
saveSettingsDebounced();
});
$('#openai_show_external_models').on('input', function () {
oai_settings.show_external_models = !!$(this).prop('checked');
$('#openai_external_category').toggle(oai_settings.show_external_models);
saveSettingsDebounced();
});
$("#api_button_openai").on("click", onConnectButtonClick);
$("#openai_reverse_proxy").on("input", onReverseProxyInput);
$("#model_openai_select").on("change", onModelChange);