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

Add lock=on/off to /gen and /genraw commands

Browse Source
This commit is contained in:
Cohee
2023-11-24 15:18:49 +02:00
parent 8e16f28827
commit dd17c2483f
3 changed files with 53 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/script.js
View File

@ -2702,7 +2702,7 @@ class StreamingProcessor {
* Generates a message using the provided prompt.
* @param {string} prompt Prompt to generate a message from
* @param {string} api API to use. Main API is used if not specified.
* @param {string} instructOverride If 0, false or off, disables instruct formatting
* @param {boolean} instructOverride true to override instruct mode, false to use the default value
* @returns {Promise<string>} Generated message
*/
export async function generateRaw(prompt, api, instructOverride) {
@ -2711,8 +2711,7 @@ export async function generateRaw(prompt, api, instructOverride) {
}
const abortController = new AbortController();
const instructDisabled = instructOverride === '0' || instructOverride === 'false' || instructOverride === 'off';
const isInstruct = power_user.instruct.enabled && main_api !== 'openai' && main_api !== 'novel' && !instructDisabled;
const isInstruct = power_user.instruct.enabled && main_api !== 'openai' && main_api !== 'novel' && !instructOverride;
prompt = substituteParams(prompt);
prompt = api == 'novel' ? adjustNovelInstructionPrompt(prompt) : prompt;