rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-12 10:00:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #912 from spacegeek69/sg69-api-prices-fix

Browse Source 
[OpenRouter] Show more API price information
This commit is contained in:
Cohee 2023-08-10 20:04:15 +03:00 committed by GitHub
commit 92666b18d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
public/scripts/openai.js
View File

@ -722,10 +722,13 @@ function saveModelList(data) {
$('#model_openrouter_select').empty(); $('#model_openrouter_select').empty();
$('#model_openrouter_select').append($('<option>', { value: openrouter_website_model, text: 'Use OpenRouter website setting' })); $('#model_openrouter_select').append($('<option>', { value: openrouter_website_model, text: 'Use OpenRouter website setting' }));
model_list.forEach((model) => { model_list.forEach((model) => {
let prompt_max_price = parseFloat(model.pricing.prompt) * model.context_length;
let price_rounded = (Math.round(prompt_max_price * 1000) / 1000).toFixed(3);
let model_description = `${model.id} \$${price_rounded} (${model.context_length})`;
$('#model_openrouter_select').append( $('#model_openrouter_select').append(
$('<option>', { $('<option>', {
value: model.id, value: model.id,
text: model.id, text: model_description,
})); }));
}); });
$('#model_openrouter_select').val(oai_settings.openrouter_model).trigger('change'); $('#model_openrouter_select').val(oai_settings.openrouter_model).trigger('change');

24
server.js
View File

@ -2964,8 +2964,28 @@ app.post("/getstatus_openai", jsonParser, function (request, response_getstatus_
client.get(api_url + "/models", args, function (data, response) { client.get(api_url + "/models", args, function (data, response) {
if (response.statusCode == 200) { if (response.statusCode == 200) {
response_getstatus_openai.send(data); response_getstatus_openai.send(data);
const modelIds = data?.data?.map(x => x.id)?.sort(); if (request.body.use_openrouter) {
console.log('Available OpenAI models:', modelIds); let models = [];
data.data.forEach(model =>
{
context_length = model.context_length;
prompt_max_price = parseFloat(model.pricing.prompt) * context_length;
price_rounded = (Math.round(prompt_max_price * 1000)/1000).toFixed(3);
// completion_price = parseFloat(model.pricing.completion) * 1000;
models[model.id] = {
// prompt_max_price: { text: price_rounded,
// val: prompt_max_price },
// completion_price: { text: (Math.round(completion_price * 1000)/1000).toFixed(3),
// val: completion_price },
prompt_max_price: price_rounded,
context_length: model.context_length,
};
});
console.log('Available OpenRouter models:', models);
} else {
const modelIds = data?.data?.map(x => x.id)?.sort();
console.log('Available OpenAI models:', modelIds);
}
} }
if (response.statusCode == 401) { if (response.statusCode == 401) {
console.log('Access Token is incorrect.'); console.log('Access Token is incorrect.');