illuma-agents 1.0.2 → 1.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +25 -21
- package/dist/cjs/agents/AgentContext.cjs +222 -0
- package/dist/cjs/agents/AgentContext.cjs.map +1 -0
- package/dist/cjs/common/enum.cjs +7 -6
- package/dist/cjs/common/enum.cjs.map +1 -1
- package/dist/cjs/events.cjs +7 -5
- package/dist/cjs/events.cjs.map +1 -1
- package/dist/cjs/graphs/Graph.cjs +328 -207
- package/dist/cjs/graphs/Graph.cjs.map +1 -1
- package/dist/cjs/graphs/MultiAgentGraph.cjs +507 -0
- package/dist/cjs/graphs/MultiAgentGraph.cjs.map +1 -0
- package/dist/cjs/llm/anthropic/index.cjs.map +1 -1
- package/dist/cjs/llm/google/index.cjs.map +1 -1
- package/dist/cjs/llm/ollama/index.cjs.map +1 -1
- package/dist/cjs/llm/openai/index.cjs +35 -0
- package/dist/cjs/llm/openai/index.cjs.map +1 -1
- package/dist/cjs/llm/openai/utils/index.cjs +3 -1
- package/dist/cjs/llm/openai/utils/index.cjs.map +1 -1
- package/dist/cjs/llm/openrouter/index.cjs.map +1 -1
- package/dist/cjs/llm/providers.cjs +0 -2
- package/dist/cjs/llm/providers.cjs.map +1 -1
- package/dist/cjs/llm/vertexai/index.cjs.map +1 -1
- package/dist/cjs/main.cjs +12 -1
- package/dist/cjs/main.cjs.map +1 -1
- package/dist/cjs/messages/cache.cjs +123 -0
- package/dist/cjs/messages/cache.cjs.map +1 -0
- package/dist/cjs/messages/content.cjs +53 -0
- package/dist/cjs/messages/content.cjs.map +1 -0
- package/dist/cjs/messages/format.cjs +17 -29
- package/dist/cjs/messages/format.cjs.map +1 -1
- package/dist/cjs/run.cjs +119 -74
- package/dist/cjs/run.cjs.map +1 -1
- package/dist/cjs/stream.cjs +77 -73
- package/dist/cjs/stream.cjs.map +1 -1
- package/dist/cjs/tools/Calculator.cjs +45 -0
- package/dist/cjs/tools/Calculator.cjs.map +1 -0
- package/dist/cjs/tools/CodeExecutor.cjs +22 -22
- package/dist/cjs/tools/CodeExecutor.cjs.map +1 -1
- package/dist/cjs/tools/ToolNode.cjs +5 -3
- package/dist/cjs/tools/ToolNode.cjs.map +1 -1
- package/dist/cjs/tools/handlers.cjs +20 -20
- package/dist/cjs/tools/handlers.cjs.map +1 -1
- package/dist/cjs/utils/events.cjs +31 -0
- package/dist/cjs/utils/events.cjs.map +1 -0
- package/dist/cjs/utils/handlers.cjs +70 -0
- package/dist/cjs/utils/handlers.cjs.map +1 -0
- package/dist/cjs/utils/tokens.cjs +54 -7
- package/dist/cjs/utils/tokens.cjs.map +1 -1
- package/dist/esm/agents/AgentContext.mjs +220 -0
- package/dist/esm/agents/AgentContext.mjs.map +1 -0
- package/dist/esm/common/enum.mjs +7 -6
- package/dist/esm/common/enum.mjs.map +1 -1
- package/dist/esm/events.mjs +7 -5
- package/dist/esm/events.mjs.map +1 -1
- package/dist/esm/graphs/Graph.mjs +330 -209
- package/dist/esm/graphs/Graph.mjs.map +1 -1
- package/dist/esm/graphs/MultiAgentGraph.mjs +505 -0
- package/dist/esm/graphs/MultiAgentGraph.mjs.map +1 -0
- package/dist/esm/llm/anthropic/index.mjs.map +1 -1
- package/dist/esm/llm/google/index.mjs.map +1 -1
- package/dist/esm/llm/ollama/index.mjs.map +1 -1
- package/dist/esm/llm/openai/index.mjs +35 -0
- package/dist/esm/llm/openai/index.mjs.map +1 -1
- package/dist/esm/llm/openai/utils/index.mjs +3 -1
- package/dist/esm/llm/openai/utils/index.mjs.map +1 -1
- package/dist/esm/llm/openrouter/index.mjs.map +1 -1
- package/dist/esm/llm/providers.mjs +0 -2
- package/dist/esm/llm/providers.mjs.map +1 -1
- package/dist/esm/llm/vertexai/index.mjs.map +1 -1
- package/dist/esm/main.mjs +7 -2
- package/dist/esm/main.mjs.map +1 -1
- package/dist/esm/messages/cache.mjs +120 -0
- package/dist/esm/messages/cache.mjs.map +1 -0
- package/dist/esm/messages/content.mjs +51 -0
- package/dist/esm/messages/content.mjs.map +1 -0
- package/dist/esm/messages/format.mjs +18 -29
- package/dist/esm/messages/format.mjs.map +1 -1
- package/dist/esm/run.mjs +119 -74
- package/dist/esm/run.mjs.map +1 -1
- package/dist/esm/stream.mjs +77 -73
- package/dist/esm/stream.mjs.map +1 -1
- package/dist/esm/tools/Calculator.mjs +24 -0
- package/dist/esm/tools/Calculator.mjs.map +1 -0
- package/dist/esm/tools/CodeExecutor.mjs +22 -22
- package/dist/esm/tools/CodeExecutor.mjs.map +1 -1
- package/dist/esm/tools/ToolNode.mjs +5 -3
- package/dist/esm/tools/ToolNode.mjs.map +1 -1
- package/dist/esm/tools/handlers.mjs +20 -20
- package/dist/esm/tools/handlers.mjs.map +1 -1
- package/dist/esm/utils/events.mjs +29 -0
- package/dist/esm/utils/events.mjs.map +1 -0
- package/dist/esm/utils/handlers.mjs +68 -0
- package/dist/esm/utils/handlers.mjs.map +1 -0
- package/dist/esm/utils/tokens.mjs +54 -8
- package/dist/esm/utils/tokens.mjs.map +1 -1
- package/dist/types/agents/AgentContext.d.ts +94 -0
- package/dist/types/common/enum.d.ts +9 -7
- package/dist/types/events.d.ts +3 -3
- package/dist/types/graphs/Graph.d.ts +60 -66
- package/dist/types/graphs/MultiAgentGraph.d.ts +47 -0
- package/dist/types/graphs/index.d.ts +1 -0
- package/dist/types/index.d.ts +1 -0
- package/dist/types/llm/openai/index.d.ts +10 -0
- package/dist/types/messages/cache.d.ts +20 -0
- package/dist/types/messages/content.d.ts +7 -0
- package/dist/types/messages/format.d.ts +1 -7
- package/dist/types/messages/index.d.ts +2 -0
- package/dist/types/messages/reducer.d.ts +9 -0
- package/dist/types/run.d.ts +16 -10
- package/dist/types/stream.d.ts +4 -3
- package/dist/types/tools/Calculator.d.ts +8 -0
- package/dist/types/tools/ToolNode.d.ts +1 -1
- package/dist/types/tools/handlers.d.ts +9 -7
- package/dist/types/tools/search/tool.d.ts +4 -4
- package/dist/types/types/graph.d.ts +124 -11
- package/dist/types/types/llm.d.ts +13 -9
- package/dist/types/types/messages.d.ts +4 -0
- package/dist/types/types/run.d.ts +46 -8
- package/dist/types/types/stream.d.ts +3 -2
- package/dist/types/utils/events.d.ts +6 -0
- package/dist/types/utils/handlers.d.ts +34 -0
- package/dist/types/utils/index.d.ts +1 -0
- package/dist/types/utils/tokens.d.ts +24 -0
- package/package.json +162 -145
- package/src/agents/AgentContext.ts +323 -0
- package/src/common/enum.ts +177 -176
- package/src/events.ts +197 -191
- package/src/graphs/Graph.ts +1058 -846
- package/src/graphs/MultiAgentGraph.ts +598 -0
- package/src/graphs/index.ts +2 -1
- package/src/index.ts +25 -24
- package/src/llm/anthropic/index.ts +413 -413
- package/src/llm/google/index.ts +222 -222
- package/src/llm/google/utils/zod_to_genai_parameters.ts +86 -88
- package/src/llm/ollama/index.ts +92 -92
- package/src/llm/openai/index.ts +894 -853
- package/src/llm/openai/utils/index.ts +920 -918
- package/src/llm/openrouter/index.ts +60 -60
- package/src/llm/providers.ts +55 -57
- package/src/llm/vertexai/index.ts +360 -360
- package/src/messages/cache.test.ts +461 -0
- package/src/messages/cache.ts +151 -0
- package/src/messages/content.test.ts +362 -0
- package/src/messages/content.ts +63 -0
- package/src/messages/format.ts +611 -625
- package/src/messages/formatAgentMessages.test.ts +1144 -917
- package/src/messages/index.ts +6 -4
- package/src/messages/reducer.ts +80 -0
- package/src/run.ts +447 -381
- package/src/scripts/abort.ts +157 -138
- package/src/scripts/ant_web_search.ts +158 -158
- package/src/scripts/cli.ts +172 -167
- package/src/scripts/cli2.ts +133 -125
- package/src/scripts/cli3.ts +184 -178
- package/src/scripts/cli4.ts +191 -184
- package/src/scripts/cli5.ts +191 -184
- package/src/scripts/code_exec.ts +213 -214
- package/src/scripts/code_exec_simple.ts +147 -129
- package/src/scripts/content.ts +138 -120
- package/src/scripts/handoff-test.ts +135 -0
- package/src/scripts/multi-agent-chain.ts +278 -0
- package/src/scripts/multi-agent-conditional.ts +220 -0
- package/src/scripts/multi-agent-document-review-chain.ts +197 -0
- package/src/scripts/multi-agent-hybrid-flow.ts +310 -0
- package/src/scripts/multi-agent-parallel.ts +343 -0
- package/src/scripts/multi-agent-sequence.ts +212 -0
- package/src/scripts/multi-agent-supervisor.ts +364 -0
- package/src/scripts/multi-agent-test.ts +186 -0
- package/src/scripts/search.ts +146 -150
- package/src/scripts/simple.ts +225 -225
- package/src/scripts/stream.ts +140 -122
- package/src/scripts/test-custom-prompt-key.ts +145 -0
- package/src/scripts/test-handoff-input.ts +170 -0
- package/src/scripts/test-multi-agent-list-handoff.ts +261 -0
- package/src/scripts/test-tools-before-handoff.ts +222 -0
- package/src/scripts/tools.ts +153 -155
- package/src/specs/agent-handoffs.test.ts +889 -0
- package/src/specs/anthropic.simple.test.ts +320 -317
- package/src/specs/azure.simple.test.ts +325 -316
- package/src/specs/openai.simple.test.ts +311 -316
- package/src/specs/openrouter.simple.test.ts +107 -0
- package/src/specs/prune.test.ts +758 -763
- package/src/specs/reasoning.test.ts +201 -165
- package/src/specs/thinking-prune.test.ts +769 -703
- package/src/specs/token-memoization.test.ts +39 -0
- package/src/stream.ts +664 -651
- package/src/tools/Calculator.test.ts +278 -0
- package/src/tools/Calculator.ts +25 -0
- package/src/tools/CodeExecutor.ts +220 -220
- package/src/tools/ToolNode.ts +170 -170
- package/src/tools/handlers.ts +341 -336
- package/src/types/graph.ts +372 -185
- package/src/types/llm.ts +141 -140
- package/src/types/messages.ts +4 -0
- package/src/types/run.ts +128 -89
- package/src/types/stream.ts +401 -400
- package/src/utils/events.ts +32 -0
- package/src/utils/handlers.ts +107 -0
- package/src/utils/index.ts +6 -5
- package/src/utils/llmConfig.ts +183 -183
- package/src/utils/tokens.ts +129 -70
- package/dist/types/scripts/abort.d.ts +0 -1
- package/dist/types/scripts/ant_web_search.d.ts +0 -1
- package/dist/types/scripts/args.d.ts +0 -7
- package/dist/types/scripts/caching.d.ts +0 -1
- package/dist/types/scripts/cli.d.ts +0 -1
- package/dist/types/scripts/cli2.d.ts +0 -1
- package/dist/types/scripts/cli3.d.ts +0 -1
- package/dist/types/scripts/cli4.d.ts +0 -1
- package/dist/types/scripts/cli5.d.ts +0 -1
- package/dist/types/scripts/code_exec.d.ts +0 -1
- package/dist/types/scripts/code_exec_files.d.ts +0 -1
- package/dist/types/scripts/code_exec_simple.d.ts +0 -1
- package/dist/types/scripts/content.d.ts +0 -1
- package/dist/types/scripts/empty_input.d.ts +0 -1
- package/dist/types/scripts/image.d.ts +0 -1
- package/dist/types/scripts/memory.d.ts +0 -1
- package/dist/types/scripts/search.d.ts +0 -1
- package/dist/types/scripts/simple.d.ts +0 -1
- package/dist/types/scripts/stream.d.ts +0 -1
- package/dist/types/scripts/thinking.d.ts +0 -1
- package/dist/types/scripts/tools.d.ts +0 -1
- package/dist/types/specs/spec.utils.d.ts +0 -1
- package/dist/types/tools/example.d.ts +0 -78
- package/src/tools/example.ts +0 -129
|
@@ -0,0 +1,461 @@
|
|
|
1
|
+
import type Anthropic from '@anthropic-ai/sdk';
|
|
2
|
+
import type { AnthropicMessages } from '@/types/messages';
|
|
3
|
+
import { addCacheControl, addBedrockCacheControl } from './cache';
|
|
4
|
+
import { MessageContentComplex } from '@langchain/core/messages';
|
|
5
|
+
import { ContentTypes } from '@/common/enum';
|
|
6
|
+
|
|
7
|
+
describe('addCacheControl', () => {
|
|
8
|
+
test('should add cache control to the last two user messages with array content', () => {
|
|
9
|
+
const messages: AnthropicMessages = [
|
|
10
|
+
{ role: 'user', content: [{ type: 'text', text: 'Hello' }] },
|
|
11
|
+
{ role: 'assistant', content: [{ type: 'text', text: 'Hi there' }] },
|
|
12
|
+
{ role: 'user', content: [{ type: 'text', text: 'How are you?' }] },
|
|
13
|
+
{
|
|
14
|
+
role: 'assistant',
|
|
15
|
+
content: [{ type: 'text', text: 'I\'m doing well, thanks!' }],
|
|
16
|
+
},
|
|
17
|
+
{ role: 'user', content: [{ type: 'text', text: 'Great!' }] },
|
|
18
|
+
];
|
|
19
|
+
|
|
20
|
+
const result = addCacheControl(messages);
|
|
21
|
+
|
|
22
|
+
expect(result[0].content[0]).not.toHaveProperty('cache_control');
|
|
23
|
+
expect(
|
|
24
|
+
(result[2].content[0] as Anthropic.TextBlockParam).cache_control
|
|
25
|
+
).toEqual({ type: 'ephemeral' });
|
|
26
|
+
expect(
|
|
27
|
+
(result[4].content[0] as Anthropic.TextBlockParam).cache_control
|
|
28
|
+
).toEqual({ type: 'ephemeral' });
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
test('should add cache control to the last two user messages with string content', () => {
|
|
32
|
+
const messages: AnthropicMessages = [
|
|
33
|
+
{ role: 'user', content: 'Hello' },
|
|
34
|
+
{ role: 'assistant', content: 'Hi there' },
|
|
35
|
+
{ role: 'user', content: 'How are you?' },
|
|
36
|
+
{ role: 'assistant', content: 'I\'m doing well, thanks!' },
|
|
37
|
+
{ role: 'user', content: 'Great!' },
|
|
38
|
+
];
|
|
39
|
+
|
|
40
|
+
const result = addCacheControl(messages);
|
|
41
|
+
|
|
42
|
+
expect(result[0].content).toBe('Hello');
|
|
43
|
+
expect(result[2].content[0]).toEqual({
|
|
44
|
+
type: 'text',
|
|
45
|
+
text: 'How are you?',
|
|
46
|
+
cache_control: { type: 'ephemeral' },
|
|
47
|
+
});
|
|
48
|
+
expect(result[4].content[0]).toEqual({
|
|
49
|
+
type: 'text',
|
|
50
|
+
text: 'Great!',
|
|
51
|
+
cache_control: { type: 'ephemeral' },
|
|
52
|
+
});
|
|
53
|
+
});
|
|
54
|
+
|
|
55
|
+
test('should handle mixed string and array content', () => {
|
|
56
|
+
const messages: AnthropicMessages = [
|
|
57
|
+
{ role: 'user', content: 'Hello' },
|
|
58
|
+
{ role: 'assistant', content: 'Hi there' },
|
|
59
|
+
{ role: 'user', content: [{ type: 'text', text: 'How are you?' }] },
|
|
60
|
+
];
|
|
61
|
+
|
|
62
|
+
const result = addCacheControl(messages);
|
|
63
|
+
|
|
64
|
+
expect(result[0].content[0]).toEqual({
|
|
65
|
+
type: 'text',
|
|
66
|
+
text: 'Hello',
|
|
67
|
+
cache_control: { type: 'ephemeral' },
|
|
68
|
+
});
|
|
69
|
+
expect(
|
|
70
|
+
(result[2].content[0] as Anthropic.TextBlockParam).cache_control
|
|
71
|
+
).toEqual({ type: 'ephemeral' });
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
test('should handle less than two user messages', () => {
|
|
75
|
+
const messages: AnthropicMessages = [
|
|
76
|
+
{ role: 'user', content: 'Hello' },
|
|
77
|
+
{ role: 'assistant', content: 'Hi there' },
|
|
78
|
+
];
|
|
79
|
+
|
|
80
|
+
const result = addCacheControl(messages);
|
|
81
|
+
|
|
82
|
+
expect(result[0].content[0]).toEqual({
|
|
83
|
+
type: 'text',
|
|
84
|
+
text: 'Hello',
|
|
85
|
+
cache_control: { type: 'ephemeral' },
|
|
86
|
+
});
|
|
87
|
+
expect(result[1].content).toBe('Hi there');
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
test('should return original array if no user messages', () => {
|
|
91
|
+
const messages: AnthropicMessages = [
|
|
92
|
+
{ role: 'assistant', content: 'Hi there' },
|
|
93
|
+
{ role: 'assistant', content: 'How can I help?' },
|
|
94
|
+
];
|
|
95
|
+
|
|
96
|
+
const result = addCacheControl(messages);
|
|
97
|
+
|
|
98
|
+
expect(result).toEqual(messages);
|
|
99
|
+
});
|
|
100
|
+
|
|
101
|
+
test('should handle empty array', () => {
|
|
102
|
+
const messages: AnthropicMessages = [];
|
|
103
|
+
const result = addCacheControl(messages);
|
|
104
|
+
expect(result).toEqual([]);
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
test('should handle non-array input', () => {
|
|
108
|
+
const messages = 'not an array';
|
|
109
|
+
/** @ts-expect-error - This is a test */
|
|
110
|
+
const result = addCacheControl(messages);
|
|
111
|
+
expect(result).toBe('not an array');
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
test('should not modify assistant messages', () => {
|
|
115
|
+
const messages: AnthropicMessages = [
|
|
116
|
+
{ role: 'user', content: 'Hello' },
|
|
117
|
+
{ role: 'assistant', content: 'Hi there' },
|
|
118
|
+
{ role: 'user', content: 'How are you?' },
|
|
119
|
+
];
|
|
120
|
+
|
|
121
|
+
const result = addCacheControl(messages);
|
|
122
|
+
|
|
123
|
+
expect(result[1].content).toBe('Hi there');
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
test('should handle multiple content items in user messages', () => {
|
|
127
|
+
const messages: AnthropicMessages = [
|
|
128
|
+
{
|
|
129
|
+
role: 'user',
|
|
130
|
+
content: [
|
|
131
|
+
{ type: 'text', text: 'Hello' },
|
|
132
|
+
{
|
|
133
|
+
type: 'image',
|
|
134
|
+
source: { type: 'url', url: 'http://example.com/image.jpg' },
|
|
135
|
+
},
|
|
136
|
+
{ type: 'text', text: 'This is an image' },
|
|
137
|
+
],
|
|
138
|
+
},
|
|
139
|
+
{ role: 'assistant', content: 'Hi there' },
|
|
140
|
+
{ role: 'user', content: 'How are you?' },
|
|
141
|
+
];
|
|
142
|
+
|
|
143
|
+
const result = addCacheControl(messages);
|
|
144
|
+
|
|
145
|
+
expect(result[0].content[0]).not.toHaveProperty('cache_control');
|
|
146
|
+
expect(result[0].content[1]).not.toHaveProperty('cache_control');
|
|
147
|
+
expect(
|
|
148
|
+
(result[0].content[2] as Anthropic.TextBlockParam).cache_control
|
|
149
|
+
).toEqual({ type: 'ephemeral' });
|
|
150
|
+
expect(result[2].content[0]).toEqual({
|
|
151
|
+
type: 'text',
|
|
152
|
+
text: 'How are you?',
|
|
153
|
+
cache_control: { type: 'ephemeral' },
|
|
154
|
+
});
|
|
155
|
+
});
|
|
156
|
+
|
|
157
|
+
test('should handle an array with mixed content types', () => {
|
|
158
|
+
const messages: AnthropicMessages = [
|
|
159
|
+
{ role: 'user', content: 'Hello' },
|
|
160
|
+
{ role: 'assistant', content: 'Hi there' },
|
|
161
|
+
{ role: 'user', content: [{ type: 'text', text: 'How are you?' }] },
|
|
162
|
+
{ role: 'assistant', content: 'I\'m doing well, thanks!' },
|
|
163
|
+
{ role: 'user', content: 'Great!' },
|
|
164
|
+
];
|
|
165
|
+
|
|
166
|
+
const result = addCacheControl(messages);
|
|
167
|
+
|
|
168
|
+
expect(result[0].content).toEqual('Hello');
|
|
169
|
+
expect(result[2].content[0]).toEqual({
|
|
170
|
+
type: 'text',
|
|
171
|
+
text: 'How are you?',
|
|
172
|
+
cache_control: { type: 'ephemeral' },
|
|
173
|
+
});
|
|
174
|
+
expect(result[4].content).toEqual([
|
|
175
|
+
{
|
|
176
|
+
type: 'text',
|
|
177
|
+
text: 'Great!',
|
|
178
|
+
cache_control: { type: 'ephemeral' },
|
|
179
|
+
},
|
|
180
|
+
]);
|
|
181
|
+
expect(result[1].content).toBe('Hi there');
|
|
182
|
+
expect(result[3].content).toBe('I\'m doing well, thanks!');
|
|
183
|
+
});
|
|
184
|
+
|
|
185
|
+
test('should handle edge case with multiple content types', () => {
|
|
186
|
+
const messages: AnthropicMessages = [
|
|
187
|
+
{
|
|
188
|
+
role: 'user',
|
|
189
|
+
content: [
|
|
190
|
+
{
|
|
191
|
+
type: 'image',
|
|
192
|
+
source: {
|
|
193
|
+
type: 'base64',
|
|
194
|
+
media_type: 'image/png',
|
|
195
|
+
data: 'some_base64_string',
|
|
196
|
+
},
|
|
197
|
+
},
|
|
198
|
+
{
|
|
199
|
+
type: 'image',
|
|
200
|
+
source: {
|
|
201
|
+
type: 'base64',
|
|
202
|
+
media_type: 'image/png',
|
|
203
|
+
data: 'another_base64_string',
|
|
204
|
+
},
|
|
205
|
+
},
|
|
206
|
+
{ type: 'text', text: 'what do all these images have in common' },
|
|
207
|
+
],
|
|
208
|
+
},
|
|
209
|
+
{ role: 'assistant', content: 'I see multiple images.' },
|
|
210
|
+
{ role: 'user', content: 'Correct!' },
|
|
211
|
+
];
|
|
212
|
+
|
|
213
|
+
const result = addCacheControl(messages);
|
|
214
|
+
|
|
215
|
+
expect(result[0].content[0]).not.toHaveProperty('cache_control');
|
|
216
|
+
expect(result[0].content[1]).not.toHaveProperty('cache_control');
|
|
217
|
+
expect(
|
|
218
|
+
(result[0].content[2] as Anthropic.ImageBlockParam).cache_control
|
|
219
|
+
).toEqual({ type: 'ephemeral' });
|
|
220
|
+
expect(result[2].content[0]).toEqual({
|
|
221
|
+
type: 'text',
|
|
222
|
+
text: 'Correct!',
|
|
223
|
+
cache_control: { type: 'ephemeral' },
|
|
224
|
+
});
|
|
225
|
+
});
|
|
226
|
+
|
|
227
|
+
test('should handle user message with no text block', () => {
|
|
228
|
+
const messages: AnthropicMessages = [
|
|
229
|
+
{
|
|
230
|
+
role: 'user',
|
|
231
|
+
content: [
|
|
232
|
+
{
|
|
233
|
+
type: 'image',
|
|
234
|
+
source: {
|
|
235
|
+
type: 'base64',
|
|
236
|
+
media_type: 'image/png',
|
|
237
|
+
data: 'some_base64_string',
|
|
238
|
+
},
|
|
239
|
+
},
|
|
240
|
+
{
|
|
241
|
+
type: 'image',
|
|
242
|
+
source: {
|
|
243
|
+
type: 'base64',
|
|
244
|
+
media_type: 'image/png',
|
|
245
|
+
data: 'another_base64_string',
|
|
246
|
+
},
|
|
247
|
+
},
|
|
248
|
+
],
|
|
249
|
+
},
|
|
250
|
+
{ role: 'assistant', content: 'I see two images.' },
|
|
251
|
+
{ role: 'user', content: 'Correct!' },
|
|
252
|
+
];
|
|
253
|
+
|
|
254
|
+
const result = addCacheControl(messages);
|
|
255
|
+
|
|
256
|
+
expect(result[0].content[0]).not.toHaveProperty('cache_control');
|
|
257
|
+
expect(result[0].content[1]).not.toHaveProperty('cache_control');
|
|
258
|
+
expect(result[2].content[0]).toEqual({
|
|
259
|
+
type: 'text',
|
|
260
|
+
text: 'Correct!',
|
|
261
|
+
cache_control: { type: 'ephemeral' },
|
|
262
|
+
});
|
|
263
|
+
});
|
|
264
|
+
});
|
|
265
|
+
|
|
266
|
+
type TestMsg = {
|
|
267
|
+
role?: 'user' | 'assistant' | 'system';
|
|
268
|
+
content?: string | MessageContentComplex[];
|
|
269
|
+
};
|
|
270
|
+
|
|
271
|
+
describe('addBedrockCacheControl (Bedrock cache checkpoints)', () => {
|
|
272
|
+
it('returns input when not enough messages', () => {
|
|
273
|
+
const empty: TestMsg[] = [];
|
|
274
|
+
expect(addBedrockCacheControl(empty)).toEqual(empty);
|
|
275
|
+
const single: TestMsg[] = [{ role: 'user', content: 'only' }];
|
|
276
|
+
expect(addBedrockCacheControl(single)).toEqual(single);
|
|
277
|
+
});
|
|
278
|
+
|
|
279
|
+
it('wraps string content and appends separate cachePoint block', () => {
|
|
280
|
+
const messages: TestMsg[] = [
|
|
281
|
+
{ role: 'user', content: 'Hello' },
|
|
282
|
+
{ role: 'assistant', content: [{ type: ContentTypes.TEXT, text: 'Hi' }] },
|
|
283
|
+
];
|
|
284
|
+
const result = addBedrockCacheControl(messages);
|
|
285
|
+
const last = result[1].content as MessageContentComplex[];
|
|
286
|
+
expect(Array.isArray(last)).toBe(true);
|
|
287
|
+
expect(last[0]).toEqual({ type: ContentTypes.TEXT, text: 'Hi' });
|
|
288
|
+
expect(last[1]).toEqual({ cachePoint: { type: 'default' } });
|
|
289
|
+
});
|
|
290
|
+
|
|
291
|
+
it('inserts cachePoint after the last text when multiple text blocks exist', () => {
|
|
292
|
+
const messages: TestMsg[] = [
|
|
293
|
+
{
|
|
294
|
+
role: 'user',
|
|
295
|
+
content: [
|
|
296
|
+
{ type: ContentTypes.TEXT, text: 'Intro' },
|
|
297
|
+
{ type: ContentTypes.TEXT, text: 'Details' },
|
|
298
|
+
{
|
|
299
|
+
type: ContentTypes.IMAGE_FILE,
|
|
300
|
+
image_file: { file_id: 'file_123' },
|
|
301
|
+
},
|
|
302
|
+
],
|
|
303
|
+
},
|
|
304
|
+
{
|
|
305
|
+
role: 'assistant',
|
|
306
|
+
content: [
|
|
307
|
+
{ type: ContentTypes.TEXT, text: 'Reply A' },
|
|
308
|
+
{ type: ContentTypes.TEXT, text: 'Reply B' },
|
|
309
|
+
],
|
|
310
|
+
},
|
|
311
|
+
];
|
|
312
|
+
|
|
313
|
+
const result = addBedrockCacheControl(messages);
|
|
314
|
+
|
|
315
|
+
const first = result[0].content as MessageContentComplex[];
|
|
316
|
+
const second = result[1].content as MessageContentComplex[];
|
|
317
|
+
|
|
318
|
+
expect(first[0]).toEqual({ type: ContentTypes.TEXT, text: 'Intro' });
|
|
319
|
+
expect(first[1]).toEqual({ type: ContentTypes.TEXT, text: 'Details' });
|
|
320
|
+
expect(first[2]).toEqual({ cachePoint: { type: 'default' } });
|
|
321
|
+
|
|
322
|
+
const img = first[3] as MessageContentComplex;
|
|
323
|
+
expect(img.type).toBe(ContentTypes.IMAGE_FILE);
|
|
324
|
+
if (img.type === ContentTypes.IMAGE_FILE) {
|
|
325
|
+
expect('image_file' in img).toBe(true);
|
|
326
|
+
}
|
|
327
|
+
|
|
328
|
+
expect(second[0]).toEqual({ type: ContentTypes.TEXT, text: 'Reply A' });
|
|
329
|
+
expect(second[1]).toEqual({ type: ContentTypes.TEXT, text: 'Reply B' });
|
|
330
|
+
expect(second[2]).toEqual({ cachePoint: { type: 'default' } });
|
|
331
|
+
});
|
|
332
|
+
|
|
333
|
+
it('skips adding cachePoint when content is an empty array', () => {
|
|
334
|
+
const messages: TestMsg[] = [
|
|
335
|
+
{ role: 'user', content: [] },
|
|
336
|
+
{ role: 'assistant', content: [] },
|
|
337
|
+
{ role: 'user', content: 'ignored because only last two are modified' },
|
|
338
|
+
];
|
|
339
|
+
|
|
340
|
+
const result = addBedrockCacheControl(messages);
|
|
341
|
+
|
|
342
|
+
const first = result[0].content as MessageContentComplex[];
|
|
343
|
+
const second = result[1].content as MessageContentComplex[];
|
|
344
|
+
|
|
345
|
+
expect(Array.isArray(first)).toBe(true);
|
|
346
|
+
expect(first.length).toBe(0);
|
|
347
|
+
|
|
348
|
+
expect(Array.isArray(second)).toBe(true);
|
|
349
|
+
expect(second.length).toBe(0);
|
|
350
|
+
expect(second[0]).not.toEqual({ cachePoint: { type: 'default' } });
|
|
351
|
+
});
|
|
352
|
+
|
|
353
|
+
it('skips adding cachePoint when content is an empty string', () => {
|
|
354
|
+
const messages: TestMsg[] = [
|
|
355
|
+
{ role: 'user', content: '' },
|
|
356
|
+
{ role: 'assistant', content: '' },
|
|
357
|
+
{ role: 'user', content: 'ignored because only last two are modified' },
|
|
358
|
+
];
|
|
359
|
+
|
|
360
|
+
const result = addBedrockCacheControl(messages);
|
|
361
|
+
|
|
362
|
+
expect(result[0].content).toBe('');
|
|
363
|
+
expect(result[1].content).toBe('');
|
|
364
|
+
});
|
|
365
|
+
|
|
366
|
+
/** (I don't think this will ever occur in actual use, but its the only branch left uncovered so I'm covering it */
|
|
367
|
+
it('skips messages with non-string, non-array content and still modifies the previous to reach two edits', () => {
|
|
368
|
+
const messages: TestMsg[] = [
|
|
369
|
+
{
|
|
370
|
+
role: 'user',
|
|
371
|
+
content: [{ type: ContentTypes.TEXT, text: 'Will be modified' }],
|
|
372
|
+
},
|
|
373
|
+
{ role: 'assistant', content: undefined },
|
|
374
|
+
{
|
|
375
|
+
role: 'user',
|
|
376
|
+
content: [{ type: ContentTypes.TEXT, text: 'Also modified' }],
|
|
377
|
+
},
|
|
378
|
+
];
|
|
379
|
+
|
|
380
|
+
const result = addBedrockCacheControl(messages);
|
|
381
|
+
|
|
382
|
+
const last = result[2].content as MessageContentComplex[];
|
|
383
|
+
expect(last[0]).toEqual({ type: ContentTypes.TEXT, text: 'Also modified' });
|
|
384
|
+
expect(last[1]).toEqual({ cachePoint: { type: 'default' } });
|
|
385
|
+
|
|
386
|
+
expect(result[1].content).toBeUndefined();
|
|
387
|
+
|
|
388
|
+
const first = result[0].content as MessageContentComplex[];
|
|
389
|
+
expect(first[0]).toEqual({
|
|
390
|
+
type: ContentTypes.TEXT,
|
|
391
|
+
text: 'Will be modified',
|
|
392
|
+
});
|
|
393
|
+
expect(first[1]).toEqual({ cachePoint: { type: 'default' } });
|
|
394
|
+
});
|
|
395
|
+
|
|
396
|
+
it('works with the example from the langchain pr', () => {
|
|
397
|
+
const messages: TestMsg[] = [
|
|
398
|
+
{
|
|
399
|
+
role: 'system',
|
|
400
|
+
content: [
|
|
401
|
+
{ type: ContentTypes.TEXT, text: 'You\'re an advanced AI assistant.' },
|
|
402
|
+
],
|
|
403
|
+
},
|
|
404
|
+
{
|
|
405
|
+
role: 'user',
|
|
406
|
+
content: [
|
|
407
|
+
{ type: ContentTypes.TEXT, text: 'What is the capital of France?' },
|
|
408
|
+
],
|
|
409
|
+
},
|
|
410
|
+
];
|
|
411
|
+
|
|
412
|
+
const result = addBedrockCacheControl(messages);
|
|
413
|
+
|
|
414
|
+
let system = result[0].content as MessageContentComplex[];
|
|
415
|
+
let user = result[1].content as MessageContentComplex[];
|
|
416
|
+
|
|
417
|
+
expect(system[0]).toEqual({
|
|
418
|
+
type: ContentTypes.TEXT,
|
|
419
|
+
text: 'You\'re an advanced AI assistant.',
|
|
420
|
+
});
|
|
421
|
+
expect(system[1]).toEqual({ cachePoint: { type: 'default' } });
|
|
422
|
+
expect(user[0]).toEqual({
|
|
423
|
+
type: ContentTypes.TEXT,
|
|
424
|
+
text: 'What is the capital of France?',
|
|
425
|
+
});
|
|
426
|
+
expect(user[1]).toEqual({ cachePoint: { type: 'default' } });
|
|
427
|
+
|
|
428
|
+
result.push({
|
|
429
|
+
role: 'assistant',
|
|
430
|
+
content: [
|
|
431
|
+
{
|
|
432
|
+
type: ContentTypes.TEXT,
|
|
433
|
+
text: 'Sure! The capital of France is Paris.',
|
|
434
|
+
},
|
|
435
|
+
],
|
|
436
|
+
});
|
|
437
|
+
|
|
438
|
+
const result2 = addBedrockCacheControl(result);
|
|
439
|
+
|
|
440
|
+
system = result2[0].content as MessageContentComplex[];
|
|
441
|
+
user = result2[1].content as MessageContentComplex[];
|
|
442
|
+
const assistant = result2[2].content as MessageContentComplex[];
|
|
443
|
+
|
|
444
|
+
expect(system[0]).toEqual({
|
|
445
|
+
type: ContentTypes.TEXT,
|
|
446
|
+
text: 'You\'re an advanced AI assistant.',
|
|
447
|
+
});
|
|
448
|
+
expect(system[1]).toEqual({ cachePoint: { type: 'default' } });
|
|
449
|
+
expect(user[0]).toEqual({
|
|
450
|
+
type: ContentTypes.TEXT,
|
|
451
|
+
text: 'What is the capital of France?',
|
|
452
|
+
});
|
|
453
|
+
expect(user[1]).toEqual({ cachePoint: { type: 'default' } });
|
|
454
|
+
|
|
455
|
+
expect(assistant[0]).toEqual({
|
|
456
|
+
type: ContentTypes.TEXT,
|
|
457
|
+
text: 'Sure! The capital of France is Paris.',
|
|
458
|
+
});
|
|
459
|
+
expect(assistant[1]).toEqual({ cachePoint: { type: 'default' } });
|
|
460
|
+
});
|
|
461
|
+
});
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
import { BaseMessage, MessageContentComplex } from '@langchain/core/messages';
|
|
2
|
+
import type { AnthropicMessage } from '@/types/messages';
|
|
3
|
+
import type Anthropic from '@anthropic-ai/sdk';
|
|
4
|
+
import { ContentTypes } from '@/common/enum';
|
|
5
|
+
|
|
6
|
+
type MessageWithContent = {
|
|
7
|
+
content?: string | MessageContentComplex[];
|
|
8
|
+
};
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* Anthropic API: Adds cache control to the appropriate user messages in the payload.
|
|
12
|
+
* @param messages - The array of message objects.
|
|
13
|
+
* @returns - The updated array of message objects with cache control added.
|
|
14
|
+
*/
|
|
15
|
+
export function addCacheControl<T extends AnthropicMessage | BaseMessage>(
|
|
16
|
+
messages: T[]
|
|
17
|
+
): T[] {
|
|
18
|
+
if (!Array.isArray(messages) || messages.length < 2) {
|
|
19
|
+
return messages;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
const updatedMessages = [...messages];
|
|
23
|
+
let userMessagesModified = 0;
|
|
24
|
+
|
|
25
|
+
for (
|
|
26
|
+
let i = updatedMessages.length - 1;
|
|
27
|
+
i >= 0 && userMessagesModified < 2;
|
|
28
|
+
i--
|
|
29
|
+
) {
|
|
30
|
+
const message = updatedMessages[i];
|
|
31
|
+
if ('getType' in message && message.getType() !== 'human') {
|
|
32
|
+
continue;
|
|
33
|
+
} else if ('role' in message && message.role !== 'user') {
|
|
34
|
+
continue;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
if (typeof message.content === 'string') {
|
|
38
|
+
message.content = [
|
|
39
|
+
{
|
|
40
|
+
type: 'text',
|
|
41
|
+
text: message.content,
|
|
42
|
+
cache_control: { type: 'ephemeral' },
|
|
43
|
+
},
|
|
44
|
+
];
|
|
45
|
+
userMessagesModified++;
|
|
46
|
+
} else if (Array.isArray(message.content)) {
|
|
47
|
+
for (let j = message.content.length - 1; j >= 0; j--) {
|
|
48
|
+
const contentPart = message.content[j];
|
|
49
|
+
if ('type' in contentPart && contentPart.type === 'text') {
|
|
50
|
+
(contentPart as Anthropic.TextBlockParam).cache_control = {
|
|
51
|
+
type: 'ephemeral',
|
|
52
|
+
};
|
|
53
|
+
userMessagesModified++;
|
|
54
|
+
break;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
return updatedMessages;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* Adds Bedrock Converse API cache points to the last two messages.
|
|
65
|
+
* Inserts `{ cachePoint: { type: 'default' } }` as a separate content block
|
|
66
|
+
* immediately after the last text block in each targeted message.
|
|
67
|
+
* @param messages - The array of message objects.
|
|
68
|
+
* @returns - The updated array of message objects with cache points added.
|
|
69
|
+
*/
|
|
70
|
+
export function addBedrockCacheControl<
|
|
71
|
+
T extends Partial<BaseMessage> & MessageWithContent,
|
|
72
|
+
>(messages: T[]): T[] {
|
|
73
|
+
if (!Array.isArray(messages) || messages.length < 2) {
|
|
74
|
+
return messages;
|
|
75
|
+
}
|
|
76
|
+
|
|
77
|
+
const updatedMessages: T[] = messages.slice();
|
|
78
|
+
let messagesModified = 0;
|
|
79
|
+
|
|
80
|
+
for (
|
|
81
|
+
let i = updatedMessages.length - 1;
|
|
82
|
+
i >= 0 && messagesModified < 2;
|
|
83
|
+
i--
|
|
84
|
+
) {
|
|
85
|
+
const message = updatedMessages[i];
|
|
86
|
+
|
|
87
|
+
if (
|
|
88
|
+
'getType' in message &&
|
|
89
|
+
typeof message.getType === 'function' &&
|
|
90
|
+
message.getType() === 'tool'
|
|
91
|
+
) {
|
|
92
|
+
continue;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
const content = message.content;
|
|
96
|
+
|
|
97
|
+
if (typeof content === 'string' && content === '') {
|
|
98
|
+
continue;
|
|
99
|
+
}
|
|
100
|
+
|
|
101
|
+
if (typeof content === 'string') {
|
|
102
|
+
message.content = [
|
|
103
|
+
{ type: ContentTypes.TEXT, text: content },
|
|
104
|
+
{ cachePoint: { type: 'default' } },
|
|
105
|
+
] as MessageContentComplex[];
|
|
106
|
+
messagesModified++;
|
|
107
|
+
continue;
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
if (Array.isArray(content)) {
|
|
111
|
+
let hasCacheableContent = false;
|
|
112
|
+
for (const block of content) {
|
|
113
|
+
if (block.type === ContentTypes.TEXT) {
|
|
114
|
+
if (typeof block.text === 'string' && block.text !== '') {
|
|
115
|
+
hasCacheableContent = true;
|
|
116
|
+
break;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
if (!hasCacheableContent) {
|
|
122
|
+
continue;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
let inserted = false;
|
|
126
|
+
for (let j = content.length - 1; j >= 0; j--) {
|
|
127
|
+
const block = content[j] as MessageContentComplex;
|
|
128
|
+
const type = (block as { type?: string }).type;
|
|
129
|
+
if (type === ContentTypes.TEXT || type === 'text') {
|
|
130
|
+
const text = (block as { text?: string }).text;
|
|
131
|
+
if (text === '' || text === undefined) {
|
|
132
|
+
continue;
|
|
133
|
+
}
|
|
134
|
+
content.splice(j + 1, 0, {
|
|
135
|
+
cachePoint: { type: 'default' },
|
|
136
|
+
} as MessageContentComplex);
|
|
137
|
+
inserted = true;
|
|
138
|
+
break;
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
if (!inserted) {
|
|
142
|
+
content.push({
|
|
143
|
+
cachePoint: { type: 'default' },
|
|
144
|
+
} as MessageContentComplex);
|
|
145
|
+
}
|
|
146
|
+
messagesModified++;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
return updatedMessages;
|
|
151
|
+
}
|