Skip to content

Commit c0844bf

Browse files
authored
Merge branch 'main' into dev/robgruen/smoke_tests
2 parents 6bae1da + d5565b8 commit c0844bf

File tree

15 files changed

+1070
-778
lines changed

15 files changed

+1070
-778
lines changed

ts/packages/defaultAgentProvider/test/data/translate-e2e.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@
1010
{
1111
"request": "get my top 50 favorite songs, filter the current list to Bach pieces, and create a playlist call test",
1212
"action": ["player.getFavorites", "player.filterTracks", "player.createPlaylist"]
13+
},
14+
{
15+
"request": "look up information about Oregon and write a poem using what you found",
16+
"action": ["chat.lookupAndGenerateResponse", "dispatcher.pendingRequestAction"]
1317
}
1418
]

ts/packages/dispatcher/src/context/commandHandlerContext.ts

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,10 @@ import {
5454
ConstructionProvider,
5555
} from "../agentProvider/agentProvider.js";
5656
import { RequestMetricsManager } from "../utils/metrics.js";
57-
import { getSchemaNamePrefix } from "../execute/actionHandlers.js";
57+
import {
58+
ActionContextWithClose,
59+
getSchemaNamePrefix,
60+
} from "../execute/actionHandlers.js";
5861
import { displayError } from "@typeagent/agent-sdk/helpers/display";
5962

6063
import {
@@ -78,11 +81,6 @@ export interface ClientSettingsProvider {
7881
set: SetSettingFunction | null;
7982
}
8083

81-
type ActionContextWithClose = {
82-
actionContext: ActionContext<unknown>;
83-
closeActionContext: () => void;
84-
};
85-
8684
// Command Handler Context definition.
8785
export type CommandHandlerContext = {
8886
agents: AppAgentManager;
@@ -133,7 +131,7 @@ export function getTranslatorForSchema(
133131
context.agents,
134132
getActiveTranslators(context),
135133
config.switch.inline,
136-
config.multipleActions,
134+
config.multiple,
137135
config.schema.generation,
138136
config.model,
139137
!config.schema.optimize.enabled,
@@ -171,7 +169,7 @@ export async function getTranslatorForSelectedActions(
171169
context.agents,
172170
getActiveTranslators(context),
173171
config.switch.inline,
174-
config.multipleActions,
172+
config.multiple,
175173
config.model,
176174
);
177175
}
@@ -540,7 +538,7 @@ export async function changeContextConfig(
540538
translatorChanged ||
541539
changed.translation?.model !== undefined ||
542540
changed.translation?.switch?.inline !== undefined ||
543-
changed.translation?.multipleActions !== undefined ||
541+
changed.translation?.multiple !== undefined ||
544542
changed.translation?.schema?.generation !== undefined ||
545543
changed.translation?.schema?.optimize?.enabled !== undefined
546544
) {

0 commit comments

Comments
 (0)