pika-shared 1.4.0 → 1.4.2
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/index.js.map +1 -1
- package/dist/index.mjs.map +1 -1
- package/dist/types/chatbot/bedrock-lambda-error.js.map +1 -1
- package/dist/types/chatbot/bedrock-lambda-error.mjs.map +1 -1
- package/dist/types/chatbot/chatbot-types.d.mts +421 -24
- package/dist/types/chatbot/chatbot-types.d.ts +421 -24
- package/dist/types/chatbot/chatbot-types.js +9 -1
- package/dist/types/chatbot/chatbot-types.js.map +1 -1
- package/dist/types/chatbot/chatbot-types.mjs +6 -2
- package/dist/types/chatbot/chatbot-types.mjs.map +1 -1
- package/dist/types/chatbot/webcomp-types.d.mts +326 -0
- package/dist/types/chatbot/webcomp-types.d.ts +326 -0
- package/dist/types/chatbot/webcomp-types.js +4 -0
- package/dist/types/chatbot/webcomp-types.js.map +1 -0
- package/dist/types/chatbot/webcomp-types.mjs +3 -0
- package/dist/types/chatbot/webcomp-types.mjs.map +1 -0
- package/dist/util/api-gateway-utils.js.map +1 -1
- package/dist/util/api-gateway-utils.mjs.map +1 -1
- package/dist/util/bad-request-error.js.map +1 -1
- package/dist/util/bad-request-error.mjs.map +1 -1
- package/dist/util/bedrock.js.map +1 -1
- package/dist/util/bedrock.mjs.map +1 -1
- package/dist/util/chatbot-shared-utils.js.map +1 -1
- package/dist/util/chatbot-shared-utils.mjs.map +1 -1
- package/dist/util/forbidden-error.js.map +1 -1
- package/dist/util/forbidden-error.mjs.map +1 -1
- package/dist/util/http-status-error.js.map +1 -1
- package/dist/util/http-status-error.mjs.map +1 -1
- package/dist/util/icon-utils.d.mts +12 -0
- package/dist/util/icon-utils.d.ts +12 -0
- package/dist/util/icon-utils.js +26 -0
- package/dist/util/icon-utils.js.map +1 -0
- package/dist/util/icon-utils.mjs +24 -0
- package/dist/util/icon-utils.mjs.map +1 -0
- package/dist/util/instruction-assistance-utils.d.mts +28 -1
- package/dist/util/instruction-assistance-utils.d.ts +28 -1
- package/dist/util/instruction-assistance-utils.js +56 -8
- package/dist/util/instruction-assistance-utils.js.map +1 -1
- package/dist/util/instruction-assistance-utils.mjs +55 -9
- package/dist/util/instruction-assistance-utils.mjs.map +1 -1
- package/dist/util/jwt.js.map +1 -1
- package/dist/util/jwt.mjs.map +1 -1
- package/dist/util/server-client-utils.js.map +1 -1
- package/dist/util/server-client-utils.mjs.map +1 -1
- package/dist/util/server-utils.js +6 -2
- package/dist/util/server-utils.js.map +1 -1
- package/dist/util/server-utils.mjs +6 -2
- package/dist/util/server-utils.mjs.map +1 -1
- package/dist/util/unauthorized-error.js.map +1 -1
- package/dist/util/unauthorized-error.mjs.map +1 -1
- package/dist/util/wc-utils.d.mts +22 -0
- package/dist/util/wc-utils.d.ts +22 -0
- package/dist/util/wc-utils.js +26 -0
- package/dist/util/wc-utils.js.map +1 -0
- package/dist/util/wc-utils.mjs +24 -0
- package/dist/util/wc-utils.mjs.map +1 -0
- package/package.json +1 -1
|
@@ -7,18 +7,21 @@ function generateInstructionAssistanceContent(instructionAssistanceConfig, tags,
|
|
|
7
7
|
includeOutputFormattingRequirements: agentInstructionFeature?.includeOutputFormattingRequirements,
|
|
8
8
|
includeInstructionsForTags: agentInstructionFeature?.includeInstructionsForTags,
|
|
9
9
|
completeExampleEnabled: agentInstructionFeature?.completeExampleInstructionEnabled,
|
|
10
|
-
jsonOnlyEnabled: agentInstructionFeature?.jsonOnlyImperativeInstructionEnabled
|
|
10
|
+
jsonOnlyEnabled: agentInstructionFeature?.jsonOnlyImperativeInstructionEnabled,
|
|
11
|
+
includeTypescriptBackedOutputFormattingRequirements: agentInstructionFeature?.includeTypescriptBackedOutputFormattingRequirements
|
|
11
12
|
});
|
|
12
13
|
let outputFormattingRequirements = "";
|
|
13
14
|
let tagInstructions = "";
|
|
14
15
|
let completeExampleInstructionLine = "";
|
|
15
16
|
let jsonOnlyImperativeInstructionLine = "";
|
|
17
|
+
let typescriptBackedOutputFormattingRequirements = "";
|
|
16
18
|
if (!agentInstructionFeature?.enabled) {
|
|
17
19
|
return {
|
|
18
20
|
outputFormattingRequirements,
|
|
19
21
|
tagInstructions,
|
|
20
22
|
completeExampleInstructionLine,
|
|
21
|
-
jsonOnlyImperativeInstructionLine
|
|
23
|
+
jsonOnlyImperativeInstructionLine,
|
|
24
|
+
typescriptBackedOutputFormattingRequirements
|
|
22
25
|
};
|
|
23
26
|
}
|
|
24
27
|
if (agentInstructionFeature.includeOutputFormattingRequirements) {
|
|
@@ -29,7 +32,7 @@ function generateInstructionAssistanceContent(instructionAssistanceConfig, tags,
|
|
|
29
32
|
if (agentInstructionFeature.includeInstructionsForTags && tags && tags.tagsEnabled?.length > 0) {
|
|
30
33
|
console.log("Fetching tag definitions for instruction generation:", tags.tagsEnabled);
|
|
31
34
|
if (tagDefinitions.length > 0) {
|
|
32
|
-
const tagDictionary = tagDefinitions.filter((tagDef) => tagDef.canBeGeneratedByLlm &&
|
|
35
|
+
const tagDictionary = tagDefinitions.filter((tagDef) => tagDef.canBeGeneratedByLlm && tagDef.status === "enabled").map((tagDef) => ` - ${tagDef.tagTitle}: \`${tagDef.shortTagEx}\``).join("\n");
|
|
33
36
|
let tagInstructionsContent = "";
|
|
34
37
|
if (tagDictionary) {
|
|
35
38
|
tagInstructionsContent += `- **Custom Tags Supported:**
|
|
@@ -37,7 +40,7 @@ ${tagDictionary}
|
|
|
37
40
|
`;
|
|
38
41
|
}
|
|
39
42
|
for (const tagDef of tagDefinitions) {
|
|
40
|
-
if (tagDef.canBeGeneratedByLlm &&
|
|
43
|
+
if (tagDef.canBeGeneratedByLlm && tagDef.status === "enabled" && tagDef.llmInstructionsMd) {
|
|
41
44
|
const tagType = `${tagDef.scope}.${tagDef.tag}`;
|
|
42
45
|
tagInstructionsContent += `- **${tagDef.tagTitle}:**
|
|
43
46
|
<tag-instructions type="${tagType}">
|
|
@@ -61,13 +64,15 @@ ${tagDef.llmInstructionsMd}
|
|
|
61
64
|
hasOutputFormatting: !!outputFormattingRequirements,
|
|
62
65
|
hasTagInstructions: !!tagInstructions,
|
|
63
66
|
hasCompleteExample: !!completeExampleInstructionLine,
|
|
64
|
-
hasJsonValidation: !!jsonOnlyImperativeInstructionLine
|
|
67
|
+
hasJsonValidation: !!jsonOnlyImperativeInstructionLine,
|
|
68
|
+
hasTypescriptBackedOutputFormattingRequirements: false
|
|
65
69
|
});
|
|
66
70
|
return {
|
|
67
71
|
outputFormattingRequirements,
|
|
68
72
|
tagInstructions,
|
|
69
73
|
completeExampleInstructionLine,
|
|
70
|
-
jsonOnlyImperativeInstructionLine
|
|
74
|
+
jsonOnlyImperativeInstructionLine,
|
|
75
|
+
typescriptBackedOutputFormattingRequirements
|
|
71
76
|
};
|
|
72
77
|
}
|
|
73
78
|
function applyInstructionAssistance(basePrompt, instructionContent) {
|
|
@@ -111,8 +116,48 @@ function applyInstructionAssistance(basePrompt, instructionContent) {
|
|
|
111
116
|
}
|
|
112
117
|
return enhancedPrompt;
|
|
113
118
|
}
|
|
119
|
+
function generateComponentInstructionContent(tagDefinition, componentAgentInstructionName, instructionAssistanceConfig, agentInstructionFeature) {
|
|
120
|
+
console.log("Generating component instruction content:", {
|
|
121
|
+
scope: tagDefinition.scope,
|
|
122
|
+
tag: tagDefinition.tag,
|
|
123
|
+
componentAgentInstructionName,
|
|
124
|
+
hasDirectInvocationInstructions: !!tagDefinition.componentAgentInstructionsMd,
|
|
125
|
+
hasInstructionAssistanceConfig: !!instructionAssistanceConfig
|
|
126
|
+
});
|
|
127
|
+
if (!tagDefinition.componentAgentInstructionsMd) {
|
|
128
|
+
return void 0;
|
|
129
|
+
}
|
|
130
|
+
const instructions = tagDefinition.componentAgentInstructionsMd[componentAgentInstructionName];
|
|
131
|
+
if (!instructions) {
|
|
132
|
+
console.log(`No instructions found for componentAgentInstructionName: ${componentAgentInstructionName}`);
|
|
133
|
+
console.log("Available instruction names:", Object.keys(tagDefinition.componentAgentInstructionsMd));
|
|
134
|
+
return void 0;
|
|
135
|
+
}
|
|
136
|
+
console.log("Component instructions found:", {
|
|
137
|
+
instructionLength: instructions.length
|
|
138
|
+
});
|
|
139
|
+
if (instructionAssistanceConfig && agentInstructionFeature) {
|
|
140
|
+
return applyComponentInstructionAssistance(instructions, instructionAssistanceConfig, agentInstructionFeature);
|
|
141
|
+
}
|
|
142
|
+
return instructions;
|
|
143
|
+
}
|
|
144
|
+
function applyComponentInstructionAssistance(componentInstructions, instructionConfig, agentInstructionFeature) {
|
|
145
|
+
let enhancedInstructions = componentInstructions;
|
|
146
|
+
console.log("Applying component instruction assistance:", {
|
|
147
|
+
includeTypescriptBackedOutputFormattingRequirements: agentInstructionFeature.includeTypescriptBackedOutputFormattingRequirements,
|
|
148
|
+
hasPlaceholder: enhancedInstructions.includes("{{typescript-backed-output-formatting-requirements}}")
|
|
149
|
+
});
|
|
150
|
+
if (agentInstructionFeature.includeTypescriptBackedOutputFormattingRequirements && instructionConfig.typescriptBackedOutputFormattingRequirements) {
|
|
151
|
+
const placeholder = "{{typescript-backed-output-formatting-requirements}}";
|
|
152
|
+
if (enhancedInstructions.includes(placeholder)) {
|
|
153
|
+
console.log("Replacing typescript-backed-output-formatting-requirements placeholder");
|
|
154
|
+
enhancedInstructions = enhancedInstructions.replace(placeholder, instructionConfig.typescriptBackedOutputFormattingRequirements);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
return enhancedInstructions;
|
|
158
|
+
}
|
|
114
159
|
function getInstructionsAssistanceConfigFromRawSsmParams(params) {
|
|
115
|
-
const expectedKeys = ["output-formatting-requirements", "default-complete-example-line", "default-json-validation-line"];
|
|
160
|
+
const expectedKeys = ["output-formatting-requirements", "default-complete-example-line", "default-json-validation-line", "typescript-backed-output-formatting-requirements"];
|
|
116
161
|
const missingKeys = expectedKeys.filter((key) => !params[key]);
|
|
117
162
|
if (missingKeys.length > 0) {
|
|
118
163
|
throw new Error(
|
|
@@ -122,11 +167,14 @@ function getInstructionsAssistanceConfigFromRawSsmParams(params) {
|
|
|
122
167
|
return {
|
|
123
168
|
outputFormattingRequirements: params["output-formatting-requirements"],
|
|
124
169
|
completeExampleInstructionLine: params["default-complete-example-line"],
|
|
125
|
-
jsonOnlyImperativeInstructionLine: params["default-json-validation-line"]
|
|
170
|
+
jsonOnlyImperativeInstructionLine: params["default-json-validation-line"],
|
|
171
|
+
typescriptBackedOutputFormattingRequirements: params["typescript-backed-output-formatting-requirements"]
|
|
126
172
|
};
|
|
127
173
|
}
|
|
128
174
|
|
|
175
|
+
exports.applyComponentInstructionAssistance = applyComponentInstructionAssistance;
|
|
129
176
|
exports.applyInstructionAssistance = applyInstructionAssistance;
|
|
177
|
+
exports.generateComponentInstructionContent = generateComponentInstructionContent;
|
|
130
178
|
exports.generateInstructionAssistanceContent = generateInstructionAssistanceContent;
|
|
131
179
|
exports.getInstructionsAssistanceConfigFromRawSsmParams = getInstructionsAssistanceConfigFromRawSsmParams;
|
|
132
180
|
//# sourceMappingURL=instruction-assistance-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/util/instruction-assistance-utils.ts"],"names":[],"mappings":"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","file":"instruction-assistance-utils.js","sourcesContent":["/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * The functions in this utility are used both by the front end svelte kit web client in the browser\n * and in the backend lambda converse functions. So, that means it needs to be able\n * to run in a browser. Do not add additional imports beyond anodine types.\n *\n * To be super clear: this is just logic to generate instruction assistance content given\n * the right inputs. It does not collect up those inputs, it is given them.\n *\n */\n\nimport type {\n AgentInstructionChatAppOverridableFeature,\n InstructionAssistanceConfig,\n TagDefinition,\n TagDefinitionWidget,\n TagsChatAppOverridableFeature\n} from '../types/chatbot/chatbot-types';\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Generate instruction assistance content based on enabled features\n *\n * @param instructionAssistanceConfig - The instruction assistance configuration from SSM\n * @param tags - The tags configuration from the chat app\n * @param agentInstructionFeature - The agent instruction feature configuration from the chat app\n * @returns The instruction assistance content\n */\nexport function generateInstructionAssistanceContent(\n instructionAssistanceConfig: InstructionAssistanceConfig | undefined,\n tags: TagsChatAppOverridableFeature | undefined,\n agentInstructionFeature: AgentInstructionChatAppOverridableFeature | undefined,\n tagDefinitions: TagDefinition<TagDefinitionWidget>[]\n): InstructionAssistanceConfig {\n console.log('Generating instruction assistance content:', {\n enabled: agentInstructionFeature?.enabled,\n includeOutputFormattingRequirements: agentInstructionFeature?.includeOutputFormattingRequirements,\n includeInstructionsForTags: agentInstructionFeature?.includeInstructionsForTags,\n completeExampleEnabled: agentInstructionFeature?.completeExampleInstructionEnabled,\n jsonOnlyEnabled: agentInstructionFeature?.jsonOnlyImperativeInstructionEnabled\n });\n\n let outputFormattingRequirements = '';\n let tagInstructions = '';\n let completeExampleInstructionLine = '';\n let jsonOnlyImperativeInstructionLine = '';\n\n if (!agentInstructionFeature?.enabled) {\n return {\n outputFormattingRequirements,\n tagInstructions,\n completeExampleInstructionLine,\n jsonOnlyImperativeInstructionLine\n };\n }\n\n // Generate output formatting requirements\n if (agentInstructionFeature.includeOutputFormattingRequirements) {\n outputFormattingRequirements =\n instructionAssistanceConfig?.outputFormattingRequirements ||\n `**Output Formatting Requirements:**\n- **Output Response Enclosure**: All response output MUST be completely enclosed within <answer></answer> tags, including supported custom tags.\n- **Output Content Format:** All responses MUST be in Markdown with supported custom tags.`;\n }\n\n // Generate tag instructions\n if (agentInstructionFeature.includeInstructionsForTags && tags && tags.tagsEnabled?.length > 0) {\n console.log('Fetching tag definitions for instruction generation:', tags.tagsEnabled);\n\n if (tagDefinitions.length > 0) {\n // First create a dictionary listing all supported tags\n const tagDictionary = tagDefinitions\n .filter((tagDef) => tagDef.canBeGeneratedByLlm && !tagDef.disabled)\n .map((tagDef) => ` - ${tagDef.tagTitle}: \\`${tagDef.shortTagEx}\\``)\n .join('\\n');\n\n let tagInstructionsContent = '';\n if (tagDictionary) {\n tagInstructionsContent += `- **Custom Tags Supported:**\\n${tagDictionary}\\n`;\n }\n\n // Then add detailed instructions for each tag\n for (const tagDef of tagDefinitions) {\n if (tagDef.canBeGeneratedByLlm && !tagDef.disabled && tagDef.llmInstructionsMd) {\n const tagType = `${tagDef.scope}.${tagDef.tag}`;\n tagInstructionsContent += `- **${tagDef.tagTitle}:**\\n <tag-instructions type=\"${tagType}\">\\n${tagDef.llmInstructionsMd}\\n </tag-instructions>\\n`;\n }\n }\n\n if (tagInstructionsContent) {\n tagInstructions = tagInstructionsContent;\n }\n }\n }\n\n // Generate complete example instruction line\n if (agentInstructionFeature.completeExampleInstructionEnabled) {\n completeExampleInstructionLine =\n agentInstructionFeature.completeExampleInstructionLine ||\n instructionAssistanceConfig?.completeExampleInstructionLine ||\n '- **Complete Example Output:**\\n `<answer>##Example markdown\\nNormal text and an <image>http://some.url</image> and some **bold text**\\n<chart>(...)</chart></answer>`';\n }\n\n // Generate JSON validation instruction line\n if (agentInstructionFeature.jsonOnlyImperativeInstructionEnabled) {\n jsonOnlyImperativeInstructionLine =\n agentInstructionFeature.jsonOnlyImperativeInstructionLine ||\n instructionAssistanceConfig?.jsonOnlyImperativeInstructionLine ||\n 'BE ABSOLUTELY CERTAIN ANY JSON INCLUDED IS 100% VALID (especially for charts). Invalid JSON will break the user experience.';\n }\n\n console.log('Generated instruction assistance content:', {\n hasOutputFormatting: !!outputFormattingRequirements,\n hasTagInstructions: !!tagInstructions,\n hasCompleteExample: !!completeExampleInstructionLine,\n hasJsonValidation: !!jsonOnlyImperativeInstructionLine\n });\n\n return {\n outputFormattingRequirements,\n tagInstructions,\n completeExampleInstructionLine,\n jsonOnlyImperativeInstructionLine\n };\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Apply instruction assistance to the base prompt using placeholder replacement\n */\nexport function applyInstructionAssistance(basePrompt: string, instructionContent: InstructionAssistanceConfig): string {\n let enhancedPrompt = basePrompt;\n\n // Check for primary placeholder first\n if (enhancedPrompt.includes('{{prompt-assistance}}')) {\n console.log('Found {{prompt-assistance}} placeholder');\n\n const allContent = [\n instructionContent.outputFormattingRequirements,\n instructionContent.tagInstructions,\n instructionContent.completeExampleInstructionLine,\n instructionContent.jsonOnlyImperativeInstructionLine\n ]\n .filter((content) => content && content.trim().length > 0)\n .join('\\n\\n');\n\n enhancedPrompt = enhancedPrompt.replace('{{prompt-assistance}}', allContent);\n } else {\n // Look for fine-grained placeholders\n const placeholders = [\n { placeholder: '{{output-formatting-requirements}}', content: instructionContent.outputFormattingRequirements },\n { placeholder: '{{tag-instructions}}', content: instructionContent.tagInstructions },\n { placeholder: '{{complete-example-instruction-line}}', content: instructionContent.completeExampleInstructionLine },\n { placeholder: '{{json-only-imperative-instruction-line}}', content: instructionContent.jsonOnlyImperativeInstructionLine }\n ];\n\n let hasAnyPlaceholder = false;\n for (const { placeholder, content } of placeholders) {\n if (enhancedPrompt.includes(placeholder) && content) {\n console.log(`Found ${placeholder} placeholder`);\n hasAnyPlaceholder = true;\n enhancedPrompt = enhancedPrompt.replace(placeholder, content);\n }\n }\n\n // If no placeholders found, append to end\n if (!hasAnyPlaceholder) {\n console.log('No placeholders found, appending to end of prompt');\n const allContent = [\n instructionContent.outputFormattingRequirements,\n instructionContent.tagInstructions,\n instructionContent.completeExampleInstructionLine,\n instructionContent.jsonOnlyImperativeInstructionLine\n ].filter((content) => content && content.trim().length > 0);\n\n if (allContent.length > 0) {\n enhancedPrompt = enhancedPrompt + '\\n\\n' + allContent.join('\\n\\n');\n }\n }\n }\n\n return enhancedPrompt;\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Get the instruction assistance configuration from raw SSM parameters\n *\n * @param params - The raw SSM parameters\n * @returns The instruction assistance configuration\n */\nexport function getInstructionsAssistanceConfigFromRawSsmParams(params: Record<string, string>): InstructionAssistanceConfig {\n const expectedKeys = ['output-formatting-requirements', 'default-complete-example-line', 'default-json-validation-line'];\n const missingKeys = expectedKeys.filter((key) => !params[key]);\n if (missingKeys.length > 0) {\n throw new Error(\n `Missing required instruction assistance parameters: ${Object.keys(params)\n .filter((key) => !expectedKeys.includes(key))\n .join(', ')}`\n );\n }\n\n return {\n outputFormattingRequirements: params['output-formatting-requirements'],\n completeExampleInstructionLine: params['default-complete-example-line'],\n jsonOnlyImperativeInstructionLine: params['default-json-validation-line']\n };\n}\n"]}
|
|
1
|
+
{"version":3,"sources":["../../src/util/instruction-assistance-utils.ts"],"names":[],"mappings":";;;AAgCO,SAAS,oCAAA,CACZ,2BAAA,EACA,IAAA,EACA,uBAAA,EACA,cAAA,EAC2B;AAC3B,EAAA,OAAA,CAAQ,IAAI,4CAAA,EAA8C;AAAA,IACtD,SAAS,uBAAA,EAAyB,OAAA;AAAA,IAClC,qCAAqC,uBAAA,EAAyB,mCAAA;AAAA,IAC9D,4BAA4B,uBAAA,EAAyB,0BAAA;AAAA,IACrD,wBAAwB,uBAAA,EAAyB,iCAAA;AAAA,IACjD,iBAAiB,uBAAA,EAAyB,oCAAA;AAAA,IAC1C,qDAAqD,uBAAA,EAAyB;AAAA,GACjF,CAAA;AAED,EAAA,IAAI,4BAAA,GAA+B,EAAA;AACnC,EAAA,IAAI,eAAA,GAAkB,EAAA;AACtB,EAAA,IAAI,8BAAA,GAAiC,EAAA;AACrC,EAAA,IAAI,iCAAA,GAAoC,EAAA;AACxC,EAAA,IAAI,4CAAA,GAA+C,EAAA;AAEnD,EAAA,IAAI,CAAC,yBAAyB,OAAA,EAAS;AACnC,IAAA,OAAO;AAAA,MACH,4BAAA;AAAA,MACA,eAAA;AAAA,MACA,8BAAA;AAAA,MACA,iCAAA;AAAA,MACA;AAAA,KACJ;AAAA,EACJ;AAGA,EAAA,IAAI,wBAAwB,mCAAA,EAAqC;AAC7D,IAAA,4BAAA,GACI,6BAA6B,4BAAA,IAC7B,CAAA;AAAA;AAAA,0FAAA,CAAA;AAAA,EAGR;AAGA,EAAA,IAAI,wBAAwB,0BAAA,IAA8B,IAAA,IAAQ,IAAA,CAAK,WAAA,EAAa,SAAS,CAAA,EAAG;AAC5F,IAAA,OAAA,CAAQ,GAAA,CAAI,sDAAA,EAAwD,IAAA,CAAK,WAAW,CAAA;AAEpF,IAAA,IAAI,cAAA,CAAe,SAAS,CAAA,EAAG;AAE3B,MAAA,MAAM,aAAA,GAAgB,eACjB,MAAA,CAAO,CAAC,WAAW,MAAA,CAAO,mBAAA,IAAuB,MAAA,CAAO,MAAA,KAAW,SAAS,CAAA,CAC5E,IAAI,CAAC,MAAA,KAAW,CAAA,IAAA,EAAO,MAAA,CAAO,QAAQ,CAAA,IAAA,EAAO,OAAO,UAAU,CAAA,EAAA,CAAI,CAAA,CAClE,IAAA,CAAK,IAAI,CAAA;AAEd,MAAA,IAAI,sBAAA,GAAyB,EAAA;AAC7B,MAAA,IAAI,aAAA,EAAe;AACf,QAAA,sBAAA,IAA0B,CAAA;AAAA,EAAiC,aAAa;AAAA,CAAA;AAAA,MAC5E;AAGA,MAAA,KAAA,MAAW,UAAU,cAAA,EAAgB;AACjC,QAAA,IAAI,OAAO,mBAAA,IAAuB,MAAA,CAAO,MAAA,KAAW,SAAA,IAAa,OAAO,iBAAA,EAAmB;AACvF,UAAA,MAAM,UAAU,CAAA,EAAG,MAAA,CAAO,KAAK,CAAA,CAAA,EAAI,OAAO,GAAG,CAAA,CAAA;AAC7C,UAAA,sBAAA,IAA0B,CAAA,IAAA,EAAO,OAAO,QAAQ,CAAA;AAAA,0BAAA,EAAkC,OAAO,CAAA;AAAA,EAAO,OAAO,iBAAiB;AAAA;AAAA,CAAA;AAAA,QAC5H;AAAA,MACJ;AAEA,MAAA,IAAI,sBAAA,EAAwB;AACxB,QAAA,eAAA,GAAkB,sBAAA;AAAA,MACtB;AAAA,IACJ;AAAA,EACJ;AAGA,EAAA,IAAI,wBAAwB,iCAAA,EAAmC;AAC3D,IAAA,8BAAA,GACI,uBAAA,CAAwB,8BAAA,IACxB,2BAAA,EAA6B,8BAAA,IAC7B,yKAAA;AAAA,EACR;AAGA,EAAA,IAAI,wBAAwB,oCAAA,EAAsC;AAC9D,IAAA,iCAAA,GACI,uBAAA,CAAwB,iCAAA,IACxB,2BAAA,EAA6B,iCAAA,IAC7B,6HAAA;AAAA,EACR;AAEA,EAAA,OAAA,CAAQ,IAAI,2CAAA,EAA6C;AAAA,IACrD,mBAAA,EAAqB,CAAC,CAAC,4BAAA;AAAA,IACvB,kBAAA,EAAoB,CAAC,CAAC,eAAA;AAAA,IACtB,kBAAA,EAAoB,CAAC,CAAC,8BAAA;AAAA,IACtB,iBAAA,EAAmB,CAAC,CAAC,iCAAA;AAAA,IACrB,+CAAA,EAAiD;AAAE,GACtD,CAAA;AAED,EAAA,OAAO;AAAA,IACH,4BAAA;AAAA,IACA,eAAA;AAAA,IACA,8BAAA;AAAA,IACA,iCAAA;AAAA,IACA;AAAA,GACJ;AACJ;AASO,SAAS,0BAAA,CAA2B,YAAoB,kBAAA,EAAyD;AACpH,EAAA,IAAI,cAAA,GAAiB,UAAA;AAGrB,EAAA,IAAI,cAAA,CAAe,QAAA,CAAS,uBAAuB,CAAA,EAAG;AAClD,IAAA,OAAA,CAAQ,IAAI,yCAAyC,CAAA;AAErD,IAAA,MAAM,UAAA,GAAa;AAAA,MACf,kBAAA,CAAmB,4BAAA;AAAA,MACnB,kBAAA,CAAmB,eAAA;AAAA,MACnB,kBAAA,CAAmB,8BAAA;AAAA,MACnB,kBAAA,CAAmB;AAAA,KACvB,CACK,MAAA,CAAO,CAAC,OAAA,KAAY,OAAA,IAAW,OAAA,CAAQ,IAAA,EAAK,CAAE,MAAA,GAAS,CAAC,CAAA,CACxD,IAAA,CAAK,MAAM,CAAA;AAEhB,IAAA,cAAA,GAAiB,cAAA,CAAe,OAAA,CAAQ,uBAAA,EAAyB,UAAU,CAAA;AAAA,EAC/E,CAAA,MAAO;AAEH,IAAA,MAAM,YAAA,GAAe;AAAA,MACjB,EAAE,WAAA,EAAa,oCAAA,EAAsC,OAAA,EAAS,mBAAmB,4BAAA,EAA6B;AAAA,MAC9G,EAAE,WAAA,EAAa,sBAAA,EAAwB,OAAA,EAAS,mBAAmB,eAAA,EAAgB;AAAA,MACnF,EAAE,WAAA,EAAa,uCAAA,EAAyC,OAAA,EAAS,mBAAmB,8BAAA,EAA+B;AAAA,MACnH,EAAE,WAAA,EAAa,2CAAA,EAA6C,OAAA,EAAS,mBAAmB,iCAAA;AAAkC,KAC9H;AAEA,IAAA,IAAI,iBAAA,GAAoB,KAAA;AACxB,IAAA,KAAA,MAAW,EAAE,WAAA,EAAa,OAAA,EAAQ,IAAK,YAAA,EAAc;AACjD,MAAA,IAAI,cAAA,CAAe,QAAA,CAAS,WAAW,CAAA,IAAK,OAAA,EAAS;AACjD,QAAA,OAAA,CAAQ,GAAA,CAAI,CAAA,MAAA,EAAS,WAAW,CAAA,YAAA,CAAc,CAAA;AAC9C,QAAA,iBAAA,GAAoB,IAAA;AACpB,QAAA,cAAA,GAAiB,cAAA,CAAe,OAAA,CAAQ,WAAA,EAAa,OAAO,CAAA;AAAA,MAChE;AAAA,IACJ;AAGA,IAAA,IAAI,CAAC,iBAAA,EAAmB;AACpB,MAAA,OAAA,CAAQ,IAAI,mDAAmD,CAAA;AAC/D,MAAA,MAAM,UAAA,GAAa;AAAA,QACf,kBAAA,CAAmB,4BAAA;AAAA,QACnB,kBAAA,CAAmB,eAAA;AAAA,QACnB,kBAAA,CAAmB,8BAAA;AAAA,QACnB,kBAAA,CAAmB;AAAA,OACvB,CAAE,OAAO,CAAC,OAAA,KAAY,WAAW,OAAA,CAAQ,IAAA,EAAK,CAAE,MAAA,GAAS,CAAC,CAAA;AAE1D,MAAA,IAAI,UAAA,CAAW,SAAS,CAAA,EAAG;AACvB,QAAA,cAAA,GAAiB,cAAA,GAAiB,MAAA,GAAS,UAAA,CAAW,IAAA,CAAK,MAAM,CAAA;AAAA,MACrE;AAAA,IACJ;AAAA,EACJ;AAEA,EAAA,OAAO,cAAA;AACX;AAeO,SAAS,mCAAA,CACZ,aAAA,EACA,6BAAA,EACA,2BAAA,EACA,uBAAA,EACkB;AAClB,EAAA,OAAA,CAAQ,IAAI,2CAAA,EAA6C;AAAA,IACrD,OAAO,aAAA,CAAc,KAAA;AAAA,IACrB,KAAK,aAAA,CAAc,GAAA;AAAA,IACnB,6BAAA;AAAA,IACA,+BAAA,EAAiC,CAAC,CAAC,aAAA,CAAc,4BAAA;AAAA,IACjD,8BAAA,EAAgC,CAAC,CAAC;AAAA,GACrC,CAAA;AAED,EAAA,IAAI,CAAC,cAAc,4BAAA,EAA8B;AAE7C,IAAA,OAAO,MAAA;AAAA,EACX;AAEA,EAAA,MAAM,YAAA,GAAe,aAAA,CAAc,4BAAA,CAA6B,6BAA6B,CAAA;AAE7F,EAAA,IAAI,CAAC,YAAA,EAAc;AACf,IAAA,OAAA,CAAQ,GAAA,CAAI,CAAA,yDAAA,EAA4D,6BAA6B,CAAA,CAAE,CAAA;AACvG,IAAA,OAAA,CAAQ,IAAI,8BAAA,EAAgC,MAAA,CAAO,IAAA,CAAK,aAAA,CAAc,4BAA4B,CAAC,CAAA;AACnG,IAAA,OAAO,MAAA;AAAA,EACX;AAEA,EAAA,OAAA,CAAQ,IAAI,+BAAA,EAAiC;AAAA,IACzC,mBAAmB,YAAA,CAAa;AAAA,GACnC,CAAA;AAGD,EAAA,IAAI,+BAA+B,uBAAA,EAAyB;AACxD,IAAA,OAAO,mCAAA,CAAoC,YAAA,EAAc,2BAAA,EAA6B,uBAAuB,CAAA;AAAA,EACjH;AAEA,EAAA,OAAO,YAAA;AACX;AAcO,SAAS,mCAAA,CACZ,qBAAA,EACA,iBAAA,EACA,uBAAA,EACM;AACN,EAAA,IAAI,oBAAA,GAAuB,qBAAA;AAE3B,EAAA,OAAA,CAAQ,IAAI,4CAAA,EAA8C;AAAA,IACtD,qDAAqD,uBAAA,CAAwB,mDAAA;AAAA,IAC7E,cAAA,EAAgB,oBAAA,CAAqB,QAAA,CAAS,sDAAsD;AAAA,GACvG,CAAA;AAGD,EAAA,IAAI,uBAAA,CAAwB,mDAAA,IAAuD,iBAAA,CAAkB,4CAAA,EAA8C;AAC/I,IAAA,MAAM,WAAA,GAAc,sDAAA;AACpB,IAAA,IAAI,oBAAA,CAAqB,QAAA,CAAS,WAAW,CAAA,EAAG;AAC5C,MAAA,OAAA,CAAQ,IAAI,wEAAwE,CAAA;AACpF,MAAA,oBAAA,GAAuB,oBAAA,CAAqB,OAAA,CAAQ,WAAA,EAAa,iBAAA,CAAkB,4CAA4C,CAAA;AAAA,IACnI;AAAA,EACJ;AAEA,EAAA,OAAO,oBAAA;AACX;AAYO,SAAS,gDAAgD,MAAA,EAA6D;AACzH,EAAA,MAAM,YAAA,GAAe,CAAC,gCAAA,EAAkC,+BAAA,EAAiC,gCAAgC,kDAAkD,CAAA;AAC3K,EAAA,MAAM,WAAA,GAAc,aAAa,MAAA,CAAO,CAAC,QAAQ,CAAC,MAAA,CAAO,GAAG,CAAC,CAAA;AAC7D,EAAA,IAAI,WAAA,CAAY,SAAS,CAAA,EAAG;AACxB,IAAA,MAAM,IAAI,KAAA;AAAA,MACN,uDAAuD,MAAA,CAAO,IAAA,CAAK,MAAM,CAAA,CACpE,OAAO,CAAC,GAAA,KAAQ,CAAC,YAAA,CAAa,SAAS,GAAG,CAAC,CAAA,CAC3C,IAAA,CAAK,IAAI,CAAC,CAAA;AAAA,KACnB;AAAA,EACJ;AAEA,EAAA,OAAO;AAAA,IACH,4BAAA,EAA8B,OAAO,gCAAgC,CAAA;AAAA,IACrE,8BAAA,EAAgC,OAAO,+BAA+B,CAAA;AAAA,IACtE,iCAAA,EAAmC,OAAO,8BAA8B,CAAA;AAAA,IACxE,4CAAA,EAA8C,OAAO,kDAAkD;AAAA,GAC3G;AACJ","file":"instruction-assistance-utils.js","sourcesContent":["/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * The functions in this utility are used both by the front end svelte kit web client in the browser\n * and in the backend lambda converse functions. So, that means it needs to be able\n * to run in a browser. Do not add additional imports beyond anodine types.\n *\n * To be super clear: this is just logic to generate instruction assistance content given\n * the right inputs. It does not collect up those inputs, it is given them.\n *\n */\n\nimport type {\n AgentInstructionChatAppOverridableFeature,\n InstructionAssistanceConfig,\n TagDefinition,\n TagDefinitionWidget,\n TagsChatAppOverridableFeature\n} from '../types/chatbot/chatbot-types';\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Generate instruction assistance content based on enabled features\n *\n * @param instructionAssistanceConfig - The instruction assistance configuration from SSM\n * @param tags - The tags configuration from the chat app\n * @param agentInstructionFeature - The agent instruction feature configuration from the chat app\n * @returns The instruction assistance content\n */\nexport function generateInstructionAssistanceContent(\n instructionAssistanceConfig: InstructionAssistanceConfig | undefined,\n tags: TagsChatAppOverridableFeature | undefined,\n agentInstructionFeature: AgentInstructionChatAppOverridableFeature | undefined,\n tagDefinitions: TagDefinition<TagDefinitionWidget>[]\n): InstructionAssistanceConfig {\n console.log('Generating instruction assistance content:', {\n enabled: agentInstructionFeature?.enabled,\n includeOutputFormattingRequirements: agentInstructionFeature?.includeOutputFormattingRequirements,\n includeInstructionsForTags: agentInstructionFeature?.includeInstructionsForTags,\n completeExampleEnabled: agentInstructionFeature?.completeExampleInstructionEnabled,\n jsonOnlyEnabled: agentInstructionFeature?.jsonOnlyImperativeInstructionEnabled,\n includeTypescriptBackedOutputFormattingRequirements: agentInstructionFeature?.includeTypescriptBackedOutputFormattingRequirements\n });\n\n let outputFormattingRequirements = '';\n let tagInstructions = '';\n let completeExampleInstructionLine = '';\n let jsonOnlyImperativeInstructionLine = '';\n let typescriptBackedOutputFormattingRequirements = '';\n\n if (!agentInstructionFeature?.enabled) {\n return {\n outputFormattingRequirements,\n tagInstructions,\n completeExampleInstructionLine,\n jsonOnlyImperativeInstructionLine,\n typescriptBackedOutputFormattingRequirements\n };\n }\n\n // Generate output formatting requirements\n if (agentInstructionFeature.includeOutputFormattingRequirements) {\n outputFormattingRequirements =\n instructionAssistanceConfig?.outputFormattingRequirements ||\n `**Output Formatting Requirements:**\n- **Output Response Enclosure**: All response output MUST be completely enclosed within <answer></answer> tags, including supported custom tags.\n- **Output Content Format:** All responses MUST be in Markdown with supported custom tags.`;\n }\n\n // Generate tag instructions\n if (agentInstructionFeature.includeInstructionsForTags && tags && tags.tagsEnabled?.length > 0) {\n console.log('Fetching tag definitions for instruction generation:', tags.tagsEnabled);\n\n if (tagDefinitions.length > 0) {\n // First create a dictionary listing all supported tags\n const tagDictionary = tagDefinitions\n .filter((tagDef) => tagDef.canBeGeneratedByLlm && tagDef.status === 'enabled')\n .map((tagDef) => ` - ${tagDef.tagTitle}: \\`${tagDef.shortTagEx}\\``)\n .join('\\n');\n\n let tagInstructionsContent = '';\n if (tagDictionary) {\n tagInstructionsContent += `- **Custom Tags Supported:**\\n${tagDictionary}\\n`;\n }\n\n // Then add detailed instructions for each tag\n for (const tagDef of tagDefinitions) {\n if (tagDef.canBeGeneratedByLlm && tagDef.status === 'enabled' && tagDef.llmInstructionsMd) {\n const tagType = `${tagDef.scope}.${tagDef.tag}`;\n tagInstructionsContent += `- **${tagDef.tagTitle}:**\\n <tag-instructions type=\"${tagType}\">\\n${tagDef.llmInstructionsMd}\\n </tag-instructions>\\n`;\n }\n }\n\n if (tagInstructionsContent) {\n tagInstructions = tagInstructionsContent;\n }\n }\n }\n\n // Generate complete example instruction line\n if (agentInstructionFeature.completeExampleInstructionEnabled) {\n completeExampleInstructionLine =\n agentInstructionFeature.completeExampleInstructionLine ||\n instructionAssistanceConfig?.completeExampleInstructionLine ||\n '- **Complete Example Output:**\\n `<answer>##Example markdown\\nNormal text and an <image>http://some.url</image> and some **bold text**\\n<chart>(...)</chart></answer>`';\n }\n\n // Generate JSON validation instruction line\n if (agentInstructionFeature.jsonOnlyImperativeInstructionEnabled) {\n jsonOnlyImperativeInstructionLine =\n agentInstructionFeature.jsonOnlyImperativeInstructionLine ||\n instructionAssistanceConfig?.jsonOnlyImperativeInstructionLine ||\n 'BE ABSOLUTELY CERTAIN ANY JSON INCLUDED IS 100% VALID (especially for charts). Invalid JSON will break the user experience.';\n }\n\n console.log('Generated instruction assistance content:', {\n hasOutputFormatting: !!outputFormattingRequirements,\n hasTagInstructions: !!tagInstructions,\n hasCompleteExample: !!completeExampleInstructionLine,\n hasJsonValidation: !!jsonOnlyImperativeInstructionLine,\n hasTypescriptBackedOutputFormattingRequirements: !!typescriptBackedOutputFormattingRequirements\n });\n\n return {\n outputFormattingRequirements,\n tagInstructions,\n completeExampleInstructionLine,\n jsonOnlyImperativeInstructionLine,\n typescriptBackedOutputFormattingRequirements\n };\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Apply instruction assistance to the base prompt using placeholder replacement\n */\nexport function applyInstructionAssistance(basePrompt: string, instructionContent: InstructionAssistanceConfig): string {\n let enhancedPrompt = basePrompt;\n\n // Check for primary placeholder first\n if (enhancedPrompt.includes('{{prompt-assistance}}')) {\n console.log('Found {{prompt-assistance}} placeholder');\n\n const allContent = [\n instructionContent.outputFormattingRequirements,\n instructionContent.tagInstructions,\n instructionContent.completeExampleInstructionLine,\n instructionContent.jsonOnlyImperativeInstructionLine\n ]\n .filter((content) => content && content.trim().length > 0)\n .join('\\n\\n');\n\n enhancedPrompt = enhancedPrompt.replace('{{prompt-assistance}}', allContent);\n } else {\n // Look for fine-grained placeholders\n const placeholders = [\n { placeholder: '{{output-formatting-requirements}}', content: instructionContent.outputFormattingRequirements },\n { placeholder: '{{tag-instructions}}', content: instructionContent.tagInstructions },\n { placeholder: '{{complete-example-instruction-line}}', content: instructionContent.completeExampleInstructionLine },\n { placeholder: '{{json-only-imperative-instruction-line}}', content: instructionContent.jsonOnlyImperativeInstructionLine }\n ];\n\n let hasAnyPlaceholder = false;\n for (const { placeholder, content } of placeholders) {\n if (enhancedPrompt.includes(placeholder) && content) {\n console.log(`Found ${placeholder} placeholder`);\n hasAnyPlaceholder = true;\n enhancedPrompt = enhancedPrompt.replace(placeholder, content);\n }\n }\n\n // If no placeholders found, append to end\n if (!hasAnyPlaceholder) {\n console.log('No placeholders found, appending to end of prompt');\n const allContent = [\n instructionContent.outputFormattingRequirements,\n instructionContent.tagInstructions,\n instructionContent.completeExampleInstructionLine,\n instructionContent.jsonOnlyImperativeInstructionLine\n ].filter((content) => content && content.trim().length > 0);\n\n if (allContent.length > 0) {\n enhancedPrompt = enhancedPrompt + '\\n\\n' + allContent.join('\\n\\n');\n }\n }\n }\n\n return enhancedPrompt;\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Generate component-specific instruction content for direct component invocations\n *\n * @param tagDefinition - The tag definition with component invocation instructions\n * @param componentAgentInstructionName - The name of the instruction set to use\n * @param instructionAssistanceConfig - Optional instruction assistance config for placeholder replacement\n * @param agentInstructionFeature - Optional agent instruction feature to control which placeholders are replaced\n * @returns The component instruction content or undefined if not found\n */\nexport function generateComponentInstructionContent(\n tagDefinition: TagDefinition<TagDefinitionWidget>,\n componentAgentInstructionName: string,\n instructionAssistanceConfig?: InstructionAssistanceConfig,\n agentInstructionFeature?: AgentInstructionChatAppOverridableFeature\n): string | undefined {\n console.log('Generating component instruction content:', {\n scope: tagDefinition.scope,\n tag: tagDefinition.tag,\n componentAgentInstructionName,\n hasDirectInvocationInstructions: !!tagDefinition.componentAgentInstructionsMd,\n hasInstructionAssistanceConfig: !!instructionAssistanceConfig\n });\n\n if (!tagDefinition.componentAgentInstructionsMd) {\n // console.log('No componentAgentInstructionsMd found on tag definition');\n return undefined;\n }\n\n const instructions = tagDefinition.componentAgentInstructionsMd[componentAgentInstructionName];\n\n if (!instructions) {\n console.log(`No instructions found for componentAgentInstructionName: ${componentAgentInstructionName}`);\n console.log('Available instruction names:', Object.keys(tagDefinition.componentAgentInstructionsMd));\n return undefined;\n }\n\n console.log('Component instructions found:', {\n instructionLength: instructions.length\n });\n\n // Apply placeholder replacement if instruction assistance config is provided\n if (instructionAssistanceConfig && agentInstructionFeature) {\n return applyComponentInstructionAssistance(instructions, instructionAssistanceConfig, agentInstructionFeature);\n }\n\n return instructions;\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Apply instruction assistance placeholder replacement to component instructions\n *\n * @param componentInstructions - The raw component instructions with placeholders\n * @param instructionConfig - The instruction assistance configuration\n * @param agentInstructionFeature - The agent instruction feature configuration\n * @returns The component instructions with placeholders replaced\n */\nexport function applyComponentInstructionAssistance(\n componentInstructions: string,\n instructionConfig: InstructionAssistanceConfig,\n agentInstructionFeature: AgentInstructionChatAppOverridableFeature\n): string {\n let enhancedInstructions = componentInstructions;\n\n console.log('Applying component instruction assistance:', {\n includeTypescriptBackedOutputFormattingRequirements: agentInstructionFeature.includeTypescriptBackedOutputFormattingRequirements,\n hasPlaceholder: enhancedInstructions.includes('{{typescript-backed-output-formatting-requirements}}')\n });\n\n // Replace typescript-backed-output-formatting-requirements placeholder if enabled\n if (agentInstructionFeature.includeTypescriptBackedOutputFormattingRequirements && instructionConfig.typescriptBackedOutputFormattingRequirements) {\n const placeholder = '{{typescript-backed-output-formatting-requirements}}';\n if (enhancedInstructions.includes(placeholder)) {\n console.log('Replacing typescript-backed-output-formatting-requirements placeholder');\n enhancedInstructions = enhancedInstructions.replace(placeholder, instructionConfig.typescriptBackedOutputFormattingRequirements);\n }\n }\n\n return enhancedInstructions;\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Get the instruction assistance configuration from raw SSM parameters\n *\n * @param params - The raw SSM parameters\n * @returns The instruction assistance configuration\n */\nexport function getInstructionsAssistanceConfigFromRawSsmParams(params: Record<string, string>): InstructionAssistanceConfig {\n const expectedKeys = ['output-formatting-requirements', 'default-complete-example-line', 'default-json-validation-line', 'typescript-backed-output-formatting-requirements'];\n const missingKeys = expectedKeys.filter((key) => !params[key]);\n if (missingKeys.length > 0) {\n throw new Error(\n `Missing required instruction assistance parameters: ${Object.keys(params)\n .filter((key) => !expectedKeys.includes(key))\n .join(', ')}`\n );\n }\n\n return {\n outputFormattingRequirements: params['output-formatting-requirements'],\n completeExampleInstructionLine: params['default-complete-example-line'],\n jsonOnlyImperativeInstructionLine: params['default-json-validation-line'],\n typescriptBackedOutputFormattingRequirements: params['typescript-backed-output-formatting-requirements']\n };\n}\n"]}
|
|
@@ -5,18 +5,21 @@ function generateInstructionAssistanceContent(instructionAssistanceConfig, tags,
|
|
|
5
5
|
includeOutputFormattingRequirements: agentInstructionFeature?.includeOutputFormattingRequirements,
|
|
6
6
|
includeInstructionsForTags: agentInstructionFeature?.includeInstructionsForTags,
|
|
7
7
|
completeExampleEnabled: agentInstructionFeature?.completeExampleInstructionEnabled,
|
|
8
|
-
jsonOnlyEnabled: agentInstructionFeature?.jsonOnlyImperativeInstructionEnabled
|
|
8
|
+
jsonOnlyEnabled: agentInstructionFeature?.jsonOnlyImperativeInstructionEnabled,
|
|
9
|
+
includeTypescriptBackedOutputFormattingRequirements: agentInstructionFeature?.includeTypescriptBackedOutputFormattingRequirements
|
|
9
10
|
});
|
|
10
11
|
let outputFormattingRequirements = "";
|
|
11
12
|
let tagInstructions = "";
|
|
12
13
|
let completeExampleInstructionLine = "";
|
|
13
14
|
let jsonOnlyImperativeInstructionLine = "";
|
|
15
|
+
let typescriptBackedOutputFormattingRequirements = "";
|
|
14
16
|
if (!agentInstructionFeature?.enabled) {
|
|
15
17
|
return {
|
|
16
18
|
outputFormattingRequirements,
|
|
17
19
|
tagInstructions,
|
|
18
20
|
completeExampleInstructionLine,
|
|
19
|
-
jsonOnlyImperativeInstructionLine
|
|
21
|
+
jsonOnlyImperativeInstructionLine,
|
|
22
|
+
typescriptBackedOutputFormattingRequirements
|
|
20
23
|
};
|
|
21
24
|
}
|
|
22
25
|
if (agentInstructionFeature.includeOutputFormattingRequirements) {
|
|
@@ -27,7 +30,7 @@ function generateInstructionAssistanceContent(instructionAssistanceConfig, tags,
|
|
|
27
30
|
if (agentInstructionFeature.includeInstructionsForTags && tags && tags.tagsEnabled?.length > 0) {
|
|
28
31
|
console.log("Fetching tag definitions for instruction generation:", tags.tagsEnabled);
|
|
29
32
|
if (tagDefinitions.length > 0) {
|
|
30
|
-
const tagDictionary = tagDefinitions.filter((tagDef) => tagDef.canBeGeneratedByLlm &&
|
|
33
|
+
const tagDictionary = tagDefinitions.filter((tagDef) => tagDef.canBeGeneratedByLlm && tagDef.status === "enabled").map((tagDef) => ` - ${tagDef.tagTitle}: \`${tagDef.shortTagEx}\``).join("\n");
|
|
31
34
|
let tagInstructionsContent = "";
|
|
32
35
|
if (tagDictionary) {
|
|
33
36
|
tagInstructionsContent += `- **Custom Tags Supported:**
|
|
@@ -35,7 +38,7 @@ ${tagDictionary}
|
|
|
35
38
|
`;
|
|
36
39
|
}
|
|
37
40
|
for (const tagDef of tagDefinitions) {
|
|
38
|
-
if (tagDef.canBeGeneratedByLlm &&
|
|
41
|
+
if (tagDef.canBeGeneratedByLlm && tagDef.status === "enabled" && tagDef.llmInstructionsMd) {
|
|
39
42
|
const tagType = `${tagDef.scope}.${tagDef.tag}`;
|
|
40
43
|
tagInstructionsContent += `- **${tagDef.tagTitle}:**
|
|
41
44
|
<tag-instructions type="${tagType}">
|
|
@@ -59,13 +62,15 @@ ${tagDef.llmInstructionsMd}
|
|
|
59
62
|
hasOutputFormatting: !!outputFormattingRequirements,
|
|
60
63
|
hasTagInstructions: !!tagInstructions,
|
|
61
64
|
hasCompleteExample: !!completeExampleInstructionLine,
|
|
62
|
-
hasJsonValidation: !!jsonOnlyImperativeInstructionLine
|
|
65
|
+
hasJsonValidation: !!jsonOnlyImperativeInstructionLine,
|
|
66
|
+
hasTypescriptBackedOutputFormattingRequirements: false
|
|
63
67
|
});
|
|
64
68
|
return {
|
|
65
69
|
outputFormattingRequirements,
|
|
66
70
|
tagInstructions,
|
|
67
71
|
completeExampleInstructionLine,
|
|
68
|
-
jsonOnlyImperativeInstructionLine
|
|
72
|
+
jsonOnlyImperativeInstructionLine,
|
|
73
|
+
typescriptBackedOutputFormattingRequirements
|
|
69
74
|
};
|
|
70
75
|
}
|
|
71
76
|
function applyInstructionAssistance(basePrompt, instructionContent) {
|
|
@@ -109,8 +114,48 @@ function applyInstructionAssistance(basePrompt, instructionContent) {
|
|
|
109
114
|
}
|
|
110
115
|
return enhancedPrompt;
|
|
111
116
|
}
|
|
117
|
+
function generateComponentInstructionContent(tagDefinition, componentAgentInstructionName, instructionAssistanceConfig, agentInstructionFeature) {
|
|
118
|
+
console.log("Generating component instruction content:", {
|
|
119
|
+
scope: tagDefinition.scope,
|
|
120
|
+
tag: tagDefinition.tag,
|
|
121
|
+
componentAgentInstructionName,
|
|
122
|
+
hasDirectInvocationInstructions: !!tagDefinition.componentAgentInstructionsMd,
|
|
123
|
+
hasInstructionAssistanceConfig: !!instructionAssistanceConfig
|
|
124
|
+
});
|
|
125
|
+
if (!tagDefinition.componentAgentInstructionsMd) {
|
|
126
|
+
return void 0;
|
|
127
|
+
}
|
|
128
|
+
const instructions = tagDefinition.componentAgentInstructionsMd[componentAgentInstructionName];
|
|
129
|
+
if (!instructions) {
|
|
130
|
+
console.log(`No instructions found for componentAgentInstructionName: ${componentAgentInstructionName}`);
|
|
131
|
+
console.log("Available instruction names:", Object.keys(tagDefinition.componentAgentInstructionsMd));
|
|
132
|
+
return void 0;
|
|
133
|
+
}
|
|
134
|
+
console.log("Component instructions found:", {
|
|
135
|
+
instructionLength: instructions.length
|
|
136
|
+
});
|
|
137
|
+
if (instructionAssistanceConfig && agentInstructionFeature) {
|
|
138
|
+
return applyComponentInstructionAssistance(instructions, instructionAssistanceConfig, agentInstructionFeature);
|
|
139
|
+
}
|
|
140
|
+
return instructions;
|
|
141
|
+
}
|
|
142
|
+
function applyComponentInstructionAssistance(componentInstructions, instructionConfig, agentInstructionFeature) {
|
|
143
|
+
let enhancedInstructions = componentInstructions;
|
|
144
|
+
console.log("Applying component instruction assistance:", {
|
|
145
|
+
includeTypescriptBackedOutputFormattingRequirements: agentInstructionFeature.includeTypescriptBackedOutputFormattingRequirements,
|
|
146
|
+
hasPlaceholder: enhancedInstructions.includes("{{typescript-backed-output-formatting-requirements}}")
|
|
147
|
+
});
|
|
148
|
+
if (agentInstructionFeature.includeTypescriptBackedOutputFormattingRequirements && instructionConfig.typescriptBackedOutputFormattingRequirements) {
|
|
149
|
+
const placeholder = "{{typescript-backed-output-formatting-requirements}}";
|
|
150
|
+
if (enhancedInstructions.includes(placeholder)) {
|
|
151
|
+
console.log("Replacing typescript-backed-output-formatting-requirements placeholder");
|
|
152
|
+
enhancedInstructions = enhancedInstructions.replace(placeholder, instructionConfig.typescriptBackedOutputFormattingRequirements);
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
return enhancedInstructions;
|
|
156
|
+
}
|
|
112
157
|
function getInstructionsAssistanceConfigFromRawSsmParams(params) {
|
|
113
|
-
const expectedKeys = ["output-formatting-requirements", "default-complete-example-line", "default-json-validation-line"];
|
|
158
|
+
const expectedKeys = ["output-formatting-requirements", "default-complete-example-line", "default-json-validation-line", "typescript-backed-output-formatting-requirements"];
|
|
114
159
|
const missingKeys = expectedKeys.filter((key) => !params[key]);
|
|
115
160
|
if (missingKeys.length > 0) {
|
|
116
161
|
throw new Error(
|
|
@@ -120,10 +165,11 @@ function getInstructionsAssistanceConfigFromRawSsmParams(params) {
|
|
|
120
165
|
return {
|
|
121
166
|
outputFormattingRequirements: params["output-formatting-requirements"],
|
|
122
167
|
completeExampleInstructionLine: params["default-complete-example-line"],
|
|
123
|
-
jsonOnlyImperativeInstructionLine: params["default-json-validation-line"]
|
|
168
|
+
jsonOnlyImperativeInstructionLine: params["default-json-validation-line"],
|
|
169
|
+
typescriptBackedOutputFormattingRequirements: params["typescript-backed-output-formatting-requirements"]
|
|
124
170
|
};
|
|
125
171
|
}
|
|
126
172
|
|
|
127
|
-
export { applyInstructionAssistance, generateInstructionAssistanceContent, getInstructionsAssistanceConfigFromRawSsmParams };
|
|
173
|
+
export { applyComponentInstructionAssistance, applyInstructionAssistance, generateComponentInstructionContent, generateInstructionAssistanceContent, getInstructionsAssistanceConfigFromRawSsmParams };
|
|
128
174
|
//# sourceMappingURL=instruction-assistance-utils.mjs.map
|
|
129
175
|
//# sourceMappingURL=instruction-assistance-utils.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/util/instruction-assistance-utils.ts"],"names":[],"mappings":"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","file":"instruction-assistance-utils.mjs","sourcesContent":["/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * The functions in this utility are used both by the front end svelte kit web client in the browser\n * and in the backend lambda converse functions. So, that means it needs to be able\n * to run in a browser. Do not add additional imports beyond anodine types.\n *\n * To be super clear: this is just logic to generate instruction assistance content given\n * the right inputs. It does not collect up those inputs, it is given them.\n *\n */\n\nimport type {\n AgentInstructionChatAppOverridableFeature,\n InstructionAssistanceConfig,\n TagDefinition,\n TagDefinitionWidget,\n TagsChatAppOverridableFeature\n} from '../types/chatbot/chatbot-types';\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Generate instruction assistance content based on enabled features\n *\n * @param instructionAssistanceConfig - The instruction assistance configuration from SSM\n * @param tags - The tags configuration from the chat app\n * @param agentInstructionFeature - The agent instruction feature configuration from the chat app\n * @returns The instruction assistance content\n */\nexport function generateInstructionAssistanceContent(\n instructionAssistanceConfig: InstructionAssistanceConfig | undefined,\n tags: TagsChatAppOverridableFeature | undefined,\n agentInstructionFeature: AgentInstructionChatAppOverridableFeature | undefined,\n tagDefinitions: TagDefinition<TagDefinitionWidget>[]\n): InstructionAssistanceConfig {\n console.log('Generating instruction assistance content:', {\n enabled: agentInstructionFeature?.enabled,\n includeOutputFormattingRequirements: agentInstructionFeature?.includeOutputFormattingRequirements,\n includeInstructionsForTags: agentInstructionFeature?.includeInstructionsForTags,\n completeExampleEnabled: agentInstructionFeature?.completeExampleInstructionEnabled,\n jsonOnlyEnabled: agentInstructionFeature?.jsonOnlyImperativeInstructionEnabled\n });\n\n let outputFormattingRequirements = '';\n let tagInstructions = '';\n let completeExampleInstructionLine = '';\n let jsonOnlyImperativeInstructionLine = '';\n\n if (!agentInstructionFeature?.enabled) {\n return {\n outputFormattingRequirements,\n tagInstructions,\n completeExampleInstructionLine,\n jsonOnlyImperativeInstructionLine\n };\n }\n\n // Generate output formatting requirements\n if (agentInstructionFeature.includeOutputFormattingRequirements) {\n outputFormattingRequirements =\n instructionAssistanceConfig?.outputFormattingRequirements ||\n `**Output Formatting Requirements:**\n- **Output Response Enclosure**: All response output MUST be completely enclosed within <answer></answer> tags, including supported custom tags.\n- **Output Content Format:** All responses MUST be in Markdown with supported custom tags.`;\n }\n\n // Generate tag instructions\n if (agentInstructionFeature.includeInstructionsForTags && tags && tags.tagsEnabled?.length > 0) {\n console.log('Fetching tag definitions for instruction generation:', tags.tagsEnabled);\n\n if (tagDefinitions.length > 0) {\n // First create a dictionary listing all supported tags\n const tagDictionary = tagDefinitions\n .filter((tagDef) => tagDef.canBeGeneratedByLlm && !tagDef.disabled)\n .map((tagDef) => ` - ${tagDef.tagTitle}: \\`${tagDef.shortTagEx}\\``)\n .join('\\n');\n\n let tagInstructionsContent = '';\n if (tagDictionary) {\n tagInstructionsContent += `- **Custom Tags Supported:**\\n${tagDictionary}\\n`;\n }\n\n // Then add detailed instructions for each tag\n for (const tagDef of tagDefinitions) {\n if (tagDef.canBeGeneratedByLlm && !tagDef.disabled && tagDef.llmInstructionsMd) {\n const tagType = `${tagDef.scope}.${tagDef.tag}`;\n tagInstructionsContent += `- **${tagDef.tagTitle}:**\\n <tag-instructions type=\"${tagType}\">\\n${tagDef.llmInstructionsMd}\\n </tag-instructions>\\n`;\n }\n }\n\n if (tagInstructionsContent) {\n tagInstructions = tagInstructionsContent;\n }\n }\n }\n\n // Generate complete example instruction line\n if (agentInstructionFeature.completeExampleInstructionEnabled) {\n completeExampleInstructionLine =\n agentInstructionFeature.completeExampleInstructionLine ||\n instructionAssistanceConfig?.completeExampleInstructionLine ||\n '- **Complete Example Output:**\\n `<answer>##Example markdown\\nNormal text and an <image>http://some.url</image> and some **bold text**\\n<chart>(...)</chart></answer>`';\n }\n\n // Generate JSON validation instruction line\n if (agentInstructionFeature.jsonOnlyImperativeInstructionEnabled) {\n jsonOnlyImperativeInstructionLine =\n agentInstructionFeature.jsonOnlyImperativeInstructionLine ||\n instructionAssistanceConfig?.jsonOnlyImperativeInstructionLine ||\n 'BE ABSOLUTELY CERTAIN ANY JSON INCLUDED IS 100% VALID (especially for charts). Invalid JSON will break the user experience.';\n }\n\n console.log('Generated instruction assistance content:', {\n hasOutputFormatting: !!outputFormattingRequirements,\n hasTagInstructions: !!tagInstructions,\n hasCompleteExample: !!completeExampleInstructionLine,\n hasJsonValidation: !!jsonOnlyImperativeInstructionLine\n });\n\n return {\n outputFormattingRequirements,\n tagInstructions,\n completeExampleInstructionLine,\n jsonOnlyImperativeInstructionLine\n };\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Apply instruction assistance to the base prompt using placeholder replacement\n */\nexport function applyInstructionAssistance(basePrompt: string, instructionContent: InstructionAssistanceConfig): string {\n let enhancedPrompt = basePrompt;\n\n // Check for primary placeholder first\n if (enhancedPrompt.includes('{{prompt-assistance}}')) {\n console.log('Found {{prompt-assistance}} placeholder');\n\n const allContent = [\n instructionContent.outputFormattingRequirements,\n instructionContent.tagInstructions,\n instructionContent.completeExampleInstructionLine,\n instructionContent.jsonOnlyImperativeInstructionLine\n ]\n .filter((content) => content && content.trim().length > 0)\n .join('\\n\\n');\n\n enhancedPrompt = enhancedPrompt.replace('{{prompt-assistance}}', allContent);\n } else {\n // Look for fine-grained placeholders\n const placeholders = [\n { placeholder: '{{output-formatting-requirements}}', content: instructionContent.outputFormattingRequirements },\n { placeholder: '{{tag-instructions}}', content: instructionContent.tagInstructions },\n { placeholder: '{{complete-example-instruction-line}}', content: instructionContent.completeExampleInstructionLine },\n { placeholder: '{{json-only-imperative-instruction-line}}', content: instructionContent.jsonOnlyImperativeInstructionLine }\n ];\n\n let hasAnyPlaceholder = false;\n for (const { placeholder, content } of placeholders) {\n if (enhancedPrompt.includes(placeholder) && content) {\n console.log(`Found ${placeholder} placeholder`);\n hasAnyPlaceholder = true;\n enhancedPrompt = enhancedPrompt.replace(placeholder, content);\n }\n }\n\n // If no placeholders found, append to end\n if (!hasAnyPlaceholder) {\n console.log('No placeholders found, appending to end of prompt');\n const allContent = [\n instructionContent.outputFormattingRequirements,\n instructionContent.tagInstructions,\n instructionContent.completeExampleInstructionLine,\n instructionContent.jsonOnlyImperativeInstructionLine\n ].filter((content) => content && content.trim().length > 0);\n\n if (allContent.length > 0) {\n enhancedPrompt = enhancedPrompt + '\\n\\n' + allContent.join('\\n\\n');\n }\n }\n }\n\n return enhancedPrompt;\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Get the instruction assistance configuration from raw SSM parameters\n *\n * @param params - The raw SSM parameters\n * @returns The instruction assistance configuration\n */\nexport function getInstructionsAssistanceConfigFromRawSsmParams(params: Record<string, string>): InstructionAssistanceConfig {\n const expectedKeys = ['output-formatting-requirements', 'default-complete-example-line', 'default-json-validation-line'];\n const missingKeys = expectedKeys.filter((key) => !params[key]);\n if (missingKeys.length > 0) {\n throw new Error(\n `Missing required instruction assistance parameters: ${Object.keys(params)\n .filter((key) => !expectedKeys.includes(key))\n .join(', ')}`\n );\n }\n\n return {\n outputFormattingRequirements: params['output-formatting-requirements'],\n completeExampleInstructionLine: params['default-complete-example-line'],\n jsonOnlyImperativeInstructionLine: params['default-json-validation-line']\n };\n}\n"]}
|
|
1
|
+
{"version":3,"sources":["../../src/util/instruction-assistance-utils.ts"],"names":[],"mappings":"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","file":"instruction-assistance-utils.mjs","sourcesContent":["/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * The functions in this utility are used both by the front end svelte kit web client in the browser\n * and in the backend lambda converse functions. So, that means it needs to be able\n * to run in a browser. Do not add additional imports beyond anodine types.\n *\n * To be super clear: this is just logic to generate instruction assistance content given\n * the right inputs. It does not collect up those inputs, it is given them.\n *\n */\n\nimport type {\n AgentInstructionChatAppOverridableFeature,\n InstructionAssistanceConfig,\n TagDefinition,\n TagDefinitionWidget,\n TagsChatAppOverridableFeature\n} from '../types/chatbot/chatbot-types';\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Generate instruction assistance content based on enabled features\n *\n * @param instructionAssistanceConfig - The instruction assistance configuration from SSM\n * @param tags - The tags configuration from the chat app\n * @param agentInstructionFeature - The agent instruction feature configuration from the chat app\n * @returns The instruction assistance content\n */\nexport function generateInstructionAssistanceContent(\n instructionAssistanceConfig: InstructionAssistanceConfig | undefined,\n tags: TagsChatAppOverridableFeature | undefined,\n agentInstructionFeature: AgentInstructionChatAppOverridableFeature | undefined,\n tagDefinitions: TagDefinition<TagDefinitionWidget>[]\n): InstructionAssistanceConfig {\n console.log('Generating instruction assistance content:', {\n enabled: agentInstructionFeature?.enabled,\n includeOutputFormattingRequirements: agentInstructionFeature?.includeOutputFormattingRequirements,\n includeInstructionsForTags: agentInstructionFeature?.includeInstructionsForTags,\n completeExampleEnabled: agentInstructionFeature?.completeExampleInstructionEnabled,\n jsonOnlyEnabled: agentInstructionFeature?.jsonOnlyImperativeInstructionEnabled,\n includeTypescriptBackedOutputFormattingRequirements: agentInstructionFeature?.includeTypescriptBackedOutputFormattingRequirements\n });\n\n let outputFormattingRequirements = '';\n let tagInstructions = '';\n let completeExampleInstructionLine = '';\n let jsonOnlyImperativeInstructionLine = '';\n let typescriptBackedOutputFormattingRequirements = '';\n\n if (!agentInstructionFeature?.enabled) {\n return {\n outputFormattingRequirements,\n tagInstructions,\n completeExampleInstructionLine,\n jsonOnlyImperativeInstructionLine,\n typescriptBackedOutputFormattingRequirements\n };\n }\n\n // Generate output formatting requirements\n if (agentInstructionFeature.includeOutputFormattingRequirements) {\n outputFormattingRequirements =\n instructionAssistanceConfig?.outputFormattingRequirements ||\n `**Output Formatting Requirements:**\n- **Output Response Enclosure**: All response output MUST be completely enclosed within <answer></answer> tags, including supported custom tags.\n- **Output Content Format:** All responses MUST be in Markdown with supported custom tags.`;\n }\n\n // Generate tag instructions\n if (agentInstructionFeature.includeInstructionsForTags && tags && tags.tagsEnabled?.length > 0) {\n console.log('Fetching tag definitions for instruction generation:', tags.tagsEnabled);\n\n if (tagDefinitions.length > 0) {\n // First create a dictionary listing all supported tags\n const tagDictionary = tagDefinitions\n .filter((tagDef) => tagDef.canBeGeneratedByLlm && tagDef.status === 'enabled')\n .map((tagDef) => ` - ${tagDef.tagTitle}: \\`${tagDef.shortTagEx}\\``)\n .join('\\n');\n\n let tagInstructionsContent = '';\n if (tagDictionary) {\n tagInstructionsContent += `- **Custom Tags Supported:**\\n${tagDictionary}\\n`;\n }\n\n // Then add detailed instructions for each tag\n for (const tagDef of tagDefinitions) {\n if (tagDef.canBeGeneratedByLlm && tagDef.status === 'enabled' && tagDef.llmInstructionsMd) {\n const tagType = `${tagDef.scope}.${tagDef.tag}`;\n tagInstructionsContent += `- **${tagDef.tagTitle}:**\\n <tag-instructions type=\"${tagType}\">\\n${tagDef.llmInstructionsMd}\\n </tag-instructions>\\n`;\n }\n }\n\n if (tagInstructionsContent) {\n tagInstructions = tagInstructionsContent;\n }\n }\n }\n\n // Generate complete example instruction line\n if (agentInstructionFeature.completeExampleInstructionEnabled) {\n completeExampleInstructionLine =\n agentInstructionFeature.completeExampleInstructionLine ||\n instructionAssistanceConfig?.completeExampleInstructionLine ||\n '- **Complete Example Output:**\\n `<answer>##Example markdown\\nNormal text and an <image>http://some.url</image> and some **bold text**\\n<chart>(...)</chart></answer>`';\n }\n\n // Generate JSON validation instruction line\n if (agentInstructionFeature.jsonOnlyImperativeInstructionEnabled) {\n jsonOnlyImperativeInstructionLine =\n agentInstructionFeature.jsonOnlyImperativeInstructionLine ||\n instructionAssistanceConfig?.jsonOnlyImperativeInstructionLine ||\n 'BE ABSOLUTELY CERTAIN ANY JSON INCLUDED IS 100% VALID (especially for charts). Invalid JSON will break the user experience.';\n }\n\n console.log('Generated instruction assistance content:', {\n hasOutputFormatting: !!outputFormattingRequirements,\n hasTagInstructions: !!tagInstructions,\n hasCompleteExample: !!completeExampleInstructionLine,\n hasJsonValidation: !!jsonOnlyImperativeInstructionLine,\n hasTypescriptBackedOutputFormattingRequirements: !!typescriptBackedOutputFormattingRequirements\n });\n\n return {\n outputFormattingRequirements,\n tagInstructions,\n completeExampleInstructionLine,\n jsonOnlyImperativeInstructionLine,\n typescriptBackedOutputFormattingRequirements\n };\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Apply instruction assistance to the base prompt using placeholder replacement\n */\nexport function applyInstructionAssistance(basePrompt: string, instructionContent: InstructionAssistanceConfig): string {\n let enhancedPrompt = basePrompt;\n\n // Check for primary placeholder first\n if (enhancedPrompt.includes('{{prompt-assistance}}')) {\n console.log('Found {{prompt-assistance}} placeholder');\n\n const allContent = [\n instructionContent.outputFormattingRequirements,\n instructionContent.tagInstructions,\n instructionContent.completeExampleInstructionLine,\n instructionContent.jsonOnlyImperativeInstructionLine\n ]\n .filter((content) => content && content.trim().length > 0)\n .join('\\n\\n');\n\n enhancedPrompt = enhancedPrompt.replace('{{prompt-assistance}}', allContent);\n } else {\n // Look for fine-grained placeholders\n const placeholders = [\n { placeholder: '{{output-formatting-requirements}}', content: instructionContent.outputFormattingRequirements },\n { placeholder: '{{tag-instructions}}', content: instructionContent.tagInstructions },\n { placeholder: '{{complete-example-instruction-line}}', content: instructionContent.completeExampleInstructionLine },\n { placeholder: '{{json-only-imperative-instruction-line}}', content: instructionContent.jsonOnlyImperativeInstructionLine }\n ];\n\n let hasAnyPlaceholder = false;\n for (const { placeholder, content } of placeholders) {\n if (enhancedPrompt.includes(placeholder) && content) {\n console.log(`Found ${placeholder} placeholder`);\n hasAnyPlaceholder = true;\n enhancedPrompt = enhancedPrompt.replace(placeholder, content);\n }\n }\n\n // If no placeholders found, append to end\n if (!hasAnyPlaceholder) {\n console.log('No placeholders found, appending to end of prompt');\n const allContent = [\n instructionContent.outputFormattingRequirements,\n instructionContent.tagInstructions,\n instructionContent.completeExampleInstructionLine,\n instructionContent.jsonOnlyImperativeInstructionLine\n ].filter((content) => content && content.trim().length > 0);\n\n if (allContent.length > 0) {\n enhancedPrompt = enhancedPrompt + '\\n\\n' + allContent.join('\\n\\n');\n }\n }\n }\n\n return enhancedPrompt;\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Generate component-specific instruction content for direct component invocations\n *\n * @param tagDefinition - The tag definition with component invocation instructions\n * @param componentAgentInstructionName - The name of the instruction set to use\n * @param instructionAssistanceConfig - Optional instruction assistance config for placeholder replacement\n * @param agentInstructionFeature - Optional agent instruction feature to control which placeholders are replaced\n * @returns The component instruction content or undefined if not found\n */\nexport function generateComponentInstructionContent(\n tagDefinition: TagDefinition<TagDefinitionWidget>,\n componentAgentInstructionName: string,\n instructionAssistanceConfig?: InstructionAssistanceConfig,\n agentInstructionFeature?: AgentInstructionChatAppOverridableFeature\n): string | undefined {\n console.log('Generating component instruction content:', {\n scope: tagDefinition.scope,\n tag: tagDefinition.tag,\n componentAgentInstructionName,\n hasDirectInvocationInstructions: !!tagDefinition.componentAgentInstructionsMd,\n hasInstructionAssistanceConfig: !!instructionAssistanceConfig\n });\n\n if (!tagDefinition.componentAgentInstructionsMd) {\n // console.log('No componentAgentInstructionsMd found on tag definition');\n return undefined;\n }\n\n const instructions = tagDefinition.componentAgentInstructionsMd[componentAgentInstructionName];\n\n if (!instructions) {\n console.log(`No instructions found for componentAgentInstructionName: ${componentAgentInstructionName}`);\n console.log('Available instruction names:', Object.keys(tagDefinition.componentAgentInstructionsMd));\n return undefined;\n }\n\n console.log('Component instructions found:', {\n instructionLength: instructions.length\n });\n\n // Apply placeholder replacement if instruction assistance config is provided\n if (instructionAssistanceConfig && agentInstructionFeature) {\n return applyComponentInstructionAssistance(instructions, instructionAssistanceConfig, agentInstructionFeature);\n }\n\n return instructions;\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Apply instruction assistance placeholder replacement to component instructions\n *\n * @param componentInstructions - The raw component instructions with placeholders\n * @param instructionConfig - The instruction assistance configuration\n * @param agentInstructionFeature - The agent instruction feature configuration\n * @returns The component instructions with placeholders replaced\n */\nexport function applyComponentInstructionAssistance(\n componentInstructions: string,\n instructionConfig: InstructionAssistanceConfig,\n agentInstructionFeature: AgentInstructionChatAppOverridableFeature\n): string {\n let enhancedInstructions = componentInstructions;\n\n console.log('Applying component instruction assistance:', {\n includeTypescriptBackedOutputFormattingRequirements: agentInstructionFeature.includeTypescriptBackedOutputFormattingRequirements,\n hasPlaceholder: enhancedInstructions.includes('{{typescript-backed-output-formatting-requirements}}')\n });\n\n // Replace typescript-backed-output-formatting-requirements placeholder if enabled\n if (agentInstructionFeature.includeTypescriptBackedOutputFormattingRequirements && instructionConfig.typescriptBackedOutputFormattingRequirements) {\n const placeholder = '{{typescript-backed-output-formatting-requirements}}';\n if (enhancedInstructions.includes(placeholder)) {\n console.log('Replacing typescript-backed-output-formatting-requirements placeholder');\n enhancedInstructions = enhancedInstructions.replace(placeholder, instructionConfig.typescriptBackedOutputFormattingRequirements);\n }\n }\n\n return enhancedInstructions;\n}\n\n/**\n * IMPORTANT!!!!!!!!!!!!!!!!!!!!!!\n *\n * See header at top of file for important notes.\n *\n * Get the instruction assistance configuration from raw SSM parameters\n *\n * @param params - The raw SSM parameters\n * @returns The instruction assistance configuration\n */\nexport function getInstructionsAssistanceConfigFromRawSsmParams(params: Record<string, string>): InstructionAssistanceConfig {\n const expectedKeys = ['output-formatting-requirements', 'default-complete-example-line', 'default-json-validation-line', 'typescript-backed-output-formatting-requirements'];\n const missingKeys = expectedKeys.filter((key) => !params[key]);\n if (missingKeys.length > 0) {\n throw new Error(\n `Missing required instruction assistance parameters: ${Object.keys(params)\n .filter((key) => !expectedKeys.includes(key))\n .join(', ')}`\n );\n }\n\n return {\n outputFormattingRequirements: params['output-formatting-requirements'],\n completeExampleInstructionLine: params['default-complete-example-line'],\n jsonOnlyImperativeInstructionLine: params['default-json-validation-line'],\n typescriptBackedOutputFormattingRequirements: params['typescript-backed-output-formatting-requirements']\n };\n}\n"]}
|
package/dist/util/jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/util/jwt.ts"],"names":["jwt2"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAI,
|
|
1
|
+
{"version":3,"sources":["../../src/util/jwt.ts"],"names":["jwt2"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAIA,IAAI,GAAA,GAAMA,eAAA;AACV,IAAI,aAAa,GAAA,EAAK;AAClB,EAAA,GAAA,GAAM,IAAI,SAAS,CAAA;AACvB;AAUO,SAAS,kBAAA,CAAwD,SAAqC,SAAA,EAA2B;AACpI,EAAA,OAAO,IAAI,IAAA,CAAK,OAAA,EAAS,WAAW,EAAE,SAAA,EAAW,MAAM,CAAA;AAC3D;AAWO,SAAS,oBAAA,CAA0D,UAAkB,SAAA,EAA8E;AACtK,EAAA,IAAI;AAEA,IAAA,MAAM,KAAA,GAAQ,SAAS,UAAA,CAAW,SAAS,IAAI,QAAA,CAAS,SAAA,CAAU,CAAC,CAAA,GAAI,QAAA;AACvE,IAAA,MAAM,OAAA,GAAU,GAAA,CAAI,MAAA,CAAO,KAAA,EAAO,SAAS,CAAA;AAE3C,IAAA,IAAI,MAAA;AACJ,IAAA,IAAI,cAAA;AAEJ,IAAA,IAAI,OAAO,OAAA,KAAY,QAAA,IAAY,OAAA,KAAY,IAAA,IAAQ,YAAY,OAAA,EAAS;AACxE,MAAA,MAAA,GAAU,OAAA,CAA+B,MAAA;AACzC,MAAA,cAAA,GAAkB,QAAkC,cAAA,IAAkB,KAAA,CAAA;AACtE,MAAA,OAAO,CAAC,EAAE,MAAA,EAAQ,cAAA,IAAkB,KAAA,CAAS,CAAA;AAAA,IACjD;AAEA,IAAA,OAAO,CAAC,KAAK,qDAAqD,CAAA;AAAA,EACtE,SAAS,KAAA,EAAO;AACZ,IAAA,OAAA,CAAQ,IAAI,uCAAA,EAAyC,KAAA,YAAiB,KAAA,GAAQ,KAAA,CAAM,UAAU,eAAe,CAAA;AAC7G,IAAA,OAAO,CAAC,KAAK,CAAA,mDAAA,CAAqD,CAAA;AAAA,EACtE;AACJ","file":"jwt.js","sourcesContent":["import type { RecordOrUndef, SimpleAuthenticatedUser } from '../types/chatbot/chatbot-types';\nimport * as jwt2 from 'jsonwebtoken';\n\n// Added this because running locally did not import default correctly\nlet jwt = jwt2;\nif ('default' in jwt) {\n jwt = jwt['default'] as any;\n}\n\n/**\n * Converts a payload containing a userId and optional customUserData into a JWT string.\n *\n * Here the generic T is the type of the customUserData field. If not known, pass unknown.\n *\n * @param payload The payload to convert to a JWT string.\n * @returns A JWT string.\n */\nexport function convertToJwtString<T extends RecordOrUndef = undefined>(payload: SimpleAuthenticatedUser<T>, jwtSecret: string): string {\n return jwt.sign(payload, jwtSecret, { expiresIn: '1h' });\n}\n\n/**\n * Extracts the payload from a JWT string. If successful, the first value in the tuple will be the SimpleAuthenticatedUser<T> object.\n * If not successful, the first value in the tuple will be the number of the HTTP status code and the second value will be the error message,\n * so check the first value to see if it is a number and if it is, then the second value will be the error message.\n *\n * Here the generic T is the type of the customUserData field. If not known, pass unknown.\n * @param jwtToken - The JWT string to decode. Can include \"Bearer \" prefix which will be stripped.\n * @returns An object containing the userId and optional customUserData or the number of the HTTP status code and the error message.\n */\nexport function extractFromJwtString<T extends RecordOrUndef = undefined>(jwtToken: string, jwtSecret: string): [SimpleAuthenticatedUser<T> | number, string | undefined] {\n try {\n // Strip \"Bearer \" prefix if present\n const token = jwtToken.startsWith('Bearer ') ? jwtToken.substring(7) : jwtToken;\n const decoded = jwt.verify(token, jwtSecret);\n\n let userId: string;\n let customUserData: T | undefined;\n\n if (typeof decoded === 'object' && decoded !== null && 'userId' in decoded) {\n userId = (decoded as { userId: string }).userId;\n customUserData = (decoded as { customUserData: T }).customUserData ?? undefined;\n return [{ userId, customUserData }, undefined];\n }\n\n return [401, 'Unauthorized: Invalid or expired JWT token: code 1A'];\n } catch (error) {\n console.log('extractFromJwtString - Error message:', error instanceof Error ? error.message : 'Unknown error');\n return [401, `Unauthorized: Invalid or expired JWT token: code 1B`];\n }\n}\n"]}
|
package/dist/util/jwt.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/util/jwt.ts"],"names":[],"mappings":";;;AAIA,IAAI,GAAM,
|
|
1
|
+
{"version":3,"sources":["../../src/util/jwt.ts"],"names":[],"mappings":";;;AAIA,IAAI,GAAA,GAAM,IAAA;AACV,IAAI,aAAa,GAAA,EAAK;AAClB,EAAA,GAAA,GAAM,IAAI,SAAS,CAAA;AACvB;AAUO,SAAS,kBAAA,CAAwD,SAAqC,SAAA,EAA2B;AACpI,EAAA,OAAO,IAAI,IAAA,CAAK,OAAA,EAAS,WAAW,EAAE,SAAA,EAAW,MAAM,CAAA;AAC3D;AAWO,SAAS,oBAAA,CAA0D,UAAkB,SAAA,EAA8E;AACtK,EAAA,IAAI;AAEA,IAAA,MAAM,KAAA,GAAQ,SAAS,UAAA,CAAW,SAAS,IAAI,QAAA,CAAS,SAAA,CAAU,CAAC,CAAA,GAAI,QAAA;AACvE,IAAA,MAAM,OAAA,GAAU,GAAA,CAAI,MAAA,CAAO,KAAA,EAAO,SAAS,CAAA;AAE3C,IAAA,IAAI,MAAA;AACJ,IAAA,IAAI,cAAA;AAEJ,IAAA,IAAI,OAAO,OAAA,KAAY,QAAA,IAAY,OAAA,KAAY,IAAA,IAAQ,YAAY,OAAA,EAAS;AACxE,MAAA,MAAA,GAAU,OAAA,CAA+B,MAAA;AACzC,MAAA,cAAA,GAAkB,QAAkC,cAAA,IAAkB,KAAA,CAAA;AACtE,MAAA,OAAO,CAAC,EAAE,MAAA,EAAQ,cAAA,IAAkB,KAAA,CAAS,CAAA;AAAA,IACjD;AAEA,IAAA,OAAO,CAAC,KAAK,qDAAqD,CAAA;AAAA,EACtE,SAAS,KAAA,EAAO;AACZ,IAAA,OAAA,CAAQ,IAAI,uCAAA,EAAyC,KAAA,YAAiB,KAAA,GAAQ,KAAA,CAAM,UAAU,eAAe,CAAA;AAC7G,IAAA,OAAO,CAAC,KAAK,CAAA,mDAAA,CAAqD,CAAA;AAAA,EACtE;AACJ","file":"jwt.mjs","sourcesContent":["import type { RecordOrUndef, SimpleAuthenticatedUser } from '../types/chatbot/chatbot-types';\nimport * as jwt2 from 'jsonwebtoken';\n\n// Added this because running locally did not import default correctly\nlet jwt = jwt2;\nif ('default' in jwt) {\n jwt = jwt['default'] as any;\n}\n\n/**\n * Converts a payload containing a userId and optional customUserData into a JWT string.\n *\n * Here the generic T is the type of the customUserData field. If not known, pass unknown.\n *\n * @param payload The payload to convert to a JWT string.\n * @returns A JWT string.\n */\nexport function convertToJwtString<T extends RecordOrUndef = undefined>(payload: SimpleAuthenticatedUser<T>, jwtSecret: string): string {\n return jwt.sign(payload, jwtSecret, { expiresIn: '1h' });\n}\n\n/**\n * Extracts the payload from a JWT string. If successful, the first value in the tuple will be the SimpleAuthenticatedUser<T> object.\n * If not successful, the first value in the tuple will be the number of the HTTP status code and the second value will be the error message,\n * so check the first value to see if it is a number and if it is, then the second value will be the error message.\n *\n * Here the generic T is the type of the customUserData field. If not known, pass unknown.\n * @param jwtToken - The JWT string to decode. Can include \"Bearer \" prefix which will be stripped.\n * @returns An object containing the userId and optional customUserData or the number of the HTTP status code and the error message.\n */\nexport function extractFromJwtString<T extends RecordOrUndef = undefined>(jwtToken: string, jwtSecret: string): [SimpleAuthenticatedUser<T> | number, string | undefined] {\n try {\n // Strip \"Bearer \" prefix if present\n const token = jwtToken.startsWith('Bearer ') ? jwtToken.substring(7) : jwtToken;\n const decoded = jwt.verify(token, jwtSecret);\n\n let userId: string;\n let customUserData: T | undefined;\n\n if (typeof decoded === 'object' && decoded !== null && 'userId' in decoded) {\n userId = (decoded as { userId: string }).userId;\n customUserData = (decoded as { customUserData: T }).customUserData ?? undefined;\n return [{ userId, customUserData }, undefined];\n }\n\n return [401, 'Unauthorized: Invalid or expired JWT token: code 1A'];\n } catch (error) {\n console.log('extractFromJwtString - Error message:', error instanceof Error ? error.message : 'Unknown error');\n return [401, `Unauthorized: Invalid or expired JWT token: code 1B`];\n }\n}\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/util/server-client-utils.ts"],"names":[],"mappings":";;;AAUA,SAAS,UAAA,CAAW,MAAW,
|
|
1
|
+
{"version":3,"sources":["../../src/util/server-client-utils.ts"],"names":[],"mappings":"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","file":"server-client-utils.js","sourcesContent":["/*\n * These are utils that are safe to use both on the server and the client.\n */\n\n/**\n * Helper function to redact sensitive data from specified attributes\n * @param data - The object containing data to redact\n * @param attributesToRedact - Single attribute name or array of attribute names to redact\n * @returns A new object with specified attributes redacted\n */\nfunction redactData(data: any, attributesToRedact: string | string[]): any {\n if (!data || typeof data !== 'object') {\n return data;\n }\n\n const attributes = Array.isArray(attributesToRedact) ? attributesToRedact : [attributesToRedact];\n const redacted = { ...data };\n\n for (const attr of attributes) {\n if (attr in redacted) {\n redacted[attr] = redactValue(redacted[attr]);\n }\n }\n\n return redacted;\n}\n\n/**\n * Recursively redacts a value based on its type\n * @param value - The value to redact\n * @returns The redacted value\n */\nfunction redactValue(value: any): any {\n if (typeof value === 'string') {\n return '[REDACTED]';\n } else if (Array.isArray(value)) {\n return value.map((item) => redactValue(item));\n } else if (value && typeof value === 'object') {\n const redactedObj: any = {};\n for (const key in value) {\n if (value.hasOwnProperty(key)) {\n redactedObj[key] = redactValue(value[key]);\n }\n }\n return redactedObj;\n }\n return value; // Return as-is for other types (numbers, booleans, null, etc.)\n}\n\n/**\n * Validates that a scope value doesn't contain the '#' character which is reserved for scope construction\n */\nfunction validateScopeValue(scopeValue: string | number | Record<string, string | number>, scopeType: string): void {\n if (typeof scopeValue === 'string' && scopeValue.includes('#')) {\n throw new Error(`Scope value cannot contain '#' character. Found in ${scopeType} scope value: ${scopeValue}`);\n }\n if (typeof scopeValue === 'object' && scopeValue !== null) {\n for (const [key, value] of Object.entries(scopeValue)) {\n if (typeof value === 'string' && value.includes('#')) {\n throw new Error(`Scope value cannot contain '#' character. Found in ${scopeType}.${key}: ${value}`);\n }\n }\n }\n}\n\n/**\n * Constructs a scope string from scopeType and scopeValue\n * @param scopeType - The type of scope (chatapp, agent, tool, entity, agent-entity)\n * @param scopeValue - The value(s) for the scope\n * @returns The constructed scope string\n */\nfunction constructScope(scopeType: string, scopeValue: string | number | Record<string, string | number>): string {\n // Validate scope value doesn't contain '#'\n validateScopeValue(scopeValue, scopeType);\n\n switch (scopeType) {\n case 'chatapp':\n case 'agent':\n case 'tool':\n case 'entity':\n return `${scopeType}#${scopeValue}`;\n case 'agent-entity':\n if (typeof scopeValue !== 'object' || scopeValue === null) {\n throw new Error('agent-entity scopeType requires an object with agent and entity properties');\n }\n\n const agentEntityValue = scopeValue as Record<string, string | number>;\n if (!('agent' in agentEntityValue) || !('entity' in agentEntityValue)) {\n throw new Error('agent-entity scopeType requires an object with both agent and entity properties');\n }\n\n return `agent#${agentEntityValue.agent}#entity#${agentEntityValue.entity}`;\n\n default:\n throw new Error(`Unsupported scopeType: ${scopeType}`);\n }\n}\n\n/**\n * Parses a scope string back into scopeType and scopeValue\n * @param scope - The scope string to parse\n * @returns Object containing scopeType and scopeValue\n */\nfunction parseScope(scope: string): { scopeType: string; scopeValue: string | number | Record<string, string | number> } {\n if (!scope || typeof scope !== 'string') {\n throw new Error('Invalid scope: must be a non-empty string');\n }\n\n const parts = scope.split('#');\n if (parts.length < 2) {\n throw new Error(`Invalid scope format: ${scope}. Expected format: scopeType#scopeValue`);\n }\n\n const [firstType, firstValue, ...remaining] = parts;\n\n // Handle compound scopes (agent-entity)\n if (remaining.length >= 2 && firstType === 'agent' && remaining[0] === 'entity') {\n return {\n scopeType: 'agent-entity',\n scopeValue: {\n agent: firstValue,\n entity: remaining[1]\n }\n };\n }\n\n // Handle simple scopes\n if (remaining.length === 0) {\n // For simple scopes, try to convert to number if it's numeric\n const numericValue = Number(firstValue);\n const scopeValue = !isNaN(numericValue) && isFinite(numericValue) ? numericValue : firstValue;\n\n return {\n scopeType: firstType,\n scopeValue: scopeValue\n };\n }\n\n throw new Error(`Unsupported scope format: ${scope}`);\n}\n\n// Export both functions\nexport { redactData, redactValue, constructScope, parseScope };\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/util/server-client-utils.ts"],"names":[],"mappings":";AAUA,SAAS,UAAA,CAAW,MAAW,
|
|
1
|
+
{"version":3,"sources":["../../src/util/server-client-utils.ts"],"names":[],"mappings":"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","file":"server-client-utils.mjs","sourcesContent":["/*\n * These are utils that are safe to use both on the server and the client.\n */\n\n/**\n * Helper function to redact sensitive data from specified attributes\n * @param data - The object containing data to redact\n * @param attributesToRedact - Single attribute name or array of attribute names to redact\n * @returns A new object with specified attributes redacted\n */\nfunction redactData(data: any, attributesToRedact: string | string[]): any {\n if (!data || typeof data !== 'object') {\n return data;\n }\n\n const attributes = Array.isArray(attributesToRedact) ? attributesToRedact : [attributesToRedact];\n const redacted = { ...data };\n\n for (const attr of attributes) {\n if (attr in redacted) {\n redacted[attr] = redactValue(redacted[attr]);\n }\n }\n\n return redacted;\n}\n\n/**\n * Recursively redacts a value based on its type\n * @param value - The value to redact\n * @returns The redacted value\n */\nfunction redactValue(value: any): any {\n if (typeof value === 'string') {\n return '[REDACTED]';\n } else if (Array.isArray(value)) {\n return value.map((item) => redactValue(item));\n } else if (value && typeof value === 'object') {\n const redactedObj: any = {};\n for (const key in value) {\n if (value.hasOwnProperty(key)) {\n redactedObj[key] = redactValue(value[key]);\n }\n }\n return redactedObj;\n }\n return value; // Return as-is for other types (numbers, booleans, null, etc.)\n}\n\n/**\n * Validates that a scope value doesn't contain the '#' character which is reserved for scope construction\n */\nfunction validateScopeValue(scopeValue: string | number | Record<string, string | number>, scopeType: string): void {\n if (typeof scopeValue === 'string' && scopeValue.includes('#')) {\n throw new Error(`Scope value cannot contain '#' character. Found in ${scopeType} scope value: ${scopeValue}`);\n }\n if (typeof scopeValue === 'object' && scopeValue !== null) {\n for (const [key, value] of Object.entries(scopeValue)) {\n if (typeof value === 'string' && value.includes('#')) {\n throw new Error(`Scope value cannot contain '#' character. Found in ${scopeType}.${key}: ${value}`);\n }\n }\n }\n}\n\n/**\n * Constructs a scope string from scopeType and scopeValue\n * @param scopeType - The type of scope (chatapp, agent, tool, entity, agent-entity)\n * @param scopeValue - The value(s) for the scope\n * @returns The constructed scope string\n */\nfunction constructScope(scopeType: string, scopeValue: string | number | Record<string, string | number>): string {\n // Validate scope value doesn't contain '#'\n validateScopeValue(scopeValue, scopeType);\n\n switch (scopeType) {\n case 'chatapp':\n case 'agent':\n case 'tool':\n case 'entity':\n return `${scopeType}#${scopeValue}`;\n case 'agent-entity':\n if (typeof scopeValue !== 'object' || scopeValue === null) {\n throw new Error('agent-entity scopeType requires an object with agent and entity properties');\n }\n\n const agentEntityValue = scopeValue as Record<string, string | number>;\n if (!('agent' in agentEntityValue) || !('entity' in agentEntityValue)) {\n throw new Error('agent-entity scopeType requires an object with both agent and entity properties');\n }\n\n return `agent#${agentEntityValue.agent}#entity#${agentEntityValue.entity}`;\n\n default:\n throw new Error(`Unsupported scopeType: ${scopeType}`);\n }\n}\n\n/**\n * Parses a scope string back into scopeType and scopeValue\n * @param scope - The scope string to parse\n * @returns Object containing scopeType and scopeValue\n */\nfunction parseScope(scope: string): { scopeType: string; scopeValue: string | number | Record<string, string | number> } {\n if (!scope || typeof scope !== 'string') {\n throw new Error('Invalid scope: must be a non-empty string');\n }\n\n const parts = scope.split('#');\n if (parts.length < 2) {\n throw new Error(`Invalid scope format: ${scope}. Expected format: scopeType#scopeValue`);\n }\n\n const [firstType, firstValue, ...remaining] = parts;\n\n // Handle compound scopes (agent-entity)\n if (remaining.length >= 2 && firstType === 'agent' && remaining[0] === 'entity') {\n return {\n scopeType: 'agent-entity',\n scopeValue: {\n agent: firstValue,\n entity: remaining[1]\n }\n };\n }\n\n // Handle simple scopes\n if (remaining.length === 0) {\n // For simple scopes, try to convert to number if it's numeric\n const numericValue = Number(firstValue);\n const scopeValue = !isNaN(numericValue) && isFinite(numericValue) ? numericValue : firstValue;\n\n return {\n scopeType: firstType,\n scopeValue: scopeValue\n };\n }\n\n throw new Error(`Unsupported scope format: ${scope}`);\n}\n\n// Export both functions\nexport { redactData, redactValue, constructScope, parseScope };\n"]}
|
|
@@ -67,7 +67,9 @@ function getOverridableFeatures(siteFeatures, chatApp, user) {
|
|
|
67
67
|
completeExampleInstructionEnabled: false,
|
|
68
68
|
completeExampleInstructionLine: void 0,
|
|
69
69
|
jsonOnlyImperativeInstructionEnabled: false,
|
|
70
|
-
jsonOnlyImperativeInstructionLine: void 0
|
|
70
|
+
jsonOnlyImperativeInstructionLine: void 0,
|
|
71
|
+
includeTypescriptBackedOutputFormattingRequirements: false,
|
|
72
|
+
typescriptBackedOutputFormattingRequirements: void 0
|
|
71
73
|
},
|
|
72
74
|
instructionAugmentation: {
|
|
73
75
|
enabled: false,
|
|
@@ -170,7 +172,9 @@ function getOverridableFeatures(siteFeatures, chatApp, user) {
|
|
|
170
172
|
completeExampleInstructionEnabled: feature.completeExampleInstructionLine?.enabled ?? false,
|
|
171
173
|
completeExampleInstructionLine: feature.completeExampleInstructionLine?.mdLine ?? void 0,
|
|
172
174
|
jsonOnlyImperativeInstructionEnabled: feature.jsonOnlyImperativeInstructionLine?.enabled ?? false,
|
|
173
|
-
jsonOnlyImperativeInstructionLine: feature.jsonOnlyImperativeInstructionLine?.line ?? void 0
|
|
175
|
+
jsonOnlyImperativeInstructionLine: feature.jsonOnlyImperativeInstructionLine?.line ?? void 0,
|
|
176
|
+
includeTypescriptBackedOutputFormattingRequirements: feature.includeTypescriptBackedOutputFormattingRequirements?.enabled ?? false,
|
|
177
|
+
typescriptBackedOutputFormattingRequirements: feature.typescriptBackedOutputFormattingRequirements ?? void 0
|
|
174
178
|
})
|
|
175
179
|
);
|
|
176
180
|
const effectiveInstructionAugmentationFeature = chatApp.override?.features?.instructionAugmentation || chatApp.features?.instructionAugmentation;
|