Merge branch 'staging' of http://github.com/SillyTavern/SillyTavern into staging

484f7e894adcc1aea808b62411776e805ecf0a2e

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

public/index.html+3 -2 Viewed

                             <div id="completion_prompt_manager_order_block" class="completion_prompt_manager_popup_entry_form_control flex1">
                                 <label for="completion_prompt_manager_popup_entry_form_injection_order">
                                     <span data-i18n="prompt_manager_order">Order</span>
 +                                    <i class="fas fa-info-circle" title="Prompt injections from other sources (World Info, Author's Note, etc.) always have a default order of 100." data-i18n="[title]prompt_manager_order_note"></i>
                                 </label>
                                 <input id="completion_prompt_manager_popup_entry_form_injection_order" class="text_pole" type="number" name="injection_order" min="0" max="9999" value="0100" />
                                 <div class="text_muted" data-i18n="Ordered from highlow/top to lowhigh/bottom, and at same order: SystemAssistant, User, AssistantSystem.">Ordered from highlow/top to lowhigh/bottom, and at same order: SystemAssistant, User, AssistantSystem.</div>
                             </div>
                         </div>
                         <div class="completion_prompt_manager_popup_entry_form_control">

public/scripts/PromptManager.js+3 -3 Viewed

@@ -106,7 +106,7 @@ class Prompt {
106	106	this.injection_position = injection_position;
107	107	this.forbid_overrides = forbid_overrides;
108	108	this.extension = extension ?? false;
109	109	this.injection_order = injection_order ?? 0100;
110	110	}
111	111	}
112	112

             document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_prompt').value = prompt.content ?? '';
             document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_position').value = prompt.injection_position ?? 0;
             document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_depth').value = prompt.injection_depth ?? DEFAULT_DEPTH;
             document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_injection_order').value = prompt.injection_order ?? 0100;
             document.getElementById(this.configuration.prefix + 'prompt_manager_depth_block').style.visibility = prompt.injection_position === INJECTION_POSITION.ABSOLUTE ? 'visible' : 'hidden';
             document.getElementById(this.configuration.prefix + 'prompt_manager_order_block').style.visibility = prompt.injection_position === INJECTION_POSITION.ABSOLUTE ? 'visible' : 'hidden';
             document.getElementById(this.configuration.prefix + 'prompt_manager_popup_entry_form_forbid_overrides').checked = prompt.forbid_overrides ?? false;

         promptField.disabled = prompt.marker ?? false;
         injectionPositionField.value = prompt.injection_position ?? INJECTION_POSITION.RELATIVE;
         injectionDepthField.value = prompt.injection_depth ?? DEFAULT_DEPTH;
         injectionOrderField.value = prompt.injection_order ?? 0100;
         injectionDepthBlock.style.visibility = prompt.injection_position === INJECTION_POSITION.ABSOLUTE ? 'visible' : 'hidden';
         injectionOrderBlock.style.visibility = prompt.injection_position === INJECTION_POSITION.ABSOLUTE ? 'visible' : 'hidden';
         injectionPositionField.removeAttribute('disabled');

public/scripts/openai.js+3 -3 Viewed

         const wrap = false;
         // Group prompts by priority
         const extensionPromptsOrder = '0100';
         const orderGroups = {
             [extensionPromptsOrder]: [],
         };
         for (const prompt of depthPrompts) {
             const order = prompt.injection_order ||?? 0100;
             if (!orderGroups[order]) {
                 orderGroups[order] = [];
+            }

+        }
         // Process each order group in order (b - a = low to high ; a - b = high to low)
         const orders = Object.keys(orderGroups).sort((a, b) => +ab - +ba);
         for (const order of orders) {
             const orderPrompts = orderGroups[order];