@microsoft/agents-hosting-dialogs 1.6.0-beta.2.ga8529bd583 → 1.6.0-beta.20.gabdeae0c72
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/recognizer.js
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.Recognizer = void 0;
|
|
7
4
|
/**
|
|
@@ -11,7 +8,6 @@ exports.Recognizer = void 0;
|
|
|
11
8
|
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
12
9
|
const errorHelper_1 = require("./errorHelper");
|
|
13
10
|
const configurable_1 = require("./configurable");
|
|
14
|
-
const omit_1 = __importDefault(require("lodash/omit"));
|
|
15
11
|
const recognizerResult_1 = require("./recognizerResult");
|
|
16
12
|
/**
|
|
17
13
|
* Base class for implementing custom recognizers to identify intents and entities from user input.
|
|
@@ -94,7 +90,7 @@ class Recognizer extends configurable_1.Configurable {
|
|
|
94
90
|
TopIntentScore: intents.length > 0 ? score.toString() : '',
|
|
95
91
|
Intents: intents.length > 0 ? JSON.stringify(recognizerResult.intents) : '',
|
|
96
92
|
Entities: recognizerResult.entities ? JSON.stringify(recognizerResult.entities) : '',
|
|
97
|
-
AdditionalProperties:
|
|
93
|
+
AdditionalProperties: this.stringifyAdditionalPropertiesOfRecognizerResult(recognizerResult) || '{}',
|
|
98
94
|
};
|
|
99
95
|
if (telemetryProperties) {
|
|
100
96
|
return Object.assign({}, properties, telemetryProperties);
|
|
@@ -104,11 +100,9 @@ class Recognizer extends configurable_1.Configurable {
|
|
|
104
100
|
stringifyAdditionalPropertiesOfRecognizerResult(recognizerResult) {
|
|
105
101
|
const generalProperties = new Set(['text', 'alteredText', 'intents', 'entities']);
|
|
106
102
|
const additionalProperties = {};
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
}
|
|
111
|
-
}
|
|
103
|
+
Object.keys(recognizerResult).filter(key => !generalProperties.has(key)).forEach(key => {
|
|
104
|
+
additionalProperties[key] = recognizerResult[key];
|
|
105
|
+
});
|
|
112
106
|
return Object.keys(additionalProperties).length > 0 ? JSON.stringify(additionalProperties) : '';
|
|
113
107
|
}
|
|
114
108
|
}
|
|
@@ -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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"}
|
|
@@ -5,7 +5,7 @@ exports.WaterfallDialog = void 0;
|
|
|
5
5
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
6
6
|
* Licensed under the MIT License.
|
|
7
7
|
*/
|
|
8
|
-
const
|
|
8
|
+
const crypto_1 = require("crypto");
|
|
9
9
|
const agents_activity_1 = require("@microsoft/agents-activity");
|
|
10
10
|
const errorHelper_1 = require("./errorHelper");
|
|
11
11
|
const dialog_1 = require("./dialog");
|
|
@@ -69,7 +69,7 @@ class WaterfallDialog extends dialog_1.Dialog {
|
|
|
69
69
|
const state = dialogContext.activeDialog.state;
|
|
70
70
|
state.options = options || {};
|
|
71
71
|
state.values = {
|
|
72
|
-
instanceId: (0,
|
|
72
|
+
instanceId: (0, crypto_1.randomUUID)(),
|
|
73
73
|
};
|
|
74
74
|
// Run the first step
|
|
75
75
|
return await this.runStep(dialogContext, 0, dialogReason_1.DialogReason.beginCalled);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waterfallDialog.js","sourceRoot":"","sources":["../../src/waterfallDialog.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH
|
|
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.6.0-beta.
|
|
4
|
+
"version": "1.6.0-beta.20.gabdeae0c72",
|
|
5
5
|
"homepage": "https://github.com/microsoft/Agents-for-js",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -16,17 +16,16 @@
|
|
|
16
16
|
"main": "dist/index.js",
|
|
17
17
|
"types": "dist/src/index.d.ts",
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@microsoft/agents-
|
|
20
|
-
"@microsoft/agents-
|
|
21
|
-
"@
|
|
22
|
-
"dependency-graph": "1.0.0",
|
|
23
|
-
"@microsoft/recognizers-text-suite": "1.3.1",
|
|
24
|
-
"@microsoft/recognizers-text-number": "1.3.1",
|
|
25
|
-
"@microsoft/recognizers-text-date-time": "1.3.2",
|
|
19
|
+
"@microsoft/agents-activity": "1.6.0-beta.20.gabdeae0c72",
|
|
20
|
+
"@microsoft/agents-hosting": "1.6.0-beta.20.gabdeae0c72",
|
|
21
|
+
"@microsoft/agents-telemetry": "1.6.0-beta.20.gabdeae0c72",
|
|
26
22
|
"@microsoft/recognizers-text-choice": "1.3.1",
|
|
23
|
+
"@microsoft/recognizers-text-date-time": "1.3.2",
|
|
24
|
+
"@microsoft/recognizers-text-number": "1.3.1",
|
|
25
|
+
"@microsoft/recognizers-text-suite": "1.3.1",
|
|
26
|
+
"dependency-graph": "1.0.0",
|
|
27
27
|
"globalize": "1.7.1",
|
|
28
|
-
"zod": "3.25.75"
|
|
29
|
-
"@microsoft/agents-telemetry": "1.6.0-beta.2.ga8529bd583"
|
|
28
|
+
"zod": "3.25.75"
|
|
30
29
|
},
|
|
31
30
|
"license": "MIT",
|
|
32
31
|
"files": [
|
package/src/recognizer.ts
CHANGED
|
@@ -6,7 +6,6 @@ import { Activity, ExceptionHelper } from '@microsoft/agents-activity'
|
|
|
6
6
|
import { Errors } from './errorHelper'
|
|
7
7
|
import { Configurable } from './configurable'
|
|
8
8
|
import { DialogContext } from './dialogContext'
|
|
9
|
-
import omit from 'lodash/omit'
|
|
10
9
|
import { RecognizerResult, getTopScoringIntent } from './recognizerResult'
|
|
11
10
|
|
|
12
11
|
/**
|
|
@@ -133,9 +132,7 @@ export class Recognizer extends Configurable implements RecognizerConfiguration
|
|
|
133
132
|
TopIntentScore: intents.length > 0 ? score.toString() : '',
|
|
134
133
|
Intents: intents.length > 0 ? JSON.stringify(recognizerResult.intents) : '',
|
|
135
134
|
Entities: recognizerResult.entities ? JSON.stringify(recognizerResult.entities) : '',
|
|
136
|
-
AdditionalProperties:
|
|
137
|
-
omit(recognizerResult, ['text', 'alteredText', 'intents', 'entities'])
|
|
138
|
-
),
|
|
135
|
+
AdditionalProperties: this.stringifyAdditionalPropertiesOfRecognizerResult(recognizerResult) || '{}',
|
|
139
136
|
}
|
|
140
137
|
|
|
141
138
|
if (telemetryProperties) {
|
|
@@ -148,11 +145,10 @@ export class Recognizer extends Configurable implements RecognizerConfiguration
|
|
|
148
145
|
protected stringifyAdditionalPropertiesOfRecognizerResult (recognizerResult: RecognizerResult): string {
|
|
149
146
|
const generalProperties = new Set(['text', 'alteredText', 'intents', 'entities'])
|
|
150
147
|
const additionalProperties: { [key: string]: string } = {}
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
}
|
|
148
|
+
Object.keys(recognizerResult).filter(key => !generalProperties.has(key)).forEach(key => {
|
|
149
|
+
additionalProperties[key] = recognizerResult[key]
|
|
150
|
+
})
|
|
151
|
+
|
|
156
152
|
return Object.keys(additionalProperties).length > 0 ? JSON.stringify(additionalProperties) : ''
|
|
157
153
|
}
|
|
158
154
|
}
|
package/src/waterfallDialog.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 { randomUUID } from 'crypto'
|
|
6
6
|
import { ActivityTypes, ExceptionHelper } from '@microsoft/agents-activity'
|
|
7
7
|
import { Errors } from './errorHelper'
|
|
8
8
|
import { Dialog } from './dialog'
|
|
@@ -83,7 +83,7 @@ export class WaterfallDialog<O extends object = {}> extends Dialog<O> {
|
|
|
83
83
|
const state: WaterfallDialogState = dialogContext.activeDialog.state as WaterfallDialogState
|
|
84
84
|
state.options = options || {}
|
|
85
85
|
state.values = {
|
|
86
|
-
instanceId:
|
|
86
|
+
instanceId: randomUUID(),
|
|
87
87
|
}
|
|
88
88
|
|
|
89
89
|
// Run the first step
|