mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-06-05 21:59:27 +02:00
Adjust Novel instruction prompts for quiet generation
This commit is contained in:
@ -104,6 +104,7 @@ import {
|
|||||||
loadNovelSettings,
|
loadNovelSettings,
|
||||||
nai_settings,
|
nai_settings,
|
||||||
setNovelData,
|
setNovelData,
|
||||||
|
adjustNovelInstructionPrompt,
|
||||||
} from "./scripts/nai-settings.js";
|
} from "./scripts/nai-settings.js";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@ -2320,6 +2321,10 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject,
|
|||||||
abortController = new AbortController();
|
abortController = new AbortController();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (main_api == 'novel' && quiet_prompt) {
|
||||||
|
quiet_prompt = adjustNovelInstructionPrompt(quiet_prompt);
|
||||||
|
}
|
||||||
|
|
||||||
// OpenAI doesn't need instruct mode. Use OAI main prompt instead.
|
// OpenAI doesn't need instruct mode. Use OAI main prompt instead.
|
||||||
const isInstruct = power_user.instruct.enabled && main_api !== 'openai';
|
const isInstruct = power_user.instruct.enabled && main_api !== 'openai';
|
||||||
const isImpersonate = type == "impersonate";
|
const isImpersonate = type == "impersonate";
|
||||||
|
@ -572,6 +572,18 @@ function calculateLogitBias() {
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Transforms instruction into compatible format for Novel AI.
|
||||||
|
* 1. Instruction must begin and end with curly braces followed and preceded by a space.
|
||||||
|
* 2. Instruction must not contain square brackets as it serves different purpose in NAI.
|
||||||
|
* @param {string} prompt Original instruction prompt
|
||||||
|
* @returns Processed prompt
|
||||||
|
*/
|
||||||
|
export function adjustNovelInstructionPrompt(prompt) {
|
||||||
|
const stripedPrompt = prompt.replace(/[\[\]]/g, '').trim();
|
||||||
|
return `{ ${stripedPrompt} }`;
|
||||||
|
}
|
||||||
|
|
||||||
export async function generateNovelWithStreaming(generate_data, signal) {
|
export async function generateNovelWithStreaming(generate_data, signal) {
|
||||||
const response = await fetch('/generate_novelai', {
|
const response = await fetch('/generate_novelai', {
|
||||||
headers: getRequestHeaders(),
|
headers: getRequestHeaders(),
|
||||||
|
Reference in New Issue
Block a user