Skip to content

Commit ef6b90b

Browse files
cherrypick: bump orchestrator-core package to 4.13.1 (#3608) (#3612)
* bump: orchestrator-core package to 4.13.1 (#3608) * Update orchestrator-core package to 4.13.1 * updated yarn lock file and log model path in failed model load exception * Update orchestratorRecognizer.ts * chore: skip flaky test until we resolve failures (#3564) Co-authored-by: Tien Suwandy <tiens@microsoft.com>
1 parent 51d3fd6 commit ef6b90b

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

libraries/adaptive-expressions/tests/triggerTree.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ describe('TriggerTree', () => {
513513
assert.strictEqual(matches[1].action, 3);
514514
});
515515

516-
it('Test Tree', () => {
516+
it.skip('Test Tree', () => {
517517
const numPredicates = 50;
518518
const numSingletons = 25;
519519
const numConjunctions = 50;

libraries/botbuilder-ai-orchestrator/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"botbuilder-dialogs-adaptive": "4.1.6",
3434
"botbuilder-dialogs-declarative": "4.1.6",
3535
"botbuilder-dialogs-adaptive-runtime-core": "4.1.6",
36-
"orchestrator-core": "4.13.0",
36+
"orchestrator-core": "4.13.1",
3737
"uuid": "^8.3.2"
3838
},
3939
"scripts": {

libraries/botbuilder-ai-orchestrator/src/orchestratorRecognizer.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,11 @@ export class OrchestratorRecognizer extends AdaptiveRecognizer implements Orches
358358

359359
const orchestrator = new oc.Orchestrator();
360360
if (this.scoreEntities && !orchestrator.load(fullModelFolder, entityModelFolder)) {
361-
throw new Error(`Model load failed.`);
361+
throw new Error(
362+
`Model load failed - model folder ${fullModelFolder}, entity model folder ${entityModelFolder}.`
363+
);
362364
} else if (!orchestrator.load(fullModelFolder)) {
363-
throw new Error(`Model load failed.`);
365+
throw new Error(`Model load failed - model folder ${fullModelFolder}.`);
364366
}
365367
OrchestratorRecognizer.orchestrator = orchestrator;
366368
}

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9463,10 +9463,10 @@ ora@^4.0.3:
94639463
strip-ansi "^6.0.0"
94649464
wcwidth "^1.0.1"
94659465

9466-
orchestrator-core@4.13.0:
9467-
version "4.13.0"
9468-
resolved "https://registry.yarnpkg.com/orchestrator-core/-/orchestrator-core-4.13.0.tgz#d4b3c84d9d464da06c6d43e36438ee73485ae82c"
9469-
integrity sha512-MJj/Fa0dExB3VldmiASnRoFvbM9OV4SwkI5qTNzv6HukhnaYPyrWidxAkufOJeavka66cpM4M8Cft+Fscc3auQ==
9466+
orchestrator-core@4.13.1:
9467+
version "4.13.1"
9468+
resolved "https://registry.yarnpkg.com/orchestrator-core/-/orchestrator-core-4.13.1.tgz#87246cedd1377d9f7854f0c301254279f35c3f37"
9469+
integrity sha512-3V4Rzlc5uogicxjkdv6HryouFsT8koPzXtxGPFwmNPIF4HQXVQl93EIefF3uu8deuaoVeu6uKl6BJwSafLhssQ==
94709470
dependencies:
94719471
"@mapbox/node-pre-gyp" "^1.0.3"
94729472
bindings "1.2.1"

0 commit comments

Comments
 (0)