@just-every/ensemble 0.1.34 → 0.2.2
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 +21 -0
- package/README.md +62 -190
- package/dist/config/tool_execution.d.ts +11 -0
- package/dist/config/tool_execution.d.ts.map +1 -0
- package/dist/config/tool_execution.js +31 -0
- package/dist/config/tool_execution.js.map +1 -0
- package/dist/core/ensemble_embed.d.ts +3 -0
- package/dist/core/ensemble_embed.d.ts.map +1 -0
- package/dist/core/ensemble_embed.js +24 -0
- package/dist/core/ensemble_embed.js.map +1 -0
- package/dist/core/ensemble_image.d.ts +3 -0
- package/dist/core/ensemble_image.d.ts.map +1 -0
- package/dist/core/ensemble_image.js +10 -0
- package/dist/core/ensemble_image.js.map +1 -0
- package/dist/core/ensemble_request.d.ts +4 -0
- package/dist/core/ensemble_request.d.ts.map +1 -0
- package/dist/core/ensemble_request.js +240 -0
- package/dist/core/ensemble_request.js.map +1 -0
- package/dist/{model_data.d.ts → data/model_data.d.ts} +2 -2
- package/dist/data/model_data.d.ts.map +1 -0
- package/dist/{model_data.js → data/model_data.js} +52 -3
- package/dist/data/model_data.js.map +1 -0
- package/dist/index.d.ts +18 -35
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +18 -56
- package/dist/index.js.map +1 -1
- package/dist/model_providers/base_provider.d.ts +3 -29
- package/dist/model_providers/base_provider.d.ts.map +1 -1
- package/dist/model_providers/base_provider.js +1 -114
- package/dist/model_providers/base_provider.js.map +1 -1
- package/dist/model_providers/claude.d.ts +2 -2
- package/dist/model_providers/claude.d.ts.map +1 -1
- package/dist/model_providers/claude.js +10 -4
- package/dist/model_providers/claude.js.map +1 -1
- package/dist/model_providers/deepseek.d.ts.map +1 -1
- package/dist/model_providers/deepseek.js.map +1 -1
- package/dist/model_providers/gemini.d.ts +4 -4
- package/dist/model_providers/gemini.d.ts.map +1 -1
- package/dist/model_providers/gemini.js +31 -32
- package/dist/model_providers/gemini.js.map +1 -1
- package/dist/model_providers/grok.d.ts.map +1 -1
- package/dist/model_providers/grok.js.map +1 -1
- package/dist/model_providers/model_provider.d.ts +3 -4
- package/dist/model_providers/model_provider.d.ts.map +1 -1
- package/dist/model_providers/model_provider.js +11 -5
- package/dist/model_providers/model_provider.js.map +1 -1
- package/dist/model_providers/openai.d.ts +4 -4
- package/dist/model_providers/openai.d.ts.map +1 -1
- package/dist/model_providers/openai.js +24 -26
- package/dist/model_providers/openai.js.map +1 -1
- package/dist/model_providers/openai_chat.d.ts +3 -3
- package/dist/model_providers/openai_chat.d.ts.map +1 -1
- package/dist/model_providers/openai_chat.js +2 -2
- package/dist/model_providers/openai_chat.js.map +1 -1
- package/dist/model_providers/openrouter.d.ts.map +1 -1
- package/dist/model_providers/openrouter.js +3 -3
- package/dist/model_providers/openrouter.js.map +1 -1
- package/dist/model_providers/test_provider.d.ts +3 -5
- package/dist/model_providers/test_provider.d.ts.map +1 -1
- package/dist/model_providers/test_provider.js +9 -17
- package/dist/model_providers/test_provider.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/api_types.d.ts +1 -1
- package/dist/types/api_types.d.ts.map +1 -1
- package/dist/types/tool_types.d.ts +1 -99
- package/dist/types/tool_types.d.ts.map +1 -1
- package/dist/types/tool_types.js +1 -10
- package/dist/types/tool_types.js.map +1 -1
- package/dist/{types.d.ts → types/types.d.ts} +82 -32
- package/dist/types/types.d.ts.map +1 -0
- package/dist/types/types.js.map +1 -0
- package/dist/utils/agent.d.ts +41 -0
- package/dist/utils/agent.d.ts.map +1 -0
- package/dist/utils/agent.js +342 -0
- package/dist/utils/agent.js.map +1 -0
- package/dist/utils/communication.d.ts +0 -1
- package/dist/utils/communication.d.ts.map +1 -1
- package/dist/utils/communication.js +1 -4
- package/dist/utils/communication.js.map +1 -1
- package/dist/utils/cost_tracker.d.ts +1 -1
- package/dist/utils/cost_tracker.d.ts.map +1 -1
- package/dist/utils/cost_tracker.js +1 -1
- package/dist/utils/cost_tracker.js.map +1 -1
- package/dist/utils/create_tool_function.d.ts +1 -23
- package/dist/utils/create_tool_function.d.ts.map +1 -1
- package/dist/utils/create_tool_function.js +14 -3
- package/dist/utils/create_tool_function.js.map +1 -1
- package/dist/{external_models.d.ts → utils/external_models.d.ts} +1 -2
- package/dist/utils/external_models.d.ts.map +1 -0
- package/dist/{external_models.js → utils/external_models.js} +0 -3
- package/dist/utils/external_models.js.map +1 -0
- package/dist/utils/image_to_text.d.ts.map +1 -1
- package/dist/utils/image_to_text.js +3 -2
- package/dist/utils/image_to_text.js.map +1 -1
- package/dist/utils/image_utils.d.ts +1 -4
- package/dist/utils/image_utils.d.ts.map +1 -1
- package/dist/utils/image_utils.js +2 -10
- package/dist/utils/image_utils.js.map +1 -1
- package/dist/utils/llm_logger.d.ts +1 -1
- package/dist/utils/llm_logger.d.ts.map +1 -1
- package/dist/utils/llm_logger.js.map +1 -1
- package/dist/utils/message_history.d.ts +4 -4
- package/dist/utils/message_history.d.ts.map +1 -1
- package/dist/utils/message_history.js +18 -18
- package/dist/utils/message_history.js.map +1 -1
- package/dist/utils/quota_tracker.d.ts +1 -1
- package/dist/utils/quota_tracker.d.ts.map +1 -1
- package/dist/utils/quota_tracker.js +0 -1
- package/dist/utils/quota_tracker.js.map +1 -1
- package/dist/utils/running_tool_tracker.d.ts +42 -0
- package/dist/utils/running_tool_tracker.d.ts.map +1 -0
- package/dist/utils/running_tool_tracker.js +129 -0
- package/dist/utils/running_tool_tracker.js.map +1 -0
- package/dist/utils/sequential_queue.d.ts +13 -0
- package/dist/utils/sequential_queue.d.ts.map +1 -0
- package/dist/utils/sequential_queue.js +68 -0
- package/dist/utils/sequential_queue.js.map +1 -0
- package/dist/utils/state_manager.d.ts.map +1 -1
- package/dist/utils/state_manager.js.map +1 -1
- package/dist/utils/stream_converter.d.ts +2 -13
- package/dist/utils/stream_converter.d.ts.map +1 -1
- package/dist/utils/stream_converter.js +15 -37
- package/dist/utils/stream_converter.js.map +1 -1
- package/dist/utils/test_utils.d.ts +4 -4
- package/dist/utils/test_utils.d.ts.map +1 -1
- package/dist/utils/test_utils.js +17 -17
- package/dist/utils/test_utils.js.map +1 -1
- package/dist/utils/tool_execution_manager.d.ts +7 -0
- package/dist/utils/tool_execution_manager.d.ts.map +1 -0
- package/dist/utils/tool_execution_manager.js +145 -0
- package/dist/utils/tool_execution_manager.js.map +1 -0
- package/dist/utils/tool_parameter_utils.d.ts +2 -2
- package/dist/utils/tool_parameter_utils.d.ts.map +1 -1
- package/dist/utils/tool_parameter_utils.js +8 -4
- package/dist/utils/tool_parameter_utils.js.map +1 -1
- package/dist/utils/tool_result_processor.d.ts +6 -0
- package/dist/utils/tool_result_processor.d.ts.map +1 -0
- package/dist/utils/tool_result_processor.js +69 -0
- package/dist/utils/tool_result_processor.js.map +1 -0
- package/dist/utils/verification.d.ts +7 -0
- package/dist/utils/verification.d.ts.map +1 -0
- package/dist/utils/verification.js +43 -0
- package/dist/utils/verification.js.map +1 -0
- package/package.json +11 -10
- package/dist/cost_tracker.d.ts +0 -2
- package/dist/cost_tracker.d.ts.map +0 -1
- package/dist/cost_tracker.js +0 -2
- package/dist/cost_tracker.js.map +0 -1
- package/dist/errors.d.ts +0 -55
- package/dist/errors.d.ts.map +0 -1
- package/dist/errors.js +0 -134
- package/dist/errors.js.map +0 -1
- package/dist/external_models.d.ts.map +0 -1
- package/dist/external_models.js.map +0 -1
- package/dist/model_data.d.ts.map +0 -1
- package/dist/model_data.js.map +0 -1
- package/dist/model_providers/refactored_openai.d.ts +0 -22
- package/dist/model_providers/refactored_openai.d.ts.map +0 -1
- package/dist/model_providers/refactored_openai.js +0 -310
- package/dist/model_providers/refactored_openai.js.map +0 -1
- package/dist/openai-compat.d.ts +0 -79
- package/dist/openai-compat.d.ts.map +0 -1
- package/dist/openai-compat.js +0 -581
- package/dist/openai-compat.js.map +0 -1
- package/dist/test.d.ts +0 -5
- package/dist/test.d.ts.map +0 -1
- package/dist/test.js +0 -2
- package/dist/test.js.map +0 -1
- package/dist/types/extended_types.d.ts +0 -43
- package/dist/types/extended_types.d.ts.map +0 -1
- package/dist/types/extended_types.js +0 -2
- package/dist/types/extended_types.js.map +0 -1
- package/dist/types.d.ts.map +0 -1
- package/dist/types.js.map +0 -1
- package/dist/unified_request.d.ts +0 -19
- package/dist/unified_request.d.ts.map +0 -1
- package/dist/unified_request.js +0 -261
- package/dist/unified_request.js.map +0 -1
- package/dist/utils/async_queue.d.ts +0 -14
- package/dist/utils/async_queue.d.ts.map +0 -1
- package/dist/utils/async_queue.js +0 -68
- package/dist/utils/async_queue.js.map +0 -1
- package/dist/utils/cache.d.ts +0 -60
- package/dist/utils/cache.d.ts.map +0 -1
- package/dist/utils/cache.js +0 -205
- package/dist/utils/cache.js.map +0 -1
- package/dist/utils/error_handler.d.ts +0 -33
- package/dist/utils/error_handler.d.ts.map +0 -1
- package/dist/utils/error_handler.js +0 -84
- package/dist/utils/error_handler.js.map +0 -1
- package/dist/utils/tool_builder.d.ts +0 -51
- package/dist/utils/tool_builder.d.ts.map +0 -1
- package/dist/utils/tool_builder.js +0 -167
- package/dist/utils/tool_builder.js.map +0 -1
- package/dist/utils/tool_utils.d.ts +0 -13
- package/dist/utils/tool_utils.d.ts.map +0 -1
- package/dist/utils/tool_utils.js +0 -52
- package/dist/utils/tool_utils.js.map +0 -1
- package/dist/validation.d.ts +0 -1789
- package/dist/validation.d.ts.map +0 -1
- package/dist/validation.js +0 -289
- package/dist/validation.js.map +0 -1
- package/test.d.ts +0 -3
- package/test.js +0 -4
- /package/dist/{types.js → types/types.js} +0 -0
|
@@ -1,19 +1,8 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
export interface ConversionOptions {
|
|
3
|
-
onThinking?: (message: ResponseThinkingMessage) => void | Promise<void>;
|
|
4
|
-
onResponse?: (message: ResponseOutputMessage) => void | Promise<void>;
|
|
5
|
-
processToolCall?: (toolCalls: ToolCall[]) => Promise<Record<string, any>>;
|
|
6
|
-
model?: string;
|
|
7
|
-
}
|
|
1
|
+
import type { ProviderStreamEvent, ResponseInput, ToolCall, AgentDefinition } from '../types/types.js';
|
|
8
2
|
export interface ConversionResult {
|
|
9
3
|
messages: ResponseInput;
|
|
10
4
|
fullResponse: string;
|
|
11
5
|
toolCalls: ToolCall[];
|
|
12
6
|
}
|
|
13
|
-
export declare function convertStreamToMessages(stream: AsyncGenerator<
|
|
14
|
-
export declare function chainRequests(initialMessages: ResponseInput, requests: Array<{
|
|
15
|
-
model: string;
|
|
16
|
-
systemPrompt?: string;
|
|
17
|
-
options?: ConversionOptions;
|
|
18
|
-
}>): Promise<ConversionResult>;
|
|
7
|
+
export declare function convertStreamToMessages(stream: AsyncGenerator<ProviderStreamEvent>, initialMessages?: ResponseInput, agent?: AgentDefinition): Promise<ConversionResult>;
|
|
19
8
|
//# sourceMappingURL=stream_converter.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream_converter.d.ts","sourceRoot":"","sources":["../../utils/stream_converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,mBAAmB,EACnB,aAAa,
|
|
1
|
+
{"version":3,"file":"stream_converter.d.ts","sourceRoot":"","sources":["../../utils/stream_converter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACR,mBAAmB,EACnB,aAAa,EAKb,QAAQ,EACR,eAAe,EAClB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,WAAW,gBAAgB;IAC7B,QAAQ,EAAE,aAAa,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,QAAQ,EAAE,CAAC;CACzB;AAOD,wBAAsB,uBAAuB,CACzC,MAAM,EAAE,cAAc,CAAC,mBAAmB,CAAC,EAC3C,eAAe,GAAE,aAAkB,EACnC,KAAK,GAAE,eAAoB,GAC5B,OAAO,CAAC,gBAAgB,CAAC,CAsM3B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export async function convertStreamToMessages(stream, initialMessages = [],
|
|
1
|
+
export async function convertStreamToMessages(stream, initialMessages = [], agent = {}) {
|
|
2
2
|
const messages = [...initialMessages];
|
|
3
3
|
let fullResponse = '';
|
|
4
4
|
const collectedToolCalls = [];
|
|
@@ -18,11 +18,11 @@ export async function convertStreamToMessages(stream, initialMessages = [], opti
|
|
|
18
18
|
signature: messageEvent.thinking_signature || '',
|
|
19
19
|
thinking_id: messageEvent.message_id || '',
|
|
20
20
|
status: 'completed',
|
|
21
|
-
model:
|
|
21
|
+
model: agent.model || messageEvent.model || 'unknown',
|
|
22
22
|
};
|
|
23
23
|
messages.push(thinkingMessage);
|
|
24
|
-
if (
|
|
25
|
-
await
|
|
24
|
+
if (agent.onThinking) {
|
|
25
|
+
await agent.onThinking(thinkingMessage);
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
if (messageEvent.content) {
|
|
@@ -33,24 +33,25 @@ export async function convertStreamToMessages(stream, initialMessages = [], opti
|
|
|
33
33
|
role: 'assistant',
|
|
34
34
|
content: messageEvent.content,
|
|
35
35
|
status: 'completed',
|
|
36
|
-
model:
|
|
36
|
+
model: agent.model || messageEvent.model || 'unknown',
|
|
37
37
|
};
|
|
38
38
|
messages.push(contentMessage);
|
|
39
|
-
if (
|
|
40
|
-
await
|
|
39
|
+
if (agent.onResponse) {
|
|
40
|
+
await agent.onResponse(contentMessage);
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
break;
|
|
44
44
|
}
|
|
45
45
|
case 'tool_start': {
|
|
46
46
|
const toolEvent = event;
|
|
47
|
-
if (!toolEvent.tool_calls ||
|
|
47
|
+
if (!toolEvent.tool_calls ||
|
|
48
|
+
toolEvent.tool_calls.length === 0) {
|
|
48
49
|
continue;
|
|
49
50
|
}
|
|
50
51
|
collectedToolCalls.push(...toolEvent.tool_calls);
|
|
51
|
-
if (
|
|
52
|
+
if (agent.processToolCall) {
|
|
52
53
|
try {
|
|
53
|
-
const results = await
|
|
54
|
+
const results = await agent.processToolCall(toolEvent.tool_calls);
|
|
54
55
|
const resultsArray = Array.isArray(results)
|
|
55
56
|
? results
|
|
56
57
|
: [results];
|
|
@@ -89,7 +90,7 @@ export async function convertStreamToMessages(stream, initialMessages = [], opti
|
|
|
89
90
|
call_id: toolCall.call_id || toolCall.id,
|
|
90
91
|
name: toolCall.function.name,
|
|
91
92
|
arguments: toolCall.function.arguments,
|
|
92
|
-
model:
|
|
93
|
+
model: agent.model || 'unknown',
|
|
93
94
|
};
|
|
94
95
|
messages.push(functionCall);
|
|
95
96
|
const result = toolResults.find(r => r.call_id === (toolCall.call_id || toolCall.id));
|
|
@@ -100,7 +101,7 @@ export async function convertStreamToMessages(stream, initialMessages = [], opti
|
|
|
100
101
|
call_id: toolCall.call_id || toolCall.id,
|
|
101
102
|
name: toolCall.function.name,
|
|
102
103
|
output: result.output,
|
|
103
|
-
model:
|
|
104
|
+
model: agent.model || 'unknown',
|
|
104
105
|
};
|
|
105
106
|
messages.push(functionOutput);
|
|
106
107
|
}
|
|
@@ -123,7 +124,7 @@ export async function convertStreamToMessages(stream, initialMessages = [], opti
|
|
|
123
124
|
call_id: toolCall.call_id || toolCall.id,
|
|
124
125
|
name: toolCall.function.name,
|
|
125
126
|
arguments: toolCall.function.arguments,
|
|
126
|
-
model:
|
|
127
|
+
model: agent.model || 'unknown',
|
|
127
128
|
};
|
|
128
129
|
messages.push(functionCall);
|
|
129
130
|
const result = toolResults.find(r => r.call_id === (toolCall.call_id || toolCall.id));
|
|
@@ -134,7 +135,7 @@ export async function convertStreamToMessages(stream, initialMessages = [], opti
|
|
|
134
135
|
call_id: toolCall.call_id || toolCall.id,
|
|
135
136
|
name: toolCall.function.name,
|
|
136
137
|
output: result.output,
|
|
137
|
-
model:
|
|
138
|
+
model: agent.model || 'unknown',
|
|
138
139
|
};
|
|
139
140
|
messages.push(functionOutput);
|
|
140
141
|
}
|
|
@@ -146,27 +147,4 @@ export async function convertStreamToMessages(stream, initialMessages = [], opti
|
|
|
146
147
|
toolCalls: collectedToolCalls,
|
|
147
148
|
};
|
|
148
149
|
}
|
|
149
|
-
export async function chainRequests(initialMessages = [], requests) {
|
|
150
|
-
let currentMessages = initialMessages;
|
|
151
|
-
let lastResult = {
|
|
152
|
-
messages: currentMessages,
|
|
153
|
-
fullResponse: '',
|
|
154
|
-
toolCalls: [],
|
|
155
|
-
};
|
|
156
|
-
const { request } = await import('../index.js');
|
|
157
|
-
for (const req of requests) {
|
|
158
|
-
const messages = [...currentMessages];
|
|
159
|
-
if (req.systemPrompt) {
|
|
160
|
-
messages.push({
|
|
161
|
-
type: 'message',
|
|
162
|
-
role: 'system',
|
|
163
|
-
content: req.systemPrompt,
|
|
164
|
-
});
|
|
165
|
-
}
|
|
166
|
-
const stream = request(req.model, messages);
|
|
167
|
-
lastResult = await convertStreamToMessages(stream, [], req.options);
|
|
168
|
-
currentMessages = [...currentMessages, ...lastResult.messages];
|
|
169
|
-
}
|
|
170
|
-
return lastResult;
|
|
171
|
-
}
|
|
172
150
|
//# sourceMappingURL=stream_converter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream_converter.js","sourceRoot":"","sources":["../../utils/stream_converter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"stream_converter.js","sourceRoot":"","sources":["../../utils/stream_converter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ProviderStreamEvent, ToolCall } from '../types/types.js';
|
|
2
2
|
export interface MockToolCall {
|
|
3
3
|
name: string;
|
|
4
4
|
arguments: Record<string, any>;
|
|
@@ -18,7 +18,7 @@ export declare class EnhancedRequestMock {
|
|
|
18
18
|
private responses;
|
|
19
19
|
private callIndex;
|
|
20
20
|
constructor(responses: MockResponse | MockResponse[]);
|
|
21
|
-
getMock(): (model: string, messages: any, options: any) => AsyncGenerator<
|
|
21
|
+
getMock(): (model: string, messages: any, options: any) => AsyncGenerator<ProviderStreamEvent, any, any>;
|
|
22
22
|
private createAsyncGenerator;
|
|
23
23
|
static success(message?: string, result?: string): EnhancedRequestMock;
|
|
24
24
|
static error(message?: string, error?: string): EnhancedRequestMock;
|
|
@@ -46,10 +46,10 @@ export declare function createMockContext(overrides?: Partial<any>): {
|
|
|
46
46
|
};
|
|
47
47
|
export declare class StreamAssertions {
|
|
48
48
|
private events;
|
|
49
|
-
constructor(eventGenerator: AsyncGenerator<
|
|
49
|
+
constructor(eventGenerator: AsyncGenerator<ProviderStreamEvent>);
|
|
50
50
|
waitForCompletion(): Promise<void>;
|
|
51
51
|
hasEvent(type: string): boolean;
|
|
52
|
-
getEvents(type: string):
|
|
52
|
+
getEvents(type: string): ProviderStreamEvent[];
|
|
53
53
|
hasToolCall(name: string): boolean;
|
|
54
54
|
getFinalMessage(): string | undefined;
|
|
55
55
|
hasError(): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test_utils.d.ts","sourceRoot":"","sources":["../../utils/test_utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"test_utils.d.ts","sourceRoot":"","sources":["../../utils/test_utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,mBAAmB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAGlE,MAAM,WAAW,YAAY;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,YAAY;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,YAAY,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,iBAAiB;IAC9B,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,IAAI,CAAC;IACtC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAKD,qBAAa,mBAAmB;IAC5B,OAAO,CAAC,SAAS,CAAiB;IAClC,OAAO,CAAC,SAAS,CAAK;gBAEV,SAAS,EAAE,YAAY,GAAG,YAAY,EAAE;IAOpD,OAAO,KACK,OAAO,MAAM,EAAE,UAAU,GAAG,EAAE,SAAS,GAAG;YAQvC,oBAAoB;IA6GnC,MAAM,CAAC,OAAO,CAAC,OAAO,SAAY,EAAE,MAAM,SAAmB;IAO7D,MAAM,CAAC,KAAK,CAAC,OAAO,SAAmB,EAAE,KAAK,SAAgB;IAO9D,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM;IAMnC,MAAM,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAOjD,MAAM,CAAC,SAAS,CAAC,GAAG,KAAK,EAAE,YAAY,EAAE;IAOzC,MAAM,CAAC,QAAQ,CAAC,GAAG,SAAS,EAAE,YAAY,EAAE;CAG/C;AAKD,wBAAgB,iBAAiB,CAAC,SAAS,GAAE,OAAO,CAAC,GAAG,CAAM;;;;;;;;;;;;6CAwBpB,MAAM,SAAS,GAAG;6CAIlB,MAAM;gDAIH,GAAG;;EAU/C;AAKD,qBAAa,gBAAgB;IACzB,OAAO,CAAC,MAAM,CAA6B;gBAE/B,cAAc,EAAE,cAAc,CAAC,mBAAmB,CAAC;IAYzD,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC;IAQxC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAO/B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,EAAE;IAO9C,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAelC,eAAe,IAAI,MAAM,GAAG,SAAS;IAYrC,QAAQ,IAAI,OAAO;IAOnB,QAAQ,IAAI,MAAM,GAAG,SAAS;CAQjC"}
|
package/dist/utils/test_utils.js
CHANGED
|
@@ -22,46 +22,46 @@ export class EnhancedRequestMock {
|
|
|
22
22
|
yield {
|
|
23
23
|
type: 'error',
|
|
24
24
|
error: error.message,
|
|
25
|
-
timestamp: new Date().toISOString()
|
|
25
|
+
timestamp: new Date().toISOString(),
|
|
26
26
|
};
|
|
27
27
|
return;
|
|
28
28
|
}
|
|
29
29
|
if (response.thinking && options?.includeThinking) {
|
|
30
30
|
yield {
|
|
31
31
|
type: 'thinking_start',
|
|
32
|
-
timestamp: new Date().toISOString()
|
|
32
|
+
timestamp: new Date().toISOString(),
|
|
33
33
|
};
|
|
34
34
|
const chunks = response.thinking.match(/.{1,10}/g) || [];
|
|
35
35
|
for (const chunk of chunks) {
|
|
36
36
|
yield {
|
|
37
37
|
type: 'thinking_delta',
|
|
38
38
|
delta: chunk,
|
|
39
|
-
timestamp: new Date().toISOString()
|
|
39
|
+
timestamp: new Date().toISOString(),
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
42
|
yield {
|
|
43
43
|
type: 'thinking_complete',
|
|
44
44
|
content: response.thinking,
|
|
45
|
-
timestamp: new Date().toISOString()
|
|
45
|
+
timestamp: new Date().toISOString(),
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
48
|
if (response.message) {
|
|
49
49
|
yield {
|
|
50
50
|
type: 'message_start',
|
|
51
|
-
timestamp: new Date().toISOString()
|
|
51
|
+
timestamp: new Date().toISOString(),
|
|
52
52
|
};
|
|
53
53
|
const chunks = response.message.match(/.{1,5}/g) || [];
|
|
54
54
|
for (const chunk of chunks) {
|
|
55
55
|
yield {
|
|
56
56
|
type: 'text_delta',
|
|
57
57
|
delta: chunk,
|
|
58
|
-
timestamp: new Date().toISOString()
|
|
58
|
+
timestamp: new Date().toISOString(),
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
61
|
yield {
|
|
62
62
|
type: 'message_complete',
|
|
63
63
|
content: response.message,
|
|
64
|
-
timestamp: new Date().toISOString()
|
|
64
|
+
timestamp: new Date().toISOString(),
|
|
65
65
|
};
|
|
66
66
|
}
|
|
67
67
|
if (response.toolCalls && response.toolCalls.length > 0) {
|
|
@@ -70,13 +70,13 @@ export class EnhancedRequestMock {
|
|
|
70
70
|
type: 'function',
|
|
71
71
|
function: {
|
|
72
72
|
name: call.name,
|
|
73
|
-
arguments: JSON.stringify(call.arguments)
|
|
74
|
-
}
|
|
73
|
+
arguments: JSON.stringify(call.arguments),
|
|
74
|
+
},
|
|
75
75
|
}));
|
|
76
76
|
yield {
|
|
77
77
|
type: 'tool_start',
|
|
78
78
|
tool_calls: toolCallEvents,
|
|
79
|
-
timestamp: new Date().toISOString()
|
|
79
|
+
timestamp: new Date().toISOString(),
|
|
80
80
|
};
|
|
81
81
|
if (options?.onToolCall) {
|
|
82
82
|
for (const call of toolCallEvents) {
|
|
@@ -87,36 +87,36 @@ export class EnhancedRequestMock {
|
|
|
87
87
|
}
|
|
88
88
|
yield {
|
|
89
89
|
type: 'stream_end',
|
|
90
|
-
timestamp: new Date().toISOString()
|
|
90
|
+
timestamp: new Date().toISOString(),
|
|
91
91
|
};
|
|
92
92
|
}
|
|
93
93
|
static success(message = 'Success', result = 'Task completed') {
|
|
94
94
|
return new EnhancedRequestMock({
|
|
95
95
|
message,
|
|
96
|
-
toolCalls: [{ name: 'task_complete', arguments: { result } }]
|
|
96
|
+
toolCalls: [{ name: 'task_complete', arguments: { result } }],
|
|
97
97
|
});
|
|
98
98
|
}
|
|
99
99
|
static error(message = 'Error occurred', error = 'Task failed') {
|
|
100
100
|
return new EnhancedRequestMock({
|
|
101
101
|
message,
|
|
102
|
-
toolCalls: [{ name: 'task_fatal_error', arguments: { error } }]
|
|
102
|
+
toolCalls: [{ name: 'task_fatal_error', arguments: { error } }],
|
|
103
103
|
});
|
|
104
104
|
}
|
|
105
105
|
static throws(error) {
|
|
106
106
|
return new EnhancedRequestMock({
|
|
107
|
-
error: typeof error === 'string' ? new Error(error) : error
|
|
107
|
+
error: typeof error === 'string' ? new Error(error) : error,
|
|
108
108
|
});
|
|
109
109
|
}
|
|
110
110
|
static thinking(thinking, message) {
|
|
111
111
|
return new EnhancedRequestMock({
|
|
112
112
|
thinking,
|
|
113
|
-
message
|
|
113
|
+
message,
|
|
114
114
|
});
|
|
115
115
|
}
|
|
116
116
|
static toolCalls(...calls) {
|
|
117
117
|
return new EnhancedRequestMock({
|
|
118
118
|
message: '',
|
|
119
|
-
toolCalls: calls
|
|
119
|
+
toolCalls: calls,
|
|
120
120
|
});
|
|
121
121
|
}
|
|
122
122
|
static sequence(...responses) {
|
|
@@ -155,7 +155,7 @@ export function createMockContext(overrides = {}) {
|
|
|
155
155
|
getHistory: vi.fn(function () {
|
|
156
156
|
return this.messages;
|
|
157
157
|
}),
|
|
158
|
-
...overrides
|
|
158
|
+
...overrides,
|
|
159
159
|
};
|
|
160
160
|
}
|
|
161
161
|
export class StreamAssertions {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test_utils.js","sourceRoot":"","sources":["../../utils/test_utils.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAuB5B,MAAM,OAAO,mBAAmB;IACpB,SAAS,CAAiB;IAC1B,SAAS,GAAG,CAAC,CAAC;IAEtB,YAAY,SAAwC;QAChD,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACxE,CAAC;IAKD,OAAO;QACH,OAAO,CAAC,KAAa,EAAE,QAAa,EAAE,OAAY,EAAE,EAAE;YAClD,OAAO,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;QAC9C,CAAC,CAAC;IACN,CAAC;IAKO,KAAK,CAAC,CAAC,oBAAoB,
|
|
1
|
+
{"version":3,"file":"test_utils.js","sourceRoot":"","sources":["../../utils/test_utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { ToolCall, ToolFunction, AgentDefinition } from '../types/types.js';
|
|
2
|
+
export declare function timeoutPromise(ms: number): Promise<'TIMEOUT'>;
|
|
3
|
+
export declare function agentHasStatusTracking(agent: AgentDefinition): boolean;
|
|
4
|
+
export declare function executeToolWithLifecycle(toolCall: ToolCall, tool: ToolFunction, agent: AgentDefinition, signal?: AbortSignal): Promise<string>;
|
|
5
|
+
export declare function handleToolCall(toolCall: ToolCall, tool: ToolFunction, agent: AgentDefinition): Promise<string>;
|
|
6
|
+
export declare function prepareToolArguments(argsString: string, tool: ToolFunction): any[];
|
|
7
|
+
//# sourceMappingURL=tool_execution_manager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool_execution_manager.d.ts","sourceRoot":"","sources":["../../utils/tool_execution_manager.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAa5E,wBAAgB,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAI7D;AAKD,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAYtE;AAKD,wBAAsB,wBAAwB,CAC1C,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,eAAe,EACtB,MAAM,CAAC,EAAE,WAAW,GACrB,OAAO,CAAC,MAAM,CAAC,CAuDjB;AAKD,wBAAsB,cAAc,CAChC,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,eAAe,GACvB,OAAO,CAAC,MAAM,CAAC,CAyDjB;AAKD,wBAAgB,oBAAoB,CAChC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,YAAY,GACnB,GAAG,EAAE,CAyFP"}
|
|
@@ -0,0 +1,145 @@
|
|
|
1
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
2
|
+
import { runningToolTracker } from './running_tool_tracker.js';
|
|
3
|
+
import { runSequential } from './sequential_queue.js';
|
|
4
|
+
import { mapNamedToPositionalArgs } from './tool_parameter_utils.js';
|
|
5
|
+
import { coerceValue } from './tool_parameter_utils.js';
|
|
6
|
+
import { FUNCTION_TIMEOUT_MS, EXCLUDED_FROM_TIMEOUT_FUNCTIONS, } from '../config/tool_execution.js';
|
|
7
|
+
export function timeoutPromise(ms) {
|
|
8
|
+
return new Promise(resolve => {
|
|
9
|
+
setTimeout(() => resolve('TIMEOUT'), ms);
|
|
10
|
+
});
|
|
11
|
+
}
|
|
12
|
+
export function agentHasStatusTracking(agent) {
|
|
13
|
+
if (!agent.tools)
|
|
14
|
+
return false;
|
|
15
|
+
const statusTrackingTools = [
|
|
16
|
+
'get_running_tools',
|
|
17
|
+
'wait_for_running_tool',
|
|
18
|
+
'get_tool_status',
|
|
19
|
+
];
|
|
20
|
+
return agent.tools.some(tool => statusTrackingTools.includes(tool.definition.function.name));
|
|
21
|
+
}
|
|
22
|
+
export async function executeToolWithLifecycle(toolCall, tool, agent, signal) {
|
|
23
|
+
const fnId = toolCall.id || uuidv4();
|
|
24
|
+
const toolName = toolCall.function.name;
|
|
25
|
+
const argsString = toolCall.function.arguments || '{}';
|
|
26
|
+
let args;
|
|
27
|
+
try {
|
|
28
|
+
args = JSON.parse(argsString);
|
|
29
|
+
}
|
|
30
|
+
catch (error) {
|
|
31
|
+
throw new Error(`Invalid JSON in tool arguments: ${error}`);
|
|
32
|
+
}
|
|
33
|
+
const runningTool = runningToolTracker.addRunningTool(fnId, toolName, agent.agent_id || 'unknown', argsString);
|
|
34
|
+
const abortSignal = signal || runningTool.abortController?.signal;
|
|
35
|
+
try {
|
|
36
|
+
let result;
|
|
37
|
+
if (typeof args === 'object' && args !== null && !Array.isArray(args)) {
|
|
38
|
+
const positionalArgs = mapNamedToPositionalArgs(args, tool, agent.agent_id || 'ensemble', abortSignal);
|
|
39
|
+
result = await tool.function(...positionalArgs);
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
result = await tool.function(args);
|
|
43
|
+
}
|
|
44
|
+
await runningToolTracker.completeRunningTool(fnId, String(result), agent);
|
|
45
|
+
return String(result);
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
await runningToolTracker.failRunningTool(fnId, String(error), agent);
|
|
49
|
+
throw error;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
export async function handleToolCall(toolCall, tool, agent) {
|
|
53
|
+
const fnId = toolCall.id || uuidv4();
|
|
54
|
+
const toolName = toolCall.function.name;
|
|
55
|
+
const executeFunction = async () => {
|
|
56
|
+
if (toolName === 'wait_for_running_tool') {
|
|
57
|
+
return executeToolWithLifecycle(toolCall, tool, agent);
|
|
58
|
+
}
|
|
59
|
+
return Promise.race([
|
|
60
|
+
executeToolWithLifecycle(toolCall, tool, agent),
|
|
61
|
+
new Promise((_, reject) => {
|
|
62
|
+
const runningTool = runningToolTracker.getRunningTool(fnId);
|
|
63
|
+
if (runningTool?.abortController?.signal) {
|
|
64
|
+
runningTool.abortController.signal.addEventListener('abort', () => reject(new Error('Operation was aborted')), { once: true });
|
|
65
|
+
}
|
|
66
|
+
}),
|
|
67
|
+
]);
|
|
68
|
+
};
|
|
69
|
+
const sequential = !!agent.modelSettings?.sequential_tools;
|
|
70
|
+
const hasStatusTools = agentHasStatusTracking(agent);
|
|
71
|
+
const excludedFromTimeout = EXCLUDED_FROM_TIMEOUT_FUNCTIONS.has(toolName);
|
|
72
|
+
const shouldTimeout = !excludedFromTimeout && hasStatusTools && !sequential;
|
|
73
|
+
const execute = sequential
|
|
74
|
+
? () => runSequential(agent.agent_id || 'unknown', executeFunction)
|
|
75
|
+
: executeFunction;
|
|
76
|
+
if (!shouldTimeout) {
|
|
77
|
+
return execute();
|
|
78
|
+
}
|
|
79
|
+
const result = await Promise.race([
|
|
80
|
+
execute().catch(error => {
|
|
81
|
+
throw error;
|
|
82
|
+
}),
|
|
83
|
+
timeoutPromise(FUNCTION_TIMEOUT_MS),
|
|
84
|
+
]);
|
|
85
|
+
if (result === 'TIMEOUT') {
|
|
86
|
+
runningToolTracker.markTimedOut(fnId);
|
|
87
|
+
return `Tool ${toolName} is running in the background (RunningTool: ${fnId}).`;
|
|
88
|
+
}
|
|
89
|
+
return result;
|
|
90
|
+
}
|
|
91
|
+
export function prepareToolArguments(argsString, tool) {
|
|
92
|
+
let args;
|
|
93
|
+
try {
|
|
94
|
+
if (!argsString || argsString.trim() === '') {
|
|
95
|
+
args = {};
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
args = JSON.parse(argsString);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
catch (error) {
|
|
102
|
+
throw new Error(`Invalid JSON in tool arguments: ${error}`);
|
|
103
|
+
}
|
|
104
|
+
if (typeof args === 'object' && args !== null && !Array.isArray(args)) {
|
|
105
|
+
const paramNames = Object.keys(tool.definition.function.parameters.properties);
|
|
106
|
+
Object.keys(args).forEach(key => {
|
|
107
|
+
if (!paramNames.includes(key)) {
|
|
108
|
+
console.warn(`Removing unknown parameter "${key}" for tool "${tool.definition.function.name}"`);
|
|
109
|
+
delete args[key];
|
|
110
|
+
}
|
|
111
|
+
});
|
|
112
|
+
if (paramNames.length > 0) {
|
|
113
|
+
return paramNames.map(param => {
|
|
114
|
+
const value = args[param];
|
|
115
|
+
const paramSpec = tool.definition.function.parameters.properties[param];
|
|
116
|
+
if ((value === undefined || value === '') &&
|
|
117
|
+
!tool.definition.function.parameters.required?.includes(param)) {
|
|
118
|
+
return undefined;
|
|
119
|
+
}
|
|
120
|
+
const [coercedValue, error] = coerceValue(value, paramSpec, param);
|
|
121
|
+
if (error &&
|
|
122
|
+
tool.definition.function.parameters.required?.includes(param)) {
|
|
123
|
+
throw new Error(JSON.stringify({
|
|
124
|
+
error: {
|
|
125
|
+
param,
|
|
126
|
+
expected: paramSpec.type +
|
|
127
|
+
(paramSpec.items?.type
|
|
128
|
+
? `<${paramSpec.items.type}>`
|
|
129
|
+
: ''),
|
|
130
|
+
received: String(value),
|
|
131
|
+
message: error,
|
|
132
|
+
},
|
|
133
|
+
}));
|
|
134
|
+
}
|
|
135
|
+
else if (error) {
|
|
136
|
+
console.warn(`Parameter coercion warning for ${param}: ${error}`);
|
|
137
|
+
}
|
|
138
|
+
return coercedValue;
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
return Object.values(args);
|
|
142
|
+
}
|
|
143
|
+
return [args];
|
|
144
|
+
}
|
|
145
|
+
//# sourceMappingURL=tool_execution_manager.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool_execution_manager.js","sourceRoot":"","sources":["../../utils/tool_execution_manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ToolParameter } from '
|
|
1
|
+
import { ToolParameter } from '../types/types.js';
|
|
2
2
|
export declare function coerceValue(value: any, paramSpec: ToolParameter, paramName: string): [any, string | null];
|
|
3
|
-
export declare function extractParameterNames(func:
|
|
3
|
+
export declare function extractParameterNames(func: (...args: any[]) => any): string[];
|
|
4
4
|
export declare function mapNamedToPositionalArgs(namedArgs: Record<string, any>, tool: any, injectAgentId?: string, abortSignal?: AbortSignal): any[];
|
|
5
5
|
//# sourceMappingURL=tool_parameter_utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool_parameter_utils.d.ts","sourceRoot":"","sources":["../../utils/tool_parameter_utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"tool_parameter_utils.d.ts","sourceRoot":"","sources":["../../utils/tool_parameter_utils.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAMlD,wBAAgB,WAAW,CACvB,KAAK,EAAE,GAAG,EACV,SAAS,EAAE,aAAa,EACxB,SAAS,EAAE,MAAM,GAClB,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC,CAmGtB;AAKD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAAG,MAAM,EAAE,CA6C7E;AAKD,wBAAgB,wBAAwB,CACpC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC9B,IAAI,EAAE,GAAG,EACT,aAAa,CAAC,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,WAAW,GAC1B,GAAG,EAAE,CAqEP"}
|
|
@@ -129,7 +129,8 @@ export function mapNamedToPositionalArgs(namedArgs, tool, injectAgentId, abortSi
|
|
|
129
129
|
for (const paramName of paramNames) {
|
|
130
130
|
const value = namedArgs[paramName];
|
|
131
131
|
const paramSpec = paramSpecs[paramName] || { type: 'string' };
|
|
132
|
-
if ((value === undefined || value === '') &&
|
|
132
|
+
if ((value === undefined || value === '') &&
|
|
133
|
+
!requiredParams.includes(paramName)) {
|
|
133
134
|
positionalArgs.push(undefined);
|
|
134
135
|
continue;
|
|
135
136
|
}
|
|
@@ -138,10 +139,13 @@ export function mapNamedToPositionalArgs(namedArgs, tool, injectAgentId, abortSi
|
|
|
138
139
|
throw new Error(JSON.stringify({
|
|
139
140
|
error: {
|
|
140
141
|
param: paramName,
|
|
141
|
-
expected: paramSpec.type +
|
|
142
|
+
expected: paramSpec.type +
|
|
143
|
+
(paramSpec.items?.type
|
|
144
|
+
? `<${paramSpec.items.type}>`
|
|
145
|
+
: ''),
|
|
142
146
|
received: String(value),
|
|
143
|
-
message: error
|
|
144
|
-
}
|
|
147
|
+
message: error,
|
|
148
|
+
},
|
|
145
149
|
}));
|
|
146
150
|
}
|
|
147
151
|
else if (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool_parameter_utils.js","sourceRoot":"","sources":["../../utils/tool_parameter_utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"tool_parameter_utils.js","sourceRoot":"","sources":["../../utils/tool_parameter_utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ToolCall } from '../types/types.js';
|
|
2
|
+
export declare function createSummary(content: string, prompt: string): Promise<string>;
|
|
3
|
+
export declare function processToolResult(toolCall: ToolCall, rawResult: string): Promise<string>;
|
|
4
|
+
export declare function shouldSummarizeResult(toolName: string, resultLength: number): boolean;
|
|
5
|
+
export declare function getTruncationMessage(toolName: string): string;
|
|
6
|
+
//# sourceMappingURL=tool_result_processor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool_result_processor.d.ts","sourceRoot":"","sources":["../../utils/tool_result_processor.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,QAAQ,EAAuC,MAAM,mBAAmB,CAAC;AAWlF,wBAAsB,aAAa,CAC/B,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAqCjB;AAKD,wBAAsB,iBAAiB,CACnC,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CAuCjB;AAKD,wBAAgB,qBAAqB,CACjC,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACrB,OAAO,CAST;AAKD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAQ7D"}
|