Merge branch 'main' into dev/robgruen/smoke_tests

microsoft · Jan 29, 2025 · c0844bf · c0844bf
2 parents 6bae1da + d5565b8
commit c0844bf
Show file tree

Hide file tree

Showing 15 changed files with 1,070 additions and 778 deletions.
diff --git a/ts/packages/defaultAgentProvider/test/data/translate-e2e.json b/ts/packages/defaultAgentProvider/test/data/translate-e2e.json
@@ -10,5 +10,9 @@
     {
         "request": "get my top 50 favorite songs, filter the current list to Bach pieces, and create a playlist call test",
         "action": ["player.getFavorites", "player.filterTracks", "player.createPlaylist"]
+    },
+    {
+        "request": "look up information about Oregon and write a poem using what you found",
+        "action": ["chat.lookupAndGenerateResponse", "dispatcher.pendingRequestAction"]
     }
 ]
diff --git a/ts/packages/dispatcher/src/context/commandHandlerContext.ts b/ts/packages/dispatcher/src/context/commandHandlerContext.ts
@@ -54,7 +54,10 @@ import {
     ConstructionProvider,
 } from "../agentProvider/agentProvider.js";
 import { RequestMetricsManager } from "../utils/metrics.js";
-import { getSchemaNamePrefix } from "../execute/actionHandlers.js";
+import {
+    ActionContextWithClose,
+    getSchemaNamePrefix,
+} from "../execute/actionHandlers.js";
 import { displayError } from "@typeagent/agent-sdk/helpers/display";
 
 import {
@@ -78,11 +81,6 @@ export interface ClientSettingsProvider {
     set: SetSettingFunction | null;
 }
 
-type ActionContextWithClose = {
-    actionContext: ActionContext<unknown>;
-    closeActionContext: () => void;
-};
-
 // Command Handler Context definition.
 export type CommandHandlerContext = {
     agents: AppAgentManager;
@@ -133,7 +131,7 @@ export function getTranslatorForSchema(
         context.agents,
         getActiveTranslators(context),
         config.switch.inline,
-        config.multipleActions,
+        config.multiple,
         config.schema.generation,
         config.model,
         !config.schema.optimize.enabled,
@@ -171,7 +169,7 @@ export async function getTranslatorForSelectedActions(
         context.agents,
         getActiveTranslators(context),
         config.switch.inline,
-        config.multipleActions,
+        config.multiple,
         config.model,
     );
 }
@@ -540,7 +538,7 @@ export async function changeContextConfig(
         translatorChanged ||
         changed.translation?.model !== undefined ||
         changed.translation?.switch?.inline !== undefined ||
-        changed.translation?.multipleActions !== undefined ||
+        changed.translation?.multiple !== undefined ||
         changed.translation?.schema?.generation !== undefined ||
         changed.translation?.schema?.optimize?.enabled !== undefined
     ) {