@langchain/openai 0.6.14 → 0.6.16-rc.0
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/chat_models.cjs +2 -2
- package/dist/chat_models.js +3 -3
- package/dist/utils/output.cjs +20 -0
- package/dist/utils/output.d.ts +3 -1
- package/dist/utils/output.js +19 -0
- package/package.json +1 -1
package/dist/chat_models.cjs
CHANGED
|
@@ -1299,7 +1299,7 @@ class ChatOpenAIResponses extends BaseChatOpenAI {
|
|
|
1299
1299
|
content,
|
|
1300
1300
|
tool_calls,
|
|
1301
1301
|
invalid_tool_calls,
|
|
1302
|
-
usage_metadata: response.usage,
|
|
1302
|
+
usage_metadata: (0, output_js_1._convertOpenAIResponsesUsageToLangChainUsage)(response.usage),
|
|
1303
1303
|
additional_kwargs,
|
|
1304
1304
|
response_metadata,
|
|
1305
1305
|
});
|
|
@@ -1366,7 +1366,7 @@ class ChatOpenAIResponses extends BaseChatOpenAI {
|
|
|
1366
1366
|
}
|
|
1367
1367
|
else if (chunk.type === "response.completed") {
|
|
1368
1368
|
const msg = this._convertResponsesMessageToBaseMessage(chunk.response);
|
|
1369
|
-
usage_metadata = chunk.response.usage;
|
|
1369
|
+
usage_metadata = (0, output_js_1._convertOpenAIResponsesUsageToLangChainUsage)(chunk.response.usage);
|
|
1370
1370
|
if (chunk.response.text?.format?.type === "json_schema") {
|
|
1371
1371
|
additional_kwargs.parsed ??= JSON.parse(msg.text);
|
|
1372
1372
|
}
|
package/dist/chat_models.js
CHANGED
|
@@ -13,7 +13,7 @@ import { getEndpoint } from "./utils/azure.js";
|
|
|
13
13
|
import { formatToOpenAIToolChoice, interopZodResponseFormat, wrapOpenAIClientError, } from "./utils/openai.js";
|
|
14
14
|
import { formatFunctionDefinitions, } from "./utils/openai-format-fndef.js";
|
|
15
15
|
import { _convertToOpenAITool, convertCompletionsCustomTool, convertResponsesCustomTool, isBuiltInTool, isBuiltInToolChoice, isCustomTool, isCustomToolCall, isOpenAICustomTool, parseCustomToolCall, } from "./utils/tools.js";
|
|
16
|
-
import { handleMultiModalOutput } from "./utils/output.js";
|
|
16
|
+
import { _convertOpenAIResponsesUsageToLangChainUsage, handleMultiModalOutput, } from "./utils/output.js";
|
|
17
17
|
const _FUNCTION_CALL_IDS_MAP_KEY = "__openai_function_call_ids__";
|
|
18
18
|
function isReasoningModel(model) {
|
|
19
19
|
if (!model)
|
|
@@ -1293,7 +1293,7 @@ export class ChatOpenAIResponses extends BaseChatOpenAI {
|
|
|
1293
1293
|
content,
|
|
1294
1294
|
tool_calls,
|
|
1295
1295
|
invalid_tool_calls,
|
|
1296
|
-
usage_metadata: response.usage,
|
|
1296
|
+
usage_metadata: _convertOpenAIResponsesUsageToLangChainUsage(response.usage),
|
|
1297
1297
|
additional_kwargs,
|
|
1298
1298
|
response_metadata,
|
|
1299
1299
|
});
|
|
@@ -1360,7 +1360,7 @@ export class ChatOpenAIResponses extends BaseChatOpenAI {
|
|
|
1360
1360
|
}
|
|
1361
1361
|
else if (chunk.type === "response.completed") {
|
|
1362
1362
|
const msg = this._convertResponsesMessageToBaseMessage(chunk.response);
|
|
1363
|
-
usage_metadata = chunk.response.usage;
|
|
1363
|
+
usage_metadata = _convertOpenAIResponsesUsageToLangChainUsage(chunk.response.usage);
|
|
1364
1364
|
if (chunk.response.text?.format?.type === "json_schema") {
|
|
1365
1365
|
additional_kwargs.parsed ??= JSON.parse(msg.text);
|
|
1366
1366
|
}
|
package/dist/utils/output.cjs
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.handleMultiModalOutput = handleMultiModalOutput;
|
|
4
|
+
exports._convertOpenAIResponsesUsageToLangChainUsage = _convertOpenAIResponsesUsageToLangChainUsage;
|
|
4
5
|
/**
|
|
5
6
|
* Handle multi modal response content.
|
|
6
7
|
*
|
|
@@ -28,3 +29,22 @@ function handleMultiModalOutput(content, messages) {
|
|
|
28
29
|
}
|
|
29
30
|
return content;
|
|
30
31
|
}
|
|
32
|
+
function _convertOpenAIResponsesUsageToLangChainUsage(usage) {
|
|
33
|
+
const inputTokenDetails = {
|
|
34
|
+
...(usage?.input_tokens_details?.cached_tokens != null && {
|
|
35
|
+
cache_read: usage?.input_tokens_details?.cached_tokens,
|
|
36
|
+
}),
|
|
37
|
+
};
|
|
38
|
+
const outputTokenDetails = {
|
|
39
|
+
...(usage?.output_tokens_details?.reasoning_tokens != null && {
|
|
40
|
+
reasoning: usage?.output_tokens_details?.reasoning_tokens,
|
|
41
|
+
}),
|
|
42
|
+
};
|
|
43
|
+
return {
|
|
44
|
+
input_tokens: usage?.input_tokens ?? 0,
|
|
45
|
+
output_tokens: usage?.output_tokens ?? 0,
|
|
46
|
+
total_tokens: usage?.total_tokens ?? 0,
|
|
47
|
+
input_token_details: inputTokenDetails,
|
|
48
|
+
output_token_details: outputTokenDetails,
|
|
49
|
+
};
|
|
50
|
+
}
|
package/dist/utils/output.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { OpenAI as OpenAIClient } from "openai";
|
|
2
|
+
import { StandardImageBlock, StandardTextBlock, UsageMetadata } from "@langchain/core/messages";
|
|
2
3
|
/**
|
|
3
4
|
* Handle multi modal response content.
|
|
4
5
|
*
|
|
@@ -7,3 +8,4 @@ import { StandardImageBlock, StandardTextBlock } from "@langchain/core/messages"
|
|
|
7
8
|
* @returns The new content of the message.
|
|
8
9
|
*/
|
|
9
10
|
export declare function handleMultiModalOutput(content: string, messages: unknown): (StandardImageBlock | StandardTextBlock)[] | string;
|
|
11
|
+
export declare function _convertOpenAIResponsesUsageToLangChainUsage(usage?: OpenAIClient.Responses.ResponseUsage): UsageMetadata;
|
package/dist/utils/output.js
CHANGED
|
@@ -25,3 +25,22 @@ export function handleMultiModalOutput(content, messages) {
|
|
|
25
25
|
}
|
|
26
26
|
return content;
|
|
27
27
|
}
|
|
28
|
+
export function _convertOpenAIResponsesUsageToLangChainUsage(usage) {
|
|
29
|
+
const inputTokenDetails = {
|
|
30
|
+
...(usage?.input_tokens_details?.cached_tokens != null && {
|
|
31
|
+
cache_read: usage?.input_tokens_details?.cached_tokens,
|
|
32
|
+
}),
|
|
33
|
+
};
|
|
34
|
+
const outputTokenDetails = {
|
|
35
|
+
...(usage?.output_tokens_details?.reasoning_tokens != null && {
|
|
36
|
+
reasoning: usage?.output_tokens_details?.reasoning_tokens,
|
|
37
|
+
}),
|
|
38
|
+
};
|
|
39
|
+
return {
|
|
40
|
+
input_tokens: usage?.input_tokens ?? 0,
|
|
41
|
+
output_tokens: usage?.output_tokens ?? 0,
|
|
42
|
+
total_tokens: usage?.total_tokens ?? 0,
|
|
43
|
+
input_token_details: inputTokenDetails,
|
|
44
|
+
output_token_details: outputTokenDetails,
|
|
45
|
+
};
|
|
46
|
+
}
|