rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Capture api/model to msgs

Browse Source
This commit is contained in:
BlipRanger
2023-07-08 00:40:29 -04:00
parent 7026f7051f
commit f2e4eb1696
1 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
public/script.js
View File

@@ -728,6 +728,8 @@ var css_send_form_display = $("<div id=send_form></div>").css("display");
let generate_loop_counter = 0; let generate_loop_counter = 0;
const MAX_GENERATION_LOOPS = 5; const MAX_GENERATION_LOOPS = 5;
var kobold_horde_model = "";
let token; let token;
var PromptArrayItemForRawPromptDisplay; var PromptArrayItemForRawPromptDisplay;
@@ -2740,6 +2742,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
//const getData = await response.json(); //const getData = await response.json();
let getMessage = extractMessageFromData(data); let getMessage = extractMessageFromData(data);
let title = extractTitleFromData(data); let title = extractTitleFromData(data);
kobold_horde_model = title;
//Pygmalion run again //Pygmalion run again
// to make it continue generating so long as it's under max_amount and hasn't signaled // to make it continue generating so long as it's under max_amount and hasn't signaled
@@ -3706,6 +3709,7 @@ function saveReply(type, getMessage, this_mes_is_name, title) {
saveImageToMessage(img, chat[chat.length - 1]); saveImageToMessage(img, chat[chat.length - 1]);
addOneMessage(chat[chat.length - 1]); addOneMessage(chat[chat.length - 1]);
} }
saveGeneratorToMessage(chat[chat.length - 1]);
const item = chat[chat.length - 1]; const item = chat[chat.length - 1];
if (item['swipe_info'] === undefined) { if (item['swipe_info'] === undefined) {
item['swipe_info'] = []; item['swipe_info'] = [];
@@ -3732,6 +3736,40 @@ function saveImageToMessage(img, mes) {
} }
} }
function saveGeneratorToMessage(mes) {
let model = '';
switch (main_api) {
case 'kobold':
model = online_status;
break;
case 'novel':
model = settings.model_novel;
break;
case 'claude':
model = settings.claude_model;
break;
case 'openai':
model = settings.openai_model;
break;
case 'textgenerationwebui':
model = online_status;
break;
case 'koboldhorde':
model = kobold_horde_model;
break;
case 'poe':
model = settings.poe_model;
break;
}
if (mes && typeof mes.extra !== 'object') {
mes.extra = {};
}
mes.extra.api = main_api;
mes.extra.model = model;
}
function extractImageFromMessage(getMessage) { function extractImageFromMessage(getMessage) {
const regex = /<img src="(.*?)".*?alt="(.*?)".*?>/g; const regex = /<img src="(.*?)".*?alt="(.*?)".*?>/g;
const results = regex.exec(getMessage); const results = regex.exec(getMessage);