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.

Sign up for GitHub

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

bug: Fix OrchestratorRecognizer null checks #3074

Merged
merged 3 commits into from
Nov 17, 2020
Merged

bug: Fix OrchestratorRecognizer null checks #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1bdcd9
Fix for issue #3073
taicchoumsft Nov 17, 2020
ed6ccd5
remove minor comment
taicchoumsft Nov 17, 2020
4109807
use async, consts everywhere
taicchoumsft Nov 17, 2020
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
3 changes: 3 additions & 0 deletions libraries/botbuilder-ai-orchestrator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@
"botbuilder-dialogs-adaptive": "4.1.6",
"read-text-file": "1.1.0"
},
"devDependencies": {
"sinon": "^9.2.1"
},
"scripts": {
"build": "tsc -b",
"build-docs": "typedoc --theme markdown --entryPoint botbuilder-ai-orchestrator --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\botbuilder-ai-orchestrator .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - Orchestrator\" --readme none",
Expand Down
2 changes: 1 addition & 1 deletion libraries/botbuilder-ai-orchestrator/src/orchestratorAdaptiveRecognizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ export class OrchestratorAdaptiveRecognizer extends Recognizer implements Orches
* @private
*/
private Initialize() {
if (OrchestratorAdaptiveRecognizer.orchestrator == null && this.resolver == null) {
if (OrchestratorAdaptiveRecognizer.orchestrator === null || this.resolver == null) {
if (this._modelPath == null) {
throw new Error(`Missing "ModelPath" information.`);
}
Expand Down
125 changes: 78 additions & 47 deletions libraries/botbuilder-ai-orchestrator/tests/orchestratorAdaptiveRecognizer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,62 +10,96 @@ const { TurnContext, MessageFactory } = require('botbuilder-core');
const { BotFrameworkAdapter } = require('../../botbuilder/lib');
const { StringExpression, BoolExpression, NumberExpression } = require('adaptive-expressions');
const { NumberEntityRecognizer } = require('botbuilder-dialogs-adaptive');
const sinon = require('sinon');

describe('OrchestratorAdpativeRecognizer tests', function() {
it('Test intent recognition', (done) => {
let result = [
it('Expect initialize is called when orchestrator obj is null', async () => {
const result = [
{
score : 0.9,
label : {
name : "mockLabel"
}
}
];
let mockResolver = new MockResolver(result);
let testPaths = "test";
let rec = new OrchestratorAdaptiveRecognizer(testPaths, testPaths, mockResolver);
const mockResolver = new MockResolver(result);
const testPaths = "test";

const rec = new OrchestratorAdaptiveRecognizer(testPaths, testPaths, mockResolver);
OrchestratorAdaptiveRecognizer.orchestrator = null;
rec.Initialize = sinon.fake();

const {dc, activity} = createTestDcAndActivity("hello");
const res = await rec.recognize(dc, activity);

assert(res.text, "hello");
assert(res.intents.mockLabel.score, 0.9);
assert(rec.Initialize.calledOnce);
});

it('Expect initialize is called when labelresolver is null', async () => {
const testPaths = "test";
const rec = new OrchestratorAdaptiveRecognizer(testPaths, testPaths, null);
OrchestratorAdaptiveRecognizer.orchestrator = null;

rec.Initialize = sinon.fake();

const {dc, activity} = createTestDcAndActivity("hello");
assert.rejects(async () => await rec.recognize(dc, activity));

assert(rec.Initialize.calledOnce);
});

it('Test intent recognition', async () => {
const result = [
{
score : 0.9,
label : {
name : "mockLabel"
}
}
];
const mockResolver = new MockResolver(result);
const testPaths = "test";
const rec = new OrchestratorAdaptiveRecognizer(testPaths, testPaths, mockResolver);
OrchestratorAdaptiveRecognizer.orchestrator = "mock";
rec.modelPath = new StringExpression(testPaths);
rec.snapshotPath = new StringExpression(testPaths);
let {dc, activity} = createTestDcAndActivity("hello")
rec.recognize(dc, activity)
.then(res => {
assert(res.text, "hello");
assert(res.intents.mockLabel.score, 0.9);
done();
})
.catch(err => done(err))
const {dc, activity} = createTestDcAndActivity("hello");

const res = await rec.recognize(dc, activity)
assert(res.text, "hello");
assert(res.intents.mockLabel.score, 0.9);
})

it('Test entity recognition', (done) => {
let result = [
it('Test entity recognition', async () => {
const result = [
{
score : 0.9,
label : {
name : "mockLabel"
}
}
];
let mockResolver = new MockResolver(result);
let testPaths = "test";
let rec = new OrchestratorAdaptiveRecognizer(testPaths, testPaths, mockResolver);
const mockResolver = new MockResolver(result);
const testPaths = "test";
const rec = new OrchestratorAdaptiveRecognizer(testPaths, testPaths, mockResolver);
OrchestratorAdaptiveRecognizer.orchestrator = "mock";
rec.modelPath = new StringExpression(testPaths);
rec.snapshotPath = new StringExpression(testPaths);
rec.entityRecognizers = [
new NumberEntityRecognizer()
];
let {dc, activity} = createTestDcAndActivity("hello 123")
rec.recognize(dc, activity)
.then(res => {
assert(res.text, "hello 123");
assert(res.intents.mockLabel.score, 0.9);
assert(res.entities.number[0], "123");
done();
})
.catch(err => done(err))
const {dc, activity} = createTestDcAndActivity("hello 123")

const res = await rec.recognize(dc, activity)
assert(res.text, "hello 123");
assert(res.intents.mockLabel.score, 0.9);
assert(res.entities.number[0], "123");
})

it('Test ambiguous intent recognition', (done) => {
let result = [
it('Test ambiguous intent recognition', async () => {
const result = [
{
score : 0.9,
label : {
Expand All @@ -85,32 +119,29 @@ describe('OrchestratorAdpativeRecognizer tests', function() {
}
}
];
let mockResolver = new MockResolver(result);
let testPaths = "test";
let rec = new OrchestratorAdaptiveRecognizer(testPaths, testPaths, mockResolver);
const mockResolver = new MockResolver(result);
const testPaths = "test";
const rec = new OrchestratorAdaptiveRecognizer(testPaths, testPaths, mockResolver);
rec.modelPath = new StringExpression(testPaths);
rec.snapshotPath = new StringExpression(testPaths);
rec.detectAmbiguousIntents = new BoolExpression(true);
rec.disambiguationScoreThreshold = new NumberExpression(0.1);
let {dc, activity} = createTestDcAndActivity("hello")
rec.recognize(dc, activity)
.then(res => {
assert(res.intents.ChooseIntent.score, 1);
assert(res.candidates[0].intent, "mockLabel1");
assert(res.candidates[1].intent, "mockLabel2");
done();
})
.catch(err => done(err))
const {dc, activity} = createTestDcAndActivity("hello");

const res = await rec.recognize(dc, activity);
assert(res.intents.ChooseIntent.score, 1);
assert(res.candidates[0].intent, "mockLabel1");
assert(res.candidates[1].intent, "mockLabel2");
})
})

const createTestDcAndActivity = function (message) {
let settings = new TestAdapterSettings('appId', 'password');
let adapter = new BotFrameworkAdapter(settings);
let activity = MessageFactory.text(message);
let turnContext = new TurnContext(adapter, activity);
const settings = new TestAdapterSettings('appId', 'password');
const adapter = new BotFrameworkAdapter(settings);
const activity = MessageFactory.text(message);
const turnContext = new TurnContext(adapter, activity);
turnContext.sendTraceActivity = function() {}
let state = [{dialogStack: []}];
let dc = new DialogContext(new DialogSet(), turnContext, state);
const state = [{dialogStack: []}];
const dc = new DialogContext(new DialogSet(), turnContext, state);
return {dc, activity};
}