"Squash system messages" is back

59ba22fa9e5cb1c0a9f58935408017d0bf05a52c

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

Parents: d03a0b12b99562fb3fdf37c29139d4a0a110bde2

default/content/presets/openai/Default.json+1 -0 Viewed

     "assistant_prefill": "",
     "assistant_impersonation": "",
     "use_sysprompt": false,
 +    "squash_system_messages": false,
     "media_inlining": true,
     "bypass_status_check": false,
     "continue_prefill": false,

default/content/settings.json+3 -1 Viewed

@@ -631,6 +631,8 @@
631	631	"show_external_models": false,
632	632	"proxy_password": "",
633	633	"assistant_prefill": "",
634	634	"assistant_impersonation": "",
	635	+ "use_sysprompt": false,
	636	+ "squash_system_messages": false
635	637	}
636	638	}

public/index.html+13 -0 Viewed

                                             </span>
                                         </div>
                                     </div>
 +                                    <div class="range-block">
 +                                        <label for="squash_system_messages" title="Squash system messages" data-i18n="[title]Squash system messages" class="checkbox_label widthFreeExpand">
 +                                            <input id="squash_system_messages" type="checkbox" />
 +                                            <span data-i18n="Squash system messages">
 +                                                Squash system messages
 +                                            </span>
 +                                        </label>
 +                                        <div class="toggle-description justifyLeft">
 +                                            <span data-i18n="Combines consecutive system messages into one (excluding example dialogues). May improve coherence for some models.">
 +                                                Combines consecutive system messages into one (excluding example dialogues). May improve coherence for some models.
 +                                            </span>
 +                                        </div>
 +                                    </div>
                                     <div class="range-block" data-source="claude,makersuite,vertexai">
                                         <label for="use_sysprompt" class="checkbox_label widthFreeExpand">
                                             <input id="use_sysprompt" type="checkbox" />

public/scripts/openai.js+51 -0 Viewed

     vertexai_auth_mode: ['#vertexai_auth_mode', 'vertexai_auth_mode', false, true],
     vertexai_region: ['#vertexai_region', 'vertexai_region', false, true],
     vertexai_express_project_id: ['#vertexai_express_project_id', 'vertexai_express_project_id', false, true],
 +    squash_system_messages: ['#squash_system_messages', 'squash_system_messages', true, false],
     media_inlining: ['#openai_media_inlining', 'media_inlining', true, false],
     inline_image_quality: ['#openai_inline_image_quality', 'inline_image_quality', false, false],
     continue_prefill: ['#continue_prefill', 'continue_prefill', true, false],

     vertexai_auth_mode: 'express',
     vertexai_region: 'us-central1',
     vertexai_express_project_id: '',
 +    squash_system_messages: false,
     media_inlining: true,
     inline_image_quality: 'auto',
     bypass_status_check: false,

         // Pass chat completion to prompt manager for inspection
         promptManager.setChatCompletion(chatCompletion);
 +        if (oai_settings.squash_system_messages && dryRun == false) {
 +            await chatCompletion.squashSystemMessages();
 +        }
++
         // All information is up-to-date, render.
         if (false === dryRun) promptManager.render(false);
+    }

  */
 export class ChatCompletion {
     /**
 +     * Combines consecutive system messages into one if they have no name attached.
 +     * @returns {Promise<void>}
 +     */
 +    async squashSystemMessages() {
 +        const excludeList = ['newMainChat', 'newChat', 'groupNudge'];
 +        this.messages.collection = this.messages.flatten();
++
 +        let lastMessage = null;
 +        let squashedMessages = [];
++
 +        for (let message of this.messages.collection) {
 +            // Force exclude empty messages
 +            if (message.role === 'system' && !message.content) {
 +                continue;
 +            }
++
 +            const shouldSquash = (message) => {
 +                return !excludeList.includes(message.identifier) && message.role === 'system' && !message.name;
 +            };
++
 +            if (shouldSquash(message)) {
 +                if (lastMessage && shouldSquash(lastMessage)) {
 +                    lastMessage.content += '\n' + message.content;
 +                    lastMessage.tokens = await tokenHandler.countAsync({ role: lastMessage.role, content: lastMessage.content });
 +                }
 +                else {
 +                    squashedMessages.push(message);
 +                    lastMessage = message;
 +                }
 +            }
 +            else {
 +                squashedMessages.push(message);
 +                lastMessage = message;
 +            }
 +        }
++
 +        this.messages.collection = squashedMessages;
 +    }
++
 +    /**
      * Initializes a new instance of ChatCompletion.
      * Sets up the initial token budget and a new message collection.
      */

         saveSettingsDebounced();
     });
 +    $('#squash_system_messages').on('input', function () {
 +        oai_settings.squash_system_messages = !!$(this).prop('checked');
 +        saveSettingsDebounced();
 +    });
++
     $('#openai_media_inlining').on('input', function () {
         oai_settings.media_inlining = !!$(this).prop('checked');
         updateFeatureSupportFlags();