put event and context parameters into an options object

Author: svozza

packages/event-handler/src/bedrock-agent/BedrockAgentFunctionResolver.ts

@@ -95,15 +95,9 @@ export class BedrockAgentFunctionResolver {
     }
 
     // When used as a decorator
-    return (target, propertyKey, descriptor: PropertyDescriptor) => {
-      const originalMethod = descriptor.value;
-
-      // Store a wrapper function that will call the original method with the correct 'this'
-      this.#registerTool(async (params, event, context) => {
-        // This wrapper will receive the instance through closure when called
-        return originalMethod.apply(target, [params, event, context]);
-      }, fnOrConfig);
-
+    return (_target, _propertyKey, descriptor: PropertyDescriptor) => {
+      const toolFn = descriptor.value as ToolFunction;
+      this.#registerTool(toolFn, fnOrConfig);
       return descriptor;
     };
   }
@@ -210,7 +204,7 @@ export class BedrockAgentFunctionResolver {
     }
 
     try {
-      const res = await tool.handler(toolParams, event, context);
+      const res = await tool.handler(toolParams, { event, context });
       const body = res == null ? '' : JSON.stringify(res);
       return this.#buildResponse({
         actionGroup,

packages/event-handler/src/types/bedrock-agent.ts

@@ -19,8 +19,10 @@ type ParameterValue = ParameterPrimitives | Array<ParameterValue>;
 
 type ToolFunction<TParams = Record<string, ParameterValue>> = (
   params: TParams,
-  event: BedrockAgentFunctionEvent,
-  context: Context
+  options?: {
+    event?: BedrockAgentFunctionEvent;
+    context?: Context;
+  }
 ) => Promise<JSONValue>;
 
 type Tool<TParams = Record<string, ParameterValue>> = {

packages/event-handler/tests/unit/bedrock-agent/BedrockAgentFunctionResolver.test.ts

@@ -273,8 +273,8 @@ describe('Class: BedrockAgentFunctionResolver', () => {
     const app = new BedrockAgentFunctionResolver();
 
     app.tool(
-      async (_params, event) => {
-        return event;
+      async (_params, options) => {
+        return options?.event;
       },
       {
         name: 'event-accessor',
@@ -421,8 +421,10 @@ describe('Class: BedrockAgentFunctionResolver', () => {
 
   it('correctly parses boolean parameters', async () => {
     // Prepare
-    const toolFunction: ToolFunction<{ arg: boolean }> = async (params) =>
-      params.arg;
+    const toolFunction: ToolFunction<{ arg: boolean }> = async (
+      params,
+      _options
+    ) => params.arg;
 
     const toolParams: Configuration = {
       name: 'boolean',
@@ -451,8 +453,10 @@ describe('Class: BedrockAgentFunctionResolver', () => {
 
   it('correctly parses number parameters', async () => {
     // Prepare
-    const toolFunction: ToolFunction<{ arg: number }> = async (params) =>
-      params.arg + 10;
+    const toolFunction: ToolFunction<{ arg: number }> = async (
+      params,
+      _options
+    ) => params.arg + 10;
 
     const toolParams: Configuration = {
       name: 'number',
@@ -481,8 +485,10 @@ describe('Class: BedrockAgentFunctionResolver', () => {
 
   it('correctly parses integer parameters', async () => {
     // Prepare
-    const toolFunction: ToolFunction<{ arg: number }> = async (params) =>
-      params.arg + 10;
+    const toolFunction: ToolFunction<{ arg: number }> = async (
+      params,
+      _options
+    ) => params.arg + 10;
 
     const toolParams: Configuration = {
       name: 'integer',
@@ -511,8 +517,10 @@ describe('Class: BedrockAgentFunctionResolver', () => {
 
   it('correctly parses string parameters', async () => {
     // Prepare
-    const toolFunction: ToolFunction<{ arg: string }> = async (params) =>
-      `String: ${params.arg}`;
+    const toolFunction: ToolFunction<{ arg: string }> = async (
+      params,
+      _options
+    ) => `String: ${params.arg}`;
 
     const toolParams: Configuration = {
       name: 'string',
@@ -541,8 +549,10 @@ describe('Class: BedrockAgentFunctionResolver', () => {
 
   it('correctly parses array parameters', async () => {
     // Prepare
-    const toolFunction: ToolFunction<{ arg: string }> = async (params) =>
-      `Array as string: ${params.arg}`;
+    const toolFunction: ToolFunction<{ arg: string }> = async (
+      params,
+      _options
+    ) => `Array as string: ${params.arg}`;
 
     const toolParams: Configuration = {
       name: 'array',
@@ -574,7 +584,7 @@ describe('Class: BedrockAgentFunctionResolver', () => {
     const app = new BedrockAgentFunctionResolver();
 
     app.tool(
-      async () => {
+      async (_params, _options) => {
         throw new Error('Something went wrong');
       },
       {
@@ -602,7 +612,7 @@ describe('Class: BedrockAgentFunctionResolver', () => {
     const app = new BedrockAgentFunctionResolver();
 
     app.tool(
-      async (params) => {
+      async (params, _options) => {
         return `Hello, ${params.name}!`;
       },
       {