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

Merge branch 'staging' into singlequote

This commit is contained in:
Cohee 2023-12-02 20:43:41 +02:00
parent a37f874e38 a28c23d295
commit 9faa1e34b0
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/script.js
View File

@ -4335,6 +4335,10 @@ function extractMessageFromData(data) {
}
function cleanUpMessage(getMessage, isImpersonate, isContinue, displayIncompleteSentences = false) {
if (!getMessage) {
return '';
}
// Add the prompt bias before anything else
if (
power_user.user_prompt_bias &&

20
public/scripts/slash-commands.js
View File

@ -40,7 +40,7 @@ import { addEphemeralStoppingString, chat_styles, flushEphemeralStoppingStrings,
import { autoSelectPersona } from './personas.js';
import { getContext, saveMetadataDebounced } from './extensions.js';
import { hideChatMessage, unhideChatMessage } from './chats.js';
import { delay, isFalseBoolean, isTrueBoolean, stringToRange, trimToEndSentence, trimToStartSentence } from './utils.js';
import { delay, isFalseBoolean, isTrueBoolean, stringToRange, trimToEndSentence, trimToStartSentence, waitUntilCondition } from './utils.js';
import { registerVariableCommands, resolveVariable } from './variables.js';
import { decodeTextTokens, getFriendlyTokenizerName, getTextTokens, getTokenCount } from './tokenizers.js';
export {
@ -971,8 +971,11 @@ async function addGroupMemberCallback(_, arg) {
}
async function triggerGenerationCallback(_, arg) {
if (is_send_press || is_group_generating) {
toastr.warning('Cannot run trigger command while the reply is being generated.');
try {
await waitUntilCondition(() => !is_send_press && !is_group_generating, 10000, 100);
} catch {
console.warn('Timeout waiting for generation unlock');
toastr.warning('Cannot run /trigger command while the reply is being generated.');
return '';
}
@ -1083,10 +1086,19 @@ async function openChat(id) {
await reloadCurrentChat();
}
function continueChatCallback() {
async function continueChatCallback() {
try {
await waitUntilCondition(() => !is_send_press && !is_group_generating, 10000, 100);
} catch {
console.warn('Timeout waiting for generation unlock');
toastr.warning('Cannot run /continue command while the reply is being generated.');
return '';
}
// Prevent infinite recursion
$('#send_textarea').val('').trigger('input');
$('#option_continue').trigger('click', { fromSlashCommand: true });
return '';
}
export async function generateSystemMessage(_, prompt) {