sillytavern-utils-lib 1.0.7 → 1.0.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/config.d.ts CHANGED
@@ -54,5 +54,9 @@ export declare function st_getRegexedString(rawString: string, placement: regex_
54
54
  depth?: number;
55
55
  }): string;
56
56
  export declare function st_appendFileContent(message: object, messageText: string): Promise<string>;
57
+ export declare function st_formatWorldInfo(value: string, { wiFormat, }?: {
58
+ wiFormat?: string;
59
+ }): string;
60
+ export declare function st_getPromptPosition(position: number): string | false;
57
61
  export { persona_description_positions, name1, name2, world_info_include_names, wi_anchor_position, extension_prompt_types, selected_group, this_chid, characters, depth_prompt_role_default, depth_prompt_depth_default, main_api, regex_placement, systemUserName, system_avatar, };
58
62
  //# sourceMappingURL=config.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAqB,MAAM,2BAA2B,CAAC;AAE7F,OAAO,EACL,KAAK,EACL,KAAK,EAKL,sBAAsB,EACtB,SAAS,EACT,UAAU,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,QAAQ,EACR,cAAc,EACd,aAAa,EAEd,MAAM,0BAA0B,CAAC;AAGlC,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAsBzF,OAAO,EAAwB,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAGlF,OAAO,EAAE,eAAe,EAAoB,MAAM,0BAA0B,CAAC;AAE7E;;GAEG;AACH,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;AAED,wBAAgB,oBAAoB,CAAC,sBAAsB,CAAC,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,GAAG,MAAM,EAAE,CAEtF;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,GAAG,GAAG,CAE1E;AAED,wBAAgB,6BAA6B,CAAC,gBAAgB,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAEhH;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,gBAAgB,IAAI;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;CACd,CAQA;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,GAClB;IACD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,EAAE,CAEF;AAED,wBAAgB,wBAAwB,CACtC,EACE,KAAK,EACL,eAAe,EACf,eAAe,EACf,QAAQ,EACR,eAAe,EACf,cAAc,EACd,IAAI,EACJ,IAAI,EACJ,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,WAAW,EACX,oBAAoB,EACpB,uBAAuB,EACvB,kBAAkB,EAClB,QAAQ,EACR,eAAe,GAChB,EAAE;IACD,KAAK,EAAE,MAAM,CAAC;IACd,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uBAAuB,EAAE,MAAM,CAAC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,eAAe,EAAE,MAAM,EAAE,CAAC;CAC3B,EACD,MAAM,EAAE,GAAG,GACV,OAAO,CAAC,GAAG,EAAE,CAAC,CAuBhB;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAE7D;AAED,wBAAgB,2BAA2B,CAAC,gBAAgB,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAEhF;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,eAAe,EAC1B,EACE,iBAAiB,EACjB,UAAU,EACV,QAAQ,EACR,MAAM,EACN,KAAK,GACN,EAAE;IAAE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,GAC5G,MAAM,CAER;AAED,wBAAsB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAEhG;AAED,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,MAAM,EACb,EACE,QAAQ,GACT,GAAE;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACd,GACL,MAAM,CAER;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,KAAK,CAErE;AAED,OAAO,EACL,6BAA6B,EAC7B,KAAK,EACL,KAAK,EACL,wBAAwB,EACxB,kBAAkB,EAClB,sBAAsB,EACtB,cAAc,EACd,SAAS,EACT,UAAU,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,QAAQ,EACR,eAAe,EACf,cAAc,EACd,aAAa,GACd,CAAC"}
package/dist/config.js CHANGED
@@ -9,7 +9,7 @@ import { world_info_include_names, wi_anchor_position } from '../../../../world-
9
9
  import { formatInstructModeExamples } from '../../../../instruct-mode.js';
10
10
  // @ts-ignore
11
11
  import { appendFileContent } from '../../../../chats.js';
