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

/genraw instruct=off

Browse Source
This commit is contained in:
Cohee
2023-11-24 00:36:35 +02:00
parent c50ed4bf6a
commit c2e3bfa06d
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
public/script.js
View File

@ -2701,14 +2701,17 @@ class StreamingProcessor {
* Generates a message using the provided prompt. * Generates a message using the provided prompt.
* @param {string} prompt Prompt to generate a message from * @param {string} prompt Prompt to generate a message from
* @param {string} api API to use. Main API is used if not specified. * @param {string} api API to use. Main API is used if not specified.
* @param {string} instructOverride If 0, false or off, disables instruct formatting
* @returns {Promise<string>} Generated message
*/ */
export async function generateRaw(prompt, api) { export async function generateRaw(prompt, api, instructOverride) {
if (!api) { if (!api) {
api = main_api; api = main_api;
} }
const abortController = new AbortController(); const abortController = new AbortController();
const isInstruct = power_user.instruct.enabled && main_api !== 'openai' && main_api !== 'novel'; const instructDisabled = instructOverride === '0' || instructOverride === 'false' || instructOverride === 'off';
const isInstruct = power_user.instruct.enabled && main_api !== 'openai' && main_api !== 'novel' && !instructDisabled;
prompt = substituteParams(prompt); prompt = substituteParams(prompt);
prompt = api == 'novel' ? adjustNovelInstructionPrompt(prompt) : prompt; prompt = api == 'novel' ? adjustNovelInstructionPrompt(prompt) : prompt;
@ -7564,7 +7567,7 @@ function addDebugFunctions() {
registerDebugFunction('generationTest', 'Send a generation request', 'Generates text using the currently selected API.', async () => { registerDebugFunction('generationTest', 'Send a generation request', 'Generates text using the currently selected API.', async () => {
const text = prompt('Input text:', 'Hello'); const text = prompt('Input text:', 'Hello');
toastr.info('Working on it...'); toastr.info('Working on it...');
const message = await generateRaw(text, null); const message = await generateRaw(text, null, '');
alert(message); alert(message);
}); });

8
public/scripts/slash-commands.js
View File

@ -161,7 +161,7 @@ parser.addCommand('peek', peekCallback, [], '<span class="monospace">(message in
parser.addCommand('delswipe', deleteSwipeCallback, ['swipedel'], '<span class="monospace">(optional 1-based id)</span> – deletes a swipe from the last chat message. If swipe id not provided - deletes the current swipe.', true, true); parser.addCommand('delswipe', deleteSwipeCallback, ['swipedel'], '<span class="monospace">(optional 1-based id)</span> – deletes a swipe from the last chat message. If swipe id not provided - deletes the current swipe.', true, true);
parser.addCommand('echo', echoCallback, [], '<span class="monospace">(text)</span> – echoes the text to toast message. Useful for pipes debugging.', true, true); parser.addCommand('echo', echoCallback, [], '<span class="monospace">(text)</span> – echoes the text to toast message. Useful for pipes debugging.', true, true);
parser.addCommand('gen', generateCallback, [], '<span class="monospace">(prompt)</span> – generates text using the provided prompt and passes it to the next command through the pipe.', true, true); parser.addCommand('gen', generateCallback, [], '<span class="monospace">(prompt)</span> – generates text using the provided prompt and passes it to the next command through the pipe.', true, true);
parser.addCommand('genraw', generateRawCallback, [], '<span class="monospace">(prompt)</span> – generates text using the provided prompt and passes it to the next command through the pipe. Does not include chat history or character card.', true, true); parser.addCommand('genraw', generateRawCallback, [], '<span class="monospace">(prompt)</span> – generates text using the provided prompt and passes it to the next command through the pipe. Does not include chat history or character card. Use instruct=off to skip instruct formatting, e.g. <tt>/genraw instruct=off Why is the sky blue?</tt>', true, true);
parser.addCommand('addswipe', addSwipeCallback, ['swipeadd'], '<span class="monospace">(text)</span> – adds a swipe to the last chat message.', true, true); parser.addCommand('addswipe', addSwipeCallback, ['swipeadd'], '<span class="monospace">(text)</span> – adds a swipe to the last chat message.', true, true);
parser.addCommand('abort', abortCallback, [], ' – aborts the slash command batch execution', true, true); parser.addCommand('abort', abortCallback, [], ' – aborts the slash command batch execution', true, true);
registerVariableCommands(); registerVariableCommands();
@ -175,8 +175,8 @@ function abortCallback() {
throw new Error('/abort command executed'); throw new Error('/abort command executed');
} }
async function generateRawCallback(_, arg) { async function generateRawCallback(args, value) {
if (!arg) { if (!value) {
console.warn('WARN: No argument provided for /genraw command'); console.warn('WARN: No argument provided for /genraw command');
return; return;
} }
@ -184,7 +184,7 @@ async function generateRawCallback(_, arg) {
// Prevent generate recursion // Prevent generate recursion
$('#send_textarea').val(''); $('#send_textarea').val('');
const result = await generateRaw(arg, ''); const result = await generateRaw(value, '', args.instruct);
return result; return result;
} }