only use json.stringify

Author: svozza

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

@@ -12,7 +12,7 @@ import type {
   ToolFunction,
 } from '../types/bedrock-agent-function.js';
 import type { GenericLogger } from '../types/common.js';
-import { assertBedrockAgentFunctionEvent, isPrimitive } from './utils.js';
+import { assertBedrockAgentFunctionEvent } from './utils.js';
 
 export class BedrockAgentFunctionResolver {
   readonly #tools: Map<string, Tool> = new Map();
@@ -206,8 +206,9 @@ export class BedrockAgentFunctionResolver {
     }
 
     try {
-      const res = (await tool.handler(toolParams, event, context)) ?? '';
-      const body = isPrimitive(res) ? String(res) : JSON.stringify(res); //TODO just use JSON.stringify
+      // TODO: use apply to ensure that `this` is bound properly when used as decorator
+      const res = await tool.handler(toolParams, event, context);
+      const body = res == null ? '' : JSON.stringify(res); //TODO just use JSON.stringify
       return this.#buildResponse({
         actionGroup,
         function: toolName,

packages/event-handler/src/bedrock-agent-function/utils.ts

@@ -1,20 +1,6 @@
-import type {
-  JSONPrimitive,
-  JSONValue,
-} from '@aws-lambda-powertools/commons/types';
 import { isRecord, isString } from '@aws-lambda-powertools/commons/typeutils';
 import type { BedrockAgentFunctionEvent } from '../types/bedrock-agent-function.js';
 
-export function isPrimitive(value: JSONValue): value is JSONPrimitive {
-  return (
-    value === null ||
-    value === undefined ||
-    typeof value === 'string' ||
-    typeof value === 'number' ||
-    typeof value === 'boolean'
-  );
-}
-
 /**
  * Asserts that the provided event is a BedrockAgentFunctionEvent.
  *

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

@@ -235,7 +235,6 @@ describe('Class: BedrockAgentFunctionResolver', () => {
     );
 
     // Act
-
     await app.resolve(createEvent('noop'), context);
     await app.resolve(createEvent('error'), context).catch(() => {});
 
@@ -512,7 +511,7 @@ describe('Class: BedrockAgentFunctionResolver', () => {
     // Assess
     expect(actual.response.function).toEqual(toolParams.name);
     expect(actual.response.functionResponse.responseBody.TEXT.body).toEqual(
-      'String: hello world'
+      '"String: hello world"'
     );
   });
 
@@ -542,7 +541,7 @@ describe('Class: BedrockAgentFunctionResolver', () => {
     // Assess
     expect(actual.response.function).toEqual(toolParams.name);
     expect(actual.response.functionResponse.responseBody.TEXT.body).toEqual(
-      'Array as string: [1,2,3]'
+      '"Array as string: [1,2,3]"'
     );
   });
 
@@ -621,7 +620,7 @@ describe('Class: BedrockAgentFunctionResolver', () => {
         functionResponse: {
           responseBody: {
             TEXT: {
-              body: 'Hello, John!',
+              body: '"Hello, John!"',
             },
           },
         },