@strands-agents/sdk 0.3.0 → 0.4.0

package/dist/src/models/__tests__/bedrock.test.js

@@ -1,8 +1,9 @@
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { BedrockRuntimeClient } from '@aws-sdk/client-bedrock-runtime';
+import { BedrockRuntimeClient, ConverseStreamCommand, ValidationException } from '@aws-sdk/client-bedrock-runtime';
 import { isNode } from '../../__fixtures__/environment.js';
 import { BedrockModel } from '../bedrock.js';
 import { ContextWindowOverflowError, ModelThrottledError } from '../../errors.js';
+import { Message, ReasoningBlock, ToolUseBlock, ToolResultBlock, JsonBlock } from '../../types/messages.js';
 import { TextBlock, GuardContentBlock, CachePointBlock } from '../../types/messages.js';
 import { collectIterator } from '../../__fixtures__/model-test-helpers.js';
 /**
@@ -259,7 +260,6 @@ describe('BedrockModel', () => {
         });
     });
     describe('format_message', async () => {
-        const { ConverseStreamCommand } = await import('@aws-sdk/client-bedrock-runtime');
         const mockConverseStreamCommand = vi.mocked(ConverseStreamCommand);
         it('formats the request to bedrock properly', async () => {
             const provider = new BedrockModel({
@@ -277,7 +277,7 @@ describe('BedrockModel', () => {
                     MyExtraArg: 'ExtraArg',
                 },
             });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const options = {
                 systemPrompt: 'You are a helpful assistant',
                 toolSpecs: [
@@ -326,22 +326,19 @@ describe('BedrockModel', () => {
             });
         });
         it('formats tool use messages', async () => {
-            const { ConverseStreamCommand } = await import('@aws-sdk/client-bedrock-runtime');
             const mockConverseStreamCommand = vi.mocked(ConverseStreamCommand);
             const provider = new BedrockModel();
             const messages = [
-                {
-                    type: 'message',
+                new Message({
                     role: 'assistant',
                     content: [
-                        {
-                            type: 'toolUseBlock',
+                        new ToolUseBlock({
                             name: 'calculator',
                             toolUseId: 'tool-123',
                             input: { a: 5, b: 3 },
-                        },
+                        }),
                     ],
-                },
+                }),
             ];
             // Run the stream but ignore the output
             collectIterator(provider.stream(messages));
@@ -366,21 +363,16 @@ describe('BedrockModel', () => {
         it('formats tool result messages', async () => {
             const provider = new BedrockModel();
             const messages = [
-                {
-                    type: 'message',
+                new Message({
                     role: 'user',
                     content: [
-                        {
-                            type: 'toolResultBlock',
+                        new ToolResultBlock({
                             toolUseId: 'tool-123',
                             status: 'success',
-                            content: [
-                                { type: 'textBlock', text: 'Result: 8' },
-                                { type: 'jsonBlock', json: { hello: 'world' } },
-                            ],
-                        },
+                            content: [new TextBlock('Result: 8'), new JsonBlock({ json: { hello: 'world' } })],
+                        }),
                     ],
-                },
+                }),
             ];
             // Start the stream
             collectIterator(provider.stream(messages));
@@ -415,21 +407,18 @@ describe('BedrockModel', () => {
         it('formats reasoning messages properly', async () => {
             const provider = new BedrockModel();
             const messages = [
-                {
-                    type: 'message',
+                new Message({
                     role: 'user',
                     content: [
-                        {
-                            type: 'reasoningBlock',
+                        new ReasoningBlock({
                             text: 'Hello',
                             signature: 'World',
-                        },
-                        {
-                            type: 'reasoningBlock',
+                        }),
+                        new ReasoningBlock({
                             redactedContent: new Uint8Array(1),
-                        },
+                        }),
                     ],
-                },
+                }),
             ];
             // Start the stream but don't await it
             collectIterator(provider.stream(messages));
@@ -461,14 +450,10 @@ describe('BedrockModel', () => {
         it('formats cache point blocks in messages', async () => {
             const provider = new BedrockModel();
             const messages = [
-                {
-                    type: 'message',
+                new Message({
                     role: 'user',
-                    content: [
-                        { type: 'textBlock', text: 'Message with cache point' },
-                        { type: 'cachePointBlock', cacheType: 'default' },
-                    ],
-                },
+                    content: [new TextBlock('Message with cache point'), new CachePointBlock({ cacheType: 'default' })],
+                }),
             ];
             collectIterator(provider.stream(messages));
             // Verify ConverseStreamCommand was called with properly formatted request
@@ -514,7 +499,7 @@ describe('BedrockModel', () => {
             });
             mockBedrockClientImplementation({ send: mockSend });
             const provider = new BedrockModel({ stream });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const events = await collectIterator(provider.stream(messages));
             expect(events).toContainEqual({ role: 'assistant', type: 'modelMessageStartEvent' });
             expect(events).toContainEqual({ type: 'modelContentBlockStartEvent' });
@@ -575,9 +560,7 @@ describe('BedrockModel', () => {
             });
             mockBedrockClientImplementation({ send: mockSend });
             const provider = new BedrockModel({ stream });
-            const messages = [
-                { type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Weather?' }] },
-            ];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Weather?')] })];
             const events = await collectIterator(provider.stream(messages));
             const startEvent = events.find((e) => e.type === 'modelContentBlockStartEvent');
             const inputDeltaEvent = events.find((e) => e.type === 'modelContentBlockDeltaEvent' && e.delta.type === 'toolUseInputDelta');
@@ -635,9 +618,7 @@ describe('BedrockModel', () => {
             });
             mockBedrockClientImplementation({ send: mockSend });
             const provider = new BedrockModel({ stream });
-            const messages = [
-                { type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'A question.' }] },
-            ];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('A question.')] })];
             const events = await collectIterator(provider.stream(messages));
             expect(events).toContainEqual({ role: 'assistant', type: 'modelMessageStartEvent' });
             expect(events).toContainEqual({ type: 'modelContentBlockStartEvent' });
@@ -690,9 +671,7 @@ describe('BedrockModel', () => {
             });
             mockBedrockClientImplementation({ send: mockSend });
             const provider = new BedrockModel({ stream });
-            const messages = [
-                { type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'A sensitive question.' }] },
-            ];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('A sensitive question.')] })];
             const events = await collectIterator(provider.stream(messages));
             expect(events).toContainEqual({ role: 'assistant', type: 'modelMessageStartEvent' });
             expect(events).toContainEqual({ type: 'modelContentBlockStartEvent' });
@@ -709,7 +688,6 @@ describe('BedrockModel', () => {
             });
         });
         describe('error handling', async () => {
-            const { ValidationException } = await import('@aws-sdk/client-bedrock-runtime');
             it.each([
                 {
                     name: 'ContextWindowOverflowError for context overflow',
@@ -726,7 +704,7 @@ describe('BedrockModel', () => {
                 const mockSendError = vi.fn().mockRejectedValue(error);
                 mockBedrockClientImplementation({ send: mockSendError });
                 const provider = new BedrockModel();
-                const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+                const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
                 await expect(collectIterator(provider.stream(messages))).rejects.toThrow(expected);
             });
         });
@@ -744,7 +722,7 @@ describe('BedrockModel', () => {
                 yield { metadata: { usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 } } };
             });
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const events = await collectIterator(provider.stream(messages));
             expect(events).toContainEqual({
                 type: 'modelContentBlockDeltaEvent',
@@ -773,7 +751,7 @@ describe('BedrockModel', () => {
                 yield { metadata: { usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 } } };
             });
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const events = await collectIterator(provider.stream(messages));
             expect(events).toContainEqual({
                 type: 'modelContentBlockDeltaEvent',
@@ -811,7 +789,7 @@ describe('BedrockModel', () => {
                 yield { unknown: 'type' };
             });
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const events = await collectIterator(provider.stream(messages));
             const reasoningDelta = events.find((e) => e.type === 'modelContentBlockDeltaEvent' && e.delta.type === 'reasoningContentDelta');
             expect(reasoningDelta).toBeDefined();
@@ -835,7 +813,7 @@ describe('BedrockModel', () => {
                 yield { metadata: { usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 } } };
             });
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const events = await collectIterator(provider.stream(messages));
             const reasoningDelta = events.find((e) => e.type === 'modelContentBlockDeltaEvent' && e.delta.type === 'reasoningContentDelta');
             expect(reasoningDelta).toBeDefined();
@@ -865,7 +843,7 @@ describe('BedrockModel', () => {
                 };
             });
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const events = await collectIterator(provider.stream(messages));
             const metadataEvent = events.find((e) => e.type === 'modelMetadataEvent');
             expect(metadataEvent).toBeDefined();
@@ -889,7 +867,7 @@ describe('BedrockModel', () => {
                 };
             });
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const events = await collectIterator(provider.stream(messages));
             const metadataEvent = events.find((e) => e.type === 'modelMetadataEvent');
             expect(metadataEvent).toBeDefined();
@@ -907,7 +885,7 @@ describe('BedrockModel', () => {
                 yield { metadata: { usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 } } };
             });
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const events = await collectIterator(provider.stream(messages));
             const stopEvent = events.find((e) => e.type === 'modelMessageStopEvent');
             expect(stopEvent).toBeDefined();
@@ -934,9 +912,7 @@ describe('BedrockModel', () => {
                         yield { metadata: { usage: { inputTokens: 10, outputTokens: 5, totalTokens: 15 } } };
                     });
                     const provider = new BedrockModel();
-                    const messages = [
-                        { type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] },
-                    ];
+                    const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
                     const events = [];
                     for await (const event of provider.stream(messages)) {
                         events.push(event);
@@ -956,7 +932,7 @@ describe('BedrockModel', () => {
                     yield { throttlingException: { message: 'Rate exceeded' } };
                 });
                 const provider = new BedrockModel();
-                const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+                const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
                 await expect(async () => {
                     for await (const _ of provider.stream(messages)) {
                         // consume stream
@@ -969,7 +945,7 @@ describe('BedrockModel', () => {
                     yield { throttlingException: { message: 'Too many requests' } };
                 });
                 const provider = new BedrockModel();
-                const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+                const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
                 await expect(async () => {
                     for await (const _ of provider.stream(messages)) {
                         // consume stream
@@ -982,7 +958,7 @@ describe('BedrockModel', () => {
                     yield { throttlingException: {} };
                 });
                 const provider = new BedrockModel();
-                const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+                const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
                 await expect(async () => {
                     for await (const _ of provider.stream(messages)) {
                         // consume stream
@@ -992,14 +968,13 @@ describe('BedrockModel', () => {
         });
     });
     describe('system prompt formatting', async () => {
-        const { ConverseStreamCommand } = await import('@aws-sdk/client-bedrock-runtime');
         const mockConverseStreamCommand = vi.mocked(ConverseStreamCommand);
         beforeEach(() => {
             vi.clearAllMocks();
         });
         it('formats string system prompt with cachePrompt config', async () => {
             const provider = new BedrockModel({ cachePrompt: 'default' });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const options = {
                 systemPrompt: 'You are a helpful assistant',
             };
@@ -1017,7 +992,7 @@ describe('BedrockModel', () => {
         });
         it('formats array system prompt with text blocks only', async () => {
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const options = {
                 systemPrompt: [
                     { type: 'textBlock', text: 'You are a helpful assistant' },
@@ -1038,7 +1013,7 @@ describe('BedrockModel', () => {
         });
         it('formats array system prompt with cache points', async () => {
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const options = {
                 systemPrompt: [
                     { type: 'textBlock', text: 'You are a helpful assistant' },
@@ -1065,7 +1040,7 @@ describe('BedrockModel', () => {
         it('warns when both array system prompt and cachePrompt config are provided', async () => {
             const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => { });
             const provider = new BedrockModel({ cachePrompt: 'default' });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const options = {
                 systemPrompt: [
                     { type: 'textBlock', text: 'You are a helpful assistant' },
@@ -1090,7 +1065,7 @@ describe('BedrockModel', () => {
         });
         it('handles empty array system prompt', async () => {
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const options = {
                 systemPrompt: [],
             };
@@ -1108,7 +1083,7 @@ describe('BedrockModel', () => {
         });
         it('formats array system prompt with guard content', async () => {
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const options = {
                 systemPrompt: [
                     new TextBlock('You are a helpful assistant'),
@@ -1144,7 +1119,7 @@ describe('BedrockModel', () => {
         });
         it('formats mixed system prompt with text, guard content, and cache points', async () => {
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const options = {
                 systemPrompt: [
                     new TextBlock('You are a helpful assistant'),
@@ -1184,7 +1159,7 @@ describe('BedrockModel', () => {
         });
         it('formats guard content with all qualifier types', async () => {
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const options = {
                 systemPrompt: [
                     new GuardContentBlock({
@@ -1218,7 +1193,7 @@ describe('BedrockModel', () => {
         });
         it('formats guard content with image in system prompt', async () => {
             const provider = new BedrockModel();
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             const imageBytes = new Uint8Array([1, 2, 3, 4]);
             const options = {
                 systemPrompt: [
@@ -1253,7 +1228,6 @@ describe('BedrockModel', () => {
         });
     });
     describe('guard content in messages', async () => {
-        const { ConverseStreamCommand } = await import('@aws-sdk/client-bedrock-runtime');
         const mockConverseStreamCommand = vi.mocked(ConverseStreamCommand);
         beforeEach(() => {
             vi.clearAllMocks();
@@ -1261,8 +1235,7 @@ describe('BedrockModel', () => {
         it('formats guard content with text in message', async () => {
             const provider = new BedrockModel();
             const messages = [
-                {
-                    type: 'message',
+                new Message({
                     role: 'user',
                     content: [
                         new TextBlock('Verify this information:'),
@@ -1273,7 +1246,7 @@ describe('BedrockModel', () => {
                             },
                         }),
                     ],
-                },
+                }),
             ];
             collectIterator(provider.stream(messages));
             expect(mockConverseStreamCommand).toHaveBeenLastCalledWith({
@@ -1300,8 +1273,7 @@ describe('BedrockModel', () => {
             const provider = new BedrockModel();
             const imageBytes = new Uint8Array([1, 2, 3, 4]);
             const messages = [
-                {
-                    type: 'message',
+                new Message({
                     role: 'user',
                     content: [
                         new TextBlock('Is this image safe?'),
@@ -1312,7 +1284,7 @@ describe('BedrockModel', () => {
                             },
                         }),
                     ],
-                },
+                }),
             ];
             collectIterator(provider.stream(messages));
             expect(mockConverseStreamCommand).toHaveBeenLastCalledWith({
@@ -1337,24 +1309,21 @@ describe('BedrockModel', () => {
         });
     });
     describe('includeToolResultStatus configuration', async () => {
-        const { ConverseStreamCommand } = await import('@aws-sdk/client-bedrock-runtime');
         const mockConverseStreamCommand = vi.mocked(ConverseStreamCommand);
         describe('when includeToolResultStatus is true', () => {
             it('always includes status field in tool results', async () => {
                 const provider = new BedrockModel({ includeToolResultStatus: true });
                 const messages = [
-                    {
-                        type: 'message',
+                    new Message({
                         role: 'user',
                         content: [
-                            {
-                                type: 'toolResultBlock',
+                            new ToolResultBlock({
                                 toolUseId: 'tool-123',
                                 status: 'success',
-                                content: [{ type: 'textBlock', text: 'Result' }],
-                            },
+                                content: [new TextBlock('Result')],
+                            }),
                         ],
-                    },
+                    }),
                 ];
                 collectIterator(provider.stream(messages));
                 expect(mockConverseStreamCommand).toHaveBeenLastCalledWith({
@@ -1380,18 +1349,16 @@ describe('BedrockModel', () => {
             it('never includes status field in tool results', async () => {
                 const provider = new BedrockModel({ includeToolResultStatus: false });
                 const messages = [
-                    {
-                        type: 'message',
+                    new Message({
                         role: 'user',
                         content: [
-                            {
-                                type: 'toolResultBlock',
+                            new ToolResultBlock({
                                 toolUseId: 'tool-123',
                                 status: 'success',
-                                content: [{ type: 'textBlock', text: 'Result' }],
-                            },
+                                content: [new TextBlock('Result')],
+                            }),
                         ],
-                    },
+                    }),
                 ];
                 collectIterator(provider.stream(messages));
                 expect(mockConverseStreamCommand).toHaveBeenLastCalledWith({
@@ -1419,18 +1386,16 @@ describe('BedrockModel', () => {
                     includeToolResultStatus: 'auto',
                 });
                 const messages = [
-                    {
-                        type: 'message',
+                    new Message({
                         role: 'user',
                         content: [
-                            {
-                                type: 'toolResultBlock',
+                            new ToolResultBlock({
                                 toolUseId: 'tool-123',
                                 status: 'success',
-                                content: [{ type: 'textBlock', text: 'Result' }],
-                            },
+                                content: [new TextBlock('Result')],
+                            }),
                         ],
-                    },
+                    }),
                 ];
                 collectIterator(provider.stream(messages));
                 expect(mockConverseStreamCommand).toHaveBeenLastCalledWith({
@@ -1458,18 +1423,16 @@ describe('BedrockModel', () => {
                     modelId: 'amazon.nova-lite-v1:0',
                 });
                 const messages = [
-                    {
-                        type: 'message',
+                    new Message({
                         role: 'user',
                         content: [
-                            {
-                                type: 'toolResultBlock',
+                            new ToolResultBlock({
                                 toolUseId: 'tool-123',
                                 status: 'success',
-                                content: [{ type: 'textBlock', text: 'Result' }],
-                            },
+                                content: [new TextBlock('Result')],
+                            }),
                         ],
-                    },
+                    }),
                 ];
                 collectIterator(provider.stream(messages));
                 expect(mockConverseStreamCommand).toHaveBeenLastCalledWith({