Allow "none" position for extension prompt injects

87e562b75251bd786e6060048b47d501d08506a9

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

Parents: 1ad57e6ff63b508d8d8b66daa1f80dc3dc5e7809
5 files changed, +28 -5Showing whitespace changes
public/css/extensions-panel.css+2 -1
@@ -7,7 +7,8 @@
77 background-color: green;
88}
99
1010.extensions_block input[type="checkbox"] {,
11+.extensions_block input[type="radio"] {
1112 margin-left: 10px;
1213 margin-right: 10px;
1314}
public/script.js+1 -0
@@ -570,6 +570,7 @@ export const system_message_types = {
570570 * @enum {number} Extension prompt types
571571 */
572572export const extension_prompt_types = {
573+ NONE: -1,
573574 IN_PROMPT: 0,
574575 IN_CHAT: 1,
575576 BEFORE_PROMPT: 2,
public/scripts/extensions/memory/index.js+13 -2
@@ -14,6 +14,7 @@ import {
1414 substituteParamsExtended,
1515 generateRaw,
1616 getMaxContextSize,
17+ setExtensionPrompt,
1718} from '../../../script.js';
1819import { is_group_generating, selected_group } from '../../group-chats.js';
1920import { loadMovingUIState } from '../../power-user.js';
@@ -73,6 +74,7 @@ const defaultSettings = {
7374 template: defaultTemplate,
7475 position: extension_prompt_types.IN_PROMPT,
7576 role: extension_prompt_roles.SYSTEM,
77+ scan: false,
7678 depth: 2,
7779 promptWords: 200,
7880 promptMinWords: 25,
@@ -122,6 +124,7 @@ function loadSettings() {
122124 $(`input[name="memory_prompt_builder"][value="${extension_settings.memory.prompt_builder}"]`).prop('checked', true).trigger('input');
123125 $('#memory_override_response_length').val(extension_settings.memory.overrideResponseLength).trigger('input');
124126 $('#memory_max_messages_per_request').val(extension_settings.memory.maxMessagesPerRequest).trigger('input');
127+ $('#memory_include_wi_scan').prop('checked', extension_settings.memory.scan).trigger('input');
125128 switchSourceControls(extension_settings.memory.source);
126129}
127130
@@ -279,6 +282,13 @@ function onMemoryPositionChange(e) {
279282 saveSettingsDebounced();
280283}
281284
285+function onMemoryIncludeWIScanInput() {
286+ const value = !!$(this).prop('checked');
287+ extension_settings.memory.scan = value;
288+ reinsertMemory();
289+ saveSettingsDebounced();
290+}
291+
282292function onMemoryPromptWordsForceInput() {
283293 const value = $(this).val();
284294 extension_settings.memory.promptForceWords = Number(value);
@@ -800,8 +810,7 @@ function reinsertMemory() {
800810 * @param {number|null} index Index of the chat message to save the summary to. If null, the pre-last message is used.
801811 */
802812function setMemoryContext(value, saveToMessage, index = null) {
803- const context = getContext();
813+ setExtensionPrompt(MODULE_NAME, formatMemoryValue(value), extension_settings.memory.position, extension_settings.memory.depth, extension_settings.memory.scan, extension_settings.memory.role);
804- context.setExtensionPrompt(MODULE_NAME, formatMemoryValue(value), extension_settings.memory.position, extension_settings.memory.depth, false, extension_settings.memory.role);
805814 $('#memory_contents').val(value);
806815
807816 const summaryLog = value
@@ -809,6 +818,7 @@ function setMemoryContext(value, saveToMessage, index = null) {
809818 : 'Summary has no content';
810819 console.debug(summaryLog);
811820
821+ const context = getContext();
812822 if (saveToMessage && context.chat.length) {
813823 const idx = index ?? context.chat.length - 2;
814824 const mes = context.chat[idx < 0 ? 0 : idx];
@@ -894,6 +904,7 @@ function setupListeners() {
894904 $('#memory_prompt_words_auto').off('click').on('click', onPromptForceWordsAutoClick);
895905 $('#memory_override_response_length').off('click').on('input', onOverrideResponseLengthInput);
896906 $('#memory_max_messages_per_request').off('click').on('input', onMaxMessagesPerRequestInput);
907+ $('#memory_include_wi_scan').off('input').on('input', onMemoryIncludeWIScanInput);
897908 $('#summarySettingsBlockToggle').off('click').on('click', function () {
898909 console.log('saw settings button click');
899910 $('#summarySettingsBlock').slideToggle(200, 'swing'); //toggleClass("hidden");
public/scripts/extensions/memory/settings.html+9 -0
@@ -109,8 +109,17 @@
109109 <textarea id="memory_template" class="text_pole textarea_compact" rows="2" data-i18n="[placeholder]ext_sum_memory_template_placeholder" placeholder="&lcub;&lcub;summary&rcub;&rcub; will resolve to the current summary contents."></textarea>
110110 </div>
111111 <label for="memory_position" data-i18n="ext_sum_injection_position">Injection Position</label>
112+ <label class="checkbox_label" for="memory_include_wi_scan" data-i18n="[title]ext_sum_include_wi_scan_desc" title="Include the latest summary in the WI scan.">
113+ <input id="memory_include_wi_scan" type="checkbox" />
114+ <span data-i18n="ext_sum_include_wi_scan">Include in World Info Scanning</span>
115+ </label>
112116 <div class="radio_group">
113117 <label>
118+ <input type="radio" name="memory_position" value="-1" />
119+ <span data-i18n="None (not injected)">None (not injected)</span>
120+ <i class="fa-solid fa-info-circle" title="The summary will not be injected into the prompt. You can still access it via the &lcub;&lcub;summary&rcub;&rcub; macro." data-i18n="[title]ext_sum_injection_position_none"></i>
121+ </label>
122+ <label>
114123 <input type="radio" name="memory_position" value="2" />
115124 <span data-i18n="Before Main Prompt / Story String">Before Main Prompt / Story String</span>
116125 </label>
public/scripts/slash-commands.js+3 -2
@@ -1356,7 +1356,7 @@ export function initDefaultSlashCommands() {
13561356 enumProvider: commonEnumProviders.injects,
13571357 }),
13581358 new SlashCommandNamedArgument(
13591359 'position', 'injection position', [ARGUMENT_TYPE.STRING], false, false, 'after', ['before', 'after', 'chat', 'none'],
13601360 ),
13611361 new SlashCommandNamedArgument(
13621362 'depth', 'injection depth', [ARGUMENT_TYPE.NUMBER], false, false, '4',
@@ -1384,7 +1384,7 @@ export function initDefaultSlashCommands() {
13841384 'text', [ARGUMENT_TYPE.STRING], false,
13851385 ),
13861386 ],
13871387 helpString: 'Injects a text into the LLM prompt for the current chat. Requires a unique injection ID. Positions: "before" main prompt, "after" main prompt, in-"chat", hidden with "none" (default: after). Depth: injection depth for the prompt (default: 4). Role: role for in-chat injections (default: system). Scan: include injection content into World Info scans (default: false). Hidden injects in "none" position are not inserted into the prompt but can be used for triggering WI entries.',
13881388 }));
13891389 SlashCommandParser.addCommandObject(SlashCommand.fromProps({
13901390 name: 'listinjects',
@@ -1486,6 +1486,7 @@ function injectCallback(args, value) {
14861486 'before': extension_prompt_types.BEFORE_PROMPT,
14871487 'after': extension_prompt_types.IN_PROMPT,
14881488 'chat': extension_prompt_types.IN_CHAT,
1489+ 'none': extension_prompt_types.NONE,
14891490 };
14901491 const roles = {
14911492 'system': extension_prompt_roles.SYSTEM,