@librechat/agents 2.4.322 → 3.0.0-rc2
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/dist/cjs/agents/AgentContext.cjs +218 -0
- package/dist/cjs/agents/AgentContext.cjs.map +1 -0
- package/dist/cjs/common/enum.cjs +14 -5
- package/dist/cjs/common/enum.cjs.map +1 -1
- package/dist/cjs/events.cjs +10 -6
- package/dist/cjs/events.cjs.map +1 -1
- package/dist/cjs/graphs/Graph.cjs +309 -212
- package/dist/cjs/graphs/Graph.cjs.map +1 -1
- package/dist/cjs/graphs/MultiAgentGraph.cjs +422 -0
- package/dist/cjs/graphs/MultiAgentGraph.cjs.map +1 -0
- package/dist/cjs/llm/anthropic/index.cjs +54 -9
- package/dist/cjs/llm/anthropic/index.cjs.map +1 -1
- package/dist/cjs/llm/anthropic/types.cjs.map +1 -1
- package/dist/cjs/llm/anthropic/utils/message_inputs.cjs +52 -6
- package/dist/cjs/llm/anthropic/utils/message_inputs.cjs.map +1 -1
- package/dist/cjs/llm/anthropic/utils/message_outputs.cjs +22 -2
- package/dist/cjs/llm/anthropic/utils/message_outputs.cjs.map +1 -1
- package/dist/cjs/llm/anthropic/utils/tools.cjs +29 -0
- package/dist/cjs/llm/anthropic/utils/tools.cjs.map +1 -0
- package/dist/cjs/llm/google/index.cjs +144 -0
- package/dist/cjs/llm/google/index.cjs.map +1 -0
- package/dist/cjs/llm/google/utils/common.cjs +477 -0
- package/dist/cjs/llm/google/utils/common.cjs.map +1 -0
- package/dist/cjs/llm/ollama/index.cjs +67 -0
- package/dist/cjs/llm/ollama/index.cjs.map +1 -0
- package/dist/cjs/llm/ollama/utils.cjs +158 -0
- package/dist/cjs/llm/ollama/utils.cjs.map +1 -0
- package/dist/cjs/llm/openai/index.cjs +389 -3
- package/dist/cjs/llm/openai/index.cjs.map +1 -1
- package/dist/cjs/llm/openai/utils/index.cjs +672 -0
- package/dist/cjs/llm/openai/utils/index.cjs.map +1 -0
- package/dist/cjs/llm/providers.cjs +15 -15
- package/dist/cjs/llm/providers.cjs.map +1 -1
- package/dist/cjs/llm/text.cjs +14 -3
- package/dist/cjs/llm/text.cjs.map +1 -1
- package/dist/cjs/llm/vertexai/index.cjs +330 -0
- package/dist/cjs/llm/vertexai/index.cjs.map +1 -0
- package/dist/cjs/main.cjs +11 -0
- package/dist/cjs/main.cjs.map +1 -1
- package/dist/cjs/run.cjs +120 -81
- package/dist/cjs/run.cjs.map +1 -1
- package/dist/cjs/stream.cjs +85 -51
- package/dist/cjs/stream.cjs.map +1 -1
- package/dist/cjs/tools/ToolNode.cjs +10 -4
- package/dist/cjs/tools/ToolNode.cjs.map +1 -1
- package/dist/cjs/tools/handlers.cjs +119 -13
- package/dist/cjs/tools/handlers.cjs.map +1 -1
- package/dist/cjs/tools/search/anthropic.cjs +40 -0
- package/dist/cjs/tools/search/anthropic.cjs.map +1 -0
- package/dist/cjs/tools/search/firecrawl.cjs +55 -9
- package/dist/cjs/tools/search/firecrawl.cjs.map +1 -1
- package/dist/cjs/tools/search/format.cjs +6 -6
- package/dist/cjs/tools/search/format.cjs.map +1 -1
- package/dist/cjs/tools/search/rerankers.cjs +7 -29
- package/dist/cjs/tools/search/rerankers.cjs.map +1 -1
- package/dist/cjs/tools/search/search.cjs +86 -16
- package/dist/cjs/tools/search/search.cjs.map +1 -1
- package/dist/cjs/tools/search/tool.cjs +4 -2
- package/dist/cjs/tools/search/tool.cjs.map +1 -1
- package/dist/cjs/tools/search/utils.cjs +1 -1
- package/dist/cjs/tools/search/utils.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/title.cjs +57 -21
- package/dist/cjs/utils/title.cjs.map +1 -1
- package/dist/cjs/utils/tokens.cjs +54 -7
- package/dist/cjs/utils/tokens.cjs.map +1 -1
- package/dist/esm/agents/AgentContext.mjs +216 -0
- package/dist/esm/agents/AgentContext.mjs.map +1 -0
- package/dist/esm/common/enum.mjs +15 -6
- package/dist/esm/common/enum.mjs.map +1 -1
- package/dist/esm/events.mjs +10 -6
- package/dist/esm/events.mjs.map +1 -1
- package/dist/esm/graphs/Graph.mjs +311 -214
- package/dist/esm/graphs/Graph.mjs.map +1 -1
- package/dist/esm/graphs/MultiAgentGraph.mjs +420 -0
- package/dist/esm/graphs/MultiAgentGraph.mjs.map +1 -0
- package/dist/esm/llm/anthropic/index.mjs +54 -9
- package/dist/esm/llm/anthropic/index.mjs.map +1 -1
- package/dist/esm/llm/anthropic/types.mjs.map +1 -1
- package/dist/esm/llm/anthropic/utils/message_inputs.mjs +52 -6
- package/dist/esm/llm/anthropic/utils/message_inputs.mjs.map +1 -1
- package/dist/esm/llm/anthropic/utils/message_outputs.mjs +22 -2
- package/dist/esm/llm/anthropic/utils/message_outputs.mjs.map +1 -1
- package/dist/esm/llm/anthropic/utils/tools.mjs +27 -0
- package/dist/esm/llm/anthropic/utils/tools.mjs.map +1 -0
- package/dist/esm/llm/google/index.mjs +142 -0
- package/dist/esm/llm/google/index.mjs.map +1 -0
- package/dist/esm/llm/google/utils/common.mjs +471 -0
- package/dist/esm/llm/google/utils/common.mjs.map +1 -0
- package/dist/esm/llm/ollama/index.mjs +65 -0
- package/dist/esm/llm/ollama/index.mjs.map +1 -0
- package/dist/esm/llm/ollama/utils.mjs +155 -0
- package/dist/esm/llm/ollama/utils.mjs.map +1 -0
- package/dist/esm/llm/openai/index.mjs +388 -4
- package/dist/esm/llm/openai/index.mjs.map +1 -1
- package/dist/esm/llm/openai/utils/index.mjs +666 -0
- package/dist/esm/llm/openai/utils/index.mjs.map +1 -0
- package/dist/esm/llm/providers.mjs +5 -5
- package/dist/esm/llm/providers.mjs.map +1 -1
- package/dist/esm/llm/text.mjs +14 -3
- package/dist/esm/llm/text.mjs.map +1 -1
- package/dist/esm/llm/vertexai/index.mjs +328 -0
- package/dist/esm/llm/vertexai/index.mjs.map +1 -0
- package/dist/esm/main.mjs +6 -5
- package/dist/esm/main.mjs.map +1 -1
- package/dist/esm/run.mjs +121 -83
- package/dist/esm/run.mjs.map +1 -1
- package/dist/esm/stream.mjs +87 -54
- package/dist/esm/stream.mjs.map +1 -1
- package/dist/esm/tools/ToolNode.mjs +10 -4
- package/dist/esm/tools/ToolNode.mjs.map +1 -1
- package/dist/esm/tools/handlers.mjs +119 -15
- package/dist/esm/tools/handlers.mjs.map +1 -1
- package/dist/esm/tools/search/anthropic.mjs +37 -0
- package/dist/esm/tools/search/anthropic.mjs.map +1 -0
- package/dist/esm/tools/search/firecrawl.mjs +55 -9
- package/dist/esm/tools/search/firecrawl.mjs.map +1 -1
- package/dist/esm/tools/search/format.mjs +7 -7
- package/dist/esm/tools/search/format.mjs.map +1 -1
- package/dist/esm/tools/search/rerankers.mjs +7 -29
- package/dist/esm/tools/search/rerankers.mjs.map +1 -1
- package/dist/esm/tools/search/search.mjs +86 -16
- package/dist/esm/tools/search/search.mjs.map +1 -1
- package/dist/esm/tools/search/tool.mjs +4 -2
- package/dist/esm/tools/search/tool.mjs.map +1 -1
- package/dist/esm/tools/search/utils.mjs +1 -1
- package/dist/esm/tools/search/utils.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/title.mjs +57 -22
- package/dist/esm/utils/title.mjs.map +1 -1
- package/dist/esm/utils/tokens.mjs +54 -8
- package/dist/esm/utils/tokens.mjs.map +1 -1
- package/dist/types/agents/AgentContext.d.ts +91 -0
- package/dist/types/common/enum.d.ts +15 -6
- package/dist/types/events.d.ts +5 -4
- package/dist/types/graphs/Graph.d.ts +64 -67
- package/dist/types/graphs/MultiAgentGraph.d.ts +37 -0
- package/dist/types/graphs/index.d.ts +1 -0
- package/dist/types/llm/anthropic/index.d.ts +11 -0
- package/dist/types/llm/anthropic/types.d.ts +9 -3
- package/dist/types/llm/anthropic/utils/message_inputs.d.ts +1 -1
- package/dist/types/llm/anthropic/utils/output_parsers.d.ts +4 -4
- package/dist/types/llm/anthropic/utils/tools.d.ts +3 -0
- package/dist/types/llm/google/index.d.ts +13 -0
- package/dist/types/llm/google/types.d.ts +32 -0
- package/dist/types/llm/google/utils/common.d.ts +19 -0
- package/dist/types/llm/google/utils/tools.d.ts +10 -0
- package/dist/types/llm/google/utils/zod_to_genai_parameters.d.ts +14 -0
- package/dist/types/llm/ollama/index.d.ts +7 -0
- package/dist/types/llm/ollama/utils.d.ts +7 -0
- package/dist/types/llm/openai/index.d.ts +72 -3
- package/dist/types/llm/openai/types.d.ts +10 -0
- package/dist/types/llm/openai/utils/index.d.ts +20 -0
- package/dist/types/llm/text.d.ts +1 -1
- package/dist/types/llm/vertexai/index.d.ts +293 -0
- package/dist/types/messages/reducer.d.ts +9 -0
- package/dist/types/run.d.ts +19 -12
- package/dist/types/scripts/ant_web_search.d.ts +1 -0
- package/dist/types/scripts/args.d.ts +2 -1
- package/dist/types/scripts/handoff-test.d.ts +1 -0
- package/dist/types/scripts/multi-agent-conditional.d.ts +1 -0
- package/dist/types/scripts/multi-agent-parallel.d.ts +1 -0
- package/dist/types/scripts/multi-agent-sequence.d.ts +1 -0
- package/dist/types/scripts/multi-agent-supervisor.d.ts +1 -0
- package/dist/types/scripts/multi-agent-test.d.ts +1 -0
- package/dist/types/scripts/test-custom-prompt-key.d.ts +2 -0
- package/dist/types/scripts/test-handoff-input.d.ts +2 -0
- package/dist/types/scripts/test-multi-agent-list-handoff.d.ts +2 -0
- package/dist/types/stream.d.ts +10 -3
- package/dist/types/tools/CodeExecutor.d.ts +2 -2
- package/dist/types/tools/ToolNode.d.ts +1 -1
- package/dist/types/tools/handlers.d.ts +17 -4
- package/dist/types/tools/search/anthropic.d.ts +16 -0
- package/dist/types/tools/search/firecrawl.d.ts +15 -0
- package/dist/types/tools/search/rerankers.d.ts +0 -1
- package/dist/types/tools/search/types.d.ts +30 -9
- package/dist/types/types/graph.d.ts +129 -15
- package/dist/types/types/llm.d.ts +24 -10
- package/dist/types/types/run.d.ts +46 -8
- package/dist/types/types/stream.d.ts +16 -2
- package/dist/types/types/tools.d.ts +1 -1
- package/dist/types/utils/events.d.ts +6 -0
- package/dist/types/utils/title.d.ts +2 -1
- package/dist/types/utils/tokens.d.ts +24 -0
- package/package.json +37 -17
- package/src/agents/AgentContext.ts +315 -0
- package/src/common/enum.ts +14 -5
- package/src/events.ts +24 -13
- package/src/graphs/Graph.ts +495 -312
- package/src/graphs/MultiAgentGraph.ts +498 -0
- package/src/graphs/index.ts +2 -1
- package/src/llm/anthropic/Jacob_Lee_Resume_2023.pdf +0 -0
- package/src/llm/anthropic/index.ts +78 -13
- package/src/llm/anthropic/llm.spec.ts +491 -115
- package/src/llm/anthropic/types.ts +39 -3
- package/src/llm/anthropic/utils/message_inputs.ts +67 -11
- package/src/llm/anthropic/utils/message_outputs.ts +21 -2
- package/src/llm/anthropic/utils/output_parsers.ts +25 -6
- package/src/llm/anthropic/utils/tools.ts +29 -0
- package/src/llm/google/index.ts +218 -0
- package/src/llm/google/types.ts +43 -0
- package/src/llm/google/utils/common.ts +646 -0
- package/src/llm/google/utils/tools.ts +160 -0
- package/src/llm/google/utils/zod_to_genai_parameters.ts +86 -0
- package/src/llm/ollama/index.ts +89 -0
- package/src/llm/ollama/utils.ts +193 -0
- package/src/llm/openai/index.ts +600 -14
- package/src/llm/openai/types.ts +24 -0
- package/src/llm/openai/utils/index.ts +912 -0
- package/src/llm/openai/utils/isReasoningModel.test.ts +90 -0
- package/src/llm/providers.ts +10 -9
- package/src/llm/text.ts +26 -7
- package/src/llm/vertexai/index.ts +360 -0
- package/src/messages/reducer.ts +80 -0
- package/src/run.ts +181 -112
- package/src/scripts/ant_web_search.ts +158 -0
- package/src/scripts/args.ts +12 -8
- package/src/scripts/cli4.ts +29 -21
- package/src/scripts/cli5.ts +29 -21
- package/src/scripts/code_exec.ts +54 -23
- package/src/scripts/code_exec_files.ts +48 -17
- package/src/scripts/code_exec_simple.ts +46 -27
- package/src/scripts/handoff-test.ts +135 -0
- package/src/scripts/image.ts +52 -20
- package/src/scripts/multi-agent-conditional.ts +220 -0
- package/src/scripts/multi-agent-example-output.md +110 -0
- package/src/scripts/multi-agent-parallel.ts +341 -0
- package/src/scripts/multi-agent-sequence.ts +212 -0
- package/src/scripts/multi-agent-supervisor.ts +361 -0
- package/src/scripts/multi-agent-test.ts +186 -0
- package/src/scripts/search.ts +1 -9
- package/src/scripts/simple.ts +25 -10
- package/src/scripts/test-custom-prompt-key.ts +145 -0
- package/src/scripts/test-handoff-input.ts +110 -0
- package/src/scripts/test-multi-agent-list-handoff.ts +258 -0
- package/src/scripts/tools.ts +48 -18
- package/src/specs/anthropic.simple.test.ts +150 -34
- package/src/specs/azure.simple.test.ts +325 -0
- package/src/specs/openai.simple.test.ts +140 -33
- package/src/specs/openrouter.simple.test.ts +107 -0
- package/src/specs/prune.test.ts +4 -9
- package/src/specs/reasoning.test.ts +80 -44
- package/src/specs/token-memoization.test.ts +39 -0
- package/src/stream.test.ts +94 -0
- package/src/stream.ts +139 -60
- package/src/tools/ToolNode.ts +21 -7
- package/src/tools/handlers.ts +192 -18
- package/src/tools/search/anthropic.ts +51 -0
- package/src/tools/search/firecrawl.ts +69 -20
- package/src/tools/search/format.ts +6 -8
- package/src/tools/search/rerankers.ts +7 -40
- package/src/tools/search/search.ts +97 -16
- package/src/tools/search/tool.ts +5 -2
- package/src/tools/search/types.ts +30 -10
- package/src/tools/search/utils.ts +1 -1
- package/src/types/graph.ts +315 -103
- package/src/types/llm.ts +25 -12
- package/src/types/run.ts +51 -13
- package/src/types/stream.ts +22 -1
- package/src/types/tools.ts +16 -10
- package/src/utils/events.ts +32 -0
- package/src/utils/llmConfig.ts +19 -7
- package/src/utils/title.ts +104 -30
- package/src/utils/tokens.ts +69 -10
|
@@ -0,0 +1,158 @@
|
|
|
1
|
+
'use strict';
|
|
2
|
+
|
|
3
|
+
var messages = require('@langchain/core/messages');
|
|
4
|
+
var uuid = require('uuid');
|
|
5
|
+
|
|
6
|
+
function convertOllamaMessagesToLangChain(messages$1, extra) {
|
|
7
|
+
const additional_kwargs = {};
|
|
8
|
+
if ('thinking' in messages$1) {
|
|
9
|
+
additional_kwargs.reasoning_content = messages$1.thinking;
|
|
10
|
+
}
|
|
11
|
+
return new messages.AIMessageChunk({
|
|
12
|
+
content: messages$1.content || '',
|
|
13
|
+
tool_call_chunks: messages$1.tool_calls?.map((tc) => ({
|
|
14
|
+
name: tc.function.name,
|
|
15
|
+
args: JSON.stringify(tc.function.arguments),
|
|
16
|
+
type: 'tool_call_chunk',
|
|
17
|
+
index: 0,
|
|
18
|
+
id: uuid.v4(),
|
|
19
|
+
})),
|
|
20
|
+
response_metadata: extra?.responseMetadata,
|
|
21
|
+
usage_metadata: extra?.usageMetadata,
|
|
22
|
+
additional_kwargs,
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
function extractBase64FromDataUrl(dataUrl) {
|
|
26
|
+
const match = dataUrl.match(/^data:.*?;base64,(.*)$/);
|
|
27
|
+
return match ? match[1] : '';
|
|
28
|
+
}
|
|
29
|
+
function convertAMessagesToOllama(messages) {
|
|
30
|
+
if (typeof messages.content === 'string') {
|
|
31
|
+
return [
|
|
32
|
+
{
|
|
33
|
+
role: 'assistant',
|
|
34
|
+
content: messages.content,
|
|
35
|
+
},
|
|
36
|
+
];
|
|
37
|
+
}
|
|
38
|
+
const textFields = messages.content.filter((c) => c.type === 'text' && typeof c.text === 'string');
|
|
39
|
+
const textMessages = textFields.map((c) => ({
|
|
40
|
+
role: 'assistant',
|
|
41
|
+
content: c.text,
|
|
42
|
+
}));
|
|
43
|
+
let toolCallMsgs;
|
|
44
|
+
if (messages.content.find((c) => c.type === 'tool_use') &&
|
|
45
|
+
messages.tool_calls?.length) {
|
|
46
|
+
// `tool_use` content types are accepted if the message has tool calls
|
|
47
|
+
const toolCalls = messages.tool_calls.map((tc) => ({
|
|
48
|
+
id: tc.id,
|
|
49
|
+
type: 'function',
|
|
50
|
+
function: {
|
|
51
|
+
name: tc.name,
|
|
52
|
+
arguments: tc.args,
|
|
53
|
+
},
|
|
54
|
+
}));
|
|
55
|
+
if (toolCalls) {
|
|
56
|
+
toolCallMsgs = {
|
|
57
|
+
role: 'assistant',
|
|
58
|
+
tool_calls: toolCalls,
|
|
59
|
+
content: '',
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
}
|
|
63
|
+
else if (messages.content.find((c) => c.type === 'tool_use') &&
|
|
64
|
+
!messages.tool_calls?.length) {
|
|
65
|
+
throw new Error('\'tool_use\' content type is not supported without tool calls.');
|
|
66
|
+
}
|
|
67
|
+
return [...textMessages, ...(toolCallMsgs ? [toolCallMsgs] : [])];
|
|
68
|
+
}
|
|
69
|
+
function convertHumanGenericMessagesToOllama(message) {
|
|
70
|
+
if (typeof message.content === 'string') {
|
|
71
|
+
return [
|
|
72
|
+
{
|
|
73
|
+
role: 'user',
|
|
74
|
+
content: message.content,
|
|
75
|
+
},
|
|
76
|
+
];
|
|
77
|
+
}
|
|
78
|
+
return message.content.map((c) => {
|
|
79
|
+
if (c.type === 'text') {
|
|
80
|
+
return {
|
|
81
|
+
role: 'user',
|
|
82
|
+
content: c.text,
|
|
83
|
+
};
|
|
84
|
+
}
|
|
85
|
+
else if (c.type === 'image_url') {
|
|
86
|
+
if (typeof c.image_url === 'string') {
|
|
87
|
+
return {
|
|
88
|
+
role: 'user',
|
|
89
|
+
content: '',
|
|
90
|
+
images: [extractBase64FromDataUrl(c.image_url)],
|
|
91
|
+
};
|
|
92
|
+
}
|
|
93
|
+
else if (c.image_url.url && typeof c.image_url.url === 'string') {
|
|
94
|
+
return {
|
|
95
|
+
role: 'user',
|
|
96
|
+
content: '',
|
|
97
|
+
images: [extractBase64FromDataUrl(c.image_url.url)],
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
throw new Error(`Unsupported content type: ${c.type}`);
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
function convertSystemMessageToOllama(message) {
|
|
105
|
+
if (typeof message.content === 'string') {
|
|
106
|
+
return [
|
|
107
|
+
{
|
|
108
|
+
role: 'system',
|
|
109
|
+
content: message.content,
|
|
110
|
+
},
|
|
111
|
+
];
|
|
112
|
+
}
|
|
113
|
+
else if (message.content.every((c) => c.type === 'text' && typeof c.text === 'string')) {
|
|
114
|
+
return message.content.map((c) => ({
|
|
115
|
+
role: 'system',
|
|
116
|
+
content: c.text,
|
|
117
|
+
}));
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
throw new Error(`Unsupported content type(s): ${message.content
|
|
121
|
+
.map((c) => c.type)
|
|
122
|
+
.join(', ')}`);
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
function convertToolMessageToOllama(message) {
|
|
126
|
+
if (typeof message.content !== 'string') {
|
|
127
|
+
throw new Error('Non string tool message content is not supported');
|
|
128
|
+
}
|
|
129
|
+
return [
|
|
130
|
+
{
|
|
131
|
+
role: 'tool',
|
|
132
|
+
content: message.content,
|
|
133
|
+
},
|
|
134
|
+
];
|
|
135
|
+
}
|
|
136
|
+
function convertToOllamaMessages(messages) {
|
|
137
|
+
return messages.flatMap((msg) => {
|
|
138
|
+
if (['human', 'generic'].includes(msg._getType())) {
|
|
139
|
+
return convertHumanGenericMessagesToOllama(msg);
|
|
140
|
+
}
|
|
141
|
+
else if (msg._getType() === 'ai') {
|
|
142
|
+
return convertAMessagesToOllama(msg);
|
|
143
|
+
}
|
|
144
|
+
else if (msg._getType() === 'system') {
|
|
145
|
+
return convertSystemMessageToOllama(msg);
|
|
146
|
+
}
|
|
147
|
+
else if (msg._getType() === 'tool') {
|
|
148
|
+
return convertToolMessageToOllama(msg);
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
throw new Error(`Unsupported message type: ${msg._getType()}`);
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
exports.convertOllamaMessagesToLangChain = convertOllamaMessagesToLangChain;
|
|
157
|
+
exports.convertToOllamaMessages = convertToOllamaMessages;
|
|
158
|
+
//# sourceMappingURL=utils.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.cjs","sources":["../../../../src/llm/ollama/utils.ts"],"sourcesContent":["import {\n AIMessage,\n AIMessageChunk,\n BaseMessage,\n HumanMessage,\n MessageContentText,\n SystemMessage,\n ToolMessage,\n UsageMetadata,\n} from '@langchain/core/messages';\nimport type {\n Message as OllamaMessage,\n ToolCall as OllamaToolCall,\n} from 'ollama';\nimport { v4 as uuidv4 } from 'uuid';\n\nexport function convertOllamaMessagesToLangChain(\n messages: OllamaMessage,\n extra?: {\n // eslint-disable-next-line @typescript-eslint/no-explicit-any\n responseMetadata?: Record<string, any>;\n usageMetadata?: UsageMetadata;\n }\n): AIMessageChunk {\n const additional_kwargs: BaseMessage['additional_kwargs'] = {};\n if ('thinking' in messages) {\n additional_kwargs.reasoning_content = messages.thinking as string;\n }\n return new AIMessageChunk({\n content: messages.content || '',\n tool_call_chunks: messages.tool_calls?.map((tc) => ({\n name: tc.function.name,\n args: JSON.stringify(tc.function.arguments),\n type: 'tool_call_chunk',\n index: 0,\n id: uuidv4(),\n })),\n response_metadata: extra?.responseMetadata,\n usage_metadata: extra?.usageMetadata,\n additional_kwargs,\n });\n}\n\nfunction extractBase64FromDataUrl(dataUrl: string): string {\n const match = dataUrl.match(/^data:.*?;base64,(.*)$/);\n return match ? match[1] : '';\n}\n\nfunction convertAMessagesToOllama(messages: AIMessage): OllamaMessage[] {\n if (typeof messages.content === 'string') {\n return [\n {\n role: 'assistant',\n content: messages.content,\n },\n ];\n }\n\n const textFields = messages.content.filter(\n (c) => c.type === 'text' && typeof c.text === 'string'\n );\n const textMessages = (textFields as MessageContentText[]).map((c) => ({\n role: 'assistant',\n content: c.text,\n }));\n let toolCallMsgs: OllamaMessage | undefined;\n\n if (\n messages.content.find((c) => c.type === 'tool_use') &&\n messages.tool_calls?.length\n ) {\n // `tool_use` content types are accepted if the message has tool calls\n const toolCalls: OllamaToolCall[] | undefined = messages.tool_calls.map(\n (tc) => ({\n id: tc.id,\n type: 'function',\n function: {\n name: tc.name,\n arguments: tc.args,\n },\n })\n );\n\n if (toolCalls) {\n toolCallMsgs = {\n role: 'assistant',\n tool_calls: toolCalls,\n content: '',\n };\n }\n } else if (\n messages.content.find((c) => c.type === 'tool_use') &&\n !messages.tool_calls?.length\n ) {\n throw new Error(\n '\\'tool_use\\' content type is not supported without tool calls.'\n );\n }\n\n return [...textMessages, ...(toolCallMsgs ? [toolCallMsgs] : [])];\n}\n\nfunction convertHumanGenericMessagesToOllama(\n message: HumanMessage\n): OllamaMessage[] {\n if (typeof message.content === 'string') {\n return [\n {\n role: 'user',\n content: message.content,\n },\n ];\n }\n return message.content.map((c) => {\n if (c.type === 'text') {\n return {\n role: 'user',\n content: c.text,\n };\n } else if (c.type === 'image_url') {\n if (typeof c.image_url === 'string') {\n return {\n role: 'user',\n content: '',\n images: [extractBase64FromDataUrl(c.image_url)],\n };\n } else if (c.image_url.url && typeof c.image_url.url === 'string') {\n return {\n role: 'user',\n content: '',\n images: [extractBase64FromDataUrl(c.image_url.url)],\n };\n }\n }\n throw new Error(`Unsupported content type: ${c.type}`);\n });\n}\n\nfunction convertSystemMessageToOllama(message: SystemMessage): OllamaMessage[] {\n if (typeof message.content === 'string') {\n return [\n {\n role: 'system',\n content: message.content,\n },\n ];\n } else if (\n message.content.every(\n (c) => c.type === 'text' && typeof c.text === 'string'\n )\n ) {\n return (message.content as MessageContentText[]).map((c) => ({\n role: 'system',\n content: c.text,\n }));\n } else {\n throw new Error(\n `Unsupported content type(s): ${message.content\n .map((c) => c.type)\n .join(', ')}`\n );\n }\n}\n\nfunction convertToolMessageToOllama(message: ToolMessage): OllamaMessage[] {\n if (typeof message.content !== 'string') {\n throw new Error('Non string tool message content is not supported');\n }\n return [\n {\n role: 'tool',\n content: message.content,\n },\n ];\n}\n\nexport function convertToOllamaMessages(\n messages: BaseMessage[]\n): OllamaMessage[] {\n return messages.flatMap((msg) => {\n if (['human', 'generic'].includes(msg._getType())) {\n return convertHumanGenericMessagesToOllama(msg);\n } else if (msg._getType() === 'ai') {\n return convertAMessagesToOllama(msg);\n } else if (msg._getType() === 'system') {\n return convertSystemMessageToOllama(msg);\n } else if (msg._getType() === 'tool') {\n return convertToolMessageToOllama(msg as ToolMessage);\n } else {\n throw new Error(`Unsupported message type: ${msg._getType()}`);\n }\n });\n}\n"],"names":["messages","AIMessageChunk","uuidv4"],"mappings":"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"}
|
|
@@ -1,10 +1,50 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var openai$1 = require('openai');
|
|
4
|
+
var messages = require('@langchain/core/messages');
|
|
4
5
|
var xai = require('@langchain/xai');
|
|
6
|
+
var outputs = require('@langchain/core/outputs');
|
|
7
|
+
require('@langchain/core/utils/function_calling');
|
|
5
8
|
var deepseek = require('@langchain/deepseek');
|
|
6
9
|
var openai = require('@langchain/openai');
|
|
10
|
+
var index = require('./utils/index.cjs');
|
|
7
11
|
|
|
12
|
+
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
|
13
|
+
const iife = (fn) => fn();
|
|
14
|
+
function isHeaders(headers) {
|
|
15
|
+
return (typeof Headers !== 'undefined' &&
|
|
16
|
+
headers !== null &&
|
|
17
|
+
typeof headers === 'object' &&
|
|
18
|
+
Object.prototype.toString.call(headers) === '[object Headers]');
|
|
19
|
+
}
|
|
20
|
+
function normalizeHeaders(headers) {
|
|
21
|
+
const output = iife(() => {
|
|
22
|
+
// If headers is a Headers instance
|
|
23
|
+
if (isHeaders(headers)) {
|
|
24
|
+
return headers;
|
|
25
|
+
}
|
|
26
|
+
// If headers is an array of [key, value] pairs
|
|
27
|
+
else if (Array.isArray(headers)) {
|
|
28
|
+
return new Headers(headers);
|
|
29
|
+
}
|
|
30
|
+
// If headers is a NullableHeaders-like object (has 'values' property that is a Headers)
|
|
31
|
+
else if (typeof headers === 'object' &&
|
|
32
|
+
headers !== null &&
|
|
33
|
+
'values' in headers &&
|
|
34
|
+
isHeaders(headers.values)) {
|
|
35
|
+
return headers.values;
|
|
36
|
+
}
|
|
37
|
+
// If headers is a plain object
|
|
38
|
+
else if (typeof headers === 'object' && headers !== null) {
|
|
39
|
+
const entries = Object.entries(headers)
|
|
40
|
+
.filter(([, v]) => typeof v === 'string')
|
|
41
|
+
.map(([k, v]) => [k, v]);
|
|
42
|
+
return new Headers(entries);
|
|
43
|
+
}
|
|
44
|
+
return new Headers();
|
|
45
|
+
});
|
|
46
|
+
return Object.fromEntries(output.entries());
|
|
47
|
+
}
|
|
8
48
|
function createAbortHandler(controller) {
|
|
9
49
|
return function () {
|
|
10
50
|
controller.abort();
|
|
@@ -64,6 +104,7 @@ class CustomAzureOpenAIClient extends openai$1.AzureOpenAI {
|
|
|
64
104
|
}));
|
|
65
105
|
}
|
|
66
106
|
}
|
|
107
|
+
/** @ts-expect-error We are intentionally overriding `getReasoningParams` */
|
|
67
108
|
class ChatOpenAI extends openai.ChatOpenAI {
|
|
68
109
|
get exposedClient() {
|
|
69
110
|
return this.client;
|
|
@@ -91,11 +132,189 @@ class ChatOpenAI extends openai.ChatOpenAI {
|
|
|
91
132
|
};
|
|
92
133
|
return requestOptions;
|
|
93
134
|
}
|
|
135
|
+
/**
|
|
136
|
+
* Returns backwards compatible reasoning parameters from constructor params and call options
|
|
137
|
+
* @internal
|
|
138
|
+
*/
|
|
139
|
+
getReasoningParams(options) {
|
|
140
|
+
if (!index.isReasoningModel(this.model)) {
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
// apply options in reverse order of importance -- newer options supersede older options
|
|
144
|
+
let reasoning;
|
|
145
|
+
if (this.reasoning !== undefined) {
|
|
146
|
+
reasoning = {
|
|
147
|
+
...reasoning,
|
|
148
|
+
...this.reasoning,
|
|
149
|
+
};
|
|
150
|
+
}
|
|
151
|
+
if (options?.reasoning !== undefined) {
|
|
152
|
+
reasoning = {
|
|
153
|
+
...reasoning,
|
|
154
|
+
...options.reasoning,
|
|
155
|
+
};
|
|
156
|
+
}
|
|
157
|
+
return reasoning;
|
|
158
|
+
}
|
|
159
|
+
_getReasoningParams(options) {
|
|
160
|
+
return this.getReasoningParams(options);
|
|
161
|
+
}
|
|
162
|
+
async *_streamResponseChunks(messages, options, runManager) {
|
|
163
|
+
if (!this._useResponseApi(options)) {
|
|
164
|
+
return yield* this._streamResponseChunks2(messages, options, runManager);
|
|
165
|
+
}
|
|
166
|
+
const streamIterable = await this.responseApiWithRetry({
|
|
167
|
+
...this.invocationParams(options, { streaming: true }),
|
|
168
|
+
input: index._convertMessagesToOpenAIResponsesParams(messages, this.model, this.zdrEnabled),
|
|
169
|
+
stream: true,
|
|
170
|
+
}, options);
|
|
171
|
+
for await (const data of streamIterable) {
|
|
172
|
+
const chunk = index._convertOpenAIResponsesDeltaToBaseMessageChunk(data);
|
|
173
|
+
if (chunk == null)
|
|
174
|
+
continue;
|
|
175
|
+
yield chunk;
|
|
176
|
+
await runManager?.handleLLMNewToken(chunk.text || '', undefined, undefined, undefined, undefined, { chunk });
|
|
177
|
+
}
|
|
178
|
+
return;
|
|
179
|
+
}
|
|
180
|
+
async *_streamResponseChunks2(messages$1, options, runManager) {
|
|
181
|
+
const messagesMapped = index._convertMessagesToOpenAIParams(messages$1, this.model);
|
|
182
|
+
const params = {
|
|
183
|
+
...this.invocationParams(options, {
|
|
184
|
+
streaming: true,
|
|
185
|
+
}),
|
|
186
|
+
messages: messagesMapped,
|
|
187
|
+
stream: true,
|
|
188
|
+
};
|
|
189
|
+
let defaultRole;
|
|
190
|
+
const streamIterable = await this.completionWithRetry(params, options);
|
|
191
|
+
let usage;
|
|
192
|
+
for await (const data of streamIterable) {
|
|
193
|
+
const choice = data.choices[0];
|
|
194
|
+
if (data.usage) {
|
|
195
|
+
usage = data.usage;
|
|
196
|
+
}
|
|
197
|
+
if (!choice) {
|
|
198
|
+
continue;
|
|
199
|
+
}
|
|
200
|
+
const { delta } = choice;
|
|
201
|
+
if (!delta) {
|
|
202
|
+
continue;
|
|
203
|
+
}
|
|
204
|
+
const chunk = this._convertOpenAIDeltaToBaseMessageChunk(delta, data, defaultRole);
|
|
205
|
+
if ('reasoning_content' in delta) {
|
|
206
|
+
chunk.additional_kwargs.reasoning_content = delta.reasoning_content;
|
|
207
|
+
}
|
|
208
|
+
else if ('reasoning' in delta) {
|
|
209
|
+
chunk.additional_kwargs.reasoning_content = delta.reasoning;
|
|
210
|
+
}
|
|
211
|
+
defaultRole = delta.role ?? defaultRole;
|
|
212
|
+
const newTokenIndices = {
|
|
213
|
+
prompt: options.promptIndex ?? 0,
|
|
214
|
+
completion: choice.index ?? 0,
|
|
215
|
+
};
|
|
216
|
+
if (typeof chunk.content !== 'string') {
|
|
217
|
+
// eslint-disable-next-line no-console
|
|
218
|
+
console.log('[WARNING]: Received non-string content from OpenAI. This is currently not supported.');
|
|
219
|
+
continue;
|
|
220
|
+
}
|
|
221
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
222
|
+
const generationInfo = { ...newTokenIndices };
|
|
223
|
+
if (choice.finish_reason != null) {
|
|
224
|
+
generationInfo.finish_reason = choice.finish_reason;
|
|
225
|
+
// Only include system fingerprint in the last chunk for now
|
|
226
|
+
// to avoid concatenation issues
|
|
227
|
+
generationInfo.system_fingerprint = data.system_fingerprint;
|
|
228
|
+
generationInfo.model_name = data.model;
|
|
229
|
+
generationInfo.service_tier = data.service_tier;
|
|
230
|
+
}
|
|
231
|
+
if (this.logprobs == true) {
|
|
232
|
+
generationInfo.logprobs = choice.logprobs;
|
|
233
|
+
}
|
|
234
|
+
const generationChunk = new outputs.ChatGenerationChunk({
|
|
235
|
+
message: chunk,
|
|
236
|
+
text: chunk.content,
|
|
237
|
+
generationInfo,
|
|
238
|
+
});
|
|
239
|
+
yield generationChunk;
|
|
240
|
+
await runManager?.handleLLMNewToken(generationChunk.text || '', newTokenIndices, undefined, undefined, undefined, { chunk: generationChunk });
|
|
241
|
+
}
|
|
242
|
+
if (usage) {
|
|
243
|
+
const inputTokenDetails = {
|
|
244
|
+
...(usage.prompt_tokens_details?.audio_tokens != null && {
|
|
245
|
+
audio: usage.prompt_tokens_details.audio_tokens,
|
|
246
|
+
}),
|
|
247
|
+
...(usage.prompt_tokens_details?.cached_tokens != null && {
|
|
248
|
+
cache_read: usage.prompt_tokens_details.cached_tokens,
|
|
249
|
+
}),
|
|
250
|
+
};
|
|
251
|
+
const outputTokenDetails = {
|
|
252
|
+
...(usage.completion_tokens_details?.audio_tokens != null && {
|
|
253
|
+
audio: usage.completion_tokens_details.audio_tokens,
|
|
254
|
+
}),
|
|
255
|
+
...(usage.completion_tokens_details?.reasoning_tokens != null && {
|
|
256
|
+
reasoning: usage.completion_tokens_details.reasoning_tokens,
|
|
257
|
+
}),
|
|
258
|
+
};
|
|
259
|
+
const generationChunk = new outputs.ChatGenerationChunk({
|
|
260
|
+
message: new messages.AIMessageChunk({
|
|
261
|
+
content: '',
|
|
262
|
+
response_metadata: {
|
|
263
|
+
usage: { ...usage },
|
|
264
|
+
},
|
|
265
|
+
usage_metadata: {
|
|
266
|
+
input_tokens: usage.prompt_tokens,
|
|
267
|
+
output_tokens: usage.completion_tokens,
|
|
268
|
+
total_tokens: usage.total_tokens,
|
|
269
|
+
...(Object.keys(inputTokenDetails).length > 0 && {
|
|
270
|
+
input_token_details: inputTokenDetails,
|
|
271
|
+
}),
|
|
272
|
+
...(Object.keys(outputTokenDetails).length > 0 && {
|
|
273
|
+
output_token_details: outputTokenDetails,
|
|
274
|
+
}),
|
|
275
|
+
},
|
|
276
|
+
}),
|
|
277
|
+
text: '',
|
|
278
|
+
});
|
|
279
|
+
yield generationChunk;
|
|
280
|
+
}
|
|
281
|
+
if (options.signal?.aborted === true) {
|
|
282
|
+
throw new Error('AbortError');
|
|
283
|
+
}
|
|
284
|
+
}
|
|
94
285
|
}
|
|
286
|
+
/** @ts-expect-error We are intentionally overriding `getReasoningParams` */
|
|
95
287
|
class AzureChatOpenAI extends openai.AzureChatOpenAI {
|
|
96
288
|
get exposedClient() {
|
|
97
289
|
return this.client;
|
|
98
290
|
}
|
|
291
|
+
/**
|
|
292
|
+
* Returns backwards compatible reasoning parameters from constructor params and call options
|
|
293
|
+
* @internal
|
|
294
|
+
*/
|
|
295
|
+
getReasoningParams(options) {
|
|
296
|
+
if (!index.isReasoningModel(this.model)) {
|
|
297
|
+
return;
|
|
298
|
+
}
|
|
299
|
+
// apply options in reverse order of importance -- newer options supersede older options
|
|
300
|
+
let reasoning;
|
|
301
|
+
if (this.reasoning !== undefined) {
|
|
302
|
+
reasoning = {
|
|
303
|
+
...reasoning,
|
|
304
|
+
...this.reasoning,
|
|
305
|
+
};
|
|
306
|
+
}
|
|
307
|
+
if (options?.reasoning !== undefined) {
|
|
308
|
+
reasoning = {
|
|
309
|
+
...reasoning,
|
|
310
|
+
...options.reasoning,
|
|
311
|
+
};
|
|
312
|
+
}
|
|
313
|
+
return reasoning;
|
|
314
|
+
}
|
|
315
|
+
_getReasoningParams(options) {
|
|
316
|
+
return this.getReasoningParams(options);
|
|
317
|
+
}
|
|
99
318
|
_getClientOptions(options) {
|
|
100
319
|
if (!this.client) {
|
|
101
320
|
const openAIEndpointConfig = {
|
|
@@ -119,11 +338,12 @@ class AzureChatOpenAI extends openai.AzureChatOpenAI {
|
|
|
119
338
|
if (params.baseURL == null) {
|
|
120
339
|
delete params.baseURL;
|
|
121
340
|
}
|
|
341
|
+
const defaultHeaders = normalizeHeaders(params.defaultHeaders);
|
|
122
342
|
params.defaultHeaders = {
|
|
123
343
|
...params.defaultHeaders,
|
|
124
|
-
'User-Agent':
|
|
125
|
-
? `${
|
|
126
|
-
: '
|
|
344
|
+
'User-Agent': defaultHeaders['User-Agent'] != null
|
|
345
|
+
? `${defaultHeaders['User-Agent']}: librechat-azure-openai-v2`
|
|
346
|
+
: 'librechat-azure-openai-v2',
|
|
127
347
|
};
|
|
128
348
|
this.client = new CustomAzureOpenAIClient({
|
|
129
349
|
apiVersion: this.azureOpenAIApiVersion,
|
|
@@ -147,6 +367,24 @@ class AzureChatOpenAI extends openai.AzureChatOpenAI {
|
|
|
147
367
|
}
|
|
148
368
|
return requestOptions;
|
|
149
369
|
}
|
|
370
|
+
async *_streamResponseChunks(messages, options, runManager) {
|
|
371
|
+
if (!this._useResponseApi(options)) {
|
|
372
|
+
return yield* super._streamResponseChunks(messages, options, runManager);
|
|
373
|
+
}
|
|
374
|
+
const streamIterable = await this.responseApiWithRetry({
|
|
375
|
+
...this.invocationParams(options, { streaming: true }),
|
|
376
|
+
input: index._convertMessagesToOpenAIResponsesParams(messages, this.model, this.zdrEnabled),
|
|
377
|
+
stream: true,
|
|
378
|
+
}, options);
|
|
379
|
+
for await (const data of streamIterable) {
|
|
380
|
+
const chunk = index._convertOpenAIResponsesDeltaToBaseMessageChunk(data);
|
|
381
|
+
if (chunk == null)
|
|
382
|
+
continue;
|
|
383
|
+
yield chunk;
|
|
384
|
+
await runManager?.handleLLMNewToken(chunk.text || '', undefined, undefined, undefined, undefined, { chunk });
|
|
385
|
+
}
|
|
386
|
+
return;
|
|
387
|
+
}
|
|
150
388
|
}
|
|
151
389
|
class ChatDeepSeek extends deepseek.ChatDeepSeek {
|
|
152
390
|
get exposedClient() {
|
|
@@ -177,6 +415,19 @@ class ChatDeepSeek extends deepseek.ChatDeepSeek {
|
|
|
177
415
|
}
|
|
178
416
|
}
|
|
179
417
|
class ChatXAI extends xai.ChatXAI {
|
|
418
|
+
constructor(fields) {
|
|
419
|
+
super(fields);
|
|
420
|
+
const customBaseURL = fields?.configuration?.baseURL ?? fields?.clientConfig?.baseURL;
|
|
421
|
+
if (customBaseURL != null && customBaseURL) {
|
|
422
|
+
this.clientConfig = {
|
|
423
|
+
...this.clientConfig,
|
|
424
|
+
baseURL: customBaseURL,
|
|
425
|
+
};
|
|
426
|
+
// Reset the client to force recreation with new config
|
|
427
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
428
|
+
this.client = undefined;
|
|
429
|
+
}
|
|
430
|
+
}
|
|
180
431
|
get exposedClient() {
|
|
181
432
|
return this.client;
|
|
182
433
|
}
|
|
@@ -203,6 +454,139 @@ class ChatXAI extends xai.ChatXAI {
|
|
|
203
454
|
};
|
|
204
455
|
return requestOptions;
|
|
205
456
|
}
|
|
457
|
+
async *_streamResponseChunks(messages$1, options, runManager) {
|
|
458
|
+
const messagesMapped = index._convertMessagesToOpenAIParams(messages$1, this.model);
|
|
459
|
+
const params = {
|
|
460
|
+
...this.invocationParams(options, {
|
|
461
|
+
streaming: true,
|
|
462
|
+
}),
|
|
463
|
+
messages: messagesMapped,
|
|
464
|
+
stream: true,
|
|
465
|
+
};
|
|
466
|
+
let defaultRole;
|
|
467
|
+
const streamIterable = await this.completionWithRetry(params, options);
|
|
468
|
+
let usage;
|
|
469
|
+
for await (const data of streamIterable) {
|
|
470
|
+
const choice = data.choices[0];
|
|
471
|
+
if (data.usage) {
|
|
472
|
+
usage = data.usage;
|
|
473
|
+
}
|
|
474
|
+
if (!choice) {
|
|
475
|
+
continue;
|
|
476
|
+
}
|
|
477
|
+
const { delta } = choice;
|
|
478
|
+
if (!delta) {
|
|
479
|
+
continue;
|
|
480
|
+
}
|
|
481
|
+
const chunk = this._convertOpenAIDeltaToBaseMessageChunk(delta, data, defaultRole);
|
|
482
|
+
if (chunk.usage_metadata != null) {
|
|
483
|
+
chunk.usage_metadata = {
|
|
484
|
+
input_tokens: chunk.usage_metadata.input_tokens ?? 0,
|
|
485
|
+
output_tokens: chunk.usage_metadata.output_tokens ?? 0,
|
|
486
|
+
total_tokens: chunk.usage_metadata.total_tokens ?? 0,
|
|
487
|
+
};
|
|
488
|
+
}
|
|
489
|
+
if ('reasoning_content' in delta) {
|
|
490
|
+
chunk.additional_kwargs.reasoning_content = delta.reasoning_content;
|
|
491
|
+
}
|
|
492
|
+
defaultRole = delta.role ?? defaultRole;
|
|
493
|
+
const newTokenIndices = {
|
|
494
|
+
prompt: options.promptIndex ?? 0,
|
|
495
|
+
completion: choice.index ?? 0,
|
|
496
|
+
};
|
|
497
|
+
if (typeof chunk.content !== 'string') {
|
|
498
|
+
// eslint-disable-next-line no-console
|
|
499
|
+
console.log('[WARNING]: Received non-string content from OpenAI. This is currently not supported.');
|
|
500
|
+
continue;
|
|
501
|
+
}
|
|
502
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
503
|
+
const generationInfo = { ...newTokenIndices };
|
|
504
|
+
if (choice.finish_reason != null) {
|
|
505
|
+
generationInfo.finish_reason = choice.finish_reason;
|
|
506
|
+
// Only include system fingerprint in the last chunk for now
|
|
507
|
+
// to avoid concatenation issues
|
|
508
|
+
generationInfo.system_fingerprint = data.system_fingerprint;
|
|
509
|
+
generationInfo.model_name = data.model;
|
|
510
|
+
generationInfo.service_tier = data.service_tier;
|
|
511
|
+
}
|
|
512
|
+
if (this.logprobs == true) {
|
|
513
|
+
generationInfo.logprobs = choice.logprobs;
|
|
514
|
+
}
|
|
515
|
+
const generationChunk = new outputs.ChatGenerationChunk({
|
|
516
|
+
message: chunk,
|
|
517
|
+
text: chunk.content,
|
|
518
|
+
generationInfo,
|
|
519
|
+
});
|
|
520
|
+
yield generationChunk;
|
|
521
|
+
await runManager?.handleLLMNewToken(generationChunk.text || '', newTokenIndices, undefined, undefined, undefined, { chunk: generationChunk });
|
|
522
|
+
}
|
|
523
|
+
if (usage) {
|
|
524
|
+
// Type assertion for xAI-specific usage structure
|
|
525
|
+
const xaiUsage = usage;
|
|
526
|
+
const inputTokenDetails = {
|
|
527
|
+
// Standard OpenAI fields
|
|
528
|
+
...(usage.prompt_tokens_details?.audio_tokens != null && {
|
|
529
|
+
audio: usage.prompt_tokens_details.audio_tokens,
|
|
530
|
+
}),
|
|
531
|
+
...(usage.prompt_tokens_details?.cached_tokens != null && {
|
|
532
|
+
cache_read: usage.prompt_tokens_details.cached_tokens,
|
|
533
|
+
}),
|
|
534
|
+
// Add xAI-specific prompt token details if they exist
|
|
535
|
+
...(xaiUsage.prompt_tokens_details?.text_tokens != null && {
|
|
536
|
+
text: xaiUsage.prompt_tokens_details.text_tokens,
|
|
537
|
+
}),
|
|
538
|
+
...(xaiUsage.prompt_tokens_details?.image_tokens != null && {
|
|
539
|
+
image: xaiUsage.prompt_tokens_details.image_tokens,
|
|
540
|
+
}),
|
|
541
|
+
};
|
|
542
|
+
const outputTokenDetails = {
|
|
543
|
+
// Standard OpenAI fields
|
|
544
|
+
...(usage.completion_tokens_details?.audio_tokens != null && {
|
|
545
|
+
audio: usage.completion_tokens_details.audio_tokens,
|
|
546
|
+
}),
|
|
547
|
+
...(usage.completion_tokens_details?.reasoning_tokens != null && {
|
|
548
|
+
reasoning: usage.completion_tokens_details.reasoning_tokens,
|
|
549
|
+
}),
|
|
550
|
+
// Add xAI-specific completion token details if they exist
|
|
551
|
+
...(xaiUsage.completion_tokens_details?.accepted_prediction_tokens !=
|
|
552
|
+
null && {
|
|
553
|
+
accepted_prediction: xaiUsage.completion_tokens_details.accepted_prediction_tokens,
|
|
554
|
+
}),
|
|
555
|
+
...(xaiUsage.completion_tokens_details?.rejected_prediction_tokens !=
|
|
556
|
+
null && {
|
|
557
|
+
rejected_prediction: xaiUsage.completion_tokens_details.rejected_prediction_tokens,
|
|
558
|
+
}),
|
|
559
|
+
};
|
|
560
|
+
const generationChunk = new outputs.ChatGenerationChunk({
|
|
561
|
+
message: new messages.AIMessageChunk({
|
|
562
|
+
content: '',
|
|
563
|
+
response_metadata: {
|
|
564
|
+
usage: { ...usage },
|
|
565
|
+
// Include xAI-specific metadata if it exists
|
|
566
|
+
...(xaiUsage.num_sources_used != null && {
|
|
567
|
+
num_sources_used: xaiUsage.num_sources_used,
|
|
568
|
+
}),
|
|
569
|
+
},
|
|
570
|
+
usage_metadata: {
|
|
571
|
+
input_tokens: usage.prompt_tokens,
|
|
572
|
+
output_tokens: usage.completion_tokens,
|
|
573
|
+
total_tokens: usage.total_tokens,
|
|
574
|
+
...(Object.keys(inputTokenDetails).length > 0 && {
|
|
575
|
+
input_token_details: inputTokenDetails,
|
|
576
|
+
}),
|
|
577
|
+
...(Object.keys(outputTokenDetails).length > 0 && {
|
|
578
|
+
output_token_details: outputTokenDetails,
|
|
579
|
+
}),
|
|
580
|
+
},
|
|
581
|
+
}),
|
|
582
|
+
text: '',
|
|
583
|
+
});
|
|
584
|
+
yield generationChunk;
|
|
585
|
+
}
|
|
586
|
+
if (options.signal?.aborted === true) {
|
|
587
|
+
throw new Error('AbortError');
|
|
588
|
+
}
|
|
589
|
+
}
|
|
206
590
|
}
|
|
207
591
|
|
|
208
592
|
exports.AzureChatOpenAI = AzureChatOpenAI;
|
|
@@ -211,4 +595,6 @@ exports.ChatOpenAI = ChatOpenAI;
|
|
|
211
595
|
exports.ChatXAI = ChatXAI;
|
|
212
596
|
exports.CustomAzureOpenAIClient = CustomAzureOpenAIClient;
|
|
213
597
|
exports.CustomOpenAIClient = CustomOpenAIClient;
|
|
598
|
+
exports.isHeaders = isHeaders;
|
|
599
|
+
exports.normalizeHeaders = normalizeHeaders;
|
|
214
600
|
//# sourceMappingURL=index.cjs.map
|