Merge branch 'staging' into sd-args

This commit is contained in:
Cohee
2024-10-01 14:16:01 +03:00
4 changed files with 27 additions and 7 deletions

View File

@@ -384,6 +384,10 @@ export function formatInstructModeChat(name, mes, isUser, isNarrator, forceAvata
* @returns {string} Formatted instruct mode system prompt.
*/
export function formatInstructModeSystemPrompt(systemPrompt) {
if (!systemPrompt) {
return '';
}
const separator = power_user.instruct.wrap ? '\n' : '';
if (power_user.instruct.system_sequence_prefix) {

View File

@@ -3027,7 +3027,7 @@ async function continueChatCallback(args, prompt) {
resolve();
} catch (error) {
console.error('Error running /continue command:', error);
reject();
reject(error);
}
});