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 'staging' into staging

Browse Source
This commit is contained in:
Cohee
2023-08-21 01:51:12 +03:00
committed by GitHub
parent ad2be21531 3fbc9cd100
commit 4ea9e481a8
90 changed files with 5229 additions and 2916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
public/scripts/nai-settings.js
View File

@@ -576,7 +576,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
@@ -584,7 +584,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) {