Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

port: [#6793][#6792] Composer Bot with QnA Intent recognized triggers duplicate QnA queries #4700

Merged
merged 2 commits into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,10 @@ describe('AdaptiveDialogTests', function () {
await TestUtils.runTestScript(resourceExplorer, 'AdaptiveDialog_TopLevelFallbackMultipleActivities');
});

it('TestOnQnAMatch', async function () {
await TestUtils.runTestScript(resourceExplorer, 'AdaptiveDialog_OnQnAMatch');
});

it('TestBindingTwoWayAcrossAdaptiveDialogs', async function () {
await TestUtils.runTestScript(resourceExplorer, 'TestBindingTwoWayAcrossAdaptiveDialogs');
});
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
{
"$schema": "../../../tests.schema",
"$kind": "Microsoft.Test.Script",
"dialog": {
"$kind": "Microsoft.AdaptiveDialog",
"id": "outer",
"autoEndDialog": false,
"recognizer": {
"$kind": "Microsoft.RegexRecognizer",
"intents": [
{
"intent": "BeginIntent",
"pattern": "begin"
},
{
"intent": "QnAMatch",
"pattern": "qna"
}
]
},
"triggers": [
{
"$kind": "Microsoft.OnIntent",
"intent": "BeginIntent",
"actions": [
{
"$kind": "Microsoft.TextInput",
"maxTurnCount": 3,
"alwaysPrompt": true,
"allowInterruptions": false,
"prompt": "Which event should I emit?",
"validations": []
},
{
"$kind": "Microsoft.EmitEvent",
"eventName": "activityReceived",
"eventValue": "=turn.activity",
"handledProperty": "turn.eventHandled",
"bubbleEvent": true
}
]
},
{
"$kind": "Microsoft.OnIntent",
"intent": "QnAMatch",
"actions": [
{
"$kind": "Microsoft.SendActivity",
"activity": "QnAMatch event triggered"
}
]
}
],
"defaultResultProperty": "dialog.result"
},
"script": [
{
"$kind": "Microsoft.Test.UserSays",
"text": "begin"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "Which event should I emit?"
},
{
"$kind": "Microsoft.Test.UserSays",
"text": "qna"
},
{
"$kind": "Microsoft.Test.AssertReply",
"text": "QnAMatch event triggered"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -1877,6 +1877,8 @@ export class OnQnAMatch extends OnIntent {
// (undocumented)
static $kind: string;
constructor(actions?: Dialog[], condition?: string);
// (undocumented)
static qnaMatchIntent: string;
}

// @public
Expand Down
32 changes: 22 additions & 10 deletions libraries/botbuilder-dialogs-adaptive/src/adaptiveDialog.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import isEqual from 'lodash/isEqual';
import { ActionContext } from './actionContext';
import { AdaptiveDialogState } from './adaptiveDialogState';
import { AdaptiveEvents } from './adaptiveEvents';
import { OnCondition, OnIntent } from './conditions';
import { OnCondition, OnIntent, OnQnAMatch } from './conditions';
import { DialogSetConverter, LanguageGeneratorConverter, RecognizerConverter } from './converters';
import { EntityAssignment } from './entityAssignment';
import { EntityAssignmentComparer } from './entityAssignmentComparer';
Expand Down Expand Up @@ -547,16 +547,28 @@ export class AdaptiveDialog<O extends object = {}> extends DialogContainer<O> im
break;
case AdaptiveEvents.activityReceived:
if (activity.type === ActivityTypes.Message) {
// Recognize utterance (ignore handled)
const recognizeUtteranceEvent: DialogEvent = {
name: AdaptiveEvents.recognizeUtterance,
value: activity,
bubble: false,
};
await this.processEvent(actionContext, recognizeUtteranceEvent, true);
let recognized = actionContext.state.getValue<RecognizerResult>(TurnPath.recognized);
const activityProcessed = actionContext.state.getValue<boolean>(TurnPath.activityProcessed);

// Avoid reprocessing recognized activity for OnQnAMatch.
const isOnQnAMatchProcessed =
activityProcessed &&
Object.prototype.hasOwnProperty.call(recognized?.intents, OnQnAMatch.qnaMatchIntent) ===
true;

if (!isOnQnAMatchProcessed) {
// Recognize utterance (ignore handled)
const recognizeUtteranceEvent: DialogEvent = {
name: AdaptiveEvents.recognizeUtterance,
value: activity,
bubble: false,
};
await this.processEvent(actionContext, recognizeUtteranceEvent, true);

// Emit leading RecognizedIntent event
recognized = actionContext.state.getValue<RecognizerResult>(TurnPath.recognized);
}

// Emit leading RecognizedIntent event
const recognized = actionContext.state.getValue<RecognizerResult>(TurnPath.recognized);
const recognizedIntentEvent: DialogEvent = {
name: AdaptiveEvents.recognizedIntent,
value: recognized,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
import { Dialog } from 'botbuilder-dialogs';
import { OnIntent } from './onIntent';

const qnaMatchIntent = 'QnAMatch';

/**
* Actions triggered when a MessageUpdateActivity is received.
*/
export class OnQnAMatch extends OnIntent {
static $kind = 'Microsoft.OnQnAMatch';
// this is a duplicate of QnAMakerRecognizer.QnAMatchIntent, but copying this here removes need to have dependency between QnA and Adaptive assemblies.
static qnaMatchIntent = 'QnAMatch';

/**
* Initializes a new instance of the [OnQnAMatch](xref:botbuilder-dialogs-adaptive.OnQnAMatch) class.
Expand All @@ -23,6 +23,6 @@ export class OnQnAMatch extends OnIntent {
* @param condition Optional. Condition which needs to be met for the actions to be executed.
*/
constructor(actions: Dialog[] = [], condition?: string) {
super(qnaMatchIntent, [], actions, condition);
super(OnQnAMatch.qnaMatchIntent, [], actions, condition);
}
}
Loading