sillytavern-utils-lib 1.0.7 → 1.0.9
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 +10 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +13 -4
- package/dist/config.js.map +1 -1
- package/dist/prompt-builder.d.ts +10 -6
- package/dist/prompt-builder.d.ts.map +1 -1
- package/dist/prompt-builder.js +279 -98
- package/dist/prompt-builder.js.map +1 -1
- package/dist/types/chat-completion.d.ts +98 -0
- package/dist/types/chat-completion.d.ts.map +1 -0
- package/dist/types/chat-completion.js +2 -0
- package/dist/types/chat-completion.js.map +1 -0
- package/dist/types/context.d.ts +13 -0
- package/dist/types/context.d.ts.map +1 -0
- package/dist/types/context.js +2 -0
- package/dist/types/context.js.map +1 -0
- package/dist/types/index.d.ts +9 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/types/instruct.d.ts +28 -0
- package/dist/types/instruct.d.ts.map +1 -0
- package/dist/types/instruct.js +2 -0
- package/dist/types/instruct.js.map +1 -0
- package/dist/types/profiles.d.ts +3 -1
- package/dist/types/profiles.d.ts.map +1 -1
- package/dist/types/sysprompt.d.ts +5 -0
- package/dist/types/sysprompt.d.ts.map +1 -0
- package/dist/types/sysprompt.js +2 -0
- package/dist/types/sysprompt.js.map +1 -0
- package/package.json +17 -1
package/dist/config.d.ts
CHANGED
|
@@ -3,6 +3,7 @@ import { name1, name2, extension_prompt_types, this_chid, characters, depth_prom
|
|
|
3
3
|
import { world_info_include_names, wi_anchor_position } from '../../../../world-info.js';
|
|
4
4
|
import { selected_group } from '../../../../group-chats.js';
|
|
5
5
|
import { regex_placement } from '../../../regex/engine.js';
|
|
6
|
+
import { InstructSettings } from './types/instruct.js';
|
|
6
7
|
/**
|
|
7
8
|
* Sends an echo message using the SlashCommandParser's echo command.
|
|
8
9
|
*/
|
|
@@ -11,7 +12,11 @@ export declare function st_getMaxContextSize(overrideResponseLength?: number): n
|
|
|
11
12
|
export declare function st_parseMesExamples(examplesStr: string, isInstruct: boolean): string[];
|
|
12
13
|
export declare function st_baseChatReplace(value: any, name1: any, name2: any): any;
|
|
13
14
|
export declare function st_formatInstructModeExamples(mesExamplesArray: string[], name1: string, name2: string): string[];
|
|
14
|
-
export declare function
|
|
15
|
+
export declare function st_formatInstructModeSystemPrompt(systemPrompt: string, customInstruct?: InstructSettings): string;
|
|
16
|
+
export declare function st_renderStoryString(params: object, { customStoryString, customInstructSettings, }?: {
|
|
17
|
+
customStoryString?: string;
|
|
18
|
+
customInstructSettings?: InstructSettings;
|
|
19
|
+
}): string;
|
|
15
20
|
export declare function st_getPromptRole(role: number): string;
|
|
16
21
|
export declare function st_getAuthorNote(): {
|
|
17
22
|
prompt: string;
|
|
@@ -54,5 +59,9 @@ export declare function st_getRegexedString(rawString: string, placement: regex_
|
|
|
54
59
|
depth?: number;
|
|
55
60
|
}): string;
|
|
56
61
|
export declare function st_appendFileContent(message: object, messageText: string): Promise<string>;
|
|
62
|
+
export declare function st_formatWorldInfo(value: string, { wiFormat, }?: {
|
|
63
|
+
wiFormat?: string;
|
|
64
|
+
}): string;
|
|
65
|
+
export declare function st_getPromptPosition(position: number): string | false;
|
|
57
66
|
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
67
|
//# sourceMappingURL=config.d.ts.map
|
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAC7E,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD;;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,iCAAiC,CAAC,YAAY,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,gBAAgB,GAAG,MAAM,CAEjH;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,EACE,iBAAiB,EACjB,sBAAsB,GACvB,GAAE;IACD,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,sBAAsB,CAAC,EAAE,gBAAgB,CAAC;CACtC,GACL,MAAM,CAER;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
|
@@ -6,10 +6,10 @@ import { name1, name2, getMaxContextSize, parseMesExamples, baseChatReplace, cha
|
|
|
6
6
|
// @ts-ignore
|
|
7
7
|
import { world_info_include_names, wi_anchor_position } from '../../../../world-info.js';
|
|
8
8
|
// @ts-ignore
|
|
9
|
-
import { formatInstructModeExamples } from '../../../../instruct-mode.js';
|
|
9
|
+
import { formatInstructModeExamples, formatInstructModeSystemPrompt } 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
|
|
@@ -37,8 +37,11 @@ export function st_baseChatReplace(value, name1, name2) {
|
|
|
37
37
|
export function st_formatInstructModeExamples(mesExamplesArray, name1, name2) {
|
|
38
38
|
return formatInstructModeExamples(mesExamplesArray, name1, name2);
|
|
39
39
|
}
|
|
40
|
-
export function
|
|
41
|
-
return
|
|
40
|
+
export function st_formatInstructModeSystemPrompt(systemPrompt, customInstruct) {
|
|
41
|
+
return formatInstructModeSystemPrompt(systemPrompt, customInstruct);
|
|
42
|
+
}
|
|
43
|
+
export function st_renderStoryString(params, { customStoryString, customInstructSettings, } = {}) {
|
|
44
|
+
return renderStoryString(params, { customStoryString, customInstructSettings });
|
|
42
45
|
}
|
|
43
46
|
export function st_getPromptRole(role) {
|
|
44
47
|
return getPromptRole(role);
|
|
@@ -88,5 +91,11 @@ export function st_getRegexedString(rawString, placement, { characterOverride, i
|
|
|
88
91
|
export async function st_appendFileContent(message, messageText) {
|
|
89
92
|
return await appendFileContent(message, messageText);
|
|
90
93
|
}
|
|
94
|
+
export function st_formatWorldInfo(value, { wiFormat, } = {}) {
|
|
95
|
+
return formatWorldInfo(value, { wiFormat });
|
|
96
|
+
}
|
|
97
|
+
export function st_getPromptPosition(position) {
|
|
98
|
+
return getPromptPosition(position);
|
|
99
|
+
}
|
|
91
100
|
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
101
|
//# sourceMappingURL=config.js.map
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,aAAa;AACb,OAAO,EAAE,6BAA6B,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE7F,OAAO,EACL,KAAK,EACL,KAAK,EACL,iBAAiB,EACjB,gBAAgB,EAChB,eAAe,EACf,aAAa,EACb,sBAAsB,EACtB,SAAS,EACT,UAAU,EACV,yBAAyB,EACzB,0BAA0B,EAC1B,QAAQ,EACR,cAAc,EACd,aAAa;AACb,aAAa;EACd,MAAM,0BAA0B,CAAC;AAElC,aAAa;AACb,OAAO,EAAE,wBAAwB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEzF,aAAa;AACb,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
package/dist/prompt-builder.d.ts
CHANGED
|
@@ -2,12 +2,16 @@ import { ChatCompletionMessage } from './types/index.js';
|
|
|
2
2
|
export interface Message extends ChatCompletionMessage {
|
|
3
3
|
ignoreInstruct?: boolean;
|
|
4
4
|
}
|
|
5
|
+
export interface BuildPromptOptions {
|
|
6
|
+
presetName?: string;
|
|
7
|
+
instructName?: string;
|
|
8
|
+
contextName?: string;
|
|
9
|
+
syspromptName?: string;
|
|
10
|
+
}
|
|
5
11
|
/**
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* Chat completion supported: All (i guess)
|
|
12
|
+
* Builds chat prompt. Don't expect a perfect chat prompt like ST. But I would give guarantee that it will cover 98% of the cases.
|
|
13
|
+
* @param targetMessageIndex - Last message index to include in prompt
|
|
14
|
+
* @param [param1={}] - Options
|
|
11
15
|
*/
|
|
12
|
-
export declare function buildPrompt(targetMessageIndex
|
|
16
|
+
export declare function buildPrompt(targetMessageIndex?: number, { presetName, instructName, contextName, syspromptName }?: BuildPromptOptions): Promise<Message[]>;
|
|
13
17
|
//# sourceMappingURL=prompt-builder.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-builder.d.ts","sourceRoot":"","sources":["../src/prompt-builder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"prompt-builder.d.ts","sourceRoot":"","sources":["../src/prompt-builder.ts"],"names":[],"mappings":"AAiCA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAIzD,MAAM,WAAW,OAAQ,SAAQ,qBAAqB;IACpD,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED;;;;GAIG;AACH,wBAAsB,WAAW,CAC/B,kBAAkB,CAAC,EAAE,MAAM,EAC3B,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,GAAE,kBAAuB,GAChF,OAAO,CAAC,OAAO,EAAE,CAAC,CA4apB"}
|
package/dist/prompt-builder.js
CHANGED
|
@@ -1,24 +1,26 @@
|
|
|
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, st_formatInstructModeSystemPrompt, } from './config.js';
|
|
2
2
|
/**
|
|
3
|
-
*
|
|
4
|
-
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
* Chat completion supported: All (i guess)
|
|
3
|
+
* Builds chat prompt. Don't expect a perfect chat prompt like ST. But I would give guarantee that it will cover 98% of the cases.
|
|
4
|
+
* @param targetMessageIndex - Last message index to include in prompt
|
|
5
|
+
* @param [param1={}] - Options
|
|
8
6
|
*/
|
|
9
|
-
export async function buildPrompt(targetMessageIndex) {
|
|
7
|
+
export async function buildPrompt(targetMessageIndex, { presetName, instructName, contextName, syspromptName } = {}) {
|
|
10
8
|
if (!['textgenerationwebui', 'openai'].includes(main_api)) {
|
|
11
9
|
throw new Error('Unsupported API');
|
|
12
10
|
}
|
|
13
11
|
const context = SillyTavern.getContext();
|
|
14
12
|
let messages = [];
|
|
15
|
-
const chat = context.chat.slice(0, targetMessageIndex + 1);
|
|
16
13
|
let { description, personality, persona, scenario, mesExamples, system, jailbreak } = context.getCharacterCardFields();
|
|
17
|
-
const
|
|
14
|
+
const instructPreset = main_api === 'textgenerationwebui'
|
|
15
|
+
? context.getPresetManager('instruct')?.getCompletionPresetByName(instructName)
|
|
16
|
+
: undefined;
|
|
17
|
+
const isInstruct = !!instructPreset;
|
|
18
18
|
let mesExamplesArray = st_parseMesExamples(mesExamples, isInstruct);
|
|
19
19
|
const this_max_context = st_getMaxContextSize();
|
|
20
20
|
const canUseTools = context.ToolManager.isToolCallingSupported();
|
|
21
|
-
let coreChat = chat
|
|
21
|
+
let coreChat = context.chat
|
|
22
|
+
.slice(0, targetMessageIndex ? targetMessageIndex + 1 : undefined)
|
|
23
|
+
.filter((x) => !x.is_system || (canUseTools && Array.isArray(x.extra?.tool_invocations)));
|
|
22
24
|
coreChat = await Promise.all(coreChat.map(async (chatItem, index) => {
|
|
23
25
|
let message = chatItem.mes;
|
|
24
26
|
let regexType = chatItem.is_user ? regex_placement.USER_INPUT : regex_placement.AI_OUTPUT;
|
|
@@ -60,6 +62,16 @@ export async function buildPrompt(targetMessageIndex) {
|
|
|
60
62
|
if (mesExamplesArray) {
|
|
61
63
|
mesExamplesArray = st_formatInstructModeExamples(mesExamplesArray, name1, name2);
|
|
62
64
|
}
|
|
65
|
+
const syspromptPreset = context.getPresetManager('sysprompt')?.getCompletionPresetByName(syspromptName);
|
|
66
|
+
if (syspromptPreset) {
|
|
67
|
+
system =
|
|
68
|
+
context.powerUserSettings.prefer_character_prompt && system
|
|
69
|
+
? system
|
|
70
|
+
: st_baseChatReplace(syspromptPreset.content, name1, name2);
|
|
71
|
+
system = isInstruct
|
|
72
|
+
? st_formatInstructModeSystemPrompt(context.substituteParams(system, name1, name2, syspromptPreset.content), instructPreset)
|
|
73
|
+
: system;
|
|
74
|
+
}
|
|
63
75
|
// Build story string
|
|
64
76
|
const storyStringParams = {
|
|
65
77
|
description: description,
|
|
@@ -78,114 +90,283 @@ export async function buildPrompt(targetMessageIndex) {
|
|
|
78
90
|
mesExamples: mesExamplesArray.join(''),
|
|
79
91
|
mesExamplesRaw: mesExamplesRawArray.join(''),
|
|
80
92
|
};
|
|
81
|
-
|
|
93
|
+
const contextPreset = context.getPresetManager('context')?.getCompletionPresetByName(contextName);
|
|
94
|
+
let storyString = st_renderStoryString(storyStringParams, {
|
|
95
|
+
customInstructSettings: instructPreset,
|
|
96
|
+
customStoryString: contextPreset?.story_string,
|
|
97
|
+
});
|
|
82
98
|
messages.push({ role: 'system', content: storyString, ignoreInstruct: true });
|
|
83
|
-
|
|
84
|
-
.filter((message) => !message.is_system)
|
|
85
|
-
.forEach((message) => {
|
|
99
|
+
coreChat.forEach((message) => {
|
|
86
100
|
messages.push({
|
|
87
101
|
role: message.is_user ? 'user' : 'assistant',
|
|
88
102
|
content: message.mes,
|
|
89
103
|
});
|
|
90
104
|
});
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
let oaiMessages = st_setOpenAIMessages(coreChat);
|
|
108
|
+
let oaiMessageExamples = st_setOpenAIMessageExamples(mesExamplesArray);
|
|
109
|
+
async function addDefaultPreset() {
|
|
110
|
+
let [prompt, _counts] = await st_prepareOpenAIMessages({
|
|
111
|
+
name2: name2,
|
|
112
|
+
charDescription: description,
|
|
113
|
+
charPersonality: personality,
|
|
114
|
+
Scenario: scenario,
|
|
115
|
+
worldInfoBefore: worldInfoBefore,
|
|
116
|
+
worldInfoAfter: worldInfoAfter,
|
|
117
|
+
extensionPrompts: context.extensionPrompts,
|
|
118
|
+
bias: '',
|
|
119
|
+
type: 'normal',
|
|
120
|
+
quietPrompt: undefined,
|
|
121
|
+
quietImage: undefined,
|
|
122
|
+
cyclePrompt: '',
|
|
123
|
+
systemPromptOverride: system,
|
|
124
|
+
jailbreakPromptOverride: jailbreak,
|
|
125
|
+
personaDescription: persona,
|
|
126
|
+
messages: oaiMessages,
|
|
127
|
+
messageExamples: oaiMessageExamples,
|
|
128
|
+
}, false);
|
|
129
|
+
messages.push(...prompt);
|
|
98
130
|
}
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
131
|
+
if (!presetName) {
|
|
132
|
+
await addDefaultPreset();
|
|
133
|
+
return messages;
|
|
134
|
+
}
|
|
135
|
+
const preset = context.getPresetManager('openai')?.getCompletionPresetByName(presetName);
|
|
136
|
+
if (!preset) {
|
|
137
|
+
console.warn(`Preset not found: ${presetName}. Using current preset.`);
|
|
138
|
+
addDefaultPreset();
|
|
139
|
+
return messages;
|
|
140
|
+
}
|
|
141
|
+
let promptOrder = preset.prompt_order.find((prompt) => prompt.character_id === this_chid);
|
|
142
|
+
if (!promptOrder && preset.prompt_order.length > 0) {
|
|
143
|
+
promptOrder = preset.prompt_order[0];
|
|
144
|
+
}
|
|
145
|
+
if (!promptOrder) {
|
|
146
|
+
console.warn(`No prompt order found for preset: ${presetName}. Using current preset.`);
|
|
147
|
+
addDefaultPreset();
|
|
148
|
+
return messages;
|
|
149
|
+
}
|
|
150
|
+
const scenarioText = scenario && preset.scenario_format ? context.substituteParams(preset.scenario_format) : '';
|
|
151
|
+
const charPersonalityText = personality && preset.personality_format ? context.substituteParams(preset.personality_format) : '';
|
|
152
|
+
const groupNudge = context.substituteParams(preset.group_nudge_prompt);
|
|
153
|
+
const impersonationPrompt = preset.impersonation_prompt
|
|
154
|
+
? context.substituteParams(preset.impersonation_prompt)
|
|
155
|
+
: '';
|
|
156
|
+
// Create entries for system prompts
|
|
157
|
+
const systemPrompts = [
|
|
158
|
+
// Ordered prompts for which a marker should exist
|
|
159
|
+
{
|
|
160
|
+
role: 'system',
|
|
161
|
+
content: st_formatWorldInfo(worldInfoBefore, { wiFormat: preset.wi_format }),
|
|
162
|
+
identifier: 'worldInfoBefore',
|
|
163
|
+
},
|
|
164
|
+
{
|
|
165
|
+
role: 'system',
|
|
166
|
+
content: st_formatWorldInfo(worldInfoAfter, { wiFormat: preset.wi_format }),
|
|
167
|
+
identifier: 'worldInfoAfter',
|
|
168
|
+
},
|
|
169
|
+
{ role: 'system', content: description, identifier: 'charDescription' },
|
|
170
|
+
{ role: 'system', content: charPersonalityText, identifier: 'charPersonality' },
|
|
171
|
+
{ role: 'system', content: scenarioText, identifier: 'scenario' },
|
|
172
|
+
// Unordered prompts without marker
|
|
173
|
+
{ role: 'system', content: impersonationPrompt, identifier: 'impersonate' },
|
|
174
|
+
{ role: 'system', content: groupNudge, identifier: 'groupNudge' },
|
|
175
|
+
];
|
|
176
|
+
// Tavern Extras - Summary
|
|
177
|
+
const summary = context.extensionPrompts['1_memory'];
|
|
178
|
+
if (summary && summary.value)
|
|
179
|
+
systemPrompts.push({
|
|
180
|
+
role: st_getPromptRole(summary.role),
|
|
181
|
+
content: summary.value,
|
|
182
|
+
identifier: 'summary',
|
|
183
|
+
position: st_getPromptPosition(summary.position),
|
|
184
|
+
});
|
|
185
|
+
// Authors Note
|
|
186
|
+
const authorsNote = context.extensionPrompts['2_floating_prompt'];
|
|
187
|
+
if (authorsNote && authorsNote.value)
|
|
188
|
+
systemPrompts.push({
|
|
189
|
+
role: st_getPromptRole(authorsNote.role),
|
|
190
|
+
content: authorsNote.value,
|
|
191
|
+
identifier: 'authorsNote',
|
|
192
|
+
position: st_getPromptPosition(authorsNote.position),
|
|
193
|
+
});
|
|
194
|
+
// Vectors Memory
|
|
195
|
+
const vectorsMemory = context.extensionPrompts['3_vectors'];
|
|
196
|
+
if (vectorsMemory && vectorsMemory.value)
|
|
197
|
+
systemPrompts.push({
|
|
198
|
+
role: 'system',
|
|
199
|
+
content: vectorsMemory.value,
|
|
200
|
+
identifier: 'vectorsMemory',
|
|
201
|
+
position: st_getPromptPosition(vectorsMemory.position),
|
|
202
|
+
});
|
|
203
|
+
const vectorsDataBank = context.extensionPrompts['4_vectors_data_bank'];
|
|
204
|
+
if (vectorsDataBank && vectorsDataBank.value)
|
|
205
|
+
systemPrompts.push({
|
|
206
|
+
role: st_getPromptRole(vectorsDataBank.role),
|
|
207
|
+
content: vectorsDataBank.value,
|
|
208
|
+
identifier: 'vectorsDataBank',
|
|
209
|
+
position: st_getPromptPosition(vectorsDataBank.position),
|
|
210
|
+
});
|
|
211
|
+
// Smart Context (ChromaDB)
|
|
212
|
+
const smartContext = context.extensionPrompts['chromadb'];
|
|
213
|
+
if (smartContext && smartContext.value)
|
|
214
|
+
systemPrompts.push({
|
|
215
|
+
role: 'system',
|
|
216
|
+
content: smartContext.value,
|
|
217
|
+
identifier: 'smartContext',
|
|
218
|
+
position: st_getPromptPosition(smartContext.position),
|
|
219
|
+
});
|
|
220
|
+
// Persona Description
|
|
221
|
+
if (context.powerUserSettings.persona_description &&
|
|
222
|
+
context.powerUserSettings.persona_description_position === persona_description_positions.IN_PROMPT) {
|
|
223
|
+
systemPrompts.push({
|
|
224
|
+
role: 'system',
|
|
225
|
+
content: context.powerUserSettings.persona_description,
|
|
226
|
+
identifier: 'personaDescription',
|
|
107
227
|
});
|
|
108
228
|
}
|
|
109
|
-
|
|
110
|
-
|
|
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
|
-
];
|
|
229
|
+
function getPrompt(identifier) {
|
|
230
|
+
return systemPrompts.find((prompt) => prompt.identifier === identifier);
|
|
118
231
|
}
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
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;
|
|
232
|
+
promptOrder.order.forEach((prompt) => {
|
|
233
|
+
if (!prompt.enabled) {
|
|
234
|
+
return;
|
|
143
235
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
236
|
+
const collectionPrompt = getPrompt(prompt.identifier);
|
|
237
|
+
if (collectionPrompt && collectionPrompt.content) {
|
|
238
|
+
messages.push({
|
|
239
|
+
role: collectionPrompt.role ?? 'system',
|
|
240
|
+
content: context.substituteParams(collectionPrompt.content),
|
|
241
|
+
});
|
|
242
|
+
return;
|
|
243
|
+
}
|
|
244
|
+
if (prompt.identifier === 'chatHistory') {
|
|
245
|
+
coreChat.forEach((message) => {
|
|
246
|
+
messages.push({
|
|
247
|
+
role: message.is_user ? 'user' : 'assistant',
|
|
248
|
+
content: message.mes,
|
|
249
|
+
});
|
|
250
|
+
});
|
|
251
|
+
}
|
|
252
|
+
});
|
|
253
|
+
}
|
|
254
|
+
const knownExtensionPrompts = [
|
|
255
|
+
'1_memory',
|
|
256
|
+
'2_floating_prompt',
|
|
257
|
+
'3_vectors',
|
|
258
|
+
'4_vectors_data_bank',
|
|
259
|
+
'chromadb',
|
|
260
|
+
'PERSONA_DESCRIPTION',
|
|
261
|
+
'QUIET_PROMPT',
|
|
262
|
+
'DEPTH_PROMPT',
|
|
263
|
+
];
|
|
264
|
+
// Anything that is not a known extension prompt
|
|
265
|
+
for (const key in context.extensionPrompts) {
|
|
266
|
+
if (Object.hasOwn(context.extensionPrompts, key)) {
|
|
267
|
+
const prompt = context.extensionPrompts[key];
|
|
268
|
+
if (knownExtensionPrompts.includes(key))
|
|
269
|
+
continue;
|
|
270
|
+
if (!context.extensionPrompts[key].value)
|
|
271
|
+
continue;
|
|
272
|
+
if (![extension_prompt_types.BEFORE_PROMPT, extension_prompt_types.IN_PROMPT].includes(prompt.position))
|
|
273
|
+
continue;
|
|
274
|
+
const hasFilter = typeof prompt.filter === 'function';
|
|
275
|
+
if (hasFilter && !(await prompt.filter()))
|
|
276
|
+
continue;
|
|
277
|
+
if (prompt.position === extension_prompt_types.BEFORE_PROMPT) {
|
|
148
278
|
messages = [
|
|
149
|
-
...messages.slice(0,
|
|
150
|
-
{
|
|
151
|
-
|
|
279
|
+
...messages.slice(0, prompt.depth),
|
|
280
|
+
{
|
|
281
|
+
role: st_getPromptRole(prompt.role) ?? 'system',
|
|
282
|
+
content: prompt.value,
|
|
283
|
+
},
|
|
284
|
+
...messages.slice(prompt.depth),
|
|
152
285
|
];
|
|
153
|
-
authorNoteIndex++;
|
|
154
286
|
}
|
|
155
|
-
if (
|
|
287
|
+
else if (prompt.position === extension_prompt_types.IN_PROMPT) {
|
|
156
288
|
messages = [
|
|
157
|
-
...messages.slice(0,
|
|
158
|
-
{
|
|
159
|
-
|
|
289
|
+
...messages.slice(0, messages.length - prompt.depth),
|
|
290
|
+
{
|
|
291
|
+
role: st_getPromptRole(prompt.role) ?? 'system',
|
|
292
|
+
content: prompt.value,
|
|
293
|
+
},
|
|
294
|
+
...messages.slice(messages.length - prompt.depth),
|
|
160
295
|
];
|
|
161
296
|
}
|
|
162
297
|
}
|
|
163
298
|
}
|
|
299
|
+
// Inject world info depth.
|
|
300
|
+
for (const worldInfo of worldInfoDepth) {
|
|
301
|
+
messages = [
|
|
302
|
+
...messages.slice(0, messages.length - worldInfo.depth),
|
|
303
|
+
{ role: st_getPromptRole(worldInfo.role), content: worldInfo.entries.join('\n') },
|
|
304
|
+
...messages.slice(messages.length - worldInfo.depth),
|
|
305
|
+
];
|
|
306
|
+
}
|
|
307
|
+
const groupDepthPrompts = st_getGroupDepthPrompts(selected_group, Number(this_chid));
|
|
308
|
+
if (selected_group && Array.isArray(groupDepthPrompts) && groupDepthPrompts.length > 0) {
|
|
309
|
+
groupDepthPrompts.forEach((value, index) => {
|
|
310
|
+
messages = [
|
|
311
|
+
...messages.slice(0, messages.length - value.depth),
|
|
312
|
+
{ role: value.role, content: value.text },
|
|
313
|
+
...messages.slice(messages.length - value.depth),
|
|
314
|
+
];
|
|
315
|
+
});
|
|
316
|
+
}
|
|
164
317
|
else {
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
318
|
+
const depthPromptText = st_baseChatReplace(characters[this_chid]?.data?.extensions?.depth_prompt?.prompt?.trim(), name1, name2) || '';
|
|
319
|
+
const depthPromptDepth = depth_prompt_depth_default;
|
|
320
|
+
const depthPromptRole = characters[this_chid]?.data?.extensions?.depth_prompt?.role ?? depth_prompt_role_default;
|
|
321
|
+
messages = [
|
|
322
|
+
...messages.slice(0, messages.length - depthPromptDepth),
|
|
323
|
+
{ role: st_getPromptRole(depthPromptRole), content: depthPromptText },
|
|
324
|
+
...messages.slice(messages.length - depthPromptDepth),
|
|
325
|
+
];
|
|
326
|
+
}
|
|
327
|
+
// TODO: We should respect interval and world info scanning
|
|
328
|
+
const authorNote = st_getAuthorNote();
|
|
329
|
+
let authorNoteIndex = -1;
|
|
330
|
+
if (authorNote.prompt) {
|
|
331
|
+
authorNote.prompt = st_baseChatReplace(authorNote.prompt, name1, name2);
|
|
332
|
+
switch (authorNote.position) {
|
|
333
|
+
case extension_prompt_types.IN_PROMPT: // After first message
|
|
334
|
+
messages = [...messages.slice(0, 1), { role: 'user', content: authorNote.prompt }, ...messages.slice(1)];
|
|
335
|
+
authorNoteIndex = 1;
|
|
336
|
+
break;
|
|
337
|
+
case extension_prompt_types.IN_CHAT: // Depth + role in chat
|
|
338
|
+
messages = [
|
|
339
|
+
...messages.slice(0, messages.length - authorNote.depth),
|
|
340
|
+
{ role: st_getPromptRole(authorNote.role), content: authorNote.prompt },
|
|
341
|
+
...messages.slice(messages.length - authorNote.depth),
|
|
342
|
+
];
|
|
343
|
+
authorNoteIndex = messages.length - authorNote.depth - 1;
|
|
344
|
+
break;
|
|
345
|
+
case extension_prompt_types.BEFORE_PROMPT: // Before first message
|
|
346
|
+
messages.unshift({ role: 'user', content: authorNote.prompt });
|
|
347
|
+
authorNoteIndex = 0;
|
|
348
|
+
break;
|
|
349
|
+
default:
|
|
350
|
+
break;
|
|
351
|
+
}
|
|
352
|
+
}
|
|
353
|
+
// Add world info to author note
|
|
354
|
+
if (authorNoteIndex >= 0) {
|
|
355
|
+
if (anBefore.length > 0) {
|
|
356
|
+
messages = [
|
|
357
|
+
...messages.slice(0, authorNoteIndex),
|
|
358
|
+
{ role: 'system', content: anBefore.join('\n') },
|
|
359
|
+
...messages.slice(authorNoteIndex),
|
|
360
|
+
];
|
|
361
|
+
authorNoteIndex++;
|
|
362
|
+
}
|
|
363
|
+
if (anAfter.length > 0) {
|
|
364
|
+
messages = [
|
|
365
|
+
...messages.slice(0, authorNoteIndex + 1),
|
|
366
|
+
{ role: 'system', content: anAfter.join('\n') },
|
|
367
|
+
...messages.slice(authorNoteIndex + 1),
|
|
368
|
+
];
|
|
369
|
+
}
|
|
189
370
|
}
|
|
190
371
|
return messages;
|
|
191
372
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt-builder.js","sourceRoot":"","sources":["../src/prompt-builder.ts"],"names":[],"mappings":"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"}
|
|
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,EACpB,kBAAkB,EAClB,oBAAoB,EACpB,iCAAiC,GAClC,MAAM,aAAa,CAAC;AAkBrB;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,kBAA2B,EAC3B,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,KAAyB,EAAE;IAEjF,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,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,GACjF,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAEnC,MAAM,cAAc,GAClB,QAAQ,KAAK,qBAAqB;QAChC,CAAC,CAAE,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE,yBAAyB,CAAC,YAAY,CAAkC;QACjH,CAAC,CAAC,SAAS,CAAC;IAChB,MAAM,UAAU,GAAG,CAAC,CAAC,cAAc,CAAC;IACpC,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,OAAO,CAAC,IAAI;SACxB,KAAK,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,kBAAkB,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;SACjE,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;IAE5F,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,MAAM,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,yBAAyB,CAAC,aAAa,CAEjF,CAAC;QACtB,IAAI,eAAe,EAAE,CAAC;YACpB,MAAM;gBACJ,OAAO,CAAC,iBAAiB,CAAC,uBAAuB,IAAI,MAAM;oBACzD,CAAC,CAAC,MAAM;oBACR,CAAC,CAAC,kBAAkB,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YAChE,MAAM,GAAG,UAAU;gBACjB,CAAC,CAAC,iCAAiC,CAC/B,OAAO,CAAC,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,EACvE,cAAc,CACf;gBACH,CAAC,CAAC,MAAM,CAAC;QACb,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,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,EAAE,yBAAyB,CAAC,WAAW,CAE7E,CAAC;QACpB,IAAI,WAAW,GAAG,oBAAoB,CAAC,iBAAiB,EAAE;YACxD,sBAAsB,EAAE,cAAc;YACtC,iBAAiB,EAAE,aAAa,EAAE,YAAY;SAC/C,CAAC,CAAC;QAEH,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC;QAE9E,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,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;IACL,CAAC;SAAM,CAAC;QACN,IAAI,WAAW,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,kBAAkB,GAAG,2BAA2B,CAAC,gBAAgB,CAAC,CAAC;QAEvE,KAAK,UAAU,gBAAgB;YAC7B,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,wBAAwB,CACpD;gBACE,KAAK,EAAE,KAAK;gBACZ,eAAe,EAAE,WAAW;gBAC5B,eAAe,EAAE,WAAW;gBAC5B,QAAQ,EAAE,QAAQ;gBAClB,eAAe,EAAE,eAAe;gBAChC,cAAc,EAAE,cAAc;gBAC9B,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,SAAS;gBACtB,UAAU,EAAE,SAAS;gBACrB,WAAW,EAAE,EAAE;gBACf,oBAAoB,EAAE,MAAM;gBAC5B,uBAAuB,EAAE,SAAS;gBAClC,kBAAkB,EAAE,OAAO;gBAC3B,QAAQ,EAAE,WAAW;gBACrB,eAAe,EAAE,kBAAkB;aACpC,EACD,KAAK,CACN,CAAC;YAEF,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;QAC3B,CAAC;QAED,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,gBAAgB,EAAE,CAAC;YACzB,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,MAAM,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,yBAAyB,CAAC,UAAU,CAE1E,CAAC;QACd,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,IAAI,CAAC,qBAAqB,UAAU,yBAAyB,CAAC,CAAC;YACvE,gBAAgB,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,IAAI,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,KAAK,SAAS,CAAC,CAAC;QAC1F,IAAI,CAAC,WAAW,IAAI,MAAM,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnD,WAAW,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,CAAC,IAAI,CAAC,qCAAqC,UAAU,yBAAyB,CAAC,CAAC;YACvF,gBAAgB,EAAE,CAAC;YACnB,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,MAAM,YAAY,GAAG,QAAQ,IAAI,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChH,MAAM,mBAAmB,GACvB,WAAW,IAAI,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACtG,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;QACvE,MAAM,mBAAmB,GAAG,MAAM,CAAC,oBAAoB;YACrD,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,MAAM,CAAC,oBAAoB,CAAC;YACvD,CAAC,CAAC,EAAE,CAAC;QAEP,oCAAoC;QACpC,MAAM,aAAa,GAAuD;YACxE,kDAAkD;YAClD;gBACE,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,kBAAkB,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;gBAC5E,UAAU,EAAE,iBAAiB;aAC9B;YACD;gBACE,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,kBAAkB,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC;gBAC3E,UAAU,EAAE,gBAAgB;aAC7B;YACD,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,iBAAiB,EAAE;YACvE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,iBAAiB,EAAE;YAC/E,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,UAAU,EAAE;YACjE,mCAAmC;YACnC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,mBAAmB,EAAE,UAAU,EAAE,aAAa,EAAE;YAC3E,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE;SAClE,CAAC;QAEF,0BAA0B;QAC1B,MAAM,OAAO,GAAG,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QACrD,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK;YAC1B,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC;gBACpC,OAAO,EAAE,OAAO,CAAC,KAAK;gBACtB,UAAU,EAAE,SAAS;gBACrB,QAAQ,EAAE,oBAAoB,CAAC,OAAO,CAAC,QAAQ,CAAC;aACjD,CAAC,CAAC;QAEL,eAAe;QACf,MAAM,WAAW,GAAG,OAAO,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,CAAC;QAClE,IAAI,WAAW,IAAI,WAAW,CAAC,KAAK;YAClC,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBACxC,OAAO,EAAE,WAAW,CAAC,KAAK;gBAC1B,UAAU,EAAE,aAAa;gBACzB,QAAQ,EAAE,oBAAoB,CAAC,WAAW,CAAC,QAAQ,CAAC;aACrD,CAAC,CAAC;QAEL,iBAAiB;QACjB,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAC;QAC5D,IAAI,aAAa,IAAI,aAAa,CAAC,KAAK;YACtC,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,aAAa,CAAC,KAAK;gBAC5B,UAAU,EAAE,eAAe;gBAC3B,QAAQ,EAAE,oBAAoB,CAAC,aAAa,CAAC,QAAQ,CAAC;aACvD,CAAC,CAAC;QAEL,MAAM,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC,qBAAqB,CAAC,CAAC;QACxE,IAAI,eAAe,IAAI,eAAe,CAAC,KAAK;YAC1C,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,gBAAgB,CAAC,eAAe,CAAC,IAAI,CAAC;gBAC5C,OAAO,EAAE,eAAe,CAAC,KAAK;gBAC9B,UAAU,EAAE,iBAAiB;gBAC7B,QAAQ,EAAE,oBAAoB,CAAC,eAAe,CAAC,QAAQ,CAAC;aACzD,CAAC,CAAC;QAEL,2BAA2B;QAC3B,MAAM,YAAY,GAAG,OAAO,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC1D,IAAI,YAAY,IAAI,YAAY,CAAC,KAAK;YACpC,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,YAAY,CAAC,KAAK;gBAC3B,UAAU,EAAE,cAAc;gBAC1B,QAAQ,EAAE,oBAAoB,CAAC,YAAY,CAAC,QAAQ,CAAC;aACtD,CAAC,CAAC;QAEL,sBAAsB;QACtB,IACE,OAAO,CAAC,iBAAiB,CAAC,mBAAmB;YAC7C,OAAO,CAAC,iBAAiB,CAAC,4BAA4B,KAAK,6BAA6B,CAAC,SAAS,EAClG,CAAC;YACD,aAAa,CAAC,IAAI,CAAC;gBACjB,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,OAAO,CAAC,iBAAiB,CAAC,mBAAmB;gBACtD,UAAU,EAAE,oBAAoB;aACjC,CAAC,CAAC;QACL,CAAC;QAED,SAAS,SAAS,CAAC,UAAkB;YACnC,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC;QAC1E,CAAC;QAED,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO;YACT,CAAC;YAED,MAAM,gBAAgB,GAAG,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YACtD,IAAI,gBAAgB,IAAI,gBAAgB,CAAC,OAAO,EAAE,CAAC;gBACjD,QAAQ,CAAC,IAAI,CAAC;oBACZ,IAAI,EAAE,gBAAgB,CAAC,IAAI,IAAI,QAAQ;oBACvC,OAAO,EAAE,OAAO,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,OAAO,CAAC;iBAC5D,CAAC,CAAC;gBACH,OAAO;YACT,CAAC;YAED,IAAI,MAAM,CAAC,UAAU,KAAK,aAAa,EAAE,CAAC;gBACxC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;oBAC3B,QAAQ,CAAC,IAAI,CAAC;wBACZ,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW;wBAC5C,OAAO,EAAE,OAAO,CAAC,GAAG;qBACrB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,qBAAqB,GAAG;QAC5B,UAAU;QACV,mBAAmB;QACnB,WAAW;QACX,qBAAqB;QACrB,UAAU;QACV,qBAAqB;QACrB,cAAc;QACd,cAAc;KACf,CAAC;IAEF,gDAAgD;IAChD,KAAK,MAAM,GAAG,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC3C,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,EAAE,CAAC;YACjD,MAAM,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC;YAC7C,IAAI,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAAE,SAAS;YAClD,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,KAAK;gBAAE,SAAS;YACnD,IAAI,CAAC,CAAC,sBAAsB,CAAC,aAAa,EAAE,sBAAsB,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC;gBAAE,SAAS;YAElH,MAAM,SAAS,GAAG,OAAO,MAAM,CAAC,MAAM,KAAK,UAAU,CAAC;YACtD,IAAI,SAAS,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;gBAAE,SAAS;YAEpD,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAsB,CAAC,aAAa,EAAE,CAAC;gBAC7D,QAAQ,GAAG;oBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;oBAClC;wBACE,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,QAAQ;wBAC/C,OAAO,EAAE,MAAM,CAAC,KAAK;qBACtB;oBACD,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC;iBAChC,CAAC;YACJ,CAAC;iBAAM,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAsB,CAAC,SAAS,EAAE,CAAC;gBAChE,QAAQ,GAAG;oBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,KAAM,CAAC;oBACrD;wBACE,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,QAAQ;wBAC/C,OAAO,EAAE,MAAM,CAAC,KAAK;qBACtB;oBACD,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,KAAM,CAAC;iBACnD,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,2BAA2B;IAC3B,KAAK,MAAM,SAAS,IAAI,cAAc,EAAE,CAAC;QACvC,QAAQ,GAAG;YACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC;YACvD,EAAE,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YACjF,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC;SACrD,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,cAAc,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;IAErF,IAAI,cAAc,IAAI,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvF,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;YACzC,QAAQ,GAAG;gBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;gBACnD,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE;gBACzC,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;aACjD,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,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;QAChH,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;QACpD,MAAM,eAAe,GAAG,UAAU,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,IAAI,IAAI,yBAAyB,CAAC;QAEjH,QAAQ,GAAG;YACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,gBAAgB,CAAC;YACxD,EAAE,IAAI,EAAE,gBAAgB,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,eAAe,EAAE;YACrE,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,gBAAgB,CAAC;SACtD,CAAC;IACJ,CAAC;IAED,2DAA2D;IAC3D,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;IACtC,IAAI,eAAe,GAAG,CAAC,CAAC,CAAC;IACzB,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,UAAU,CAAC,MAAM,GAAG,kBAAkB,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QACxE,QAAQ,UAAU,CAAC,QAAQ,EAAE,CAAC;YAC5B,KAAK,sBAAsB,CAAC,SAAS,EAAE,sBAAsB;gBAC3D,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;gBACzG,eAAe,GAAG,CAAC,CAAC;gBACpB,MAAM;YACR,KAAK,sBAAsB,CAAC,OAAO,EAAE,uBAAuB;gBAC1D,QAAQ,GAAG;oBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC;oBACxD,EAAE,IAAI,EAAE,gBAAgB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE;oBACvE,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,CAAC;iBACtD,CAAC;gBACF,eAAe,GAAG,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC;gBACzD,MAAM;YACR,KAAK,sBAAsB,CAAC,aAAa,EAAE,uBAAuB;gBAChE,QAAQ,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC/D,eAAe,GAAG,CAAC,CAAC;gBACpB,MAAM;YACR;gBACE,MAAM;QACV,CAAC;IACH,CAAC;IAED,gCAAgC;IAChC,IAAI,eAAe,IAAI,CAAC,EAAE,CAAC;QACzB,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,QAAQ,GAAG;gBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC;gBACrC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAChD,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC;aACnC,CAAC;YACF,eAAe,EAAE,CAAC;QACpB,CAAC;QAED,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,QAAQ,GAAG;gBACT,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,eAAe,GAAG,CAAC,CAAC;gBACzC,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC/C,GAAG,QAAQ,CAAC,KAAK,CAAC,eAAe,GAAG,CAAC,CAAC;aACvC,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|
|
@@ -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 @@
|
|
|
1
|
+
{"version":3,"file":"chat-completion.js","sourceRoot":"","sources":["../../src/types/chat-completion.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface ContextSettings {
|
|
2
|
+
story_string: string;
|
|
3
|
+
example_separator: string;
|
|
4
|
+
chat_start: string;
|
|
5
|
+
use_stop_strings: boolean;
|
|
6
|
+
allow_jailbreak: boolean;
|
|
7
|
+
always_force_name2: boolean;
|
|
8
|
+
trim_sentences: boolean;
|
|
9
|
+
include_newline: boolean;
|
|
10
|
+
single_line: boolean;
|
|
11
|
+
name: string;
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=context.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../../src/types/context.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;IACzB,kBAAkB,EAAE,OAAO,CAAC;IAC5B,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,OAAO,CAAC;IACzB,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/types/context.ts"],"names":[],"mappings":""}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -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,8 @@ export interface SillyTavernContext {
|
|
|
135
136
|
};
|
|
136
137
|
powerUserSettings: {
|
|
137
138
|
persona_description_position: number;
|
|
139
|
+
persona_description: string;
|
|
140
|
+
prefer_character_prompt: boolean;
|
|
138
141
|
};
|
|
139
142
|
getWorldInfoPrompt: (chat: string[], maxContext: number, isDryRun: boolean) => Promise<WIPromptResult>;
|
|
140
143
|
ToolManager: {
|
|
@@ -154,7 +157,9 @@ export interface SillyTavernContext {
|
|
|
154
157
|
value: string;
|
|
155
158
|
role: number;
|
|
156
159
|
position: number;
|
|
160
|
+
depth: number;
|
|
157
161
|
identifier: string;
|
|
162
|
+
filter?: any;
|
|
158
163
|
}>;
|
|
159
164
|
addOneMessage(mes: ChatMessage, { type, insertAfter, scroll, insertBefore, forceId, showSwipes, }?: {
|
|
160
165
|
type?: string;
|
|
@@ -165,6 +170,10 @@ export interface SillyTavernContext {
|
|
|
165
170
|
showSwipes?: boolean;
|
|
166
171
|
}): void;
|
|
167
172
|
saveChat: () => Promise<void>;
|
|
173
|
+
getPresetManager: (apiId?: string) => {
|
|
174
|
+
getCompletionPresetByName(name?: string): undefined | any | ChatCompletionPreset;
|
|
175
|
+
};
|
|
176
|
+
substituteParams: (content: string, _name1?: string, _name2?: string, _original?: string, _group?: string, _replaceCharacterCard?: boolean, additionalMacro?: Record<string, any>, postProcessFn?: (x: string) => string) => string;
|
|
168
177
|
}
|
|
169
178
|
declare global {
|
|
170
179
|
const SillyTavern: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
|
package/dist/types/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"
|
|
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"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
export interface InstructSettings {
|
|
2
|
+
enabled: boolean;
|
|
3
|
+
preset: string;
|
|
4
|
+
input_sequence: string;
|
|
5
|
+
input_suffix: string;
|
|
6
|
+
output_sequence: string;
|
|
7
|
+
output_suffix: string;
|
|
8
|
+
system_sequence: string;
|
|
9
|
+
system_suffix: string;
|
|
10
|
+
last_system_sequence: string;
|
|
11
|
+
first_input_sequence: string;
|
|
12
|
+
first_output_sequence: string;
|
|
13
|
+
last_input_sequence: string;
|
|
14
|
+
last_output_sequence: string;
|
|
15
|
+
system_sequence_prefix: string;
|
|
16
|
+
system_sequence_suffix: string;
|
|
17
|
+
stop_sequence: string;
|
|
18
|
+
wrap: boolean;
|
|
19
|
+
macro: boolean;
|
|
20
|
+
names_behavior: string;
|
|
21
|
+
activation_regex: string;
|
|
22
|
+
derived: boolean;
|
|
23
|
+
bind_to_context: boolean;
|
|
24
|
+
user_alignment_message: string;
|
|
25
|
+
system_same_as_user: boolean;
|
|
26
|
+
separator_sequence: string;
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=instruct.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instruct.d.ts","sourceRoot":"","sources":["../../src/types/instruct.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,sBAAsB,EAAE,MAAM,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,OAAO,CAAC;IACd,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,OAAO,CAAC;IACzB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,EAAE,MAAM,CAAC;CAC5B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"instruct.js","sourceRoot":"","sources":["../../src/types/instruct.ts"],"names":[],"mappings":""}
|
package/dist/types/profiles.d.ts
CHANGED
|
@@ -7,8 +7,10 @@ export interface ConnectionProfile {
|
|
|
7
7
|
model?: string;
|
|
8
8
|
proxy?: string;
|
|
9
9
|
instruct?: string;
|
|
10
|
+
'instruct-state'?: string;
|
|
10
11
|
context?: string;
|
|
11
|
-
|
|
12
|
+
sysprompt?: string;
|
|
13
|
+
'sysprompt-state'?: string;
|
|
12
14
|
tokenizer?: string;
|
|
13
15
|
stop_strings?: string;
|
|
14
16
|
exclude?: string[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../../src/types/profiles.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,
|
|
1
|
+
{"version":3,"file":"profiles.d.ts","sourceRoot":"","sources":["../../src/types/profiles.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sysprompt.d.ts","sourceRoot":"","sources":["../../src/types/sysprompt.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sysprompt.js","sourceRoot":"","sources":["../../src/types/sysprompt.ts"],"names":[],"mappings":""}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sillytavern-utils-lib",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.9",
|
|
4
4
|
"description": "Utility library for SillyTavern",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -35,6 +35,22 @@
|
|
|
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"
|
|
42
|
+
},
|
|
43
|
+
"./types/instruct": {
|
|
44
|
+
"types": "./dist/types/instruct.d.ts",
|
|
45
|
+
"default": "./dist/types/instruct.js"
|
|
46
|
+
},
|
|
47
|
+
"./types/context": {
|
|
48
|
+
"types": "./dist/types/context.d.ts",
|
|
49
|
+
"default": "./dist/types/context.js"
|
|
50
|
+
},
|
|
51
|
+
"./types/sysprompt": {
|
|
52
|
+
"types": "./dist/types/sysprompt.d.ts",
|
|
53
|
+
"default": "./dist/types/sysprompt.js"
|
|
38
54
|
}
|
|
39
55
|
},
|
|
40
56
|
"files": [
|