Prompt Manager: Make main/PHI/aux injectable (#4829)

0b5b3f089ebdf5965c4295bc02b2b9065fca7a03

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

Signed

Parents: df865dda857376ce6ea708fdb5f35c822f5cb2d7

public/scripts/PromptManager.js+1 -9 Viewed

                 const sourceName = this.promptSources[promptId];
                 entrySource.textContent = sourceName;
+            }
-            if (!this.systemPrompts.includes(promptId)) {
-                injectionPositionField.removeAttribute('disabled');
-            }
         };
         // Append prompt to selected character

             entrySource.textContent = sourceName;
+        }
-        if (this.systemPrompts.includes(prompt.identifier)) {
-            injectionPositionField.setAttribute('disabled', 'disabled');
-        }
         const resetPromptButton = document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_reset');
         if (true === prompt.system_prompt) {
             resetPromptButton.style.display = 'block';

                         ${isInjectionPrompt ? '<span class="fa-fw fa-solid fa-syringe" title="In-Chat Injection"></span>' : ''}
                         ${this.isPromptInspectionAllowed(prompt) ? `<a title="${encodedName}" class="prompt-manager-inspect-action">${encodedName}</a>` : `<span title="${encodedName}">${encodedName}</span>`}
                         ${roleIcon ? `<span data-role="${escapeHtml(prompt.role)}" class="fa-xs fa-solid ${roleIcon}" title="${roleTitle}"></span>` : ''}
-                        ${isInjectionPrompt ? `<small class="prompt-manager-injection-depth">@ ${escapeHtml(prompt.injection_depth)}</small>` : ''}
+                        ${isInjectionPrompt ? `<small class="prompt-manager-injection-depth">@ ${escapeHtml(prompt.injection_depth.toString())}</small>` : ''}
                         ${isOverriddenPrompt ? '<small class="fa-solid fa-address-card prompt-manager-overridden" title="Pulled from a character card"></small>' : ''}
                     </span>
                     <span>

public/scripts/openai.js+32 -44 Viewed

     // Bias
     if (bias && bias.trim().length) await addToChatCompletion('bias');
-    // Tavern Extras - Summary
+    const injectToMain = async (/** @type {Prompt} */ prompt, /** @type {string|number} */ position) => {
-    if (prompts.has('summary')) {
+        if (chatCompletion.has('main')) {
-        const summary = prompts.get('summary');
+            const message = await Message.fromPromptAsync(prompt);
+            chatCompletion.insert(message, 'main', position);
-        if (summary.position) {
+        } else {
-            const message = await Message.fromPromptAsync(summary);
+            // Convert the relative prompt to an injection and place it relative to main prompt
-            chatCompletion.insert(message, 'main', summary.position);
+            // Keeping prompts in the same order bucket will squash them together during in-chat injection
-        }
+            const indexOfMain = absolutePrompts.findIndex(p => p.identifier === 'main');
-    }
+            if (indexOfMain >= 0) {
+                const main = absolutePrompts[indexOfMain];
-    // Authors Note
+                const promptCopy = new Prompt(prompt);
-    if (prompts.has('authorsNote')) {
+                promptCopy.role = main.role;
-        const authorsNote = prompts.get('authorsNote');
+                promptCopy.injection_position = main.injection_position;
+                promptCopy.injection_depth = main.injection_depth;
-        if (authorsNote.position) {
+                promptCopy.injection_order = main.injection_order;
-            const message = await Message.fromPromptAsync(authorsNote);
+                const newIndex = position === 'end' ? indexOfMain + 1 : indexOfMain;
-            chatCompletion.insert(message, 'main', authorsNote.position);
+                absolutePrompts.splice(newIndex, 0, promptCopy);
-        }
-    }
-    // Vectors Memory
-    if (prompts.has('vectorsMemory')) {
-        const vectorsMemory = prompts.get('vectorsMemory');
-        if (vectorsMemory.position) {
-            const message = await Message.fromPromptAsync(vectorsMemory);
-            chatCompletion.insert(message, 'main', vectorsMemory.position);
+            }
+        }
+    };
-    // Vectors Data Bank
+    const knownPrompts = [
-    if (prompts.has('vectorsDataBank')) {
+        'summary',
-        const vectorsDataBank = prompts.get('vectorsDataBank');
+        'authorsNote',
+        'vectorsMemory',
+        'vectorsDataBank',
+        'smartContext',
+    ];
-        if (vectorsDataBank.position) {
+    // Known relative extension prompts
-            const message = await Message.fromPromptAsync(vectorsDataBank);
+    for (const key of knownPrompts) {
-            chatCompletion.insert(message, 'main', vectorsDataBank.position);
+        if (prompts.has(key)) {
+            const prompt = prompts.get(key);
+            if (prompt.position) {
+                await injectToMain(prompt, prompt.position);
+            }
+        }
-    // Smart Context (ChromaDB)
-    if (prompts.has('smartContext')) {
-        const smartContext = prompts.get('smartContext');
-        if (smartContext.position) {
-            const message = await Message.fromPromptAsync(smartContext);
-            chatCompletion.insert(message, 'main', smartContext.position);
-        }
+    }
     // Other relative extension prompts
     for (const prompt of prompts.collection.filter(p => p.extension && p.position)) {
-        const message = await Message.fromPromptAsync(prompt);
+        await injectToMain(prompt, prompt.position);
-        chatCompletion.insert(message, 'main', prompt.position);
+    }
     // Pre-allocation of tokens for tool data