Add trim argument to /gen and /sysgen. Closes #4361

fb058816e86b71e769c2dbe3e50db24d5028676a

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 35b1801e6e408b5eae39c058d169446d8a068e16

public/script.js+7 -3 Viewed

  * @prop {number} [responseLength] Maximum response length. If unset, the global default value is used.
  * @prop {number} [forceChId] Character ID to use for this generation run. Works in groups only.
  * @prop {object} [jsonSchema] JSON schema to use for the structured generation. Usually requires a special instruction.
+ * @prop {boolean} [removeReasoning] Parses and removes the reasoning block according to reasoning format preferences
+ * @prop {boolean} [trimToSentence] Whether to trim the response to the last complete sentence
  * @param {GenerateQuietPromptParams} params Parameters for the quiet prompt generation
  * @returns {Promise<string>} Generated text. If using structured output, will contain a serialized JSON object.
  */
-export async function generateQuietPrompt({ quietPrompt = '', quietToLoud = false, skipWIAN = false, quietImage = null, quietName = null, responseLength = null, forceChId = null, jsonSchema = null } = {}) {
+export async function generateQuietPrompt({ quietPrompt = '', quietToLoud = false, skipWIAN = false, quietImage = null, quietName = null, responseLength = null, forceChId = null, jsonSchema = null, removeReasoning = true, trimToSentence = false } = {}) {
     if (arguments.length > 0 && typeof arguments[0] !== 'object') {
         console.trace('generateQuietPrompt called with positional arguments. Please use an object instead.');
         [quietPrompt, quietToLoud, skipWIAN, quietImage, quietName, responseLength, forceChId, jsonSchema] = arguments;

             TempResponseLength.save(main_api, responseLength);
             eventHook = TempResponseLength.setupEventHook(main_api);
+        }
-        const result = await Generate('quiet', generateOptions);
+        let result = await Generate('quiet', generateOptions);
-        return removeReasoningFromString(result);
+        result = trimToSentence ? trimToEndSentence(result) : result;
+        result = removeReasoning ? removeReasoningFromString(result) : result;
+        return result;
     } finally {
         if (responseLengthCustomized && TempResponseLength.isCustomized()) {
             TempResponseLength.restore(main_api);

public/scripts/slash-commands.js+55 -6 Viewed

     SlashCommandParser.addCommandObject(SlashCommand.fromProps({
         name: 'sysgen',
         callback: generateSystemMessage,
+        namedArgumentList: [
+            SlashCommandNamedArgument.fromProps({
+                name: 'trim',
+                description: 'Trim the output by the last sentence boundary',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'false',
+                isRequired: false,
+                enumProvider: commonEnumProviders.boolean('trueFalse'),
+            }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'compact',
+                description: 'Use a compact layout for the message',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'false',
+                isRequired: false,
+                acceptsMultiple: false,
+                enumProvider: commonEnumProviders.boolean('trueFalse'),
+            }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'at',
+                description: 'Position to insert the message (index-based, corresponding to message id). If not set, the message will be inserted at the end of the chat.\nNegative values (including -0) are accepted and will work similarly to how \'depth\' usually works. For example, -1 will insert the message right before the last message in chat.',
+                typeList: [ARGUMENT_TYPE.NUMBER],
+                enumProvider: commonEnumProviders.messages({ allowIdAfter: true }),
+            }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'name',
+                description: 'Optional custom display name to use for this system narrator message.',
+                typeList: [ARGUMENT_TYPE.STRING],
+            }),
+            SlashCommandNamedArgument.fromProps({
+                name: 'return',
+                description: 'The way how you want the return value to be provided',
+                typeList: [ARGUMENT_TYPE.STRING],
+                defaultValue: 'none',
+                enumList: slashCommandReturnHelper.enumList({ allowObject: true }),
+                forceEnum: true,
+            }),
+        ],
         unnamedArgumentList: [
             new SlashCommandArgument(
                 'prompt', [ARGUMENT_TYPE.STRING], true,

         callback: generateCallback,
         returns: 'generated text',
         namedArgumentList: [
+            SlashCommandNamedArgument.fromProps({
+                name: 'trim',
+                description: 'Trim the output by the last sentence boundary',
+                typeList: [ARGUMENT_TYPE.BOOLEAN],
+                defaultValue: 'false',
+                isRequired: false,
+                enumProvider: commonEnumProviders.boolean('trueFalse'),
+            }),
             new SlashCommandNamedArgument(
                 'lock', 'lock user input during generation', [ARGUMENT_TYPE.BOOLEAN], false, false, null, commonEnumProviders.boolean('onOff')(),
             ),

     // Prevent generate recursion
     $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
     const lock = isTrueBoolean(args?.lock);
+    const trim = isTrueBoolean(args?.trim?.toString());
     const as = args?.as || 'system';
     const quietToLoud = as === 'char';
     const length = Number(resolveVariable(args?.length) ?? 0) || 0;

             quietToLoud: quietToLoud,
             quietName: char?.name ?? name,
             responseLength: length,
+            trimToSentence: trim,
         };
         const result = await generateQuietPrompt(params);
         return result;

     return '';
+}
-export async function generateSystemMessage(_, prompt) {
+export async function generateSystemMessage(args, prompt) {
     $('#send_textarea').val('')[0].dispatchEvent(new Event('input', { bubbles: true }));
     if (!prompt) {

         return '';
+    }
+    const trim = isTrueBoolean(args?.trim?.toString());
     // Generate and regex the output if applicable
-    toastr.info('Please wait', 'Generating...');
+    const toast = toastr.info('Please wait', 'Generating...');
-    let message = await generateQuietPrompt({ quietPrompt: prompt });
+    const message = await generateQuietPrompt({ quietPrompt: prompt, trimToSentence: trim });
-    message = getRegexedString(message, regex_placement.SLASH_COMMAND);
+    toastr.clear(toast);
-    sendNarratorMessage(_, message);
+    return await sendNarratorMessage(args, getRegexedString(message, regex_placement.SLASH_COMMAND));
-    return '';
+}
 function setStoryModeCallback() {