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/Cohee1207/SillyTavern into dev

Browse Source
This commit is contained in:
RossAscends
2023-05-21 22:49:06 +09:00
parent 71d2f98391 8a3772f06b
commit ef394f7f03
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/script.js
View File

@ -2967,7 +2967,9 @@ function extractNameFromMessage(getMessage, force_name2, isImpersonate) {
// Like OAI, Poe is very unlikely to send you an incomplete message.
// But it doesn't send "name:" either, so we assume that we always have a name
// prepend to have clearer logs when building up a prompt context.
if (force_name2 || main_api == 'poe')
// Instruct mode needs to have it on to make sure you won't have names lost
// if disable in a middle of a solo chat.
if (force_name2 || main_api == 'poe' || power_user.instruct.enabled)
this_mes_is_name = true;
if (isImpersonate) {

7
public/scripts/openai.js
View File

@ -502,9 +502,10 @@ function tryParseStreamingError(str) {
}
function checkQuotaError(data) {
const errorText = `<h3>You have no credits left to use with this API key.<br>
Check your billing details on the
<a href="https://platform.openai.com/account/usage" target="_blank">OpenAI website.</a></h3>`;
const errorText = `<h3>Encountered an error while processing your request.<br>
Check you have credits available on your
<a href="https://platform.openai.com/account/usage" target="_blank">OpenAI account</a>.<br>
If you have sufficient credits, please try again later.</h3>`;
if (!data) {
return;