@illuma-ai/agents 1.0.89 → 1.0.93

package/src/llm/bedrock/__tests__/bedrock-caching.test.js

@@ -0,0 +1,392 @@
+/**
+ * Unit tests for Bedrock Prompt Caching functionality
+ *
+ * Tests cover:
+ * 1. CustomChatBedrockConverse - Tool caching with cachePoint via invocationParams
+ * 2. AgentContext - System message format per provider:
+ *    - Bedrock: plain string (cachePoint is added at the tool level by invocationParams)
+ *    - Anthropic: cache_control added inline by AgentContext
+ *    - OpenAI: plain string (no caching)
+ */
+import { CustomChatBedrockConverse } from '../index';
+import { AgentContext } from '@/agents/AgentContext';
+import { Providers } from '@/common';
+describe('Bedrock Prompt Caching', () => {
+    describe('CustomChatBedrockConverse - Tool Caching', () => {
+        describe('invocationParams with promptCache enabled', () => {
+            it('should add cachePoint to tools array when promptCache is true', () => {
+                const model = new CustomChatBedrockConverse({
+                    model: 'anthropic.claude-3-haiku-20240307-v1:0',
+                    region: 'us-east-1',
+                    promptCache: true,
+                });
+                const mockTools = [
+                    {
+                        toolSpec: {
+                            name: 'get_weather',
+                            description: 'Get weather for a location',
+                            inputSchema: { json: { type: 'object', properties: {} } },
+                        },
+                    },
+                    {
+                        toolSpec: {
+                            name: 'search_web',
+                            description: 'Search the web',
+                            inputSchema: { json: { type: 'object', properties: {} } },
+                        },
+                    },
+                ];
+                const params = model.invocationParams({
+                    tools: mockTools,
+                });
+                // Should have tools + cachePoint
+                expect(params.toolConfig?.tools).toHaveLength(3);
+                expect(params.toolConfig?.tools?.[2]).toEqual({
+                    cachePoint: { type: 'default' },
+                });
+            });
+            it('should NOT add cachePoint when promptCache is false', () => {
+                const model = new CustomChatBedrockConverse({
+                    model: 'anthropic.claude-3-haiku-20240307-v1:0',
+                    region: 'us-east-1',
+                    promptCache: false,
+                });
+                const mockTools = [
+                    {
+                        toolSpec: {
+                            name: 'get_weather',
+                            description: 'Get weather',
+                            inputSchema: { json: { type: 'object', properties: {} } },
+                        },
+                    },
+                ];
+                const params = model.invocationParams({
+                    tools: mockTools,
+                });
+                // Should only have original tools, no cachePoint
+                expect(params.toolConfig?.tools).toHaveLength(1);
+                expect(params.toolConfig?.tools?.[0]).toEqual(mockTools[0]);
+            });
+            it('should NOT add cachePoint when promptCache is undefined (default)', () => {
+                const model = new CustomChatBedrockConverse({
+                    model: 'anthropic.claude-3-haiku-20240307-v1:0',
+                    region: 'us-east-1',
+                });
+                const mockTools = [
+                    {
+                        toolSpec: {
+                            name: 'get_weather',
+                            description: 'Get weather',
+                            inputSchema: { json: { type: 'object', properties: {} } },
+                        },
+                    },
+                ];
+                const params = model.invocationParams({
+                    tools: mockTools,
+                });
+                // Should only have original tools
+                expect(params.toolConfig?.tools).toHaveLength(1);
+            });
+            it('should NOT add cachePoint when no tools are provided', () => {
+                const model = new CustomChatBedrockConverse({
+                    model: 'anthropic.claude-3-haiku-20240307-v1:0',
+                    region: 'us-east-1',
+                    promptCache: true,
+                });
+                const params = model.invocationParams({});
+                // toolConfig should be undefined or have no tools
+                expect(params.toolConfig?.tools).toBeUndefined();
+            });
+            it('should NOT add cachePoint when tools array is empty', () => {
+                const model = new CustomChatBedrockConverse({
+                    model: 'anthropic.claude-3-haiku-20240307-v1:0',
+                    region: 'us-east-1',
+                    promptCache: true,
+                });
+                const params = model.invocationParams({
+                    tools: [],
+                });
+                // Empty tools array results in undefined toolConfig
+                expect(params.toolConfig).toBeUndefined();
+            });
+            it('should preserve other invocationParams properties', () => {
+                const model = new CustomChatBedrockConverse({
+                    model: 'anthropic.claude-3-haiku-20240307-v1:0',
+                    region: 'us-east-1',
+                    promptCache: true,
+                    temperature: 0.7,
+                    maxTokens: 1000,
+                });
+                const mockTools = [
+                    {
+                        toolSpec: {
+                            name: 'test_tool',
+                            description: 'Test',
+                            inputSchema: { json: { type: 'object', properties: {} } },
+                        },
+                    },
+                ];
+                const params = model.invocationParams({
+                    tools: mockTools,
+                });
+                // Check that other params are preserved
+                expect(params.inferenceConfig?.temperature).toBe(0.7);
+                expect(params.inferenceConfig?.maxTokens).toBe(1000);
+                // And cachePoint is still added
+                expect(params.toolConfig?.tools).toHaveLength(2);
+            });
+        });
+        describe('promptCache property', () => {
+            it('should store promptCache value from constructor', () => {
+                const modelWithCache = new CustomChatBedrockConverse({
+                    model: 'test-model',
+                    region: 'us-east-1',
+                    promptCache: true,
+                });
+                const modelWithoutCache = new CustomChatBedrockConverse({
+                    model: 'test-model',
+                    region: 'us-east-1',
+                    promptCache: false,
+                });
+                expect(modelWithCache.promptCache).toBe(true);
+                expect(modelWithoutCache.promptCache).toBe(false);
+            });
+            it('should default promptCache to false when not provided', () => {
+                const model = new CustomChatBedrockConverse({
+                    model: 'test-model',
+                    region: 'us-east-1',
+                });
+                expect(model.promptCache).toBe(false);
+            });
+        });
+    });
+    describe('AgentContext - System Message Caching', () => {
+        const createBedrockContext = (options) => {
+            const clientOptions = {
+                model: 'anthropic.claude-3-haiku-20240307-v1:0',
+                region: 'us-east-1',
+                promptCache: options.promptCache,
+            };
+            return AgentContext.fromConfig({
+                agentId: 'test-bedrock-agent',
+                provider: Providers.BEDROCK,
+                instructions: options.instructions,
+                additional_instructions: options.additionalInstructions,
+                clientOptions,
+            });
+        };
+        const createAnthropicContext = (options) => {
+            const clientOptions = {
+                promptCache: options.promptCachingEnabled,
+            };
+            return AgentContext.fromConfig({
+                agentId: 'test-anthropic-agent',
+                provider: Providers.ANTHROPIC,
+                instructions: options.instructions,
+                clientOptions,
+            });
+        };
+        describe('Bedrock system message with promptCache: true', () => {
+            it('should produce plain string system message (cachePoint is handled at tool level)', async () => {
+                const ctx = createBedrockContext({
+                    instructions: 'You are a helpful assistant.',
+                    promptCache: true,
+                });
+                const systemRunnable = ctx.systemRunnable;
+                expect(systemRunnable).toBeDefined();
+                // Invoke the runnable to get the messages
+                const result = await systemRunnable.invoke([]);
+                const systemMessage = result[0];
+                // Bedrock system messages are plain strings — cachePoint is added
+                // at the tool level by IllumaBedrockConverse.invocationParams()
+                expect(typeof systemMessage.content).toBe('string');
+                expect(systemMessage.content).toBe('You are a helpful assistant.');
+            });
+            it('should include combined instructions and additional_instructions as plain string', async () => {
+                const ctx = createBedrockContext({
+                    instructions: 'Base instructions.',
+                    additionalInstructions: 'Additional context.',
+                    promptCache: true,
+                });
+                const result = await ctx.systemRunnable.invoke([]);
+                const systemMessage = result[0];
+                // Bedrock system messages are plain strings even with promptCache
+                expect(typeof systemMessage.content).toBe('string');
+                expect(systemMessage.content).toContain('Base instructions.');
+                expect(systemMessage.content).toContain('Additional context.');
+            });
+        });
+        describe('Bedrock system message with promptCache: false', () => {
+            it('should NOT add cachePoint when promptCache is false', async () => {
+                const ctx = createBedrockContext({
+                    instructions: 'You are a helpful assistant.',
+                    promptCache: false,
+                });
+                const result = await ctx.systemRunnable.invoke([]);
+                const systemMessage = result[0];
+                // Content should be plain string, not array with cachePoint
+                expect(typeof systemMessage.content).toBe('string');
+                expect(systemMessage.content).toBe('You are a helpful assistant.');
+            });
+            it('should NOT add cachePoint when promptCache is undefined', async () => {
+                const ctx = createBedrockContext({
+                    instructions: 'You are a helpful assistant.',
+                    promptCache: undefined,
+                });
+                const result = await ctx.systemRunnable.invoke([]);
+                const systemMessage = result[0];
+                expect(typeof systemMessage.content).toBe('string');
+            });
+        });
+        describe('Anthropic system message caching (for comparison)', () => {
+            it('should add cache_control for Anthropic with prompt-caching beta', async () => {
+                const ctx = createAnthropicContext({
+                    instructions: 'You are a helpful assistant.',
+                    promptCachingEnabled: true,
+                });
+                const result = await ctx.systemRunnable.invoke([]);
+                const systemMessage = result[0];
+                const content = systemMessage.content;
+                expect(content).toHaveLength(1);
+                expect(content[0]).toEqual({
+                    type: 'text',
+                    text: 'You are a helpful assistant.',
+                    cache_control: { type: 'ephemeral' },
+                });
+            });
+            it('should NOT add cache_control for Anthropic without beta header', async () => {
+                const ctx = createAnthropicContext({
+                    instructions: 'You are a helpful assistant.',
+                    promptCachingEnabled: false,
+                });
+                const result = await ctx.systemRunnable.invoke([]);
+                const systemMessage = result[0];
+                expect(typeof systemMessage.content).toBe('string');
+            });
+        });
+        describe('Provider-specific caching behavior', () => {
+            it('should produce plain string for Bedrock (cachePoint handled at tool level)', async () => {
+                const bedrockCtx = createBedrockContext({
+                    instructions: 'Test',
+                    promptCache: true,
+                });
+                const result = await bedrockCtx.systemRunnable.invoke([]);
+                // Bedrock system messages are plain strings — cachePoint is added
+                // at the tool level by IllumaBedrockConverse.invocationParams(),
+                // not inline in the system message content
+                expect(typeof result[0].content).toBe('string');
+                expect(result[0].content).toBe('Test');
+            });
+            it('should use cache_control format for Anthropic, not cachePoint', async () => {
+                const anthropicCtx = createAnthropicContext({
+                    instructions: 'Test',
+                    promptCachingEnabled: true,
+                });
+                const result = await anthropicCtx.systemRunnable.invoke([]);
+                const content = result[0].content;
+                // Anthropic uses cache_control inline in system message content
+                expect(content.some((c) => 'cache_control' in c)).toBe(true);
+                expect(content.some((c) => 'cachePoint' in c)).toBe(false);
+            });
+            it('should not add any caching for OpenAI provider', async () => {
+                const openaiCtx = AgentContext.fromConfig({
+                    agentId: 'test-openai-agent',
+                    provider: Providers.OPENAI,
+                    instructions: 'Test instructions',
+                });
+                const result = await openaiCtx.systemRunnable.invoke([]);
+                const systemMessage = result[0];
+                // OpenAI should have plain string content
+                expect(typeof systemMessage.content).toBe('string');
+                expect(systemMessage.content).toBe('Test instructions');
+            });
+        });
+    });
+    describe('Integration scenarios', () => {
+        it('should handle multi-turn caching scenario', async () => {
+            // Simulate: Query 1 with tools → Query 2 with same tools
+            // Both should have cachePoint, enabling cache reuse
+            const model = new CustomChatBedrockConverse({
+                model: 'anthropic.claude-3-haiku-20240307-v1:0',
+                region: 'us-east-1',
+                promptCache: true,
+            });
+            const tools = [
+                {
+                    toolSpec: {
+                        name: 'execute_code',
+                        description: 'Execute Python code',
+                        inputSchema: { json: { type: 'object', properties: {} } },
+                    },
+                },
+                {
+                    toolSpec: {
+                        name: 'file_search',
+                        description: 'Search files',
+                        inputSchema: { json: { type: 'object', properties: {} } },
+                    },
+                },
+            ];
+            // Query 1
+            const params1 = model.invocationParams({
+                tools,
+            });
+            // Query 2 (same tools)
+            const params2 = model.invocationParams({
+                tools,
+            });
+            // Both should have identical tool configs with cachePoint
+            expect(params1.toolConfig?.tools).toEqual(params2.toolConfig?.tools);
+            expect(params1.toolConfig?.tools).toHaveLength(3); // 2 tools + cachePoint
+        });
+        it('should handle dynamic tool selection scenario', async () => {
+            // Simulate: Query 1 with [A, B] → Query 2 with [A, B, C]
+            // Tool set changed, so cache won't match (expected behavior)
+            const model = new CustomChatBedrockConverse({
+                model: 'anthropic.claude-3-haiku-20240307-v1:0',
+                region: 'us-east-1',
+                promptCache: true,
+            });
+            const toolA = {
+                toolSpec: {
+                    name: 'tool_a',
+                    description: 'Tool A',
+                    inputSchema: { json: { type: 'object', properties: {} } },
+                },
+            };
+            const toolB = {
+                toolSpec: {
+                    name: 'tool_b',
+                    description: 'Tool B',
+                    inputSchema: { json: { type: 'object', properties: {} } },
+                },
+            };
+            const toolC = {
+                toolSpec: {
+                    name: 'tool_c',
+                    description: 'Tool C',
+                    inputSchema: { json: { type: 'object', properties: {} } },
+                },
+            };
+            // Query 1: [A, B]
+            const params1 = model.invocationParams({
+                tools: [toolA, toolB],
+            });
+            // Query 2: [A, B, C] - different tool set
+            const params2 = model.invocationParams({
+                tools: [toolA, toolB, toolC],
+            });
+            // Different lengths (cache prefix won't match beyond common prefix)
+            expect(params1.toolConfig?.tools).toHaveLength(3); // 2 tools + cachePoint
+            expect(params2.toolConfig?.tools).toHaveLength(4); // 3 tools + cachePoint
+            // But both have cachePoint at the end
+            expect(params1.toolConfig?.tools?.[2]).toEqual({
+                cachePoint: { type: 'default' },
+            });
+            expect(params2.toolConfig?.tools?.[3]).toEqual({
+                cachePoint: { type: 'default' },
+            });
+        });
+    });
+});
+//# sourceMappingURL=bedrock-caching.test.js.map

