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

Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev

Browse Source
This commit is contained in:
Cohee
2023-06-06 23:40:59 +03:00
parent 037768a3b6 87979391b9
commit 9ea7472555
18 changed files with 3803 additions and 1411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
public/script.js
View File

@ -80,6 +80,7 @@ import {
is_get_status_openai,
openai_messages_count,
getTokenCountOpenAI,
chat_completion_sources,
} from "./scripts/openai.js";
import {
@ -349,7 +350,7 @@ const system_messages = {
'<i>(Not endorsed, your discretion is advised)</i>',
'<ol>',
'<li><a target="_blank" href="https://discord.gg/pygmalionai">Pygmalion AI Discord</a></li>',
'<li><a target="_blank" href="https://www.characterhub.org/">CharacterHub (NSFW)</a></li>',
'<li><a target="_blank" href="https://chub.ai/">Chub (NSFW)</a></li>',
'</ol>',
'<hr>',
'<h3>Where can I get help?</h3>',
@ -1399,6 +1400,20 @@ function getStoppingStrings(isImpersonate, addSpace) {
return addSpace ? result.map(x => `${x} `) : result;
}
// Background prompt generation
export async function generateQuietPrompt(quiet_prompt) {
return await new Promise(
async function promptPromise(resolve, reject) {
try {
await Generate('quiet', { resolve, reject, quiet_prompt, force_name2: true, });
}
catch {
reject();
}
});
}
function processCommands(message, type) {
if (type == "regenerate" || type == "swipe" || type == 'quiet') {
return null;
@ -3808,7 +3823,7 @@ function changeMainAPI() {
main_api = selectedVal;
online_status = "no_connection";
if (main_api == 'openai' && oai_settings.use_window_ai) {
if (main_api == 'openai' && oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI) {
$('#api_button_openai').trigger('click');
}