12
- import { getPromptRole, prepareOpenAIMessages, setOpenAIMessages, setOpenAIMessageExamples,
12
+ import { getPromptRole, prepareOpenAIMessages, setOpenAIMessages, setOpenAIMessageExamples, formatWorldInfo, getPromptPosition,
13
13
  // @ts-ignore
14
14
  } from '../../../../openai.js';
15
15
  // @ts-ignore
@@ -88,5 +88,11 @@ export function st_getRegexedString(rawString, placement, { characterOverride, i
88
88
  export async function st_appendFileContent(message, messageText) {
89
89
  return await appendFileContent(message, messageText);
90
90
  }
91
+ export function st_formatWorldInfo(value, { wiFormat, } = {}) {
92
+ return formatWorldInfo(value, { wiFormat });
93
+ }
94
+ export function st_getPromptPosition(position) {
95
+ return getPromptPosition(position);
96
+ }
91
97
  export { persona_description_positions, name1, name2, world_info_include_names, wi_anchor_position, extension_prompt_types, selected_group, this_chid, characters, depth_prompt_role_default, depth_prompt_depth_default, main_api, regex_placement, systemUserName, system_avatar, };
92
98
  //# sourceMappingURL=config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
@@ -3,11 +3,11 @@ export interface Message extends ChatCompletionMessage {
3
3
  ignoreInstruct?: boolean;
4
4
  }
5
5
  /**
6
- * Text completion supported: Handles system message (description, scenario, etc.), chat history, world info, author note, char note
6
+ * Builds chat prompt.
7
7
  *
8
- * Text completion not supported: extensionPrompt, summarize
9
- *
10
- * Chat completion supported: All (i guess)
8
+ * Text completion doesn't support custom context template and system prompt. (yet)
9
+ * @param targetMessageIndex - Last message index to include in prompt
10
+ * @param presetName - Name of preset, it is for chat completion
11
11
  */
12
- export declare function buildPrompt(targetMessageIndex: number): Promise<Message[]>;
12
+ export declare function buildPrompt(targetMessageIndex?: number, presetName?: string): Promise<Message[]>;
13
13
  //# sourceMappingURL=prompt-builder.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"prompt-builder.d.ts","sourceRoot":"","sources":["../src/prompt-builder.ts"],"names":[],"mappings":"AA4BA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,WAAW,OAAQ,SAAQ,qBAAqB;IACpD,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,kBAAkB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CA2NhF"}
1
+ {"version":3,"file":"prompt-builder.d.ts","sourceRoot":"","sources":["../src/prompt-builder.ts"],"names":[],"mappings":"AA+BA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,MAAM,WAAW,OAAQ,SAAQ,qBAAqB;IACpD,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,wBAAsB,WAAW,CAAC,kBAAkB,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,CAkZtG"}
@@ -1,24 +1,25 @@
1
- import { characters, extension_prompt_types, name1, name2, persona_description_positions, selected_group, st_baseChatReplace, st_formatInstructModeExamples, st_getAuthorNote, depth_prompt_depth_default, st_getGroupDepthPrompts, st_getMaxContextSize, st_getPromptRole, st_parseMesExamples, st_renderStoryString, this_chid, wi_anchor_position, world_info_include_names, depth_prompt_role_default, st_prepareOpenAIMessages, st_setOpenAIMessages, st_setOpenAIMessageExamples, main_api, regex_placement, st_getRegexedString, st_appendFileContent, } from './config.js';
1
+ import { characters, extension_prompt_types, name1, name2, persona_description_positions, selected_group, st_baseChatReplace, st_formatInstructModeExamples, st_getAuthorNote, depth_prompt_depth_default, st_getGroupDepthPrompts, st_getMaxContextSize, st_getPromptRole, st_parseMesExamples, st_renderStoryString, this_chid, wi_anchor_position, world_info_include_names, depth_prompt_role_default, st_prepareOpenAIMessages, st_setOpenAIMessages, st_setOpenAIMessageExamples, main_api, regex_placement, st_getRegexedString, st_appendFileContent, st_formatWorldInfo, st_getPromptPosition, } from './config.js';
2
2
  /**
3
- * Text completion supported: Handles system message (description, scenario, etc.), chat history, world info, author note, char note
3
+ * Builds chat prompt.
4
4
  *
5
- * Text completion not supported: extensionPrompt, summarize
6
- *
7
- * Chat completion supported: All (i guess)
5
+ * Text completion doesn't support custom context template and system prompt. (yet)
6
+ * @param targetMessageIndex - Last message index to include in prompt
7
+ * @param presetName - Name of preset, it is for chat completion
8
8
  */
9
- export async function buildPrompt(targetMessageIndex) {
9
+ export async function buildPrompt(targetMessageIndex, presetName) {
10
10
  if (!['textgenerationwebui', 'openai'].includes(main_api)) {
11
11
  throw new Error('Unsupported API');
12
12
  }
13
13
  const context = SillyTavern.getContext();
14
14
  let messages = [];
15
- const chat = context.chat.slice(0, targetMessageIndex + 1);
16
15
  let { description, personality, persona, scenario, mesExamples, system, jailbreak } = context.getCharacterCardFields();
17
16
  const isInstruct = main_api === 'textgenerationwebui';
18
17
  let mesExamplesArray = st_parseMesExamples(mesExamples, isInstruct);
19
18
  const this_max_context = st_getMaxContextSize();
20
19
  const canUseTools = context.ToolManager.isToolCallingSupported();
21
- let coreChat = chat.filter((x) => !x.is_system || (canUseTools && Array.isArray(x.extra?.tool_invocations)));
20
+ let coreChat = context.chat
21
+ .slice(0, targetMessageIndex ? targetMessageIndex + 1 : undefined)
22
+ .filter((x) => !x.is_system || (canUseTools && Array.isArray(x.extra?.tool_invocations)));
22
23
  coreChat = await Promise.all(coreChat.map(async (chatItem, index) => {
23
24
  let message = chatItem.mes;
24
25
  let regexType = chatItem.is_user ? regex_placement.USER_INPUT : regex_placement.AI_OUTPUT;
@@ -80,112 +81,277 @@ export async function buildPrompt(targetMessageIndex) {
80
81
  };
81
82
  let storyString = st_renderStoryString(storyStringParams);
82
83
  messages.push({ role: 'system', content: storyString, ignoreInstruct: true });
83
- chat
84
- .filter((message) => !message.is_system)
85
- .forEach((message) => {
84
+ coreChat.forEach((message) => {
86
85
  messages.push({
87
86
  role: message.is_user ? 'user' : 'assistant',
88
87
  content: message.mes,
89
88
  });
90
89
  });
91
- // Inject world info depth.
92
- for (const worldInfo of worldInfoDepth) {
93
- messages = [
94
- ...messages.slice(0, messages.length - worldInfo.depth),
95
- { role: st_getPromptRole(worldInfo.role), content: worldInfo.entries.join('\n') },
96
- ...messages.slice(messages.length - worldInfo.depth),
97
- ];
90
+ }
91
+ else {
92
+ let oaiMessages = st_setOpenAIMessages(coreChat);
93
+ let oaiMessageExamples = st_setOpenAIMessageExamples(mesExamplesArray);
94
+ async function addDefaultPreset() {
95
+ let [prompt, _counts] = await st_prepareOpenAIMessages({
96
+ name2: name2,
97
+ charDescription: description,
98
+ charPersonality: personality,
99
+ Scenario: scenario,
100
+ worldInfoBefore: worldInfoBefore,
101
+ worldInfoAfter: worldInfoAfter,
102
+ extensionPrompts: context.extensionPrompts,
103
+ bias: '',
104
+ type: 'normal',
105
+ quietPrompt: undefined,
106
+ quietImage: undefined,
107
+ cyclePrompt: '',
108
+ systemPromptOverride: system,
109
+ jailbreakPromptOverride: jailbreak,
110
+ personaDescription: persona,
111
+ messages: oaiMessages,
112
+ messageExamples: oaiMessageExamples,
113
+ }, false);
114
+ messages.push(...prompt);
98
115
  }
99
- const groupDepthPrompts = st_getGroupDepthPrompts(selected_group, Number(this_chid));
100
- if (selected_group && Array.isArray(groupDepthPrompts) && groupDepthPrompts.length > 0) {
101
- groupDepthPrompts.forEach((value, index) => {
102
- messages = [
103
- ...messages.slice(0, messages.length - value.depth),
104
- { role: value.role, content: value.text },
105
- ...messages.slice(messages.length - value.depth),
106
- ];
116
+ if (!presetName) {
117
+ await addDefaultPreset();
118
+ return messages;
119
+ }
120
+ const preset = context.getPresetManager('openai')?.getCompletionPresetByName(presetName);
121
+ if (!preset) {
122
+ console.warn(`Preset not found: ${presetName}. Using current preset.`);
123
+ addDefaultPreset();
124
+ return messages;
125
+ }
126
+ let promptOrder = preset.prompt_order.find((prompt) => prompt.character_id === this_chid);
127
+ if (!promptOrder && preset.prompt_order.length > 0) {
128
+ promptOrder = preset.prompt_order[0];
129
+ }
130
+ if (!promptOrder) {
131
+ console.warn(`No prompt order found for preset: ${presetName}. Using current preset.`);
132
+ addDefaultPreset();
133
+ return messages;
134
+ }
135
+ const scenarioText = scenario && preset.scenario_format ? context.substituteParams(preset.scenario_format) : '';
136
+ const charPersonalityText = personality && preset.personality_format ? context.substituteParams(preset.personality_format) : '';
137
+ const groupNudge = context.substituteParams(preset.group_nudge_prompt);
138
+ const impersonationPrompt = preset.impersonation_prompt
139
+ ? context.substituteParams(preset.impersonation_prompt)
140
+ : '';
141
+ // Create entries for system prompts
142
+ const systemPrompts = [
143
+ // Ordered prompts for which a marker should exist
144
+ {
145
+ role: 'system',
146
+ content: st_formatWorldInfo(worldInfoBefore, { wiFormat: preset.wi_format }),
147
+ identifier: 'worldInfoBefore',
148
+ },
149
+ {
150
+ role: 'system',
151
+ content: st_formatWorldInfo(worldInfoAfter, { wiFormat: preset.wi_format }),
152
+ identifier: 'worldInfoAfter',
153
+ },
154
+ { role: 'system', content: description, identifier: 'charDescription' },
155
+ { role: 'system', content: charPersonalityText, identifier: 'charPersonality' },
156
+ { role: 'system', content: scenarioText, identifier: 'scenario' },
157
+ // Unordered prompts without marker
158
+ { role: 'system', content: impersonationPrompt, identifier: 'impersonate' },
159
+ { role: 'system', content: groupNudge, identifier: 'groupNudge' },
160
+ ];
161
+ // Tavern Extras - Summary
162
+ const summary = context.extensionPrompts['1_memory'];
163
+ if (summary && summary.value)
164
+ systemPrompts.push({
165
+ role: st_getPromptRole(summary.role),
166
+ content: summary.value,
167
+ identifier: 'summary',
168
+ position: st_getPromptPosition(summary.position),
169
+ });
170
+ // Authors Note
171
+ const authorsNote = context.extensionPrompts['2_floating_prompt'];
172
+ if (authorsNote && authorsNote.value)
173
+ systemPrompts.push({
174
+ role: st_getPromptRole(authorsNote.role),
175
+ content: authorsNote.value,
176
+ identifier: 'authorsNote',
177
+ position: st_getPromptPosition(authorsNote.position),
178
+ });
179
+ // Vectors Memory
180
+ const vectorsMemory = context.extensionPrompts['3_vectors'];
181
+ if (vectorsMemory && vectorsMemory.value)
182
+ systemPrompts.push({
183
+ role: 'system',
184
+ content: vectorsMemory.value,
185
+ identifier: 'vectorsMemory',
186
+ position: st_getPromptPosition(vectorsMemory.position),
187
+ });
188
+ const vectorsDataBank = context.extensionPrompts['4_vectors_data_bank'];
189
+ if (vectorsDataBank && vectorsDataBank.value)
190
+ systemPrompts.push({
191
+ role: st_getPromptRole(vectorsDataBank.role),
192
+ content: vectorsDataBank.value,
193
+ identifier: 'vectorsDataBank',
194
+ position: st_getPromptPosition(vectorsDataBank.position),
195
+ });
196
+ // Smart Context (ChromaDB)
197
+ const smartContext = context.extensionPrompts['chromadb'];
198
+ if (smartContext && smartContext.value)
199
+ systemPrompts.push({
200
+ role: 'system',
201
+ content: smartContext.value,
202
+ identifier: 'smartContext',
203
+ position: st_getPromptPosition(smartContext.position),
204
+ });
205
+ // Persona Description
206
+ if (context.powerUserSettings.persona_description &&
207
+ context.powerUserSettings.persona_description_position === persona_description_positions.IN_PROMPT) {
208
+ systemPrompts.push({
209
+ role: 'system',
210
+ content: context.powerUserSettings.persona_description,
211
+ identifier: 'personaDescription',
107
212
  });
108
213
  }
109
- else {
110
- const depthPromptText = st_baseChatReplace(characters[this_chid]?.data?.extensions?.depth_prompt?.prompt?.trim(), name1, name2) || '';
111
- const depthPromptDepth = depth_prompt_depth_default;
112
- const depthPromptRole = characters[this_chid]?.data?.extensions?.depth_prompt?.role ?? depth_prompt_role_default;
113
- messages = [
114
- ...messages.slice(0, messages.length - depthPromptDepth),
115
- { role: st_getPromptRole(depthPromptRole), content: depthPromptText },
116
- ...messages.slice(messages.length - depthPromptDepth),
117
- ];
214
+ function getPrompt(identifier) {
215
+ return systemPrompts.find((prompt) => prompt.identifier === identifier);
118
216
  }
119
- // TODO: We should respect interval and world info scanning
120
- const authorNote = st_getAuthorNote();
121
- let authorNoteIndex = -1;
122
- if (authorNote.prompt) {
123
- authorNote.prompt = st_baseChatReplace(authorNote.prompt, name1, name2);
124
- switch (authorNote.position) {
125
- case extension_prompt_types.IN_PROMPT: // After first message
126
- messages = [...messages.slice(0, 1), { role: 'user', content: authorNote.prompt }, ...messages.slice(1)];
127
- authorNoteIndex = 1;
128
- break;
129
- case extension_prompt_types.IN_CHAT: // Depth + role in chat
130
- messages = [
131
- ...messages.slice(0, messages.length - authorNote.depth),
132
- { role: st_getPromptRole(authorNote.role), content: authorNote.prompt },
133
- ...messages.slice(messages.length - authorNote.depth),
134
- ];
135
- authorNoteIndex = messages.length - authorNote.depth - 1;
136
- break;
137
- case extension_prompt_types.BEFORE_PROMPT: // Before first message
138
- messages.unshift({ role: 'user', content: authorNote.prompt });
139
- authorNoteIndex = 0;
140
- break;
141
- default:
142
- break;
217
+ promptOrder.order.forEach((prompt) => {
218
+ if (!prompt.enabled) {
219
+ return;
143
220
  }
144
- }
145
- // Add world info to author note
146
- if (authorNoteIndex >= 0) {
147
- if (anBefore.length > 0) {
221
+ const collectionPrompt = getPrompt(prompt.identifier);
222
+ if (collectionPrompt && collectionPrompt.content) {
223
+ messages.push({
224
+ role: collectionPrompt.role ?? 'system',
225
+ content: context.substituteParams(collectionPrompt.content),
226
+ });
227
+ return;
228
+ }
229
+ if (prompt.identifier === 'chatHistory') {
230
+ coreChat.forEach((message) => {
231
+ messages.push({
232
+ role: message.is_user ? 'user' : 'assistant',
233
+ content: message.mes,
234
+ });
235
+ });
236
+ }
237
+ });
238
+ }
239
+ const knownExtensionPrompts = [
240
+ '1_memory',
241
+ '2_floating_prompt',
242
+ '3_vectors',
243
+ '4_vectors_data_bank',
244
+ 'chromadb',
245
+ 'PERSONA_DESCRIPTION',
246
+ 'QUIET_PROMPT',
247
+ 'DEPTH_PROMPT',
248
+ ];
249
+ // Anything that is not a known extension prompt
250
+ for (const key in context.extensionPrompts) {
251
+ if (Object.hasOwn(context.extensionPrompts, key)) {
252
+ const prompt = context.extensionPrompts[key];
253
+ if (knownExtensionPrompts.includes(key))
254
+ continue;
255
+ if (!context.extensionPrompts[key].value)
256
+ continue;
257
+ if (![extension_prompt_types.BEFORE_PROMPT, extension_prompt_types.IN_PROMPT].includes(prompt.position))
258
+ continue;
259
+ const hasFilter = typeof prompt.filter === 'function';
260
+ if (hasFilter && !(await prompt.filter()))
261
+ continue;
262
+ if (prompt.position === extension_prompt_types.BEFORE_PROMPT) {
148
263
  messages = [
149
- ...messages.slice(0, authorNoteIndex),
150
- { role: 'system', content: anBefore.join('\n') },
151
- ...messages.slice(authorNoteIndex),
264
+ ...messages.slice(0, prompt.depth),
265
+ {
266
+ role: st_getPromptRole(prompt.role) ?? 'system',
267
+ content: prompt.value,
268
+ },
269
+ ...messages.slice(prompt.depth),
152
270
  ];
153
- authorNoteIndex++;
154
271
  }
155
- if (anAfter.length > 0) {
272
+ else if (prompt.position === extension_prompt_types.IN_PROMPT) {
156
273
  messages = [
157
- ...messages.slice(0, authorNoteIndex + 1),
158
- { role: 'system', content: anAfter.join('\n') },
159
- ...messages.slice(authorNoteIndex + 1),
274
+ ...messages.slice(0, messages.length - prompt.depth),
275
+ {
276
+ role: st_getPromptRole(prompt.role) ?? 'system',
277
+ content: prompt.value,
278
+ },
279
+ ...messages.slice(messages.length - prompt.depth),
160
280
  ];
161
281
  }
162
282
  }
163
283
  }
284
+ // Inject world info depth.
285
+ for (const worldInfo of worldInfoDepth) {
286
+ messages = [
287
+ ...messages.slice(0, messages.length - worldInfo.depth),
288
+ { role: st_getPromptRole(worldInfo.role), content: worldInfo.entries.join('\n') },
289
+ ...messages.slice(messages.length - worldInfo.depth),
290
+ ];
291
+ }
292
+ const groupDepthPrompts = st_getGroupDepthPrompts(selected_group, Number(this_chid));
293
+ if (selected_group && Array.isArray(groupDepthPrompts) && groupDepthPrompts.length > 0) {
294
+ groupDepthPrompts.forEach((value, index) => {
295
+ messages = [
296
+ ...messages.slice(0, messages.length - value.depth),
297
+ { role: value.role, content: value.text },
298
+ ...messages.slice(messages.length - value.depth),
299
+ ];
300
+ });
301
+ }
164
302
  else {
165
- let oaiMessages = [];
166
- let oaiMessageExamples = [];
167
- oaiMessages = st_setOpenAIMessages(coreChat);
168
- oaiMessageExamples = st_setOpenAIMessageExamples(mesExamplesArray);
169
- let [prompt, _counts] = await st_prepareOpenAIMessages({
170
- name2: name2,
171
- charDescription: description,
172
- charPersonality: personality,
173
- Scenario: scenario,
174
- worldInfoBefore: worldInfoBefore,
175
- worldInfoAfter: worldInfoAfter,
176
- extensionPrompts: context.extensionPrompts,
177
- bias: '',
178
- type: 'normal',
179
- quietPrompt: undefined,
180
- quietImage: undefined,
181
- cyclePrompt: '',
182
- systemPromptOverride: system,
183
- jailbreakPromptOverride: jailbreak,
184
- personaDescription: persona,
185
- messages: oaiMessages,
186
- messageExamples: oaiMessageExamples,
187
- }, false);
188
- messages.push(...prompt);
303
+ const depthPromptText = st_baseChatReplace(characters[this_chid]?.data?.extensions?.depth_prompt?.prompt?.trim(), name1, name2) || '';
304
+ const depthPromptDepth = depth_prompt_depth_default;
305
+ const depthPromptRole = characters[this_chid]?.data?.extensions?.depth_prompt?.role ?? depth_prompt_role_default;
306
+ messages = [
307
+ ...messages.slice(0, messages.length - depthPromptDepth),
308
+ { role: st_getPromptRole(depthPromptRole), content: depthPromptText },
309
+ ...messages.slice(messages.length - depthPromptDepth),
310
+ ];
311
+ }
312
+ // TODO: We should respect interval and world info scanning
313
+ const authorNote = st_getAuthorNote();
314
+ let authorNoteIndex = -1;
315
+ if (authorNote.prompt) {
316
+ authorNote.prompt = st_baseChatReplace(authorNote.prompt, name1, name2);
317
+ switch (authorNote.position) {
318
+ case extension_prompt_types.IN_PROMPT: // After first message
319
+ messages = [...messages.slice(0, 1), { role: 'user', content: authorNote.prompt }, ...messages.slice(1)];
320
+ authorNoteIndex = 1;
321
+ break;
322
+ case extension_prompt_types.IN_CHAT: // Depth + role in chat
323
+ messages = [
324
+ ...messages.slice(0, messages.length - authorNote.depth),
325
+ { role: st_getPromptRole(authorNote.role), content: authorNote.prompt },
326
+ ...messages.slice(messages.length - authorNote.depth),
327
+ ];
328
+ authorNoteIndex = messages.length - authorNote.depth - 1;
329
+ break;
330
+ case extension_prompt_types.BEFORE_PROMPT: // Before first message
331
+ messages.unshift({ role: 'user', content: authorNote.prompt });
332
+ authorNoteIndex = 0;
333
+ break;
334
+ default:
335
+ break;
336
+ }
337
+ }
338
+ // Add world info to author note
339
+ if (authorNoteIndex >= 0) {
340
+ if (anBefore.length > 0) {
341
+ messages = [
342
+ ...messages.slice(0, authorNoteIndex),
343
+ { role: 'system', content: anBefore.join('\n') },
344
+ ...messages.slice(authorNoteIndex),
345
+ ];
346
+ authorNoteIndex++;
347
+ }
348
+ if (anAfter.length > 0) {
349
+ messages = [
350
+ ...messages.slice(0, authorNoteIndex + 1),
351
+ { role: 'system', content: anAfter.join('\n') },
352
+ ...messages.slice(authorNoteIndex + 1),
353
+ ];
354
+ }
189
355
  }
190
356
  return messages;
191
357
  }
@@ -1 +1 @@
1
- {"version":3,"file":"prompt-builder.js","sourceRoot":"","sources":["../src/prompt-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,sBAAsB,EACtB,KAAK,EACL,KAAK,EACL,6BAA6B,EAC7B,cAAc,EACd,kBAAkB,EAClB,6BAA6B,EAC7B,gBAAgB,EAChB,0BAA0B,EAC1B,uBAAuB,EACvB,oBAAoB,EACpB,gBAAgB,EAChB,mBAAmB,EACnB,oBAAoB,EACpB,SAAS,EACT,kBAAkB,EAClB,wBAAwB,EACxB,yBAAyB,EACzB,wBAAwB,EACxB,oBAAoB,EACpB,2BAA2B,EAC3B,QAAQ,EACR,eAAe,EACf,mBAAmB,EACnB,oBAAoB,GACrB,MAAM,aAAa,CAAC;AAOrB;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,kBAA0B;IAC1D,IAAI,CAAC,CAAC,qBAAqB,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IACrC,CAAC;IAED,MAAM,OAAO,GAAG,WAAW,CAAC,UAAU,EAAE,CAAC;IACzC,IAAI,QAAQ,GAAc,EAAE,CAAC;IAE7B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,kBAAkB,GAAG,CAAC,CAAC,CAAC;IAE3D,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,GACjF,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAEnC,MAAM,UAAU,GAAG,QAAQ,KAAK,qBAAqB,CAAC;IACtD,IAAI,gBAAgB,GAAG,mBAAmB,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;IAEpE,MAAM,gBAAgB,GAAG,oBAAoB,EAAE,CAAC;IAChD,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC,sBAAsB,EAAE,CAAC;IACjE,IAAI,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,IAAI,CAAC,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAE7G,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1B,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE;QACrC,IAAI,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC;QAC3B,IAAI,SAAS,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC;QAC1F,MAAM,UAAU,GAAG,KAAK,CAAC;QACzB,IAAI,OAAO,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,GAAG,KAAK,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAExF,IAAI,cAAc,GAAG,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QACtE,cAAc,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAEtE,IAAI,QAAQ,EAAE,KAAK,EAAE,YAAY,IAAI,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;YAC5D,cAAc,GAAG,GAAG,cAAc,OAAO,QAAQ,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QAClE,CAAC;QAED,OAAO;YACL,GAAG,QAAQ;YACX,GAAG,EAAE,cAAc;YACnB,KAAK;SACN,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;IAEF,MAAM,SAAS,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;IAC5G,MAAM,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,iBAAiB,EAAE,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,GAC9G,MAAM,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC;IAEvE,yBAAyB;IACzB,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE,CAAC;QACxC,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC;QAEvC,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAChC,SAAS;QACX,CAAC;QAED,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,cAAc,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC1E,MAAM,cAAc,GAAG,mBAAmB,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;QAEzE,+CAA+C;QAC/C,IAAI,OAAO,CAAC,QAAQ,KAAK,kBAAkB,CAAC,MAAM,EAAE,CAAC;YACnD,gBAAgB,CAAC,OAAO,CAAC,GAAG,cAAc,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACN,gBAAgB,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,QAAQ,KAAK,qBAAqB,CAAC;IAC1D,IAAI,cAAc,EAAE,CAAC;QACnB,yDAAyD;QACzD,MAAM,mBAAmB,GAAG,CAAC,GAAG,gBAAgB,CAAC,CAAC;QAElD,IAAI,gBAAgB,EAAE,CAAC;YACrB,gBAAgB,GAAG,6BAA6B,CAAC,gBAAgB,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACnF,CAAC;QAED,qBAAqB;QACrB,MAAM,iBAAiB,GAAG;YACxB,WAAW,EAAE,WAAW;YACxB,WAAW,EAAE,WAAW;YACxB,OAAO,EACL,OAAO,CAAC,iBAAiB,CAAC,4BAA4B,IAAI,6BAA6B,CAAC,SAAS;gBAC/F,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,EAAE;YACR,QAAQ,EAAE,QAAQ;YAClB,MAAM,EAAE,MAAM;YACd,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,KAAK;YACX,QAAQ,EAAE,eAAe;YACzB,OAAO,EAAE,cAAc;YACvB,UAAU,EAAE,eAAe;YAC3B,SAAS,EAAE,cAAc;YACzB,WAAW,EAAE,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YACtC,cAAc,EAAE,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;SAC7C,CAAC;QAEF,IAAI,WAAW,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;QAE1D,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QAE9E,IAAI;aACD,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC;aACvC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACnB,QAAQ,CAAC,IAAI,CAAC;gBACZ,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW;gBAC5C,OAAO,EAAE,OAAO,CAAC,GAAG;aACrB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEL,2BAA2B;QAC3B,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;YACvC,QAAQ,GAAG;gBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC;gBACvD,EAAE,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACjF,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC;aACrD,CAAC;QACJ,CAAC;QAED,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,cAAc,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;QAErF,IAAI,cAAc,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvF,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;gBACzC,QAAQ,GAAG;oBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;oBACnD,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE;oBACzC,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;iBACjD,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,eAAe,GACnB,kBAAkB,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;YAChH,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;YACpD,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,IAAI,yBAAyB,CAAC;YAEjH,QAAQ,GAAG;gBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,gBAAgB,CAAC;gBACxD,EAAE,IAAI,EAAE,gBAAgB,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE;gBACrE,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,gBAAgB,CAAC;aACtD,CAAC;QACJ,CAAC;QAED,2DAA2D;QAC3D,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;QACtC,IAAI,eAAe,GAAG,CAAC,CAAC,CAAC;QACzB,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACtB,UAAU,CAAC,MAAM,GAAG,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACxE,QAAQ,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAC5B,KAAK,sBAAsB,CAAC,SAAS,EAAE,sBAAsB;oBAC3D,QAAQ,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;oBACzG,eAAe,GAAG,CAAC,CAAC;oBACpB,MAAM;gBACR,KAAK,sBAAsB,CAAC,OAAO,EAAE,uBAAuB;oBAC1D,QAAQ,GAAG;wBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC;wBACxD,EAAE,IAAI,EAAE,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE;wBACvE,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC;qBACtD,CAAC;oBACF,eAAe,GAAG,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC;oBACzD,MAAM;gBACR,KAAK,sBAAsB,CAAC,aAAa,EAAE,uBAAuB;oBAChE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;oBAC/D,eAAe,GAAG,CAAC,CAAC;oBACpB,MAAM;gBACR;oBACE,MAAM;YACV,CAAC;QACH,CAAC;QAED,gCAAgC;QAChC,IAAI,eAAe,IAAI,CAAC,EAAE,CAAC;YACzB,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,QAAQ,GAAG;oBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC;oBACrC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBAChD,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC;iBACnC,CAAC;gBACF,eAAe,EAAE,CAAC;YACpB,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,QAAQ,GAAG;oBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,CAAC,CAAC;oBACzC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;oBAC/C,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC;iBACvC,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,kBAAkB,GAAG,EAAE,CAAC;QAE5B,WAAW,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QAC7C,kBAAkB,GAAG,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;QAEnE,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,wBAAwB,CACpD;YACE,KAAK,EAAE,KAAK;YACZ,eAAe,EAAE,WAAW;YAC5B,eAAe,EAAE,WAAW;YAC5B,QAAQ,EAAE,QAAQ;YAClB,eAAe,EAAE,eAAe;YAChC,cAAc,EAAE,cAAc;YAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;YAC1C,IAAI,EAAE,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,WAAW,EAAE,SAAS;YACtB,UAAU,EAAE,SAAS;YACrB,WAAW,EAAE,EAAE;YACf,oBAAoB,EAAE,MAAM;YAC5B,uBAAuB,EAAE,SAAS;YAClC,kBAAkB,EAAE,OAAO;YAC3B,QAAQ,EAAE,WAAW;YACrB,eAAe,EAAE,kBAAkB;SACpC,EACD,KAAK,CACN,CAAC;QAEF,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;IAC3B,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"prompt-builder.js","sourceRoot":"","sources":["../src/prompt-builder.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,98 @@
1
+ export interface ChatCompletionPreset {
2
+ chat_completion_source: string;
3
+ openai_model: string;
4
+ claude_model: string;
5
+ windowai_model: string;
6
+ openrouter_model: string;
7
+ openrouter_use_fallback: boolean;
8
+ openrouter_group_models: boolean;
9
+ openrouter_sort_models: string;
10
+ openrouter_providers: string[];
11
+ openrouter_allow_fallbacks: boolean;
12
+ openrouter_middleout: string;
13
+ ai21_model: string;
14
+ mistralai_model: string;
15
+ cohere_model: string;
16
+ perplexity_model: string;
17
+ groq_model: string;
18
+ nanogpt_model?: string;
19
+ deepseek_model?: string;
20
+ zerooneai_model: string;
21
+ blockentropy_model: string;
22
+ custom_model: string;
23
+ custom_url: string;
24
+ custom_include_body: string;
25
+ custom_exclude_body: string;
26
+ custom_include_headers: string;
27
+ custom_prompt_post_processing: string;
28
+ google_model: string;
29
+ temperature: number;
30
+ frequency_penalty: number;
31
+ presence_penalty: number;
32
+ top_p: number;
33
+ top_k: number;
34
+ top_a: number;
35
+ min_p: number;
36
+ repetition_penalty: number;
37
+ openai_max_context: number;
38
+ openai_max_tokens: number;
39
+ wrap_in_quotes: boolean;
40
+ names_behavior: number;
41
+ send_if_empty: string;
42
+ impersonation_prompt: string;
43
+ new_chat_prompt: string;
44
+ new_group_chat_prompt: string;
45
+ new_example_chat_prompt: string;
46
+ continue_nudge_prompt: string;
47
+ bias_preset_selected: string;
48
+ reverse_proxy: string;
49
+ proxy_password: string;
50
+ max_context_unlocked: boolean;
51
+ wi_format: string;
52
+ scenario_format: string;
53
+ personality_format: string;
54
+ group_nudge_prompt: string;
55
+ stream_openai: boolean;
56
+ prompts: PromptConfig[];
57
+ prompt_order: PromptOrder[];
58
+ api_url_scale: string;
59
+ show_external_models: boolean;
60
+ assistant_prefill: string;
61
+ assistant_impersonation: string;
62
+ claude_use_sysprompt: boolean;
63
+ use_makersuite_sysprompt: boolean;
64
+ use_alt_scale: boolean;
65
+ squash_system_messages: boolean;
66
+ image_inlining: boolean;
67
+ inline_image_quality: string;
68
+ bypass_status_check: boolean;
69
+ continue_prefill: boolean;
70
+ continue_postfix: string;
71
+ function_calling: boolean;
72
+ show_thoughts: boolean;
73
+ reasoning_effort: string;
74
+ enable_web_search: boolean;
75
+ seed: number;
76
+ n: number;
77
+ request_images?: boolean;
78
+ }
79
+ export interface PromptConfig {
80
+ name?: string;
81
+ system_prompt?: boolean;
82
+ enabled?: boolean;
83
+ role?: string;
84
+ content: string;
85
+ identifier: string;
86
+ injection_position?: number;
87
+ injection_depth?: number;
88
+ forbid_overrides?: boolean;
89
+ marker?: boolean;
90
+ }
91
+ export interface PromptOrder {
92
+ character_id: number;
93
+ order: {
94
+ identifier: string;
95
+ enabled: boolean;
96
+ }[];
97
+ }
98
+ //# sourceMappingURL=chat-completion.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"chat-completion.d.ts","sourceRoot":"","sources":["../../src/types/chat-completion.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=chat-completion.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"chat-completion.js","sourceRoot":"","sources":["../../src/types/chat-completion.ts"],"names":[],"mappings":""}
@@ -4,6 +4,7 @@ import { POPUP_RESULT, POPUP_TYPE, PopupOptions } from './popup.js';
4
4
  import { AutoModeOptions } from './translate.js';
5
5
  import { ConnectionProfile } from './profiles.js';
6
6
  import { WIPromptResult } from './world-info.js';
7
+ import { ChatCompletionPreset } from './chat-completion.js';
7
8
  export declare enum EventNames {
8
9
  APP_READY = "app_ready",
9
10
  EXTRAS_CONNECTED = "extras_connected",
@@ -135,6 +136,7 @@ export interface SillyTavernContext {
135
136
  };
136
137
  powerUserSettings: {
137
138
  persona_description_position: number;
139
+ persona_description: string;
138
140
  };
139
141
  getWorldInfoPrompt: (chat: string[], maxContext: number, isDryRun: boolean) => Promise<WIPromptResult>;
140
142
  ToolManager: {
@@ -154,7 +156,9 @@ export interface SillyTavernContext {
154
156
  value: string;
155
157
  role: number;
156
158
  position: number;
159
+ depth: number;
157
160
  identifier: string;
161
+ filter?: any;
158
162
  }>;
159
163
  addOneMessage(mes: ChatMessage, { type, insertAfter, scroll, insertBefore, forceId, showSwipes, }?: {
160
164
  type?: string;
@@ -165,6 +169,10 @@ export interface SillyTavernContext {
165
169
  showSwipes?: boolean;
166
170
  }): void;
167
171
  saveChat: () => Promise<void>;
172
+ getPresetManager: (apiId?: string) => {
173
+ getCompletionPresetByName(name: string): undefined | any | ChatCompletionPreset;
174
+ };
175
+ substituteParams: (content: string, _name1?: string, _name2?: string, _original?: string, _group?: string, _replaceCharacterCard?: boolean, additionalMacro?: Record<string, any>, postProcessFn?: (x: string) => string) => string;
168
176
  }
169
177
  declare global {
170
178
  const SillyTavern: {
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAOA,MAAM,CAAN,IAAY,UAqEX;AArED,WAAY,UAAU;IACpB,qCAAuB,CAAA;IACvB,mDAAqC,CAAA;IACrC,+CAAiC,CAAA;IACjC,2CAA6B,CAAA;IAC7B,mDAAqC,CAAA;IACrC,+CAAiC,CAAA;IACjC,iDAAmC,CAAA;IACnC,iDAAmC,CAAA;IACnC,6DAA+C,CAAA;IAC/C,2DAA6C,CAAA;IAC7C,qDAAuC,CAAA;IACvC,8CAAgC,CAAA;IAChC,qEAAuD,CAAA;IACvD,uDAAyC,CAAA;IACzC,uDAAyC,CAAA;IACzC,mDAAqC,CAAA;IACrC,6DAA+C,CAAA;IAC/C,qEAAuD,CAAA;IACvD,iDAAmC,CAAA;IACnC,mDAAqC,CAAA;IACrC,6CAA+B,CAAA;IAC/B,2DAA6C,CAAA;IAC7C,+DAAiD,CAAA;IACjD,6DAA+C,CAAA;IAC/C,6EAA+D,CAAA;IAC/D,2EAA6D,CAAA;IAC7D,qEAAuD,CAAA;IACvD,mEAAqD,CAAA;IACrD,iEAAmD,CAAA;IACnD,iEAAmD,CAAA;IACnD,uEAAyD,CAAA;IACzD,qDAAuC,CAAA;IACvC,mDAAqC,CAAA;IACrC,6DAA+C,CAAA;IAC/C,yGAA2F,CAAA;IAC3F,uGAAyF,CAAA;IACzF,6DAA+C,CAAA;IAC/C,uEAAyD,CAAA;IACzD,2DAA6C,CAAA;IAC7C,2CAA6B,CAAA;IAC7B,2CAA6B,CAAA;IAC7B,uDAAyC,CAAA;IACzC,uDAAyC,CAAA;IACzC,iFAAmE,CAAA;IACnE,+EAAiE,CAAA;IACjE,yDAA2C,CAAA;IAC3C,2DAA6C,CAAA;IAC7C,2DAA6C,CAAA;IAC7C,+EAAiE,CAAA;IACjE,+EAAiE,CAAA;IACjE,2EAA6D,CAAA;IAC7D,mFAAqE,CAAA;IACrE,4DAA4D;IAC5D,oDAAsC,CAAA;IACtC,2DAA6C,CAAA;IAC7C,qDAAuC,CAAA;IACvC,iEAAiE;IACjE,oEAAsD,CAAA;IACtD,6DAA+C,CAAA;IAC/C,6DAA+C,CAAA;IAC/C,iEAAmD,CAAA;IACnD,mEAAqD,CAAA;IACrD,+DAAiD,CAAA;IACjD,6DAA+C,CAAA;IAC/C,2CAA6B,CAAA;IAC7B,qEAAuD,CAAA;IACvD,2DAA6C,CAAA;IAC7C,yDAA2C,CAAA;AAC7C,CAAC,EArEW,UAAU,KAAV,UAAU,QAqErB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAQA,MAAM,CAAN,IAAY,UAqEX;AArED,WAAY,UAAU;IACpB,qCAAuB,CAAA;IACvB,mDAAqC,CAAA;IACrC,+CAAiC,CAAA;IACjC,2CAA6B,CAAA;IAC7B,mDAAqC,CAAA;IACrC,+CAAiC,CAAA;IACjC,iDAAmC,CAAA;IACnC,iDAAmC,CAAA;IACnC,6DAA+C,CAAA;IAC/C,2DAA6C,CAAA;IAC7C,qDAAuC,CAAA;IACvC,8CAAgC,CAAA;IAChC,qEAAuD,CAAA;IACvD,uDAAyC,CAAA;IACzC,uDAAyC,CAAA;IACzC,mDAAqC,CAAA;IACrC,6DAA+C,CAAA;IAC/C,qEAAuD,CAAA;IACvD,iDAAmC,CAAA;IACnC,mDAAqC,CAAA;IACrC,6CAA+B,CAAA;IAC/B,2DAA6C,CAAA;IAC7C,+DAAiD,CAAA;IACjD,6DAA+C,CAAA;IAC/C,6EAA+D,CAAA;IAC/D,2EAA6D,CAAA;IAC7D,qEAAuD,CAAA;IACvD,mEAAqD,CAAA;IACrD,iEAAmD,CAAA;IACnD,iEAAmD,CAAA;IACnD,uEAAyD,CAAA;IACzD,qDAAuC,CAAA;IACvC,mDAAqC,CAAA;IACrC,6DAA+C,CAAA;IAC/C,yGAA2F,CAAA;IAC3F,uGAAyF,CAAA;IACzF,6DAA+C,CAAA;IAC/C,uEAAyD,CAAA;IACzD,2DAA6C,CAAA;IAC7C,2CAA6B,CAAA;IAC7B,2CAA6B,CAAA;IAC7B,uDAAyC,CAAA;IACzC,uDAAyC,CAAA;IACzC,iFAAmE,CAAA;IACnE,+EAAiE,CAAA;IACjE,yDAA2C,CAAA;IAC3C,2DAA6C,CAAA;IAC7C,2DAA6C,CAAA;IAC7C,+EAAiE,CAAA;IACjE,+EAAiE,CAAA;IACjE,2EAA6D,CAAA;IAC7D,mFAAqE,CAAA;IACrE,4DAA4D;IAC5D,oDAAsC,CAAA;IACtC,2DAA6C,CAAA;IAC7C,qDAAuC,CAAA;IACvC,iEAAiE;IACjE,oEAAsD,CAAA;IACtD,6DAA+C,CAAA;IAC/C,6DAA+C,CAAA;IAC/C,iEAAmD,CAAA;IACnD,mEAAqD,CAAA;IACrD,+DAAiD,CAAA;IACjD,6DAA+C,CAAA;IAC/C,2CAA6B,CAAA;IAC7B,qEAAuD,CAAA;IACvD,2DAA6C,CAAA;IAC7C,yDAA2C,CAAA;AAC7C,CAAC,EArEW,UAAU,KAAV,UAAU,QAqErB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sillytavern-utils-lib",
3
- "version": "1.0.7",
3
+ "version": "1.0.8",
4
4
  "description": "Utility library for SillyTavern",
5
5
  "type": "module",
6
6
  "exports": {
@@ -35,6 +35,10 @@
35
35
  "./types/world-info": {
36
36
  "types": "./dist/types/world-info.d.ts",
37
37
  "default": "./dist/types/world-info.js"
38
+ },
39
+ "./types/chat-completion": {
40
+ "types": "./dist/types/chat-completion.d.ts",
41
+ "default": "./dist/types/chat-completion.js"
38
42
  }
39
43
  },
40
44
  "files": [