@strands-agents/sdk 0.2.2 → 0.4.0

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

@@ -4,6 +4,7 @@ import { isNode } from '../../__fixtures__/environment.js';
 import { OpenAIModel } from '../openai.js';
 import { ContextWindowOverflowError, ModelThrottledError } from '../../errors.js';
 import { collectIterator } from '../../__fixtures__/model-test-helpers.js';
+import { Message, TextBlock, ToolUseBlock, ToolResultBlock, GuardContentBlock } from '../../types/messages.js';
 /**
  * Helper to create a mock OpenAI client with streaming support
  */
@@ -204,7 +205,7 @@ describe('OpenAIModel', () => {
                     };
                 });
                 const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-                const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+                const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
                 // System prompt that's only whitespace should not be sent
                 const events = await collectIterator(provider.stream(messages, { systemPrompt: '   ' }));
                 // Should still get valid events
@@ -218,7 +219,7 @@ describe('OpenAIModel', () => {
                     client: mockClient,
                     params: { n: 2 },
                 });
-                const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+                const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
                 await expect(async () => {
                     for await (const _ of provider.stream(messages)) {
                         // Should not reach here
@@ -228,7 +229,7 @@ describe('OpenAIModel', () => {
             it('throws error for tool spec without name or description', async () => {
                 const mockClient = createMockClient(async function* () { });
                 const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-                const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+                const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
                 await expect(async () => {
                     for await (const _ of provider.stream(messages, {
                         toolSpecs: [{ name: '', description: 'test', inputSchema: {} }],
@@ -241,11 +242,16 @@ describe('OpenAIModel', () => {
                 const mockClient = createMockClient(async function* () { });
                 const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
                 const messages = [
-                    {
-                        type: 'message',
+                    new Message({
                         role: 'user',
-                        content: [{ type: 'toolResultBlock', toolUseId: 'tool-123', status: 'success', content: [] }],
-                    },
+                        content: [
+                            new ToolResultBlock({
+                                toolUseId: 'tool-123',
+                                status: 'success',
+                                content: [],
+                            }),
+                        ],
+                    }),
                 ];
                 await expect(async () => {
                     for await (const _ of provider.stream(messages)) {
@@ -264,31 +270,27 @@ describe('OpenAIModel', () => {
                 });
                 const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
                 const messages = [
-                    { type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Run tool' }] },
-                    {
-                        type: 'message',
+                    new Message({ role: 'user', content: [new TextBlock('Run tool')] }),
+                    new Message({
                         role: 'assistant',
                         content: [
-                            {
-                                type: 'toolUseBlock',
+                            new ToolUseBlock({
                                 name: 'calculator',
                                 toolUseId: 'tool-123',
                                 input: { expr: 'invalid' },
-                            },
+                            }),
                         ],
-                    },
-                    {
-                        type: 'message',
+                    }),
+                    new Message({
                         role: 'user',
                         content: [
-                            {
-                                type: 'toolResultBlock',
+                            new ToolResultBlock({
                                 toolUseId: 'tool-123',
                                 status: 'error',
-                                content: [{ type: 'textBlock', text: 'Division by zero' }],
-                            },
+                                content: [new TextBlock('Division by zero')],
+                            }),
                         ],
-                    },
+                    }),
                 ];
                 // Should not throw - error status is handled by prepending [ERROR]
                 const events = await collectIterator(provider.stream(messages));
@@ -302,19 +304,17 @@ describe('OpenAIModel', () => {
                 const circular = { a: 1 };
                 circular.self = circular;
                 const messages = [
-                    { type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] },
-                    {
-                        type: 'message',
+                    new Message({ role: 'user', content: [new TextBlock('Hi')] }),
+                    new Message({
                         role: 'assistant',
                         content: [
-                            {
-                                type: 'toolUseBlock',
+                            new ToolUseBlock({
                                 name: 'test',
                                 toolUseId: 'tool-1',
                                 input: circular,
-                            },
+                            }),
                         ],
-                    },
+                    }),
                 ];
                 await expect(async () => {
                     for await (const _ of provider.stream(messages)) {
@@ -340,7 +340,7 @@ describe('OpenAIModel', () => {
                     };
                 });
                 const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-                const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+                const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
                 const events = await collectIterator(provider.stream(messages));
                 // Now includes complete content block lifecycle: start, deltas, stop
                 expect(events).toHaveLength(6);
@@ -376,7 +376,7 @@ describe('OpenAIModel', () => {
                 };
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             const events = await collectIterator(provider.stream(messages));
             const metadataEvent = events.find((e) => e.type === 'modelMetadataEvent');
             expect(metadataEvent).toBeDefined();
@@ -403,7 +403,7 @@ describe('OpenAIModel', () => {
                 };
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             const events = await collectIterator(provider.stream(messages));
             const metadataEvent = events.find((e) => e.type === 'modelMetadataEvent');
             expect(metadataEvent).toBeDefined();
@@ -432,7 +432,7 @@ describe('OpenAIModel', () => {
                 };
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             const events = await collectIterator(provider.stream(messages));
             // Should not emit event for empty content
             const contentEvents = events.filter((e) => e.type === 'modelContentBlockDeltaEvent');
@@ -452,7 +452,7 @@ describe('OpenAIModel', () => {
                 };
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             // Suppress console.warn for this test
             vi.spyOn(console, 'warn').mockImplementation(() => { });
             const events = await collectIterator(provider.stream(messages));
@@ -509,9 +509,7 @@ describe('OpenAIModel', () => {
                 };
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [
-                { type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Calculate 2+2' }] },
-            ];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Calculate 2+2')] })];
             const events = await collectIterator(provider.stream(messages));
             // Verify key events in sequence
             expect(events[0]).toEqual({ type: 'modelMessageStartEvent', role: 'assistant' });
@@ -586,7 +584,7 @@ describe('OpenAIModel', () => {
                 };
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             const events = await collectIterator(provider.stream(messages));
             // Should emit stop events for both tool calls
             const stopEvents = events.filter((e) => e.type === 'modelContentBlockStopEvent');
@@ -621,7 +619,7 @@ describe('OpenAIModel', () => {
                 };
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             // Suppress console.warn for this test
             vi.spyOn(console, 'warn').mockImplementation(() => { });
             const events = await collectIterator(provider.stream(messages));
@@ -661,7 +659,7 @@ describe('OpenAIModel', () => {
                 yield { choices: [{ finish_reason: 'tool_calls', delta: {}, index: 0 }] };
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             const events = await collectIterator(provider.stream(messages));
             // Extract and concatenate all tool input deltas
             const inputDeltas = events
@@ -699,9 +697,7 @@ describe('OpenAIModel', () => {
                 yield { choices: [{ finish_reason: 'tool_calls', delta: {}, index: 0 }] };
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [
-                { type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Calculate 2+2' }] },
-            ];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Calculate 2+2')] })];
             const events = await collectIterator(provider.stream(messages));
             // Should have text deltas followed by tool events
             expect(events[0]?.type).toBe('modelMessageStartEvent');
@@ -737,7 +733,7 @@ describe('OpenAIModel', () => {
                     };
                 });
                 const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-                const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+                const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
                 const events = await collectIterator(provider.stream(messages));
                 const stopEvent = events.find((e) => e.type === 'modelMessageStopEvent');
                 expect(stopEvent).toBeDefined();
@@ -754,7 +750,7 @@ describe('OpenAIModel', () => {
                 };
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             const events = await collectIterator(provider.stream(messages));
             // Should convert unknown stop reason to camelCase
             const stopEvent = events.find((e) => e.type === 'modelMessageStopEvent');
@@ -789,7 +785,7 @@ describe('OpenAIModel', () => {
                 temperature: 0.7,
                 maxTokens: 1000,
             });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             const toolSpecs = [
                 {
                     name: 'calculator',
@@ -850,7 +846,7 @@ describe('OpenAIModel', () => {
             const captured = { request: null };
             const mockClient = createMockClientWithCapture(captured);
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             await collectIterator(provider.stream(messages, {
                 systemPrompt: [
                     { type: 'textBlock', text: 'You are a helpful assistant' },
@@ -868,7 +864,7 @@ describe('OpenAIModel', () => {
             const captured = { request: null };
             const mockClient = createMockClientWithCapture(captured);
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             collectIterator(provider.stream(messages, {
                 systemPrompt: [
                     { type: 'textBlock', text: 'You are a helpful assistant' },
@@ -890,7 +886,7 @@ describe('OpenAIModel', () => {
             const captured = { request: null };
             const mockClient = createMockClientWithCapture(captured);
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             await collectIterator(provider.stream(messages, {
                 systemPrompt: [],
             }));
@@ -902,7 +898,7 @@ describe('OpenAIModel', () => {
             const captured = { request: null };
             const mockClient = createMockClientWithCapture(captured);
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             await collectIterator(provider.stream(messages, {
                 systemPrompt: [{ type: 'textBlock', text: 'You are a helpful assistant' }],
             }));
@@ -917,7 +913,7 @@ describe('OpenAIModel', () => {
             const captured = { request: null };
             const mockClient = createMockClientWithCapture(captured);
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             await collectIterator(provider.stream(messages, {
                 systemPrompt: [
                     { type: 'textBlock', text: 'You are a helpful assistant' },
@@ -945,7 +941,7 @@ describe('OpenAIModel', () => {
             const captured = { request: null };
             const mockClient = createMockClientWithCapture(captured);
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             await collectIterator(provider.stream(messages, {
                 systemPrompt: [
                     { type: 'textBlock', text: 'First text' },
@@ -974,7 +970,7 @@ describe('OpenAIModel', () => {
             const captured = { request: null };
             const mockClient = createMockClientWithCapture(captured);
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hello' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hello')] })];
             await collectIterator(provider.stream(messages, {
                 systemPrompt: [
                     {
@@ -1017,21 +1013,19 @@ describe('OpenAIModel', () => {
             const mockClient = createMockClientWithCapture(captured);
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
             const messages = [
-                {
-                    type: 'message',
+                new Message({
                     role: 'user',
                     content: [
-                        { type: 'textBlock', text: 'Verify this:' },
-                        {
-                            type: 'guardContentBlock',
+                        new TextBlock('Verify this:'),
+                        new GuardContentBlock({
                             text: {
                                 qualifiers: ['grounding_source'],
                                 text: 'Guard content',
                             },
-                        },
-                        { type: 'textBlock', text: 'Is it correct?' },
+                        }),
+                        new TextBlock('Is it correct?'),
                     ],
-                },
+                }),
             ];
             await collectIterator(provider.stream(messages));
             // Verify warning was logged
@@ -1056,20 +1050,18 @@ describe('OpenAIModel', () => {
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
             const imageBytes = new Uint8Array([1, 2, 3, 4]);
             const messages = [
-                {
-                    type: 'message',
+                new Message({
                     role: 'user',
                     content: [
-                        { type: 'textBlock', text: 'Check this image:' },
-                        {
-                            type: 'guardContentBlock',
+                        new TextBlock('Check this image:'),
+                        new GuardContentBlock({
                             image: {
                                 format: 'jpeg',
                                 source: { bytes: imageBytes },
                             },
-                        },
+                        }),
                     ],
-                },
+                }),
             ];
             await collectIterator(provider.stream(messages));
             // Verify warning was logged
@@ -1087,19 +1079,17 @@ describe('OpenAIModel', () => {
             const mockClient = createMockClientWithCapture(captured);
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
             const messages = [
-                {
-                    type: 'message',
+                new Message({
                     role: 'user',
                     content: [
-                        {
-                            type: 'guardContentBlock',
+                        new GuardContentBlock({
                             text: {
                                 qualifiers: ['guard_content'],
                                 text: 'Only guard content',
                             },
-                        },
+                        }),
                     ],
-                },
+                }),
             ];
             await collectIterator(provider.stream(messages));
             // Verify warning was logged
@@ -1124,7 +1114,7 @@ describe('OpenAIModel', () => {
                 },
             };
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             await expect(async () => {
                 for await (const _ of provider.stream(messages)) {
                     // Should not reach here
@@ -1142,7 +1132,7 @@ describe('OpenAIModel', () => {
                 },
             };
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             await expect(async () => {
                 for await (const _ of provider.stream(messages)) {
                     // Should not reach here
@@ -1167,7 +1157,7 @@ describe('OpenAIModel', () => {
                 },
             };
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             await expect(async () => {
                 for await (const _ of provider.stream(messages)) {
                     // Should not reach here
@@ -1185,7 +1175,7 @@ describe('OpenAIModel', () => {
                 },
             };
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             await expect(async () => {
                 for await (const _ of provider.stream(messages)) {
                     // Should not reach here
@@ -1200,7 +1190,7 @@ describe('OpenAIModel', () => {
                 throw new Error('Network connection lost');
             });
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             await expect(async () => {
                 for await (const _ of provider.stream(messages)) {
                     // Stream will be interrupted
@@ -1220,7 +1210,7 @@ describe('OpenAIModel', () => {
                 },
             };
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             await expect(async () => {
                 for await (const _ of provider.stream(messages)) {
                     // Should not reach here
@@ -1240,7 +1230,7 @@ describe('OpenAIModel', () => {
                 },
             };
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             await expect(async () => {
                 for await (const _ of provider.stream(messages)) {
                     // Should not reach here
@@ -1258,7 +1248,7 @@ describe('OpenAIModel', () => {
                 },
             };
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             await expect(async () => {
                 for await (const _ of provider.stream(messages)) {
                     // Should not reach here
@@ -1276,7 +1266,7 @@ describe('OpenAIModel', () => {
                 },
             };
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             await expect(async () => {
                 for await (const _ of provider.stream(messages)) {
                     // Should not reach here
@@ -1296,7 +1286,7 @@ describe('OpenAIModel', () => {
                 },
             };
             const provider = new OpenAIModel({ modelId: 'gpt-4o', client: mockClient });
-            const messages = [{ type: 'message', role: 'user', content: [{ type: 'textBlock', text: 'Hi' }] }];
+            const messages = [new Message({ role: 'user', content: [new TextBlock('Hi')] })];
             try {
                 for await (const _ of provider.stream(messages)) {
                     // Should not reach here