@microsoft/agents-hosting-dialogs 0.1.49 → 0.2.7-gd7a3e9ef95
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/README.md +86 -0
- package/dist/src/choices/choice.d.ts +1 -1
- package/dist/src/choices/choiceFactory.d.ts +2 -1
- package/dist/src/choices/choiceFactory.js +6 -5
- package/dist/src/choices/choiceFactory.js.map +1 -1
- package/dist/src/choices/tokenizer.d.ts +2 -2
- package/dist/src/dialogContext.d.ts +2 -3
- package/dist/src/dialogContext.js.map +1 -1
- package/dist/src/dialogHelper.js +2 -2
- package/dist/src/dialogHelper.js.map +1 -1
- package/dist/src/prompts/activityPrompt.d.ts +2 -1
- package/dist/src/prompts/activityPrompt.js +6 -10
- package/dist/src/prompts/activityPrompt.js.map +1 -1
- package/dist/src/prompts/attachmentPrompt.d.ts +2 -1
- package/dist/src/prompts/attachmentPrompt.js +3 -7
- package/dist/src/prompts/attachmentPrompt.js.map +1 -1
- package/dist/src/prompts/choicePrompt.js.map +1 -1
- package/dist/src/prompts/confirmPrompt.js.map +1 -1
- package/dist/src/prompts/datetimePrompt.js +3 -3
- package/dist/src/prompts/datetimePrompt.js.map +1 -1
- package/dist/src/prompts/numberPrompt.js +3 -3
- package/dist/src/prompts/numberPrompt.js.map +1 -1
- package/dist/src/prompts/prompt.d.ts +3 -2
- package/dist/src/prompts/prompt.js +6 -5
- package/dist/src/prompts/prompt.js.map +1 -1
- package/dist/src/prompts/textPrompt.js +3 -7
- package/dist/src/prompts/textPrompt.js.map +1 -1
- package/dist/src/recognizer.d.ts +1 -1
- package/dist/src/waterfallDialog.d.ts +1 -1
- package/dist/src/waterfallDialog.js +2 -2
- package/dist/src/waterfallDialog.js.map +1 -1
- package/package.json +2 -5
- package/src/choices/choice.ts +1 -1
- package/src/choices/choiceFactory.ts +2 -4
- package/src/choices/tokenizer.ts +2 -2
- package/src/dialogContext.ts +2 -3
- package/src/dialogHelper.ts +1 -2
- package/src/prompts/activityPrompt.ts +2 -1
- package/src/prompts/attachmentPrompt.ts +2 -1
- package/src/prompts/choicePrompt.ts +2 -1
- package/src/prompts/confirmPrompt.ts +2 -1
- package/src/prompts/datetimePrompt.ts +2 -1
- package/src/prompts/numberPrompt.ts +2 -1
- package/src/prompts/prompt.ts +3 -2
- package/src/prompts/textPrompt.ts +2 -1
- package/src/recognizer.ts +1 -1
- package/src/waterfallDialog.ts +2 -2
package/README.md
ADDED
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
# @microsoft/agents-hosting-dialogs
|
|
2
|
+
|
|
3
|
+
> Port https://github.com/microsoft/botbuilder-js/tree/main/libraries/botbuilder-dialogs to enable migrating to the new Agents SDK.
|
|
4
|
+
|
|
5
|
+
## Overview
|
|
6
|
+
|
|
7
|
+
This module includes a system for managing multi-turn conversations within a Microsoft Botbuilder app, including
|
|
8
|
+
tools for creating and managing dialog systems, a means for creating custom interoperable dialog systems, and a series
|
|
9
|
+
of useful prompts that provide type checking and validation of input.
|
|
10
|
+
|
|
11
|
+
## How to use
|
|
12
|
+
|
|
13
|
+
```javascript
|
|
14
|
+
// Import some of the capabilities from the module.
|
|
15
|
+
const { DialogSet, WaterfallDialog } = require("@microsoft/agents-hosting-dialogs");
|
|
16
|
+
```
|
|
17
|
+
|
|
18
|
+
Then, create one or more `DialogSet` objects to manage the dialogs used in your agent.
|
|
19
|
+
A DialogSet is used to collect and execute dialogs. An agent may have more than one
|
|
20
|
+
DialogSet, which can be used to group dialogs logically and avoid name collisions.
|
|
21
|
+
|
|
22
|
+
Then, create one or more dialogs and add them to the DialogSet. Use the WaterfallDialog
|
|
23
|
+
class to construct dialogs defined by a series of functions for sending and receiving input
|
|
24
|
+
that will be executed in order.
|
|
25
|
+
|
|
26
|
+
More sophisticated multi-dialog sets can be created using the `ComponentDialog` class, which
|
|
27
|
+
contains a DialogSet, is itself also a dialog that can be triggered like any other. By building on top ComponentDialog,
|
|
28
|
+
developer can bundle multiple dialogs into a single unit which can then be packaged, distributed and reused.
|
|
29
|
+
|
|
30
|
+
```javascript
|
|
31
|
+
// Set up a storage system that will capture the conversation state.
|
|
32
|
+
const storage = new MemoryStorage();
|
|
33
|
+
const convoState = new ConversationState(storage);
|
|
34
|
+
|
|
35
|
+
// Define a property associated with the conversation state.
|
|
36
|
+
const dialogState = convoState.createProperty('dialogState');
|
|
37
|
+
|
|
38
|
+
// Initialize a DialogSet, passing in a property used to capture state.
|
|
39
|
+
const dialogs = new DialogSet(dialogState);
|
|
40
|
+
|
|
41
|
+
// Each dialog is identified by a unique name used to invoke the dialog later.
|
|
42
|
+
const DIALOG_ONE = 'dialog_identifier_value';
|
|
43
|
+
|
|
44
|
+
// Add a dialog. Use the included WaterfallDialog type, or build your own
|
|
45
|
+
// by subclassing from the Dialog class.
|
|
46
|
+
dialogs.add(new WaterfallDialog(DIALOG_ONE, [
|
|
47
|
+
async (step) => {
|
|
48
|
+
// access user input from previous step
|
|
49
|
+
var last_step_answer = step.result;
|
|
50
|
+
|
|
51
|
+
// send a message to the user
|
|
52
|
+
await step.context.sendActivity('Send a reply');
|
|
53
|
+
|
|
54
|
+
// continue to the next step
|
|
55
|
+
return await step.next();
|
|
56
|
+
|
|
57
|
+
// OR end
|
|
58
|
+
// return await step.endDialog();
|
|
59
|
+
},
|
|
60
|
+
step2fn,
|
|
61
|
+
step3fn,
|
|
62
|
+
...,
|
|
63
|
+
stepNfn
|
|
64
|
+
]));
|
|
65
|
+
```
|
|
66
|
+
|
|
67
|
+
Finally, from somewhere in your agents' code, invoke your dialog by name:
|
|
68
|
+
```javascript
|
|
69
|
+
// Receive and process incoming events into TurnContext objects in the normal way
|
|
70
|
+
adapter.processActivity(req, res, async (turnContext) => {
|
|
71
|
+
// Create a DialogContext object from the incoming TurnContext
|
|
72
|
+
const dc = await dialogs.createContext(turnContext);
|
|
73
|
+
|
|
74
|
+
// ...evaluate message and do other bot logic...
|
|
75
|
+
|
|
76
|
+
// If the bot hasn't yet responded, try to continue any active dialog
|
|
77
|
+
if (!turnContext.responded) {
|
|
78
|
+
const status = await dc.continueDialog();
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
// Invoke the dialog we created above.
|
|
82
|
+
if (!turnContext.responded) {
|
|
83
|
+
await dc.beginDialog(DIALOG_ONE);
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
```
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { CardAction } from '@microsoft/agents-
|
|
5
|
+
import { CardAction } from '@microsoft/agents-activity';
|
|
6
6
|
/**
|
|
7
7
|
* An instance of a choice that can be used to render a choice to a user or recognize something a
|
|
8
8
|
* user picked.
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { Activity
|
|
5
|
+
import { Activity } from '@microsoft/agents-activity';
|
|
6
|
+
import { TurnContext } from '@microsoft/agents-hosting';
|
|
6
7
|
import { Choice } from './choice';
|
|
7
8
|
/**
|
|
8
9
|
* Additional options used to tweak the formatting of choice lists.
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ChoiceFactory = void 0;
|
|
2
4
|
/**
|
|
3
5
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
4
6
|
* Licensed under the MIT License.
|
|
5
7
|
*/
|
|
6
|
-
|
|
7
|
-
exports.ChoiceFactory = void 0;
|
|
8
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
8
9
|
const agents_hosting_1 = require("@microsoft/agents-hosting");
|
|
9
10
|
/**
|
|
10
11
|
* A set of utility functions to assist with the formatting a 'message' activity containing a list
|
|
@@ -73,7 +74,7 @@ class ChoiceFactory {
|
|
|
73
74
|
}
|
|
74
75
|
});
|
|
75
76
|
txt += '';
|
|
76
|
-
return agents_hosting_1.MessageFactory.text(txt, speak,
|
|
77
|
+
return agents_hosting_1.MessageFactory.text(txt, speak, agents_activity_1.InputHints.ExpectingInput);
|
|
77
78
|
}
|
|
78
79
|
/**
|
|
79
80
|
* Returns a 'message' activity containing a list of choices that has been formatted as an
|
|
@@ -98,7 +99,7 @@ class ChoiceFactory {
|
|
|
98
99
|
txt += `${connector}${opt.includeNumbers ? (index + 1).toString() + '. ' : '- '}${title}`;
|
|
99
100
|
connector = '\n ';
|
|
100
101
|
});
|
|
101
|
-
return agents_hosting_1.MessageFactory.text(txt, speak,
|
|
102
|
+
return agents_hosting_1.MessageFactory.text(txt, speak, agents_activity_1.InputHints.ExpectingInput);
|
|
102
103
|
}
|
|
103
104
|
/**
|
|
104
105
|
* Takes a mixed list of `string` and `Choice` based choices and returns them as a `Choice[]`.
|
|
@@ -112,7 +113,7 @@ class ChoiceFactory {
|
|
|
112
113
|
.map((choice) => {
|
|
113
114
|
const action = choice.action;
|
|
114
115
|
if (action) {
|
|
115
|
-
action.type = action.type ? action.type :
|
|
116
|
+
action.type = action.type ? action.type : agents_activity_1.ActionTypes.ImBack;
|
|
116
117
|
if (!action.value && action.title) {
|
|
117
118
|
action.value = action.title;
|
|
118
119
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"choiceFactory.js","sourceRoot":"","sources":["../../../src/choices/choiceFactory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"choiceFactory.js","sourceRoot":"","sources":["../../../src/choices/choiceFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,8 +11,8 @@ export interface Token {
|
|
|
11
11
|
/**
|
|
12
12
|
* Signature for an alternate word breaker.
|
|
13
13
|
*
|
|
14
|
-
* @param
|
|
15
|
-
* @param
|
|
14
|
+
* @param text The text to be tokenized.
|
|
15
|
+
* @param locale (Optional) locale of the text if known.
|
|
16
16
|
*/
|
|
17
17
|
export type TokenizerFunction = (text: string, locale?: string) => Token[];
|
|
18
18
|
/**
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { TurnContext, TurnContextStateCollection } from '@microsoft/agents-hosting';
|
|
6
6
|
import { Dialog } from './dialog';
|
|
7
7
|
import { DialogSet } from './dialogSet';
|
|
8
8
|
import { PromptOptions } from './prompts';
|
|
@@ -11,6 +11,7 @@ import { DialogManager } from './dialogManager';
|
|
|
11
11
|
import { DialogInstance } from './dialogInstance';
|
|
12
12
|
import { DialogTurnResult } from './dialogTurnResult';
|
|
13
13
|
import { Choice } from './choices';
|
|
14
|
+
import { Activity } from '@microsoft/agents-activity';
|
|
14
15
|
/**
|
|
15
16
|
* Contains dialog state, information about the state of the dialog stack, for a specific DialogSet.
|
|
16
17
|
*
|
|
@@ -163,8 +164,6 @@ export declare class DialogContext {
|
|
|
163
164
|
* @param promptOrOptions The text of the initial prompt to send the user,
|
|
164
165
|
* the activity to send as the initial prompt, or
|
|
165
166
|
* the object with which to format the prompt dialog.
|
|
166
|
-
* @param choices Optional. Array of choices for the user to choose from,
|
|
167
|
-
* for use with a ChoicePrompt.
|
|
168
167
|
*
|
|
169
168
|
* @remarks
|
|
170
169
|
* This helper method formats the object to use as the `options` parameter, and then calls
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialogContext.js","sourceRoot":"","sources":["../../src/dialogContext.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,
|
|
1
|
+
{"version":3,"file":"dialogContext.js","sourceRoot":"","sources":["../../src/dialogContext.ts"],"names":[],"mappings":"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"}
|
package/dist/src/dialogHelper.js
CHANGED
|
@@ -7,11 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.runDialog = runDialog;
|
|
8
8
|
exports.internalRun = internalRun;
|
|
9
9
|
exports.getActiveDialogContext = getActiveDialogContext;
|
|
10
|
-
const agents_hosting_1 = require("@microsoft/agents-hosting");
|
|
11
10
|
const dialogEvents_1 = require("./dialogEvents");
|
|
12
11
|
const dialogSet_1 = require("./dialogSet");
|
|
13
12
|
const memory_1 = require("./memory");
|
|
14
13
|
const dialogTurnStatus_1 = require("./dialogTurnStatus");
|
|
14
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
15
15
|
/**
|
|
16
16
|
* Runs a dialog from a given context and accessor.
|
|
17
17
|
*
|
|
@@ -106,7 +106,7 @@ const sendStateSnapshotTrace = async (dialogContext) => {
|
|
|
106
106
|
const traceLabel = 'Agent State';
|
|
107
107
|
// Send trace of memory
|
|
108
108
|
const snapshot = getActiveDialogContext(dialogContext).state.getMemorySnapshot();
|
|
109
|
-
const traceActivity = new
|
|
109
|
+
const traceActivity = new agents_activity_1.Activity(agents_activity_1.ActivityTypes.Trace);
|
|
110
110
|
traceActivity.name = 'AgentState';
|
|
111
111
|
traceActivity.label = 'https://www.botframework.com/schemas/botState';
|
|
112
112
|
traceActivity.value = snapshot;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dialogHelper.js","sourceRoot":"","sources":["../../src/dialogHelper.ts"],"names":[],"mappings":";AAAA;;;GAGG;;
|
|
1
|
+
{"version":3,"file":"dialogHelper.js","sourceRoot":"","sources":["../../src/dialogHelper.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,13 +2,14 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { TurnContext } from '@microsoft/agents-hosting';
|
|
6
6
|
import { Dialog } from '../dialog';
|
|
7
7
|
import { DialogContext } from '../dialogContext';
|
|
8
8
|
import { PromptOptions, PromptRecognizerResult, PromptValidator } from './prompt';
|
|
9
9
|
import { DialogInstance } from '../dialogInstance';
|
|
10
10
|
import { DialogReason } from '../dialogReason';
|
|
11
11
|
import { DialogTurnResult } from '../dialogTurnResult';
|
|
12
|
+
import { Activity } from '@microsoft/agents-activity';
|
|
12
13
|
/**
|
|
13
14
|
* Waits for an activity to be received.
|
|
14
15
|
*
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ActivityPrompt = void 0;
|
|
4
|
-
/**
|
|
5
|
-
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
6
|
-
* Licensed under the MIT License.
|
|
7
|
-
*/
|
|
8
|
-
const agents_hosting_1 = require("@microsoft/agents-hosting");
|
|
9
4
|
const dialog_1 = require("../dialog");
|
|
5
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
10
6
|
/**
|
|
11
7
|
* Waits for an activity to be received.
|
|
12
8
|
*
|
|
@@ -42,10 +38,10 @@ class ActivityPrompt extends dialog_1.Dialog {
|
|
|
42
38
|
// Ensure prompts have input hint set
|
|
43
39
|
const opt = { ...options };
|
|
44
40
|
if (opt.prompt && typeof opt.prompt === 'object' && typeof opt.prompt.inputHint !== 'string') {
|
|
45
|
-
opt.prompt.inputHint =
|
|
41
|
+
opt.prompt.inputHint = agents_activity_1.InputHints.ExpectingInput;
|
|
46
42
|
}
|
|
47
43
|
if (opt.retryPrompt && typeof opt.retryPrompt === 'object' && typeof opt.retryPrompt.inputHint !== 'string') {
|
|
48
|
-
opt.retryPrompt.inputHint =
|
|
44
|
+
opt.retryPrompt.inputHint = agents_activity_1.InputHints.ExpectingInput;
|
|
49
45
|
}
|
|
50
46
|
// Initialize prompt state
|
|
51
47
|
const state = dialogContext.activeDialog.state;
|
|
@@ -89,7 +85,7 @@ class ActivityPrompt extends dialog_1.Dialog {
|
|
|
89
85
|
return await dialogContext.endDialog(recognized.value);
|
|
90
86
|
}
|
|
91
87
|
else {
|
|
92
|
-
if (dialogContext.context.activity.type ===
|
|
88
|
+
if (dialogContext.context.activity.type === agents_activity_1.ActivityTypes.Message && !dialogContext.context.responded) {
|
|
93
89
|
await this.onPrompt(dialogContext.context, state.state, state.options, true);
|
|
94
90
|
}
|
|
95
91
|
return dialog_1.Dialog.EndOfTurn;
|
|
@@ -142,10 +138,10 @@ class ActivityPrompt extends dialog_1.Dialog {
|
|
|
142
138
|
*/
|
|
143
139
|
async onPrompt(context, state, options, isRetry) {
|
|
144
140
|
if (isRetry && options.retryPrompt) {
|
|
145
|
-
await context.sendActivity(options.retryPrompt, undefined,
|
|
141
|
+
await context.sendActivity(options.retryPrompt, undefined, agents_activity_1.InputHints.ExpectingInput);
|
|
146
142
|
}
|
|
147
143
|
else if (options.prompt) {
|
|
148
|
-
await context.sendActivity(options.prompt, undefined,
|
|
144
|
+
await context.sendActivity(options.prompt, undefined, agents_activity_1.InputHints.ExpectingInput);
|
|
149
145
|
}
|
|
150
146
|
}
|
|
151
147
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"activityPrompt.js","sourceRoot":"","sources":["../../../src/prompts/activityPrompt.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"activityPrompt.js","sourceRoot":"","sources":["../../../src/prompts/activityPrompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { TurnContext } from '@microsoft/agents-hosting';
|
|
6
6
|
import { Prompt, PromptOptions, PromptRecognizerResult, PromptValidator } from './prompt';
|
|
7
|
+
import { Attachment } from '@microsoft/agents-activity';
|
|
7
8
|
/**
|
|
8
9
|
* Prompts a user to upload attachments like images.
|
|
9
10
|
*
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AttachmentPrompt = void 0;
|
|
4
|
-
/**
|
|
5
|
-
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
6
|
-
* Licensed under the MIT License.
|
|
7
|
-
*/
|
|
8
|
-
const agents_hosting_1 = require("@microsoft/agents-hosting");
|
|
9
4
|
const prompt_1 = require("./prompt");
|
|
5
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
10
6
|
/**
|
|
11
7
|
* Prompts a user to upload attachments like images.
|
|
12
8
|
*
|
|
@@ -31,10 +27,10 @@ class AttachmentPrompt extends prompt_1.Prompt {
|
|
|
31
27
|
*/
|
|
32
28
|
async onPrompt(context, state, options, isRetry) {
|
|
33
29
|
if (isRetry && options.retryPrompt) {
|
|
34
|
-
await context.sendActivity(options.retryPrompt, undefined,
|
|
30
|
+
await context.sendActivity(options.retryPrompt, undefined, agents_activity_1.InputHints.ExpectingInput);
|
|
35
31
|
}
|
|
36
32
|
else if (options.prompt) {
|
|
37
|
-
await context.sendActivity(options.prompt, undefined,
|
|
33
|
+
await context.sendActivity(options.prompt, undefined, agents_activity_1.InputHints.ExpectingInput);
|
|
38
34
|
}
|
|
39
35
|
}
|
|
40
36
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attachmentPrompt.js","sourceRoot":"","sources":["../../../src/prompts/attachmentPrompt.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"attachmentPrompt.js","sourceRoot":"","sources":["../../../src/prompts/attachmentPrompt.ts"],"names":[],"mappings":";;;AAKA,qCAAyF;AACzF,gEAAmE;AAEnE;;;;;GAKG;AACH,MAAa,gBAAiB,SAAQ,eAAoB;IACxD,qEAAqE;IACrE,YAAa,QAAgB,EAAE,SAAyC;QACtE,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IAC5B,CAAC;IAED;;;;;;;;;;SAUK;IACK,KAAK,CAAC,QAAQ,CACtB,OAAoB,EACpB,KAAU,EACV,OAAsB,EACtB,OAAgB;QAEhB,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,4BAAU,CAAC,cAAc,CAAC,CAAA;QACvF,CAAC;aAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,4BAAU,CAAC,cAAc,CAAC,CAAA;QAClF,CAAC;IACH,CAAC;IAED;;;;;;;;SAQK;IACK,KAAK,CAAC,WAAW,CACzB,OAAoB,EACpB,MAAW,EACX,QAAuB;QAEvB,MAAM,KAAK,GAAiB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAA;QAExD,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAA;IACrG,CAAC;CACF;AAhDD,4CAgDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"choicePrompt.js","sourceRoot":"","sources":["../../../src/prompts/choicePrompt.ts"],"names":[],"mappings":";;;AAKA,wCAAmH;AACnH,qCAAoG;AACpG,+DAA2D;
|
|
1
|
+
{"version":3,"file":"choicePrompt.js","sourceRoot":"","sources":["../../../src/prompts/choicePrompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"confirmPrompt.js","sourceRoot":"","sources":["../../../src/prompts/confirmPrompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,8 +39,8 @@ exports.DateTimePrompt = void 0;
|
|
|
39
39
|
* Licensed under the MIT License.
|
|
40
40
|
*/
|
|
41
41
|
const Recognizers = __importStar(require("@microsoft/recognizers-text-date-time"));
|
|
42
|
-
const agents_hosting_1 = require("@microsoft/agents-hosting");
|
|
43
42
|
const prompt_1 = require("./prompt");
|
|
43
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
44
44
|
/**
|
|
45
45
|
* Prompts a user to enter a datetime expression.
|
|
46
46
|
*
|
|
@@ -73,10 +73,10 @@ class DateTimePrompt extends prompt_1.Prompt {
|
|
|
73
73
|
*/
|
|
74
74
|
async onPrompt(context, state, options, isRetry) {
|
|
75
75
|
if (isRetry && options.retryPrompt) {
|
|
76
|
-
await context.sendActivity(options.retryPrompt, undefined,
|
|
76
|
+
await context.sendActivity(options.retryPrompt, undefined, agents_activity_1.InputHints.ExpectingInput);
|
|
77
77
|
}
|
|
78
78
|
else if (options.prompt) {
|
|
79
|
-
await context.sendActivity(options.prompt, undefined,
|
|
79
|
+
await context.sendActivity(options.prompt, undefined, agents_activity_1.InputHints.ExpectingInput);
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
82
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datetimePrompt.js","sourceRoot":"","sources":["../../../src/prompts/datetimePrompt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;GAGG;AACH,mFAAoE;
|
|
1
|
+
{"version":3,"file":"datetimePrompt.js","sourceRoot":"","sources":["../../../src/prompts/datetimePrompt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;GAGG;AACH,mFAAoE;AAEpE,qCAAyF;AACzF,gEAAiE;AAwBjE;;;;;GAKG;AACH,MAAa,cAAe,SAAQ,eAA4B;IAM9D;;;;;;SAMK;IACL,YAAa,QAAgB,EAAE,SAAiD,EAAE,aAAsB;QACtG,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAC1B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAED;;;;;;;;;;;SAWK;IACK,KAAK,CAAC,QAAQ,CACtB,OAAoB,EACpB,KAAU,EACV,OAAsB,EACtB,OAAgB;QAEhB,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,4BAAU,CAAC,cAAc,CAAC,CAAA;QACvF,CAAC;aAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,4BAAU,CAAC,cAAc,CAAC,CAAA;QAClF,CAAC;IACH,CAAC;IAED;;;;;;;;;SASK;IACK,KAAK,CAAC,WAAW,CACzB,OAAoB,EACpB,MAAW,EACX,QAAuB;QAEvB,MAAM,MAAM,GAAiD,EAAE,SAAS,EAAE,KAAK,EAAE,CAAA;QACjF,MAAM,QAAQ,GAAa,OAAO,CAAC,QAAQ,CAAA;QAC3C,MAAM,SAAS,GAAW,QAAQ,CAAC,IAAI,CAAA;QACvC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,MAAM,CAAA;QACf,CAAC;QACD,MAAM,MAAM,GAAW,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,aAAa,IAAI,OAAO,CAAA;QACvE,MAAM,OAAO,GAAU,WAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAA;QACvE,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;YAChD,MAAM,CAAC,SAAS,GAAG,IAAI,CAAA;YACvB,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAA;QAC7C,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;CACF;AAzED,wCAyEC"}
|
|
@@ -44,8 +44,8 @@ exports.NumberPrompt = void 0;
|
|
|
44
44
|
const globalize_1 = __importDefault(require("globalize"));
|
|
45
45
|
const recognizers_text_number_1 = require("@microsoft/recognizers-text-number");
|
|
46
46
|
const locales = __importStar(require("../i18n"));
|
|
47
|
-
const agents_hosting_1 = require("@microsoft/agents-hosting");
|
|
48
47
|
const prompt_1 = require("./prompt");
|
|
48
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
49
49
|
// Load all registered locales into Globalize library
|
|
50
50
|
Object.values(locales).forEach((locale) => globalize_1.default.load(locale));
|
|
51
51
|
/**
|
|
@@ -80,10 +80,10 @@ class NumberPrompt extends prompt_1.Prompt {
|
|
|
80
80
|
*/
|
|
81
81
|
async onPrompt(context, state, options, isRetry) {
|
|
82
82
|
if (isRetry && options.retryPrompt) {
|
|
83
|
-
await context.sendActivity(options.retryPrompt, undefined,
|
|
83
|
+
await context.sendActivity(options.retryPrompt, undefined, agents_activity_1.InputHints.ExpectingInput);
|
|
84
84
|
}
|
|
85
85
|
else if (options.prompt) {
|
|
86
|
-
await context.sendActivity(options.prompt, undefined,
|
|
86
|
+
await context.sendActivity(options.prompt, undefined, agents_activity_1.InputHints.ExpectingInput);
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
89
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"numberPrompt.js","sourceRoot":"","sources":["../../../src/prompts/numberPrompt.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,0DAAiC;AACjC,gFAAoE;AACpE,iDAAkC;
|
|
1
|
+
{"version":3,"file":"numberPrompt.js","sourceRoot":"","sources":["../../../src/prompts/numberPrompt.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,0DAAiC;AACjC,gFAAoE;AACpE,iDAAkC;AAElC,qCAAyF;AACzF,gEAAuD;AAEvD,qDAAqD;AACrD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,mBAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;AAElE;;;;;GAKG;AACH,MAAa,YAAa,SAAQ,eAAc;IAM9C;;;;;;SAMK;IACL,YAAa,QAAgB,EAAE,SAAmC,EAAE,aAAsB;QACxF,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;QAC1B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;IACpC,CAAC;IAED;;;;;;;;;;;SAWK;IACK,KAAK,CAAC,QAAQ,CACtB,OAAoB,EACpB,KAAc,EACd,OAAsB,EACtB,OAAgB;QAEhB,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,4BAAU,CAAC,cAAc,CAAC,CAAA;QACvF,CAAC;aAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,4BAAU,CAAC,cAAc,CAAC,CAAA;QAClF,CAAC;IACH,CAAC;IAED;;;;;;;;;SASK;IACK,KAAK,CAAC,WAAW,CACzB,OAAoB,EACpB,MAAe,EACf,QAAuB;QAEvB,MAAM,MAAM,GAAmC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAA;QACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;QAEjC,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAA;QAC/B,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,MAAM,CAAA;QACf,CAAC;QAED,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,IAAI,OAAO,CAAA;QACnD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,aAAa,CAAA;QAE/C,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,EAAE,GAAG,EAAE,CAAC,GAAG,IAAA,yCAAe,EAAC,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,CAAA;QAC7E,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,CAAC,SAAS,GAAG,IAAI,CAAA;YAEvB,yFAAyF;YACzF,gCAAgC;YAChC,MAAM,MAAM,GAAG,IAAA,mBAAS,EAAC,IAAI,CAAC,+BAA+B,CAAC,MAAM,CAAC,CAAC,CAAA;YACtE,IAAI,YAAuC,CAAA;YAC3C,IAAI,CAAC;gBACH,YAAY,GAAG,MAAM,CAAC,YAAY,EAAE,CAAA;YACtC,CAAC;YAAC,MAAM,CAAC;gBACP,YAAY,GAAG,IAAA,mBAAS,EAAC,IAAI,CAAC,+BAA+B,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,EAAE,CAAA;YAC9F,CAAC;YAED,MAAM,CAAC,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAC/C,CAAC;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED;;;SAGK;IACG,+BAA+B,CAAE,OAAe;QACtD,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAA;IAC1C,CAAC;CACF;AAhGD,oCAgGC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { TurnContext } from '@microsoft/agents-hosting';
|
|
6
6
|
import { Choice, ChoiceFactoryOptions } from '../choices';
|
|
7
7
|
import { Dialog } from '../dialog';
|
|
8
8
|
import { DialogContext } from '../dialogContext';
|
|
@@ -10,6 +10,7 @@ import { DialogInstance } from '../dialogInstance';
|
|
|
10
10
|
import { DialogTurnResult } from '../dialogTurnResult';
|
|
11
11
|
import { DialogReason } from '../dialogReason';
|
|
12
12
|
import { DialogEvent } from '../dialogEvent';
|
|
13
|
+
import { Activity } from '@microsoft/agents-activity';
|
|
13
14
|
/**
|
|
14
15
|
* Controls the way that choices for a `ChoicePrompt` or yes/no options for a `ConfirmPrompt` are
|
|
15
16
|
* presented to a user.
|
|
@@ -102,7 +103,7 @@ export interface PromptRecognizerResult<T> {
|
|
|
102
103
|
* > validator sends a custom re-prompt to the user using `prompt.context.sendActivity()`. In that
|
|
103
104
|
* > case the prompts default re-rpompt logic will not be run.
|
|
104
105
|
* @param T Type of recognizer result being validated.
|
|
105
|
-
* @param
|
|
106
|
+
* @param prompt Contextual information containing the recognizer result and original options passed to the prompt.
|
|
106
107
|
*/
|
|
107
108
|
export type PromptValidator<T> = (prompt: PromptValidatorContext<T>) => Promise<boolean>;
|
|
108
109
|
/**
|
|
@@ -8,6 +8,7 @@ exports.Prompt = exports.ListStyle = void 0;
|
|
|
8
8
|
const agents_hosting_1 = require("@microsoft/agents-hosting");
|
|
9
9
|
const choices_1 = require("../choices");
|
|
10
10
|
const dialog_1 = require("../dialog");
|
|
11
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
11
12
|
/**
|
|
12
13
|
* Controls the way that choices for a `ChoicePrompt` or yes/no options for a `ConfirmPrompt` are
|
|
13
14
|
* presented to a user.
|
|
@@ -71,10 +72,10 @@ class Prompt extends dialog_1.Dialog {
|
|
|
71
72
|
// Ensure prompts have input hint set
|
|
72
73
|
const opt = { ...options };
|
|
73
74
|
if (opt.prompt && typeof opt.prompt === 'object' && typeof opt.prompt.inputHint !== 'string') {
|
|
74
|
-
opt.prompt.inputHint =
|
|
75
|
+
opt.prompt.inputHint = agents_activity_1.InputHints.ExpectingInput;
|
|
75
76
|
}
|
|
76
77
|
if (opt.retryPrompt && typeof opt.retryPrompt === 'object' && typeof opt.retryPrompt.inputHint !== 'string') {
|
|
77
|
-
opt.retryPrompt.inputHint =
|
|
78
|
+
opt.retryPrompt.inputHint = agents_activity_1.InputHints.ExpectingInput;
|
|
78
79
|
}
|
|
79
80
|
// Initialize prompt state
|
|
80
81
|
const state = dialogContext.activeDialog.state;
|
|
@@ -97,7 +98,7 @@ class Prompt extends dialog_1.Dialog {
|
|
|
97
98
|
*/
|
|
98
99
|
async continueDialog(dialogContext) {
|
|
99
100
|
// Don't do anything for non-message activities
|
|
100
|
-
if (dialogContext.context.activity.type !==
|
|
101
|
+
if (dialogContext.context.activity.type !== agents_activity_1.ActivityTypes.Message) {
|
|
101
102
|
return dialog_1.Dialog.EndOfTurn;
|
|
102
103
|
}
|
|
103
104
|
// Are we being continued after an interruption?
|
|
@@ -152,7 +153,7 @@ class Prompt extends dialog_1.Dialog {
|
|
|
152
153
|
* dialogs from performing their default processing.
|
|
153
154
|
*/
|
|
154
155
|
async onPreBubbleEvent(dialogContext, event) {
|
|
155
|
-
if (event.name === 'activityReceived' && dialogContext.context.activity.type ===
|
|
156
|
+
if (event.name === 'activityReceived' && dialogContext.context.activity.type === agents_activity_1.ActivityTypes.Message) {
|
|
156
157
|
// Perform base recognition
|
|
157
158
|
const state = dialogContext.activeDialog.state;
|
|
158
159
|
const recognized = await this.onRecognize(dialogContext.context, state.state, state.options);
|
|
@@ -251,7 +252,7 @@ class Prompt extends dialog_1.Dialog {
|
|
|
251
252
|
return prompt;
|
|
252
253
|
}
|
|
253
254
|
else {
|
|
254
|
-
msg.inputHint =
|
|
255
|
+
msg.inputHint = agents_activity_1.InputHints.ExpectingInput;
|
|
255
256
|
return msg;
|
|
256
257
|
}
|
|
257
258
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/prompts/prompt.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,
|
|
1
|
+
{"version":3,"file":"prompt.js","sourceRoot":"","sources":["../../../src/prompts/prompt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TextPrompt = void 0;
|
|
4
|
-
/**
|
|
5
|
-
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
6
|
-
* Licensed under the MIT License.
|
|
7
|
-
*/
|
|
8
|
-
const agents_hosting_1 = require("@microsoft/agents-hosting");
|
|
9
4
|
const prompt_1 = require("./prompt");
|
|
5
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
10
6
|
/**
|
|
11
7
|
* Prompts a user to enter some text.
|
|
12
8
|
*
|
|
@@ -32,10 +28,10 @@ class TextPrompt extends prompt_1.Prompt {
|
|
|
32
28
|
*/
|
|
33
29
|
async onPrompt(context, state, options, isRetry) {
|
|
34
30
|
if (isRetry && options.retryPrompt) {
|
|
35
|
-
await context.sendActivity(options.retryPrompt, undefined,
|
|
31
|
+
await context.sendActivity(options.retryPrompt, undefined, agents_activity_1.InputHints.ExpectingInput);
|
|
36
32
|
}
|
|
37
33
|
else if (options.prompt) {
|
|
38
|
-
await context.sendActivity(options.prompt, undefined,
|
|
34
|
+
await context.sendActivity(options.prompt, undefined, agents_activity_1.InputHints.ExpectingInput);
|
|
39
35
|
}
|
|
40
36
|
}
|
|
41
37
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textPrompt.js","sourceRoot":"","sources":["../../../src/prompts/textPrompt.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"textPrompt.js","sourceRoot":"","sources":["../../../src/prompts/textPrompt.ts"],"names":[],"mappings":";;;AAKA,qCAAyF;AAGzF,gEAAuD;AAEvD;;;;;GAKG;AACH,MAAa,UAAW,SAAQ,eAAc;IAC5C,qEAAqE;IACrE,YAAa,QAAiB,EAAE,SAAmC;QACjE,KAAK,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAA;IAC5B,CAAC;IAED;;;;;;;;;;;SAWK;IACK,KAAK,CAAC,QAAQ,CACtB,OAAoB,EACpB,KAAU,EACV,OAAsB,EACtB,OAAgB;QAEhB,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,EAAE,CAAC;YACnC,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,EAAE,4BAAU,CAAC,cAAc,CAAC,CAAA;QACvF,CAAC;aAAM,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YAC1B,MAAM,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,4BAAU,CAAC,cAAc,CAAC,CAAA;QAClF,CAAC;IACH,CAAC;IAED;;;;;;;;;SASK;IACK,KAAK,CAAC,WAAW,CACzB,OAAoB,EACpB,MAAW,EACX,QAAuB;QAEvB,MAAM,KAAK,GAAW,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAA;QAE3C,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,CAAA;IAC1G,CAAC;IAED;;;;;;;;;;;SAWK;IACK,KAAK,CAAC,gBAAgB,CAAE,GAAkB,EAAE,MAAmB;QACvE,OAAO,KAAK,CAAA;IACd,CAAC;CACF;AAlED,gCAkEC"}
|
package/dist/src/recognizer.d.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { Activity } from '@microsoft/agents-
|
|
5
|
+
import { Activity } from '@microsoft/agents-activity';
|
|
6
6
|
import { Configurable } from './configurable';
|
|
7
7
|
import { DialogContext } from './dialogContext';
|
|
8
8
|
import { RecognizerResult } from './recognizerResult';
|
|
@@ -7,7 +7,7 @@ import { DialogReason } from './dialogReason';
|
|
|
7
7
|
* Function signature of an individual waterfall step.
|
|
8
8
|
*
|
|
9
9
|
* @param O (Optional) type of dialog options passed into the step.
|
|
10
|
-
* @param
|
|
10
|
+
* @param step Contextual information for the current step being executed.
|
|
11
11
|
*/
|
|
12
12
|
export type WaterfallStep<O extends object = {}> = (step: WaterfallStepContext<O>) => Promise<DialogTurnResult>;
|
|
13
13
|
/**
|
|
@@ -6,7 +6,7 @@ exports.WaterfallDialog = void 0;
|
|
|
6
6
|
* Licensed under the MIT License.
|
|
7
7
|
*/
|
|
8
8
|
const uuid_1 = require("uuid");
|
|
9
|
-
const
|
|
9
|
+
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
10
10
|
const dialog_1 = require("./dialog");
|
|
11
11
|
const waterfallStepContext_1 = require("./waterfallStepContext");
|
|
12
12
|
const dialogReason_1 = require("./dialogReason");
|
|
@@ -82,7 +82,7 @@ class WaterfallDialog extends dialog_1.Dialog {
|
|
|
82
82
|
*/
|
|
83
83
|
async continueDialog(dialogContext) {
|
|
84
84
|
// Don't do anything for non-message activities
|
|
85
|
-
if (dialogContext.context.activity.type !==
|
|
85
|
+
if (dialogContext.context.activity.type !== agents_activity_1.ActivityTypes.Message) {
|
|
86
86
|
return dialog_1.Dialog.EndOfTurn;
|
|
87
87
|
}
|
|
88
88
|
// Run next step with the message text as the result.
|
|
@@ -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": "0.
|
|
4
|
+
"version": "0.2.7-gd7a3e9ef95",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
"main": "dist/index.js",
|
|
17
17
|
"types": "dist/src/index.d.ts",
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@microsoft/agents-hosting": "0.
|
|
19
|
+
"@microsoft/agents-hosting": "0.2.7-gd7a3e9ef95",
|
|
20
20
|
"@types/lodash": "^4.17.16",
|
|
21
21
|
"dependency-graph": "^1.0.0",
|
|
22
22
|
"@microsoft/recognizers-text-suite": "^1.3.1",
|
|
@@ -25,9 +25,6 @@
|
|
|
25
25
|
"@microsoft/recognizers-text-choice": "^1.3.1",
|
|
26
26
|
"globalize": "^1.7.0"
|
|
27
27
|
},
|
|
28
|
-
"devDependencies": {
|
|
29
|
-
"@types/express": "^5.0.1"
|
|
30
|
-
},
|
|
31
28
|
"license": "MIT",
|
|
32
29
|
"files": [
|
|
33
30
|
"README.md",
|
package/src/choices/choice.ts
CHANGED
|
@@ -2,11 +2,9 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
|
|
5
|
+
import { ActionTypes, Activity, InputHints } from '@microsoft/agents-activity'
|
|
6
6
|
import {
|
|
7
|
-
|
|
8
|
-
Activity,
|
|
9
|
-
InputHints,
|
|
7
|
+
|
|
10
8
|
MessageFactory,
|
|
11
9
|
TurnContext,
|
|
12
10
|
} from '@microsoft/agents-hosting'
|
package/src/choices/tokenizer.ts
CHANGED
|
@@ -12,8 +12,8 @@ export interface Token {
|
|
|
12
12
|
/**
|
|
13
13
|
* Signature for an alternate word breaker.
|
|
14
14
|
*
|
|
15
|
-
* @param
|
|
16
|
-
* @param
|
|
15
|
+
* @param text The text to be tokenized.
|
|
16
|
+
* @param locale (Optional) locale of the text if known.
|
|
17
17
|
*/
|
|
18
18
|
export type TokenizerFunction = (text: string, locale?: string) => Token[]
|
|
19
19
|
|
package/src/dialogContext.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { TurnContext, TurnContextStateCollection } from '@microsoft/agents-hosting'
|
|
6
6
|
import { Dialog } from './dialog'
|
|
7
7
|
import { DialogSet } from './dialogSet'
|
|
8
8
|
import { PromptOptions } from './prompts'
|
|
@@ -18,6 +18,7 @@ import { DialogEvent } from './dialogEvent'
|
|
|
18
18
|
import { DialogTurnResult } from './dialogTurnResult'
|
|
19
19
|
import { DialogTurnStatus } from './dialogTurnStatus'
|
|
20
20
|
import { Choice } from './choices'
|
|
21
|
+
import { Activity } from '@microsoft/agents-activity'
|
|
21
22
|
|
|
22
23
|
/**
|
|
23
24
|
* Wraps a promise in a try-catch that automatically enriches errors with extra dialog context.
|
|
@@ -325,8 +326,6 @@ export class DialogContext {
|
|
|
325
326
|
* @param promptOrOptions The text of the initial prompt to send the user,
|
|
326
327
|
* the activity to send as the initial prompt, or
|
|
327
328
|
* the object with which to format the prompt dialog.
|
|
328
|
-
* @param choices Optional. Array of choices for the user to choose from,
|
|
329
|
-
* for use with a ChoicePrompt.
|
|
330
329
|
*
|
|
331
330
|
* @remarks
|
|
332
331
|
* This helper method formats the object to use as the `options` parameter, and then calls
|
package/src/dialogHelper.ts
CHANGED
|
@@ -4,8 +4,6 @@
|
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
import {
|
|
7
|
-
Activity,
|
|
8
|
-
ActivityTypes,
|
|
9
7
|
AgentStatePropertyAccessor,
|
|
10
8
|
TurnContext
|
|
11
9
|
} from '@microsoft/agents-hosting'
|
|
@@ -16,6 +14,7 @@ import { DialogSet } from './dialogSet'
|
|
|
16
14
|
import { DialogStateManager, DialogStateManagerConfiguration } from './memory'
|
|
17
15
|
import { DialogTurnResult } from './dialogTurnResult'
|
|
18
16
|
import { DialogTurnStatus } from './dialogTurnStatus'
|
|
17
|
+
import { Activity, ActivityTypes } from '@microsoft/agents-activity'
|
|
19
18
|
|
|
20
19
|
/**
|
|
21
20
|
* Runs a dialog from a given context and accessor.
|
|
@@ -2,13 +2,14 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { TurnContext } from '@microsoft/agents-hosting'
|
|
6
6
|
import { Dialog } from '../dialog'
|
|
7
7
|
import { DialogContext } from '../dialogContext'
|
|
8
8
|
import { PromptOptions, PromptRecognizerResult, PromptValidator } from './prompt'
|
|
9
9
|
import { DialogInstance } from '../dialogInstance'
|
|
10
10
|
import { DialogReason } from '../dialogReason'
|
|
11
11
|
import { DialogTurnResult } from '../dialogTurnResult'
|
|
12
|
+
import { Activity, ActivityTypes, InputHints } from '@microsoft/agents-activity'
|
|
12
13
|
|
|
13
14
|
/**
|
|
14
15
|
* Waits for an activity to be received.
|
|
@@ -2,8 +2,9 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { TurnContext } from '@microsoft/agents-hosting'
|
|
6
6
|
import { Prompt, PromptOptions, PromptRecognizerResult, PromptValidator } from './prompt'
|
|
7
|
+
import { Attachment, InputHints } from '@microsoft/agents-activity'
|
|
7
8
|
|
|
8
9
|
/**
|
|
9
10
|
* Prompts a user to upload attachments like images.
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { TurnContext } from '@microsoft/agents-hosting'
|
|
6
6
|
import { ChoiceFactory, ChoiceFactoryOptions, FindChoicesOptions, FoundChoice, recognizeChoices } from '../choices'
|
|
7
7
|
import { ListStyle, Prompt, PromptOptions, PromptRecognizerResult, PromptValidator } from './prompt'
|
|
8
8
|
import { PromptCultureModels } from './promptCultureModels'
|
|
9
|
+
import { Activity } from '@microsoft/agents-activity'
|
|
9
10
|
|
|
10
11
|
// Need ChoiceDefaultsProperty so we can set choiceDefaults dynamically with lambda
|
|
11
12
|
interface ChoiceDefaultsChoicePrompt {
|
|
@@ -3,10 +3,11 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
import * as Recognizers from '@microsoft/recognizers-text-choice'
|
|
6
|
-
import {
|
|
6
|
+
import { TurnContext } from '@microsoft/agents-hosting'
|
|
7
7
|
import { Choice, ChoiceFactoryOptions, recognizeChoices } from '../choices'
|
|
8
8
|
import { ListStyle, Prompt, PromptOptions, PromptRecognizerResult, PromptValidator } from './prompt'
|
|
9
9
|
import { PromptCultureModels } from './promptCultureModels'
|
|
10
|
+
import { Activity } from '@microsoft/agents-activity'
|
|
10
11
|
|
|
11
12
|
// Need ChoiceDefaultsProperty so we can set choiceDefaults dynamically with lambda
|
|
12
13
|
interface ChoiceDefaultsConfirmPrompt {
|
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
import * as Recognizers from '@microsoft/recognizers-text-date-time'
|
|
6
|
-
import {
|
|
6
|
+
import { TurnContext } from '@microsoft/agents-hosting'
|
|
7
7
|
import { Prompt, PromptOptions, PromptRecognizerResult, PromptValidator } from './prompt'
|
|
8
|
+
import { Activity, InputHints } from '@microsoft/agents-activity'
|
|
8
9
|
|
|
9
10
|
/**
|
|
10
11
|
* Result returned by the `DateTimePrompt`.
|
|
@@ -6,8 +6,9 @@
|
|
|
6
6
|
import Globalize from 'globalize'
|
|
7
7
|
import { recognizeNumber } from '@microsoft/recognizers-text-number'
|
|
8
8
|
import * as locales from '../i18n'
|
|
9
|
-
import {
|
|
9
|
+
import { TurnContext } from '@microsoft/agents-hosting'
|
|
10
10
|
import { Prompt, PromptOptions, PromptRecognizerResult, PromptValidator } from './prompt'
|
|
11
|
+
import { InputHints } from '@microsoft/agents-activity'
|
|
11
12
|
|
|
12
13
|
// Load all registered locales into Globalize library
|
|
13
14
|
Object.values(locales).forEach((locale) => Globalize.load(locale))
|
package/src/prompts/prompt.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { MessageFactory, TurnContext } from '@microsoft/agents-hosting'
|
|
6
6
|
import { Choice, ChoiceFactory, ChoiceFactoryOptions } from '../choices'
|
|
7
7
|
import { Dialog } from '../dialog'
|
|
8
8
|
import { DialogContext } from '../dialogContext'
|
|
@@ -10,6 +10,7 @@ import { DialogInstance } from '../dialogInstance'
|
|
|
10
10
|
import { DialogTurnResult } from '../dialogTurnResult'
|
|
11
11
|
import { DialogReason } from '../dialogReason'
|
|
12
12
|
import { DialogEvent } from '../dialogEvent'
|
|
13
|
+
import { Activity, ActivityTypes, InputHints } from '@microsoft/agents-activity'
|
|
13
14
|
|
|
14
15
|
/**
|
|
15
16
|
* Controls the way that choices for a `ChoicePrompt` or yes/no options for a `ConfirmPrompt` are
|
|
@@ -117,7 +118,7 @@ export interface PromptRecognizerResult<T> {
|
|
|
117
118
|
* > validator sends a custom re-prompt to the user using `prompt.context.sendActivity()`. In that
|
|
118
119
|
* > case the prompts default re-rpompt logic will not be run.
|
|
119
120
|
* @param T Type of recognizer result being validated.
|
|
120
|
-
* @param
|
|
121
|
+
* @param prompt Contextual information containing the recognizer result and original options passed to the prompt.
|
|
121
122
|
*/
|
|
122
123
|
export type PromptValidator<T> = (prompt: PromptValidatorContext<T>) => Promise<boolean>
|
|
123
124
|
|
|
@@ -2,10 +2,11 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import {
|
|
5
|
+
import { TurnContext } from '@microsoft/agents-hosting'
|
|
6
6
|
import { Prompt, PromptOptions, PromptRecognizerResult, PromptValidator } from './prompt'
|
|
7
7
|
import { DialogContext } from '../dialogContext'
|
|
8
8
|
import { DialogEvent } from '../dialogEvent'
|
|
9
|
+
import { InputHints } from '@microsoft/agents-activity'
|
|
9
10
|
|
|
10
11
|
/**
|
|
11
12
|
* Prompts a user to enter some text.
|
package/src/recognizer.ts
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
|
-
import { Activity } from '@microsoft/agents-
|
|
5
|
+
import { Activity } from '@microsoft/agents-activity'
|
|
6
6
|
import { Configurable } from './configurable'
|
|
7
7
|
import { DialogContext } from './dialogContext'
|
|
8
8
|
import omit from 'lodash/omit'
|
package/src/waterfallDialog.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Licensed under the MIT License.
|
|
4
4
|
*/
|
|
5
5
|
import { v4 as uuidv4 } from 'uuid'
|
|
6
|
-
import { ActivityTypes } from '@microsoft/agents-
|
|
6
|
+
import { ActivityTypes } from '@microsoft/agents-activity'
|
|
7
7
|
import { Dialog } from './dialog'
|
|
8
8
|
import { DialogContext } from './dialogContext'
|
|
9
9
|
import { WaterfallStepContext } from './waterfallStepContext'
|
|
@@ -14,7 +14,7 @@ import { DialogReason } from './dialogReason'
|
|
|
14
14
|
* Function signature of an individual waterfall step.
|
|
15
15
|
*
|
|
16
16
|
* @param O (Optional) type of dialog options passed into the step.
|
|
17
|
-
* @param
|
|
17
|
+
* @param step Contextual information for the current step being executed.
|
|
18
18
|
*/
|
|
19
19
|
export type WaterfallStep<O extends object = {}> = (step: WaterfallStepContext<O>) => Promise<DialogTurnResult>
|
|
20
20
|
|