@microsoft/agents-hosting-dialogs 1.1.4-g8d884129e7 → 1.2.0-alpha.18.g3c104e426a
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/src/agentStateSet.js +3 -1
- package/dist/src/agentStateSet.js.map +1 -1
- package/dist/src/choices/choiceFactory.d.ts +42 -1
- package/dist/src/choices/choiceFactory.js +128 -4
- package/dist/src/choices/choiceFactory.js.map +1 -1
- package/dist/src/dialog.js +3 -1
- package/dist/src/dialog.js.map +1 -1
- package/dist/src/dialogContextError.js +4 -2
- package/dist/src/dialogContextError.js.map +1 -1
- package/dist/src/dialogHelper.js +6 -5
- package/dist/src/dialogHelper.js.map +1 -1
- package/dist/src/dialogManager.js +4 -2
- package/dist/src/dialogManager.js.map +1 -1
- package/dist/src/dialogSet.js +4 -2
- package/dist/src/dialogSet.js.map +1 -1
- package/dist/src/errorHelper.d.ts +19 -0
- package/dist/src/errorHelper.js +236 -0
- package/dist/src/errorHelper.js.map +1 -0
- package/dist/src/index.d.ts +1 -0
- package/dist/src/index.js +3 -1
- package/dist/src/index.js.map +1 -1
- package/dist/src/memory/dialogStateManager.js +10 -8
- package/dist/src/memory/dialogStateManager.js.map +1 -1
- package/dist/src/memory/scopes/agentStateMemoryScope.js +4 -2
- package/dist/src/memory/scopes/agentStateMemoryScope.js.map +1 -1
- package/dist/src/memory/scopes/dialogMemoryScope.js +4 -2
- package/dist/src/memory/scopes/dialogMemoryScope.js.map +1 -1
- package/dist/src/memory/scopes/memoryScope.js +4 -2
- package/dist/src/memory/scopes/memoryScope.js.map +1 -1
- package/dist/src/memory/scopes/thisMemoryScope.js +4 -2
- package/dist/src/memory/scopes/thisMemoryScope.js.map +1 -1
- package/dist/src/memory/scopes/turnMemoryScope.js +3 -1
- package/dist/src/memory/scopes/turnMemoryScope.js.map +1 -1
- package/dist/src/prompts/choicePrompt.js +4 -2
- package/dist/src/prompts/choicePrompt.js.map +1 -1
- package/dist/src/prompts/confirmPrompt.js +4 -2
- package/dist/src/prompts/confirmPrompt.js.map +1 -1
- package/dist/src/prompts/prompt.d.ts +2 -1
- package/dist/src/prompts/prompt.js +9 -2
- package/dist/src/prompts/prompt.js.map +1 -1
- package/dist/src/recognizer.js +7 -1
- package/dist/src/recognizer.js.map +1 -1
- package/dist/src/recognizerResult.js +3 -1
- package/dist/src/recognizerResult.js.map +1 -1
- package/dist/src/waterfallDialog.js +2 -1
- package/dist/src/waterfallDialog.js.map +1 -1
- package/package.json +3 -3
- package/src/agentStateSet.ts +6 -1
- package/src/choices/choiceFactory.ts +151 -4
- package/src/dialog.ts +6 -1
- package/src/dialogContextError.ts +10 -2
- package/src/dialogHelper.ts +18 -5
- package/src/dialogManager.ts +10 -2
- package/src/dialogSet.ts +9 -3
- package/src/errorHelper.ts +263 -0
- package/src/index.ts +1 -0
- package/src/memory/dialogStateManager.ts +46 -10
- package/src/memory/scopes/agentStateMemoryScope.ts +12 -2
- package/src/memory/scopes/dialogMemoryScope.ts +12 -2
- package/src/memory/scopes/memoryScope.ts +14 -2
- package/src/memory/scopes/thisMemoryScope.ts +12 -2
- package/src/memory/scopes/turnMemoryScope.ts +8 -1
- package/src/prompts/choicePrompt.ts +3 -2
- package/src/prompts/confirmPrompt.ts +3 -2
- package/src/prompts/prompt.ts +12 -2
- package/src/recognizer.ts +6 -2
- package/src/recognizerResult.ts +6 -1
- package/src/waterfallDialog.ts +7 -3
|
@@ -95,17 +95,19 @@ class ConfirmPrompt extends prompt_1.Prompt {
|
|
|
95
95
|
* @returns A `Promise` representing the asynchronous operation.
|
|
96
96
|
*/
|
|
97
97
|
async onPrompt(context, state, options, isRetry) {
|
|
98
|
+
var _a;
|
|
98
99
|
// Format prompt to send
|
|
99
100
|
let prompt;
|
|
100
101
|
const channelId = context.activity.channelId;
|
|
101
102
|
const culture = this.determineCulture(context.activity);
|
|
102
103
|
const choiceOptions = this.choiceOptions || this.choiceDefaults[culture].options;
|
|
103
104
|
const choices = this.confirmChoices || this.choiceDefaults[culture].choices;
|
|
105
|
+
const conversationType = (_a = context.activity.conversation) === null || _a === void 0 ? void 0 : _a.conversationType;
|
|
104
106
|
if (isRetry && options.retryPrompt) {
|
|
105
|
-
prompt = this.appendChoices(options.retryPrompt, channelId, choices, this.style, choiceOptions);
|
|
107
|
+
prompt = this.appendChoices(options.retryPrompt, channelId, choices, this.style, choiceOptions, conversationType);
|
|
106
108
|
}
|
|
107
109
|
else {
|
|
108
|
-
prompt = this.appendChoices(options.prompt, channelId, choices, this.style, choiceOptions);
|
|
110
|
+
prompt = this.appendChoices(options.prompt, channelId, choices, this.style, choiceOptions, conversationType);
|
|
109
111
|
}
|
|
110
112
|
// Send prompt
|
|
111
113
|
await context.sendActivity(prompt);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"confirmPrompt.js","sourceRoot":"","sources":["../../../src/prompts/confirmPrompt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;GAGG;AACH,gFAAiE;AAEjE,wCAA2E;AAC3E,qCAAoG;AACpG,+DAA2D;AA4D3D;;;;;;;GAOG;AACH,MAAa,aAAc,SAAQ,eAAe;IAgChD;;;;;;;SAOK;IACL,YACE,QAAgB,EAChB,SAAoC,EACpC,aAAsB,EACtB,cAA4C;QAE5C,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAC1B,IAAI,CAAC,KAAK,GAAG,kBAAS,CAAC,IAAI,CAAA;QAC3B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAElC,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;YACjC,MAAM,SAAS,GAAgC,EAAE,CAAA;YACjD,yCAAmB,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC,CAAC,OAAO,EAAQ,EAAE;gBACnE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG;oBAC1B,OAAO,EAAE,CAAC,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC;oBACtD,OAAO,EAAE;wBACP,eAAe,EAAE,OAAO,CAAC,SAAS;wBAClC,QAAQ,EAAE,OAAO,CAAC,QAAQ;wBAC1B,YAAY,EAAE,OAAO,CAAC,YAAY;wBAClC,cAAc,EAAE,IAAI;qBACrB;iBACF,CAAA;YACH,CAAC,CAAC,CAAA;YACF,IAAI,CAAC,cAAc,GAAG,SAAS,CAAA;QACjC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,cAAc,GAAG,cAAc,CAAA;QACtC,CAAC;IACH,CAAC;IAED;;;;;;;;;;;SAWK;IACK,KAAK,CAAC,QAAQ,CACtB,OAAoB,EACpB,KAAU,EACV,OAAsB,EACtB,OAAgB
|
|
1
|
+
{"version":3,"file":"confirmPrompt.js","sourceRoot":"","sources":["../../../src/prompts/confirmPrompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -268,7 +268,8 @@ export declare abstract class Prompt<T> extends Dialog {
|
|
|
268
268
|
* @param choices List of choices to append.
|
|
269
269
|
* @param style Configured style for the list of choices.
|
|
270
270
|
* @param options (Optional) options to configure the underlying ChoiceFactory call.
|
|
271
|
+
* @param conversationType (Optional) the type of the conversation.
|
|
271
272
|
* @returns The composed activity ready to send to the user.
|
|
272
273
|
*/
|
|
273
|
-
protected appendChoices(prompt: string | Activity, channelId: string, choices: (string | Choice)[], style: ListStyle, options?: ChoiceFactoryOptions): Activity;
|
|
274
|
+
protected appendChoices(prompt: string | Activity, channelId: string, choices: (string | Choice)[], style: ListStyle, options?: ChoiceFactoryOptions, conversationType?: string): Activity;
|
|
274
275
|
}
|
|
@@ -212,9 +212,10 @@ class Prompt extends dialog_1.Dialog {
|
|
|
212
212
|
* @param choices List of choices to append.
|
|
213
213
|
* @param style Configured style for the list of choices.
|
|
214
214
|
* @param options (Optional) options to configure the underlying ChoiceFactory call.
|
|
215
|
+
* @param conversationType (Optional) the type of the conversation.
|
|
215
216
|
* @returns The composed activity ready to send to the user.
|
|
216
217
|
*/
|
|
217
|
-
appendChoices(prompt, channelId, choices, style, options) {
|
|
218
|
+
appendChoices(prompt, channelId, choices, style, options, conversationType) {
|
|
218
219
|
// Get base prompt text (if any)
|
|
219
220
|
let text = '';
|
|
220
221
|
if (typeof prompt === 'string') {
|
|
@@ -232,11 +233,17 @@ class Prompt extends dialog_1.Dialog {
|
|
|
232
233
|
case ListStyle.list:
|
|
233
234
|
msg = choices_1.ChoiceFactory.list(choices, text, undefined, options);
|
|
234
235
|
break;
|
|
236
|
+
case ListStyle.suggestedAction:
|
|
237
|
+
msg = choices_1.ChoiceFactory.suggestedActions(choices, text);
|
|
238
|
+
break;
|
|
239
|
+
case ListStyle.heroCard:
|
|
240
|
+
msg = choices_1.ChoiceFactory.heroCard(choices, text);
|
|
241
|
+
break;
|
|
235
242
|
case ListStyle.none:
|
|
236
243
|
msg = agents_hosting_1.MessageFactory.text(text);
|
|
237
244
|
break;
|
|
238
245
|
default:
|
|
239
|
-
msg = choices_1.ChoiceFactory.forChannel(channelId, choices, text, undefined, options);
|
|
246
|
+
msg = choices_1.ChoiceFactory.forChannel(channelId, choices, text, undefined, options, conversationType);
|
|
240
247
|
break;
|
|
241
248
|
}
|
|
242
249
|
// Update prompt with text, actions and attachments
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/prompts/prompt.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/prompts/prompt.ts"],"names":[],"mappings":"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"}
|
package/dist/src/recognizer.js
CHANGED
|
@@ -4,6 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Recognizer = void 0;
|
|
7
|
+
/**
|
|
8
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
9
|
+
* Licensed under the MIT License.
|
|
10
|
+
*/
|
|
11
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
12
|
+
const errorHelper_1 = require("./errorHelper");
|
|
7
13
|
const configurable_1 = require("./configurable");
|
|
8
14
|
const omit_1 = __importDefault(require("lodash/omit"));
|
|
9
15
|
const recognizerResult_1 = require("./recognizerResult");
|
|
@@ -26,7 +32,7 @@ class Recognizer extends configurable_1.Configurable {
|
|
|
26
32
|
* @param {Record<string, number>} _telemetryMetrics Additional metrics to be logged to telemetry with event.
|
|
27
33
|
*/
|
|
28
34
|
recognize(_dialogContext, _activity, _telemetryProperties, _telemetryMetrics) {
|
|
29
|
-
throw
|
|
35
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.RecognizeFunctionNotImplemented);
|
|
30
36
|
}
|
|
31
37
|
/**
|
|
32
38
|
* Creates choose intent result in the case that there are conflicting or ambiguous signals from the recognizers.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recognizer.js","sourceRoot":"","sources":["../../src/recognizer.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"recognizer.js","sourceRoot":"","sources":["../../src/recognizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTopScoringIntent = void 0;
|
|
4
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
5
|
+
const errorHelper_1 = require("./errorHelper");
|
|
4
6
|
/**
|
|
5
7
|
* Finds the intent with the highest confidence score from a recognizer result.
|
|
6
8
|
*
|
|
@@ -32,7 +34,7 @@ exports.getTopScoringIntent = void 0;
|
|
|
32
34
|
const getTopScoringIntent = (result) => {
|
|
33
35
|
var _a;
|
|
34
36
|
if (!result || !result.intents) {
|
|
35
|
-
throw
|
|
37
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.EmptyRecognizerResult);
|
|
36
38
|
}
|
|
37
39
|
let topIntent = '';
|
|
38
40
|
let topScore = -1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recognizerResult.js","sourceRoot":"","sources":["../../src/recognizerResult.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"recognizerResult.js","sourceRoot":"","sources":["../../src/recognizerResult.ts"],"names":[],"mappings":";;;AAKA,gEAA4D;AAC5D,+CAAsC;AAgCtC;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACI,MAAM,mBAAmB,GAAG,CAAC,MAAwB,EAAqC,EAAE;;IACjG,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/B,MAAM,iCAAe,CAAC,iBAAiB,CACrC,KAAK,EACL,oBAAM,CAAC,qBAAqB,CAC7B,CAAA;IACH,CAAC;IAED,IAAI,SAAS,GAAG,EAAE,CAAA;IAClB,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAA;IACjB,KAAK,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAClE,MAAM,KAAK,GAAG,MAAA,MAAM,CAAC,KAAK,mCAAI,CAAC,CAAC,CAAA;QAChC,IAAI,CAAC,SAAS,IAAI,KAAK,GAAG,QAAQ,EAAE,CAAC;YACnC,SAAS,GAAG,UAAU,CAAA;YACtB,QAAQ,GAAG,KAAK,CAAA;QAClB,CAAC;IACH,CAAC;IAED,OAAO;QACL,MAAM,EAAE,SAAS;QACjB,KAAK,EAAE,QAAQ;KAChB,CAAA;AACH,CAAC,CAAA;AAtBY,QAAA,mBAAmB,uBAsB/B"}
|
|
@@ -7,6 +7,7 @@ exports.WaterfallDialog = void 0;
|
|
|
7
7
|
*/
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
9
|
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
10
|
+
const errorHelper_1 = require("./errorHelper");
|
|
10
11
|
const dialog_1 = require("./dialog");
|
|
11
12
|
const waterfallStepContext_1 = require("./waterfallStepContext");
|
|
12
13
|
const dialogReason_1 = require("./dialogReason");
|
|
@@ -145,7 +146,7 @@ class WaterfallDialog extends dialog_1.Dialog {
|
|
|
145
146
|
values: state.values,
|
|
146
147
|
onNext: async (stepResult) => {
|
|
147
148
|
if (nextCalled) {
|
|
148
|
-
throw
|
|
149
|
+
throw agents_activity_1.ExceptionHelper.generateException(Error, errorHelper_1.Errors.WaterfallStepError, undefined, { stepIndex: index.toString() });
|
|
149
150
|
}
|
|
150
151
|
nextCalled = true;
|
|
151
152
|
return await this.resumeDialog(dc, dialogReason_1.DialogReason.nextCalled, stepResult);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waterfallDialog.js","sourceRoot":"","sources":["../../src/waterfallDialog.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,+BAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"waterfallDialog.js","sourceRoot":"","sources":["../../src/waterfallDialog.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "https://json.schemastore.org/package.json",
|
|
3
3
|
"name": "@microsoft/agents-hosting-dialogs",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.2.0-alpha.18.g3c104e426a",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"main": "dist/index.js",
|
|
17
17
|
"types": "dist/src/index.d.ts",
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@microsoft/agents-hosting": "1.
|
|
20
|
-
"@types/lodash": "^4.17.
|
|
19
|
+
"@microsoft/agents-hosting": "1.2.0-alpha.18.g3c104e426a",
|
|
20
|
+
"@types/lodash": "^4.17.21",
|
|
21
21
|
"dependency-graph": "^1.0.0",
|
|
22
22
|
"@microsoft/recognizers-text-suite": "^1.3.1",
|
|
23
23
|
"@microsoft/recognizers-text-number": "^1.3.1",
|
package/src/agentStateSet.ts
CHANGED
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
import { AgentState, TurnContext } from '@microsoft/agents-hosting'
|
|
6
|
+
import { ExceptionHelper } from '@microsoft/agents-activity'
|
|
7
|
+
import { Errors } from './errorHelper'
|
|
6
8
|
|
|
7
9
|
/**
|
|
8
10
|
* A collection of `AgentState` plugins that should be loaded or saved in parallel as a single unit.
|
|
@@ -36,7 +38,10 @@ export class AgentStateSet {
|
|
|
36
38
|
if (typeof agentstate.load === 'function' && typeof agentstate.saveChanges === 'function') {
|
|
37
39
|
this.agentStates.push(agentstate)
|
|
38
40
|
} else {
|
|
39
|
-
throw
|
|
41
|
+
throw ExceptionHelper.generateException(
|
|
42
|
+
Error,
|
|
43
|
+
Errors.InvalidAgentStateObject
|
|
44
|
+
)
|
|
40
45
|
}
|
|
41
46
|
})
|
|
42
47
|
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { ActionTypes, Activity, InputHints } from '@microsoft/agents-activity'
|
|
5
|
+
import { ActionTypes, Activity, CardAction, Channels, InputHints } from '@microsoft/agents-activity'
|
|
6
6
|
import {
|
|
7
7
|
|
|
8
|
+
CardFactory,
|
|
8
9
|
MessageFactory,
|
|
9
10
|
TurnContext,
|
|
10
11
|
} from '@microsoft/agents-hosting'
|
|
@@ -57,6 +58,7 @@ export class ChoiceFactory {
|
|
|
57
58
|
* @param text (Optional) text of the message.
|
|
58
59
|
* @param speak (Optional) SSML to speak for the message.
|
|
59
60
|
* @param options (Optional) formatting options to use when rendering as a list.
|
|
61
|
+
* @param conversationType (Optional) the type of the conversation.
|
|
60
62
|
* @returns The created message activity.
|
|
61
63
|
*/
|
|
62
64
|
static forChannel (
|
|
@@ -64,8 +66,12 @@ export class ChoiceFactory {
|
|
|
64
66
|
choices: (string | Choice)[],
|
|
65
67
|
text?: string,
|
|
66
68
|
speak?: string,
|
|
67
|
-
options?: ChoiceFactoryOptions
|
|
69
|
+
options?: ChoiceFactoryOptions,
|
|
70
|
+
conversationType?: string
|
|
68
71
|
): Activity {
|
|
72
|
+
const channelId: string =
|
|
73
|
+
typeof channelOrContext === 'string' ? channelOrContext : this.getChannelId(channelOrContext)
|
|
74
|
+
|
|
69
75
|
const list: Choice[] = ChoiceFactory.toChoices(choices)
|
|
70
76
|
|
|
71
77
|
let maxTitleLength = 0
|
|
@@ -76,13 +82,30 @@ export class ChoiceFactory {
|
|
|
76
82
|
}
|
|
77
83
|
})
|
|
78
84
|
|
|
85
|
+
// Determine list style
|
|
86
|
+
const supportsSuggestedActions: boolean = this.supportsSuggestedActions(channelId, choices.length, conversationType)
|
|
87
|
+
const supportsCardActions = this.supportsCardActions(channelId, choices.length)
|
|
79
88
|
const longTitles: boolean = maxTitleLength > this.MAX_ACTION_TITLE_LENGTH
|
|
89
|
+
|
|
90
|
+
if (!longTitles && !supportsSuggestedActions && supportsCardActions) {
|
|
91
|
+
// SuggestedActions is the preferred approach, but for channels that don't
|
|
92
|
+
// support them (e.g. Teams) we should use a HeroCard with CardActions
|
|
93
|
+
return ChoiceFactory.heroCard(list, text, speak)
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
if (!longTitles && supportsSuggestedActions) {
|
|
97
|
+
// We always prefer showing choices using suggested actions. If the titles are too long, however,
|
|
98
|
+
// we'll have to show them as a text list.
|
|
99
|
+
return ChoiceFactory.suggestedActions(list, text, speak)
|
|
100
|
+
}
|
|
101
|
+
|
|
80
102
|
if (!longTitles && choices.length <= 3) {
|
|
81
103
|
// If the titles are short and there are 3 or less choices we'll use an inline list.
|
|
82
104
|
return ChoiceFactory.inline(list, text, speak, options)
|
|
83
|
-
} else {
|
|
84
|
-
return ChoiceFactory.list(list, text, speak, options)
|
|
85
105
|
}
|
|
106
|
+
|
|
107
|
+
// Show a numbered list.
|
|
108
|
+
return ChoiceFactory.list(list, text, speak, options)
|
|
86
109
|
}
|
|
87
110
|
|
|
88
111
|
/**
|
|
@@ -159,6 +182,62 @@ export class ChoiceFactory {
|
|
|
159
182
|
return MessageFactory.text(txt, speak, InputHints.ExpectingInput)
|
|
160
183
|
}
|
|
161
184
|
|
|
185
|
+
/**
|
|
186
|
+
* Returns a 'message' activity containing a list of choices that has been formatted as suggested actions.
|
|
187
|
+
*
|
|
188
|
+
* @param choices List of choices to render.
|
|
189
|
+
* @param text (Optional) Text of the message.
|
|
190
|
+
* @param speak (Optional) SSML to speak for the message.
|
|
191
|
+
* @returns The created message activity.
|
|
192
|
+
*/
|
|
193
|
+
static suggestedActions (
|
|
194
|
+
choices: (string | Choice)[],
|
|
195
|
+
text?: string,
|
|
196
|
+
speak?: string
|
|
197
|
+
): Activity {
|
|
198
|
+
// Map choices to actions
|
|
199
|
+
const actions: CardAction[] = ChoiceFactory.toChoices(choices).map<CardAction>((choice: Choice) => {
|
|
200
|
+
if (choice.action) {
|
|
201
|
+
return choice.action
|
|
202
|
+
} else {
|
|
203
|
+
return { type: ActionTypes.ImBack, value: choice.value, title: choice.value, channelData: undefined }
|
|
204
|
+
}
|
|
205
|
+
})
|
|
206
|
+
|
|
207
|
+
// Return activity with choices as suggested actions
|
|
208
|
+
return MessageFactory.suggestedActions(actions, text, speak, InputHints.ExpectingInput)
|
|
209
|
+
}
|
|
210
|
+
|
|
211
|
+
/**
|
|
212
|
+
* Returns a 'message' activity that includes a list of choices that have been added as `HeroCard`'s.
|
|
213
|
+
*
|
|
214
|
+
* @param choices List of choices to render.
|
|
215
|
+
* @param text (Optional) Text of the message.
|
|
216
|
+
* @param speak (Optional) SSML to speak for the message.
|
|
217
|
+
* @returns The created message activity with choices as a HeroCard with buttons.
|
|
218
|
+
*/
|
|
219
|
+
static heroCard (
|
|
220
|
+
choices: (string | Choice)[],
|
|
221
|
+
text?: string,
|
|
222
|
+
speak?: string
|
|
223
|
+
): Activity {
|
|
224
|
+
const buttons: CardAction[] = ChoiceFactory.toChoices(choices).map<CardAction>((choice: Choice) => {
|
|
225
|
+
if (choice.action) {
|
|
226
|
+
return choice.action
|
|
227
|
+
} else {
|
|
228
|
+
return {
|
|
229
|
+
title: choice.value,
|
|
230
|
+
type: ActionTypes.ImBack,
|
|
231
|
+
value: choice.value,
|
|
232
|
+
}
|
|
233
|
+
}
|
|
234
|
+
})
|
|
235
|
+
|
|
236
|
+
const attachment = CardFactory.heroCard(undefined, text, undefined, buttons)
|
|
237
|
+
|
|
238
|
+
return MessageFactory.attachment(attachment, undefined, speak, InputHints.ExpectingInput) as Activity
|
|
239
|
+
}
|
|
240
|
+
|
|
162
241
|
/**
|
|
163
242
|
* Takes a mixed list of `string` and `Choice` based choices and returns them as a `Choice[]`.
|
|
164
243
|
*
|
|
@@ -184,4 +263,72 @@ export class ChoiceFactory {
|
|
|
184
263
|
})
|
|
185
264
|
.filter((choice: Choice) => choice)
|
|
186
265
|
}
|
|
266
|
+
|
|
267
|
+
/**
|
|
268
|
+
* @private
|
|
269
|
+
* Determines if a number of Suggested Actions are supported by a Channel.
|
|
270
|
+
* @param channelId The Channel to check if Suggested Actions are supported in.
|
|
271
|
+
* @param buttonCnt Optional. The number of Suggested Actions to check for the Channel.
|
|
272
|
+
* @param conversationType Optional.The type of the conversation.
|
|
273
|
+
* @returns true if the Channel supports the buttonCnt total Suggested Actions, false if the Channel does not support that number of Suggested Actions.
|
|
274
|
+
*/
|
|
275
|
+
private static supportsSuggestedActions (channelId: string, buttonCnt = 100, conversationType: string = ''): boolean {
|
|
276
|
+
switch (channelId) {
|
|
277
|
+
case Channels.Facebook:
|
|
278
|
+
case Channels.Skype:
|
|
279
|
+
return buttonCnt <= 10
|
|
280
|
+
case Channels.Line:
|
|
281
|
+
return buttonCnt <= 13
|
|
282
|
+
case Channels.Telegram:
|
|
283
|
+
case Channels.Emulator:
|
|
284
|
+
case Channels.Directline:
|
|
285
|
+
case Channels.Webchat:
|
|
286
|
+
case Channels.DirectlineSpeech:
|
|
287
|
+
return buttonCnt <= 100
|
|
288
|
+
case Channels.Msteams:
|
|
289
|
+
if (conversationType === 'personal') {
|
|
290
|
+
return buttonCnt <= 3
|
|
291
|
+
}
|
|
292
|
+
return false
|
|
293
|
+
default:
|
|
294
|
+
return false
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
/**
|
|
299
|
+
* @private
|
|
300
|
+
* Determines if a number of Card Actions are supported by a Channel.
|
|
301
|
+
* @param channelId The Channel to check if the Card Actions are supported in.
|
|
302
|
+
* @param buttonCnt Optional. The number of Card Actions to check for the Channel.
|
|
303
|
+
* @returns true if the Channel supports the buttonCnt total Card Actions, false if the Channel does not support that number of Card Actions.
|
|
304
|
+
*/
|
|
305
|
+
private static supportsCardActions (channelId: string, buttonCnt = 100): boolean {
|
|
306
|
+
switch (channelId) {
|
|
307
|
+
case Channels.Facebook:
|
|
308
|
+
case Channels.Skype:
|
|
309
|
+
return buttonCnt <= 3
|
|
310
|
+
// any "msteams" channel regardless of subchannel since the switch is on channelId.Channel
|
|
311
|
+
case Channels.Msteams:
|
|
312
|
+
return buttonCnt <= 50
|
|
313
|
+
case Channels.Line:
|
|
314
|
+
return buttonCnt <= 99
|
|
315
|
+
case Channels.Slack:
|
|
316
|
+
case Channels.Telegram:
|
|
317
|
+
case Channels.Emulator:
|
|
318
|
+
case Channels.Directline:
|
|
319
|
+
case Channels.DirectlineSpeech:
|
|
320
|
+
case Channels.Webchat:
|
|
321
|
+
return buttonCnt <= 100
|
|
322
|
+
default:
|
|
323
|
+
return false
|
|
324
|
+
}
|
|
325
|
+
}
|
|
326
|
+
|
|
327
|
+
/**
|
|
328
|
+
* @private
|
|
329
|
+
* @param context a TurnContext object representing an incoming message.
|
|
330
|
+
*/
|
|
331
|
+
private static getChannelId (context: TurnContext): string {
|
|
332
|
+
return context.activity.channelId || ''
|
|
333
|
+
}
|
|
187
334
|
}
|
package/src/dialog.ts
CHANGED
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
import { TurnContext } from '@microsoft/agents-hosting'
|
|
6
|
+
import { ExceptionHelper } from '@microsoft/agents-activity'
|
|
7
|
+
import { Errors } from './errorHelper'
|
|
6
8
|
import { DialogContext } from './dialogContext'
|
|
7
9
|
import { Configurable } from './configurable'
|
|
8
10
|
import { DialogTurnResult } from './dialogTurnResult'
|
|
@@ -244,6 +246,9 @@ export abstract class Dialog<O extends object = {}> extends Configurable {
|
|
|
244
246
|
* ID's is `<dialog type>(this.hashedLabel('<dialog args>'))`.
|
|
245
247
|
*/
|
|
246
248
|
protected onComputeId (): string {
|
|
247
|
-
throw
|
|
249
|
+
throw ExceptionHelper.generateException(
|
|
250
|
+
Error,
|
|
251
|
+
Errors.OnComputeIdNotImplemented
|
|
252
|
+
)
|
|
248
253
|
}
|
|
249
254
|
}
|
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
import { DialogContext } from './dialogContext'
|
|
6
|
+
import { ExceptionHelper } from '@microsoft/agents-activity'
|
|
7
|
+
import { Errors } from './errorHelper'
|
|
6
8
|
import { DialogInstance } from './dialogInstance'
|
|
7
9
|
|
|
8
10
|
/**
|
|
@@ -31,11 +33,17 @@ export class DialogContextError extends Error {
|
|
|
31
33
|
super()
|
|
32
34
|
|
|
33
35
|
if (!(error instanceof Error) && typeof error !== 'string') {
|
|
34
|
-
throw
|
|
36
|
+
throw ExceptionHelper.generateException(
|
|
37
|
+
Error,
|
|
38
|
+
Errors.InvalidErrorArgument
|
|
39
|
+
)
|
|
35
40
|
}
|
|
36
41
|
|
|
37
42
|
if (!(dialogContext instanceof DialogContext)) {
|
|
38
|
-
throw
|
|
43
|
+
throw ExceptionHelper.generateException(
|
|
44
|
+
Error,
|
|
45
|
+
Errors.InvalidDialogContextArgument
|
|
46
|
+
)
|
|
39
47
|
}
|
|
40
48
|
|
|
41
49
|
this.name = 'DialogContextError'
|
package/src/dialogHelper.ts
CHANGED
|
@@ -7,6 +7,8 @@ import {
|
|
|
7
7
|
AgentStatePropertyAccessor,
|
|
8
8
|
TurnContext
|
|
9
9
|
} from '@microsoft/agents-hosting'
|
|
10
|
+
import { Activity, ActivityTypes, ExceptionHelper } from '@microsoft/agents-activity'
|
|
11
|
+
import { Errors } from './errorHelper'
|
|
10
12
|
import { Dialog } from './dialog'
|
|
11
13
|
import { DialogContext, DialogState } from './dialogContext'
|
|
12
14
|
import { DialogEvents } from './dialogEvents'
|
|
@@ -14,7 +16,6 @@ import { DialogSet } from './dialogSet'
|
|
|
14
16
|
import { DialogStateManager, DialogStateManagerConfiguration } from './memory'
|
|
15
17
|
import { DialogTurnResult } from './dialogTurnResult'
|
|
16
18
|
import { DialogTurnStatus } from './dialogTurnStatus'
|
|
17
|
-
import { Activity, ActivityTypes } from '@microsoft/agents-activity'
|
|
18
19
|
|
|
19
20
|
/**
|
|
20
21
|
* Runs a dialog from a given context and accessor.
|
|
@@ -29,19 +30,31 @@ export async function runDialog (
|
|
|
29
30
|
accessor: AgentStatePropertyAccessor<DialogState>
|
|
30
31
|
): Promise<void> {
|
|
31
32
|
if (!dialog) {
|
|
32
|
-
throw
|
|
33
|
+
throw ExceptionHelper.generateException(
|
|
34
|
+
Error,
|
|
35
|
+
Errors.MissingDialog
|
|
36
|
+
)
|
|
33
37
|
}
|
|
34
38
|
|
|
35
39
|
if (!context) {
|
|
36
|
-
throw
|
|
40
|
+
throw ExceptionHelper.generateException(
|
|
41
|
+
Error,
|
|
42
|
+
Errors.MissingContext
|
|
43
|
+
)
|
|
37
44
|
}
|
|
38
45
|
|
|
39
46
|
if (!context.activity) {
|
|
40
|
-
throw
|
|
47
|
+
throw ExceptionHelper.generateException(
|
|
48
|
+
Error,
|
|
49
|
+
Errors.MissingContextActivity
|
|
50
|
+
)
|
|
41
51
|
}
|
|
42
52
|
|
|
43
53
|
if (!accessor) {
|
|
44
|
-
throw
|
|
54
|
+
throw ExceptionHelper.generateException(
|
|
55
|
+
Error,
|
|
56
|
+
Errors.MissingAccessor
|
|
57
|
+
)
|
|
45
58
|
}
|
|
46
59
|
|
|
47
60
|
const dialogSet = new DialogSet(accessor)
|
package/src/dialogManager.ts
CHANGED
|
@@ -10,6 +10,8 @@ import {
|
|
|
10
10
|
UserState,
|
|
11
11
|
TurnContextStateCollection,
|
|
12
12
|
} from '@microsoft/agents-hosting'
|
|
13
|
+
import { ExceptionHelper } from '@microsoft/agents-activity'
|
|
14
|
+
import { Errors } from './errorHelper'
|
|
13
15
|
import { AgentStateSet } from './agentStateSet'
|
|
14
16
|
import { Configurable } from './configurable'
|
|
15
17
|
import { DialogContainer } from './dialogContainer'
|
|
@@ -157,7 +159,10 @@ export class DialogManager extends Configurable {
|
|
|
157
159
|
async onTurn (context: TurnContext): Promise<DialogManagerResult> {
|
|
158
160
|
// Ensure properly configured
|
|
159
161
|
if (!this._rootDialogId) {
|
|
160
|
-
throw
|
|
162
|
+
throw ExceptionHelper.generateException(
|
|
163
|
+
Error,
|
|
164
|
+
Errors.RootDialogNotConfigured
|
|
165
|
+
)
|
|
161
166
|
}
|
|
162
167
|
|
|
163
168
|
// Copy initial turn state to context
|
|
@@ -174,7 +179,10 @@ export class DialogManager extends Configurable {
|
|
|
174
179
|
}
|
|
175
180
|
|
|
176
181
|
if (!this.conversationState) {
|
|
177
|
-
throw
|
|
182
|
+
throw ExceptionHelper.generateException(
|
|
183
|
+
Error,
|
|
184
|
+
Errors.ConversationStateNotConfigured
|
|
185
|
+
)
|
|
178
186
|
}
|
|
179
187
|
agentStateSet.add(this.conversationState)
|
|
180
188
|
|
package/src/dialogSet.ts
CHANGED
|
@@ -6,6 +6,8 @@ import {
|
|
|
6
6
|
AgentStatePropertyAccessor,
|
|
7
7
|
TurnContext
|
|
8
8
|
} from '@microsoft/agents-hosting'
|
|
9
|
+
import { ExceptionHelper } from '@microsoft/agents-activity'
|
|
10
|
+
import { Errors } from './errorHelper'
|
|
9
11
|
|
|
10
12
|
import { Dialog } from './dialog'
|
|
11
13
|
import { DialogContext, DialogState } from './dialogContext'
|
|
@@ -127,7 +129,10 @@ export class DialogSet {
|
|
|
127
129
|
*/
|
|
128
130
|
add<T extends Dialog>(dialog: T): this {
|
|
129
131
|
if (!(dialog instanceof Dialog)) {
|
|
130
|
-
throw
|
|
132
|
+
throw ExceptionHelper.generateException(
|
|
133
|
+
Error,
|
|
134
|
+
Errors.InvalidDialogBeingAdded
|
|
135
|
+
)
|
|
131
136
|
}
|
|
132
137
|
|
|
133
138
|
// Ensure new version hash is computed
|
|
@@ -177,8 +182,9 @@ export class DialogSet {
|
|
|
177
182
|
*/
|
|
178
183
|
async createContext (context: TurnContext): Promise<DialogContext> {
|
|
179
184
|
if (!this.dialogState) {
|
|
180
|
-
throw
|
|
181
|
-
|
|
185
|
+
throw ExceptionHelper.generateException(
|
|
186
|
+
Error,
|
|
187
|
+
Errors.DialogSetNotBound
|
|
182
188
|
)
|
|
183
189
|
}
|
|
184
190
|
const state: DialogState = await this.dialogState.get(context, { dialogStack: [] } as DialogState)
|