package/src/llm/bedrock/__tests__/bedrock-caching.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bedrock-caching.test.js","sourceRoot":"","sources":["bedrock-caching.test.ts"],"names":[],"mappings":"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"}

package/src/llm/bedrock/__tests__/bedrock-caching.test.ts

@@ -2,8 +2,11 @@
  * Unit tests for Bedrock Prompt Caching functionality
  *
  * Tests cover:
- * 1. CustomChatBedrockConverse - Tool caching with cachePoint
- * 2. AgentContext - System message caching with cachePoint for Bedrock
+ * 1. CustomChatBedrockConverse - Tool caching with cachePoint via invocationParams
+ * 2. AgentContext - System message format per provider:
+ *    - Bedrock: plain string (cachePoint is added at the tool level by invocationParams)
+ *    - Anthropic: cache_control added inline by AgentContext
+ *    - OpenAI: plain string (no caching)
  */
 
 import { CustomChatBedrockConverse } from '../index';
@@ -12,7 +15,7 @@ import { Providers } from '@/common';
 import type * as t from '@/types';
 
 type InvocationParamsOptions = Parameters<
-  CustomChatBedrockConverse['invocationParams']
+  InstanceType<typeof CustomChatBedrockConverse>['invocationParams']
 >[0];
 
 describe('Bedrock Prompt Caching', () => {
@@ -219,12 +222,7 @@ describe('Bedrock Prompt Caching', () => {
       promptCachingEnabled?: boolean;
     }): AgentContext => {
       const clientOptions: t.AnthropicClientOptions = {
-        clientOptions: {
-          defaultHeaders:
-            options.promptCachingEnabled === true
-              ? { 'anthropic-beta': 'prompt-caching-2024-07-31' }
-              : undefined,
-        },
+        promptCache: options.promptCachingEnabled,
       };
       return AgentContext.fromConfig({
         agentId: 'test-anthropic-agent',
@@ -235,7 +233,7 @@ describe('Bedrock Prompt Caching', () => {
     };
 
     describe('Bedrock system message with promptCache: true', () => {
-      it('should add cachePoint to system message content', async () => {
+      it('should produce plain string system message (cachePoint is handled at tool level)', async () => {
         const ctx = createBedrockContext({
           instructions: 'You are a helpful assistant.',
           promptCache: true,
@@ -248,21 +246,13 @@ describe('Bedrock Prompt Caching', () => {
         const result = await systemRunnable!.invoke([]);
         const systemMessage = result[0];
 
-        // Check content structure has cachePoint
-        expect(systemMessage.content).toBeInstanceOf(Array);
-        const content = systemMessage.content as Array<Record<string, unknown>>;
-
-        expect(content).toHaveLength(2);
-        expect(content[0]).toEqual({
-          type: 'text',
-          text: 'You are a helpful assistant.',
-        });
-        expect(content[1]).toEqual({
-          cachePoint: { type: 'default' },
-        });
+        // Bedrock system messages are plain strings — cachePoint is added
+        // at the tool level by IllumaBedrockConverse.invocationParams()
+        expect(typeof systemMessage.content).toBe('string');
+        expect(systemMessage.content).toBe('You are a helpful assistant.');
       });
 
-      it('should include combined instructions and additional_instructions with cachePoint', async () => {
+      it('should include combined instructions and additional_instructions as plain string', async () => {
         const ctx = createBedrockContext({
           instructions: 'Base instructions.',
           additionalInstructions: 'Additional context.',
@@ -271,18 +261,11 @@ describe('Bedrock Prompt Caching', () => {
 
         const result = await ctx.systemRunnable!.invoke([]);
         const systemMessage = result[0];
-        const content = systemMessage.content as Array<Record<string, unknown>>;
 
-        expect(content).toHaveLength(2);
-        expect((content[0] as { text: string }).text).toContain(
-          'Base instructions.'
-        );
-        expect((content[0] as { text: string }).text).toContain(
-          'Additional context.'
-        );
-        expect(content[1]).toEqual({
-          cachePoint: { type: 'default' },
-        });
+        // Bedrock system messages are plain strings even with promptCache
+        expect(typeof systemMessage.content).toBe('string');
+        expect(systemMessage.content).toContain('Base instructions.');
+        expect(systemMessage.content).toContain('Additional context.');
       });
     });
 
@@ -347,18 +330,19 @@ describe('Bedrock Prompt Caching', () => {
     });
 
     describe('Provider-specific caching behavior', () => {
-      it('should use cachePoint format for Bedrock, not cache_control', async () => {
+      it('should produce plain string for Bedrock (cachePoint handled at tool level)', async () => {
         const bedrockCtx = createBedrockContext({
           instructions: 'Test',
           promptCache: true,
         });
 
         const result = await bedrockCtx.systemRunnable!.invoke([]);
-        const content = result[0].content as Array<Record<string, unknown>>;
 
-        // Bedrock uses cachePoint, NOT cache_control
-        expect(content.some((c) => 'cachePoint' in c)).toBe(true);
-        expect(content.some((c) => 'cache_control' in c)).toBe(false);
+        // Bedrock system messages are plain strings — cachePoint is added
+        // at the tool level by IllumaBedrockConverse.invocationParams(),
+        // not inline in the system message content
+        expect(typeof result[0].content).toBe('string');
+        expect(result[0].content).toBe('Test');
       });
 
       it('should use cache_control format for Anthropic, not cachePoint', async () => {
@@ -370,7 +354,7 @@ describe('Bedrock Prompt Caching', () => {
         const result = await anthropicCtx.systemRunnable!.invoke([]);
         const content = result[0].content as Array<Record<string, unknown>>;
 
-        // Anthropic uses cache_control, NOT cachePoint
+        // Anthropic uses cache_control inline in system message content
         expect(content.some((c) => 'cache_control' in c)).toBe(true);
         expect(content.some((c) => 'cachePoint' in c)).toBe(false);
       });