Merge pull request #979 from Halsey1006/staging

NAI instruct prompt handling
This commit is contained in:
Cohee 2023-08-20 12:44:33 +03:00 committed by GitHub
commit b44c72c639
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -578,7 +578,7 @@ function calculateLogitBias() {
}
/**
* Transforms instruction into compatible format for Novel AI.
* Transforms instruction into compatible format for Novel AI if Novel AI instruct format not already detected.
* 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
@ -586,7 +586,10 @@ function calculateLogitBias() {
*/
export function adjustNovelInstructionPrompt(prompt) {
const stripedPrompt = prompt.replace(/[\[\]]/g, '').trim();
return `{ ${stripedPrompt} }`;
if (!stripedPrompt.includes('{ ')) {
return `{ ${stripedPrompt} }`;
}
return stripedPrompt;
}
export async function generateNovelWithStreaming(generate_data, signal) {