Merge branch 'staging' into welcome-screen

249cb7777cd4417ba1f53c0de14de2c0754186b8

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

public/scripts/extensions/memory/index.js+4 -2 Viewed

 import { MacrosParser } from '../../macros.js';
 import { countWebLlmTokens, generateWebLlmChatPrompt, getWebLlmContextSize, isWebLlmSupported } from '../shared.js';
 import { commonEnumProviders } from '../../slash-commands/SlashCommandCommonEnumsProvider.js';
 +import { removeReasoningFromString } from '../../reasoning.js';
 export { MODULE_NAME };
 const MODULE_NAME = '1_memory';

             case summary_sources.extras:
                 return await callExtrasSummarizeAPI(text);
             case summary_sources.main:
                 return removeReasoningFromString(await generateRaw(text, '', false, false, prompt, extension_settings.memory.overrideResponseLength));
             case summary_sources.webllm: {
                 const messages = [{ role: 'system', content: prompt }, { role: 'user', content: text }].filter(m => m.content);
                 const params = extension_settings.memory.overrideResponseLength > 0 ? { max_tokens: extension_settings.memory.overrideResponseLength } : {};

                 return null;
+            }
             summaryconst rawSummary = await generateRaw(rawPrompt, '', false, false, prompt, extension_settings.memory.overrideResponseLength);
 +            summary = removeReasoningFromString(rawSummary);
             index = lastUsedIndex;
         } finally {
             inApiCall = false;

public/scripts/extensions/vectors/index.js+2 -1 Viewed

 import { callGenericPopup, POPUP_RESULT, POPUP_TYPE } from '../../popup.js';
 import { generateWebLlmChatPrompt, isWebLlmSupported } from '../shared.js';
 import { WebLlmVectorProvider } from './webllm.js';
 +import { removeReasoningFromString } from '../../reasoning.js';
 /**
  * @typedef {object} HashedMessage

  * @returns {Promise<boolean>} Sucess
  */
 async function summarizeMain(element) {
     element.text = removeReasoningFromString(await generateRaw(element.text, '', false, false, settings.summary_prompt));
     return true;
+}

public/scripts/openai.js+7 -2 Viewed

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

                     .join(separator);
                 // Get extension prompt
 -                const extensionPrompt = await getExtensionPrompt(extension_prompt_types.IN_CHAT, i, separator, roleTypes[role], wrap);
 +                const extensionPrompt = order === extensionPromptsOrder
 +                    ? await getExtensionPrompt(extension_prompt_types.IN_CHAT, i, separator, roleTypes[role], wrap)
 +                    : '';
                 const jointPrompt = [rolePrompts, extensionPrompt].filter(x => x).map(x => x.trim()).join(separator);
                 if (jointPrompt && jointPrompt.length) {

src/endpoints/stable-diffusion.js+2 -1 Viewed

             height: String(request.body.height ?? 1024),
             nologo: String(true),
             nofeed: String(true),
 -            referer: 'sillytavern',
 +            private: String(true),
 +            referrer: 'sillytavern',
         });
         promptUrl.search = params.toString();