@tanstack/ai-bedrock 0.4.5 → 0.5.1
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/esm/adapters/responses-text.js +5 -1
- package/dist/esm/adapters/responses-text.js.map +1 -1
- package/dist/esm/adapters/text.js +5 -1
- package/dist/esm/adapters/text.js.map +1 -1
- package/dist/esm/converse/message-converter.js +1 -1
- package/dist/esm/converse/message-converter.js.map +1 -1
- package/dist/esm/converse/usage.d.ts +6 -5
- package/dist/esm/converse/usage.js +13 -10
- package/dist/esm/converse/usage.js.map +1 -1
- package/package.json +3 -3
- package/src/adapters/responses-text.ts +5 -6
- package/src/adapters/text.ts +5 -6
- package/src/converse/message-converter.ts +1 -1
- package/src/converse/usage.ts +18 -10
|
@@ -12,7 +12,11 @@ var BedrockResponsesTextAdapter = class extends OpenAIBaseResponsesTextAdapter {
|
|
|
12
12
|
kind = "text";
|
|
13
13
|
name = "bedrock-responses";
|
|
14
14
|
constructor(config, model) {
|
|
15
|
-
|
|
15
|
+
const options = withBedrockDefaults(config, "mantle", model);
|
|
16
|
+
super(model, "bedrock-responses", new OpenAI(options), {
|
|
17
|
+
...config,
|
|
18
|
+
fetch: options.fetch
|
|
19
|
+
});
|
|
16
20
|
}
|
|
17
21
|
};
|
|
18
22
|
/** Responses adapter with an explicit API key (low-level; the public branching factory delegates here). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responses-text.js","names":[],"sources":["../../../src/adapters/responses-text.ts"],"sourcesContent":["import OpenAI from 'openai'\nimport { OpenAIBaseResponsesTextAdapter } from '@tanstack/openai-base'\nimport { withBedrockDefaults } from '../utils/client'\nimport type { Modality } from '@tanstack/ai'\nimport type { BedrockClientConfig } from '../utils/client'\nimport type { BedrockMessageMetadataByModality } from '../message-types'\nimport type {\n BedrockChatModelToolCapabilitiesByName,\n BedrockResponsesModels,\n ResolveInputModalities,\n} from '../model-meta'\nimport type { ExternalResponsesProviderOptions } from '../text/responses-provider-options'\nimport type { OpenAIBaseTextAdapterOptions } from '@tanstack/openai-base'\n\nexport interface BedrockResponsesConfig\n extends BedrockClientConfig, OpenAIBaseTextAdapterOptions {}\n\nexport type { ExternalResponsesProviderOptions as BedrockResponsesProviderOptions } from '../text/responses-provider-options'\n\ntype ResolveToolCapabilities<TModel extends string> =\n TModel extends keyof BedrockChatModelToolCapabilitiesByName\n ? NonNullable<BedrockChatModelToolCapabilitiesByName[TModel]>\n : readonly []\n\n/**\n * Bedrock Responses adapter. Drives mantle's OpenAI-compatible `/responses`\n * endpoint via the OpenAI SDK (`client.responses.create`) — the same base\n * class ai-openai's `openaiText` uses. Responses is mantle-only, so the\n * constructor forces the mantle baseURL.\n */\nexport class BedrockResponsesTextAdapter<\n TModel extends BedrockResponsesModels,\n // Constraint mirrors the chat adapter (and ai-groq / ai-openai) and the base,\n // which parameterises `TProviderOptions extends Record<string, any>`. Our\n // default `ExternalResponsesProviderOptions` is an interface that (lacking an\n // implicit index signature) `Record<string, unknown>` would reject but\n // `Record<string, any>` accepts. This `any` is confined to the generic\n // constraint — no value/shape `as` cast is introduced.\n TProviderOptions extends Record<string, any> =\n ExternalResponsesProviderOptions,\n TInputModalities extends ReadonlyArray<Modality> =\n ResolveInputModalities<TModel>,\n TToolCapabilities extends ReadonlyArray<string> =\n ResolveToolCapabilities<TModel>,\n> extends OpenAIBaseResponsesTextAdapter<\n TModel,\n TProviderOptions,\n TInputModalities,\n BedrockMessageMetadataByModality,\n TToolCapabilities\n> {\n override readonly kind = 'text' as const\n override readonly name = 'bedrock-responses' as const\n\n constructor(config: BedrockResponsesConfig, model: TModel) {\n // Responses is mantle-only — force the mantle base URL (an explicit\n // config.baseURL still wins, e.g. E2E pointing at aimock).\n
|
|
1
|
+
{"version":3,"file":"responses-text.js","names":[],"sources":["../../../src/adapters/responses-text.ts"],"sourcesContent":["import OpenAI from 'openai'\nimport { OpenAIBaseResponsesTextAdapter } from '@tanstack/openai-base'\nimport { withBedrockDefaults } from '../utils/client'\nimport type { Modality } from '@tanstack/ai'\nimport type { BedrockClientConfig } from '../utils/client'\nimport type { BedrockMessageMetadataByModality } from '../message-types'\nimport type {\n BedrockChatModelToolCapabilitiesByName,\n BedrockResponsesModels,\n ResolveInputModalities,\n} from '../model-meta'\nimport type { ExternalResponsesProviderOptions } from '../text/responses-provider-options'\nimport type { OpenAIBaseTextAdapterOptions } from '@tanstack/openai-base'\n\nexport interface BedrockResponsesConfig\n extends BedrockClientConfig, OpenAIBaseTextAdapterOptions {}\n\nexport type { ExternalResponsesProviderOptions as BedrockResponsesProviderOptions } from '../text/responses-provider-options'\n\ntype ResolveToolCapabilities<TModel extends string> =\n TModel extends keyof BedrockChatModelToolCapabilitiesByName\n ? NonNullable<BedrockChatModelToolCapabilitiesByName[TModel]>\n : readonly []\n\n/**\n * Bedrock Responses adapter. Drives mantle's OpenAI-compatible `/responses`\n * endpoint via the OpenAI SDK (`client.responses.create`) — the same base\n * class ai-openai's `openaiText` uses. Responses is mantle-only, so the\n * constructor forces the mantle baseURL.\n */\nexport class BedrockResponsesTextAdapter<\n TModel extends BedrockResponsesModels,\n // Constraint mirrors the chat adapter (and ai-groq / ai-openai) and the base,\n // which parameterises `TProviderOptions extends Record<string, any>`. Our\n // default `ExternalResponsesProviderOptions` is an interface that (lacking an\n // implicit index signature) `Record<string, unknown>` would reject but\n // `Record<string, any>` accepts. This `any` is confined to the generic\n // constraint — no value/shape `as` cast is introduced.\n TProviderOptions extends Record<string, any> =\n ExternalResponsesProviderOptions,\n TInputModalities extends ReadonlyArray<Modality> =\n ResolveInputModalities<TModel>,\n TToolCapabilities extends ReadonlyArray<string> =\n ResolveToolCapabilities<TModel>,\n> extends OpenAIBaseResponsesTextAdapter<\n TModel,\n TProviderOptions,\n TInputModalities,\n BedrockMessageMetadataByModality,\n TToolCapabilities\n> {\n override readonly kind = 'text' as const\n override readonly name = 'bedrock-responses' as const\n\n constructor(config: BedrockResponsesConfig, model: TModel) {\n // Responses is mantle-only — force the mantle base URL (an explicit\n // config.baseURL still wins, e.g. E2E pointing at aimock).\n const options = withBedrockDefaults(config, 'mantle', model)\n super(model, 'bedrock-responses', new OpenAI(options), {\n ...config,\n fetch: options.fetch,\n })\n }\n}\n\n/** Responses adapter with an explicit API key (low-level; the public branching factory delegates here). */\nexport function createBedrockResponsesText<\n TModel extends BedrockResponsesModels,\n>(\n model: TModel,\n apiKey: string,\n config?: Omit<BedrockResponsesConfig, 'apiKey'>,\n): BedrockResponsesTextAdapter<TModel> {\n return new BedrockResponsesTextAdapter({ ...config, apiKey }, model)\n}\n"],"mappings":";;;;;;;;;;AA8BA,IAAa,8BAAb,cAcU,+BAMR;CACA,OAAyB;CACzB,OAAyB;CAEzB,YAAY,QAAgC,OAAe;EAGzD,MAAM,UAAU,oBAAoB,QAAQ,UAAU,KAAK;EAC3D,MAAM,OAAO,qBAAqB,IAAI,OAAO,OAAO,GAAG;GACrD,GAAG;GACH,OAAO,QAAQ;EACjB,CAAC;CACH;AACF;;AAGA,SAAgB,2BAGd,OACA,QACA,QACqC;CACrC,OAAO,IAAI,4BAA4B;EAAE,GAAG;EAAQ;CAAO,GAAG,KAAK;AACrE"}
|
|
@@ -12,7 +12,11 @@ var BedrockTextAdapter = class extends OpenAIBaseChatCompletionsTextAdapter {
|
|
|
12
12
|
kind = "text";
|
|
13
13
|
name = "bedrock";
|
|
14
14
|
constructor(config, model) {
|
|
15
|
-
|
|
15
|
+
const options = withBedrockDefaults(config, void 0, model);
|
|
16
|
+
super(model, "bedrock", new OpenAI(options), {
|
|
17
|
+
...config,
|
|
18
|
+
fetch: options.fetch
|
|
19
|
+
});
|
|
16
20
|
}
|
|
17
21
|
/**
|
|
18
22
|
* Surface reasoning deltas (gpt-oss / Claude reasoning) the OpenAI-compatible
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"text.js","names":[],"sources":["../../../src/adapters/text.ts"],"sourcesContent":["import OpenAI from 'openai'\nimport { OpenAIBaseChatCompletionsTextAdapter } from '@tanstack/openai-base'\nimport { withBedrockDefaults } from '../utils/client'\nimport type { Modality } from '@tanstack/ai'\nimport type { BedrockClientConfig } from '../utils/client'\nimport type { BedrockMessageMetadataByModality } from '../message-types'\nimport type {\n BedrockChatModelToolCapabilitiesByName,\n BedrockChatModels,\n ResolveInputModalities,\n ResolveProviderOptions,\n} from '../model-meta'\nimport type { OpenAIBaseTextAdapterOptions } from '@tanstack/openai-base'\n\nexport interface BedrockTextConfig\n extends BedrockClientConfig, OpenAIBaseTextAdapterOptions {}\n\nexport type { ExternalTextProviderOptions as BedrockTextProviderOptions } from '../text/text-provider-options'\n\ntype ResolveToolCapabilities<TModel extends string> =\n TModel extends keyof BedrockChatModelToolCapabilitiesByName\n ? NonNullable<BedrockChatModelToolCapabilitiesByName[TModel]>\n : readonly []\n\n/**\n * Bedrock Chat Completions adapter. Drives Bedrock's OpenAI-compatible\n * `/chat/completions` endpoint via the OpenAI SDK with a baseURL override\n * (same pattern as ai-groq). Tool conversion, streaming, structured output,\n * and the agent loop come from the base.\n */\nexport class BedrockTextAdapter<\n TModel extends BedrockChatModels,\n // Constraint mirrors ai-groq and the base, which parameterises\n // `TProviderOptions extends Record<string, any>`. Our default\n // `ResolveProviderOptions<TModel>` resolves to the `BedrockTextProviderOptions`\n // interface, which (lacking an implicit index signature) `Record<string,\n // unknown>` would reject but `Record<string, any>` accepts. This `any` is\n // confined to the generic constraint (the established ai-groq pattern) — no\n // value/shape `as` cast is introduced.\n TProviderOptions extends Record<string, any> = ResolveProviderOptions<TModel>,\n TInputModalities extends ReadonlyArray<Modality> =\n ResolveInputModalities<TModel>,\n TToolCapabilities extends ReadonlyArray<string> =\n ResolveToolCapabilities<TModel>,\n> extends OpenAIBaseChatCompletionsTextAdapter<\n TModel,\n TProviderOptions,\n TInputModalities,\n BedrockMessageMetadataByModality,\n TToolCapabilities\n> {\n override readonly kind = 'text' as const\n override readonly name = 'bedrock' as const\n\n constructor(config: BedrockTextConfig, model: TModel) {\n // No `forced` -> honors config.endpoint ('runtime' default, 'mantle' allowed).\n
|
|
1
|
+
{"version":3,"file":"text.js","names":[],"sources":["../../../src/adapters/text.ts"],"sourcesContent":["import OpenAI from 'openai'\nimport { OpenAIBaseChatCompletionsTextAdapter } from '@tanstack/openai-base'\nimport { withBedrockDefaults } from '../utils/client'\nimport type { Modality } from '@tanstack/ai'\nimport type { BedrockClientConfig } from '../utils/client'\nimport type { BedrockMessageMetadataByModality } from '../message-types'\nimport type {\n BedrockChatModelToolCapabilitiesByName,\n BedrockChatModels,\n ResolveInputModalities,\n ResolveProviderOptions,\n} from '../model-meta'\nimport type { OpenAIBaseTextAdapterOptions } from '@tanstack/openai-base'\n\nexport interface BedrockTextConfig\n extends BedrockClientConfig, OpenAIBaseTextAdapterOptions {}\n\nexport type { ExternalTextProviderOptions as BedrockTextProviderOptions } from '../text/text-provider-options'\n\ntype ResolveToolCapabilities<TModel extends string> =\n TModel extends keyof BedrockChatModelToolCapabilitiesByName\n ? NonNullable<BedrockChatModelToolCapabilitiesByName[TModel]>\n : readonly []\n\n/**\n * Bedrock Chat Completions adapter. Drives Bedrock's OpenAI-compatible\n * `/chat/completions` endpoint via the OpenAI SDK with a baseURL override\n * (same pattern as ai-groq). Tool conversion, streaming, structured output,\n * and the agent loop come from the base.\n */\nexport class BedrockTextAdapter<\n TModel extends BedrockChatModels,\n // Constraint mirrors ai-groq and the base, which parameterises\n // `TProviderOptions extends Record<string, any>`. Our default\n // `ResolveProviderOptions<TModel>` resolves to the `BedrockTextProviderOptions`\n // interface, which (lacking an implicit index signature) `Record<string,\n // unknown>` would reject but `Record<string, any>` accepts. This `any` is\n // confined to the generic constraint (the established ai-groq pattern) — no\n // value/shape `as` cast is introduced.\n TProviderOptions extends Record<string, any> = ResolveProviderOptions<TModel>,\n TInputModalities extends ReadonlyArray<Modality> =\n ResolveInputModalities<TModel>,\n TToolCapabilities extends ReadonlyArray<string> =\n ResolveToolCapabilities<TModel>,\n> extends OpenAIBaseChatCompletionsTextAdapter<\n TModel,\n TProviderOptions,\n TInputModalities,\n BedrockMessageMetadataByModality,\n TToolCapabilities\n> {\n override readonly kind = 'text' as const\n override readonly name = 'bedrock' as const\n\n constructor(config: BedrockTextConfig, model: TModel) {\n // No `forced` -> honors config.endpoint ('runtime' default, 'mantle' allowed).\n const options = withBedrockDefaults(config, undefined, model)\n super(model, 'bedrock', new OpenAI(options), {\n ...config,\n fetch: options.fetch,\n })\n }\n\n /**\n * Surface reasoning deltas (gpt-oss / Claude reasoning) the OpenAI-compatible\n * way. Base types the chunk as `unknown`; narrow with runtime guards — no\n * `as` casts, no `any`.\n */\n protected override extractReasoning(\n chunk: unknown,\n ): { text: string } | undefined {\n return readDeltaReasoning(chunk)\n }\n}\n\n/** Cast-free narrowing of a Chat Completions chunk's reasoning delta. */\nfunction readDeltaReasoning(chunk: unknown): { text: string } | undefined {\n if (typeof chunk !== 'object' || chunk === null || !('choices' in chunk))\n return undefined\n if (!Array.isArray(chunk.choices)) return undefined\n const choice: unknown = chunk.choices[0]\n if (typeof choice !== 'object' || choice === null || !('delta' in choice))\n return undefined\n const delta = choice.delta\n if (typeof delta !== 'object' || delta === null) return undefined\n const raw =\n 'reasoning' in delta && typeof delta.reasoning === 'string'\n ? delta.reasoning\n : 'reasoning_content' in delta &&\n typeof delta.reasoning_content === 'string'\n ? delta.reasoning_content\n : undefined\n return raw && raw.length > 0 ? { text: raw } : undefined\n}\n\n/** Chat adapter with an explicit API key (low-level; the public branching factory delegates here). */\nexport function createBedrockChat<TModel extends BedrockChatModels>(\n model: TModel,\n apiKey: string,\n config?: Omit<BedrockTextConfig, 'apiKey'>,\n): BedrockTextAdapter<TModel> {\n return new BedrockTextAdapter({ ...config, apiKey }, model)\n}\n"],"mappings":";;;;;;;;;;AA8BA,IAAa,qBAAb,cAcU,qCAMR;CACA,OAAyB;CACzB,OAAyB;CAEzB,YAAY,QAA2B,OAAe;EAEpD,MAAM,UAAU,oBAAoB,QAAQ,KAAA,GAAW,KAAK;EAC5D,MAAM,OAAO,WAAW,IAAI,OAAO,OAAO,GAAG;GAC3C,GAAG;GACH,OAAO,QAAQ;EACjB,CAAC;CACH;;;;;;CAOA,iBACE,OAC8B;EAC9B,OAAO,mBAAmB,KAAK;CACjC;AACF;;AAGA,SAAS,mBAAmB,OAA8C;CACxE,IAAI,OAAO,UAAU,YAAY,UAAU,QAAQ,EAAE,aAAa,QAChE,OAAO,KAAA;CACT,IAAI,CAAC,MAAM,QAAQ,MAAM,OAAO,GAAG,OAAO,KAAA;CAC1C,MAAM,SAAkB,MAAM,QAAQ;CACtC,IAAI,OAAO,WAAW,YAAY,WAAW,QAAQ,EAAE,WAAW,SAChE,OAAO,KAAA;CACT,MAAM,QAAQ,OAAO;CACrB,IAAI,OAAO,UAAU,YAAY,UAAU,MAAM,OAAO,KAAA;CACxD,MAAM,MACJ,eAAe,SAAS,OAAO,MAAM,cAAc,WAC/C,MAAM,YACN,uBAAuB,SACrB,OAAO,MAAM,sBAAsB,WACnC,MAAM,oBACN,KAAA;CACR,OAAO,OAAO,IAAI,SAAS,IAAI,EAAE,MAAM,IAAI,IAAI,KAAA;AACjD;;AAGA,SAAgB,kBACd,OACA,QACA,QAC4B;CAC5B,OAAO,IAAI,mBAAmB;EAAE,GAAG;EAAQ;CAAO,GAAG,KAAK;AAC5D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-converter.js","names":[],"sources":["../../../src/converse/message-converter.ts"],"sourcesContent":["import {\n isFileSource,\n normalizeSystemPrompts,\n unsupportedFileSourceError,\n} from '@tanstack/ai'\nimport type {\n ContentPart,\n ContentPartDataSource,\n DocumentPart,\n ImagePart,\n ModelMessage,\n SystemPrompt,\n TextPart,\n} from '@tanstack/ai'\nimport type {\n ContentBlock,\n Message,\n SystemContentBlock,\n ToolResultContentBlock,\n} from '@aws-sdk/client-bedrock-runtime'\nimport type { DocumentType } from '@smithy/types'\nimport type {\n BedrockSystemPromptMetadata,\n BedrockTextMetadata,\n} from '../message-types'\n\n// ---------------------------------------------------------------------------\n// Helpers\n// ---------------------------------------------------------------------------\n\nfunction base64ToBytes(b64: string): Uint8Array {\n return new Uint8Array(Buffer.from(b64, 'base64'))\n}\n\nfunction imageFormat(mime: string): 'png' | 'jpeg' | 'gif' | 'webp' {\n switch (mime) {\n case 'image/png':\n return 'png'\n case 'image/jpeg':\n case 'image/jpg':\n return 'jpeg'\n case 'image/gif':\n return 'gif'\n case 'image/webp':\n return 'webp'\n default:\n throw new Error(\n `Bedrock Converse: unsupported image MIME type \"${mime}\". Supported types: image/png, image/jpeg, image/gif, image/webp.`,\n )\n }\n}\n\nfunction documentFormat(\n mime: string,\n): 'pdf' | 'csv' | 'doc' | 'docx' | 'xls' | 'xlsx' | 'html' | 'txt' | 'md' {\n switch (mime) {\n case 'application/pdf':\n return 'pdf'\n case 'text/csv':\n return 'csv'\n case 'application/msword':\n return 'doc'\n case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':\n return 'docx'\n case 'application/vnd.ms-excel':\n return 'xls'\n case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':\n return 'xlsx'\n case 'text/html':\n return 'html'\n case 'text/plain':\n return 'txt'\n case 'text/markdown':\n case 'text/x-markdown':\n return 'md'\n default:\n throw new Error(\n `Bedrock Converse: unsupported document MIME type \"${mime}\". Supported types: pdf, csv, doc, docx, xls, xlsx, html, txt, md.`,\n )\n }\n}\n\nfunction stringContent(\n content: string | null | undefined | Array<ContentPart>,\n): string {\n if (content === null || content === undefined) return ''\n if (typeof content === 'string') return content\n return content\n .filter((p): p is TextPart => p.type === 'text')\n .map((p) => p.content)\n .join('')\n}\n\nfunction isTextPart(p: ContentPart): p is TextPart {\n return p.type === 'text'\n}\n\nfunction isImagePart(p: ContentPart): p is ImagePart {\n return p.type === 'image'\n}\n\nfunction isDocumentPart(p: ContentPart): p is DocumentPart {\n return p.type === 'document'\n}\n\nfunction isDataSource(\n source: ImagePart['source'] | DocumentPart['source'],\n): source is ContentPartDataSource {\n return source.type === 'data'\n}\n\nfunction contentPartToBlock(part: ContentPart, docIndex: number): ContentBlock {\n if (isTextPart(part)) {\n return { text: part.content }\n }\n\n if (isImagePart(part)) {\n const { source } = part\n if (isFileSource(source)) throw unsupportedFileSourceError('bedrock')\n if (!isDataSource(source)) {\n throw new Error(\n 'Bedrock Converse requires inline image bytes; URL image sources are not supported.',\n )\n }\n return {\n image: {\n format: imageFormat(source.mimeType),\n source: { bytes: base64ToBytes(source.value) },\n },\n }\n }\n\n if (isDocumentPart(part)) {\n const { source } = part\n if (isFileSource(source)) throw unsupportedFileSourceError('bedrock')\n if (!isDataSource(source)) {\n throw new Error(\n 'Bedrock Converse requires inline document bytes; URL document sources are not supported.',\n )\n }\n return {\n document: {\n format: documentFormat(source.mimeType),\n name: `document-${docIndex}`,\n source: { bytes: base64ToBytes(source.value) },\n },\n }\n }\n\n // Fail loud for unsupported part types (audio, video, etc.)\n throw new Error(\n `Bedrock Converse does not support content part type \"${String(part.type)}\".`,\n )\n}\n\nfunction messageToBlocks(\n msg: ModelMessage,\n docCounter: { value: number },\n): Array<ContentBlock> {\n const blocks: Array<ContentBlock> = []\n\n if (msg.role === 'tool') {\n if (!msg.toolCallId) {\n throw new Error(\n 'Bedrock Converse: tool message is missing toolCallId. Every tool result must reference the tool use ID it is responding to.',\n )\n }\n const textContent = stringContent(msg.content)\n const toolResult: ToolResultContentBlock = { text: textContent }\n blocks.push({\n toolResult: {\n toolUseId: msg.toolCallId,\n content: [toolResult],\n status: 'success',\n },\n })\n return blocks\n }\n\n // Map content field to text/image/document blocks\n if (typeof msg.content === 'string') {\n if (msg.content !== '') {\n blocks.push({ text: msg.content })\n }\n } else if (Array.isArray(msg.content)) {\n for (const part of msg.content) {\n const docIndex = isDocumentPart(part) ? ++docCounter.value : 0\n blocks.push(contentPartToBlock(part, docIndex))\n if (isTextPart(part)) {\n const { cachePoint } = (part.metadata ?? {}) as BedrockTextMetadata\n if (cachePoint) blocks.push({ cachePoint })\n }\n }\n }\n // null → no text blocks\n\n // Append toolUse blocks for assistant tool calls. Malformed or non-object\n // arguments come from a prior assistant turn the engine already accepted, so\n // they signal a real upstream problem — throw rather than silently coercing to\n // `{}` and forwarding a corrupted tool call (the adapter's catch surfaces it\n // as a RUN_ERROR).\n if (msg.role === 'assistant' && msg.toolCalls) {\n for (const call of msg.toolCalls) {\n const rawArguments = call.function.arguments || '{}'\n let parsed: unknown\n try {\n parsed = JSON.parse(rawArguments)\n } catch (error: unknown) {\n throw new Error(\n `Bedrock Converse: tool call \"${call.function.name}\" has malformed JSON arguments (${String(error)}). Raw: ${rawArguments}`,\n )\n }\n if (\n parsed === null ||\n typeof parsed !== 'object' ||\n Array.isArray(parsed)\n ) {\n throw new Error(\n `Bedrock Converse: tool call \"${call.function.name}\" arguments must be a JSON object, got ${Array.isArray(parsed) ? 'array' : typeof parsed}.`,\n )\n }\n blocks.push({\n toolUse: {\n toolUseId: call.id,\n name: call.function.name,\n input: parsed as DocumentType,\n },\n })\n }\n }\n\n return blocks\n}\n\n// ---------------------------------------------------------------------------\n// Public API\n// ---------------------------------------------------------------------------\n\n/**\n * Convert TanStack AI messages + system prompts into the Converse API format.\n *\n * - System prompts are lifted into `SystemContentBlock[]`; a prompt whose\n * `metadata.cachePoint` is set is followed by a `cachePoint` block.\n * - `tool` role messages are remapped to `user` role `toolResult` blocks.\n * - Consecutive messages with the same Converse role are merged (Converse\n * requires strict user/assistant alternation).\n */\nexport function toConverseMessages(\n messages: Array<ModelMessage>,\n systemPrompts?: Array<SystemPrompt>,\n): { system: Array<SystemContentBlock>; messages: Array<Message> } {\n // Build system blocks (uses normalizeSystemPrompts for runtime validation)\n const system: Array<SystemContentBlock> =\n normalizeSystemPrompts<BedrockSystemPromptMetadata>(systemPrompts).flatMap(\n (p) =>\n p.metadata?.cachePoint\n ? [{ text: p.content }, { cachePoint: p.metadata.cachePoint }]\n : [{ text: p.content }],\n )\n\n // Convert each ModelMessage to a Converse Message, merging same-role pairs\n const converseMessages: Array<Message> = []\n // Global document counter: ensures every document block across all messages\n // gets a unique name, preventing Bedrock ValidationException for duplicate names.\n const docCounter = { value: 0 }\n\n for (const msg of messages) {\n // Map TanStack roles to Converse roles\n const converseRole: 'user' | 'assistant' =\n msg.role === 'assistant' ? 'assistant' : 'user'\n\n const blocks = messageToBlocks(msg, docCounter)\n\n // Skip messages that produce no content blocks (e.g. assistant with\n // null content and no toolCalls). Pushing an empty-content message to\n // Converse triggers a ValidationException.\n if (blocks.length === 0) continue\n\n const last = converseMessages[converseMessages.length - 1]\n if (last && last.role === converseRole) {\n // Merge into the previous message's content array\n last.content = [...(last.content ?? []), ...blocks]\n } else {\n converseMessages.push({ role: converseRole, content: blocks })\n }\n }\n\n return { system, messages: converseMessages }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"message-converter.js","names":[],"sources":["../../../src/converse/message-converter.ts"],"sourcesContent":["import {\n isFileSource,\n normalizeSystemPrompts,\n unsupportedFileSourceError,\n} from '@tanstack/ai'\nimport type {\n ContentPart,\n ContentPartDataSource,\n DocumentPart,\n ImagePart,\n ModelMessage,\n SystemPrompt,\n TextPart,\n} from '@tanstack/ai'\nimport type {\n ContentBlock,\n Message,\n SystemContentBlock,\n ToolResultContentBlock,\n} from '@aws-sdk/client-bedrock-runtime'\nimport type { DocumentType } from '@smithy/types'\nimport type {\n BedrockSystemPromptMetadata,\n BedrockTextMetadata,\n} from '../message-types'\n\n// ---------------------------------------------------------------------------\n// Helpers\n// ---------------------------------------------------------------------------\n\nfunction base64ToBytes(b64: string): Uint8Array {\n return new Uint8Array(Buffer.from(b64, 'base64'))\n}\n\nfunction imageFormat(mime: string): 'png' | 'jpeg' | 'gif' | 'webp' {\n switch (mime) {\n case 'image/png':\n return 'png'\n case 'image/jpeg':\n case 'image/jpg':\n return 'jpeg'\n case 'image/gif':\n return 'gif'\n case 'image/webp':\n return 'webp'\n default:\n throw new Error(\n `Bedrock Converse: unsupported image MIME type \"${mime}\". Supported types: image/png, image/jpeg, image/gif, image/webp.`,\n )\n }\n}\n\nfunction documentFormat(\n mime: string,\n): 'pdf' | 'csv' | 'doc' | 'docx' | 'xls' | 'xlsx' | 'html' | 'txt' | 'md' {\n switch (mime) {\n case 'application/pdf':\n return 'pdf'\n case 'text/csv':\n return 'csv'\n case 'application/msword':\n return 'doc'\n case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':\n return 'docx'\n case 'application/vnd.ms-excel':\n return 'xls'\n case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':\n return 'xlsx'\n case 'text/html':\n return 'html'\n case 'text/plain':\n return 'txt'\n case 'text/markdown':\n case 'text/x-markdown':\n return 'md'\n default:\n throw new Error(\n `Bedrock Converse: unsupported document MIME type \"${mime}\". Supported types: pdf, csv, doc, docx, xls, xlsx, html, txt, md.`,\n )\n }\n}\n\nfunction stringContent(\n content: string | null | undefined | Array<ContentPart>,\n): string {\n if (content === null || content === undefined) return ''\n if (typeof content === 'string') return content\n return content\n .filter((p): p is TextPart => p.type === 'text')\n .map((p) => p.content)\n .join('')\n}\n\nfunction isTextPart(p: ContentPart): p is TextPart {\n return p.type === 'text'\n}\n\nfunction isImagePart(p: ContentPart): p is ImagePart {\n return p.type === 'image'\n}\n\nfunction isDocumentPart(p: ContentPart): p is DocumentPart {\n return p.type === 'document'\n}\n\nfunction isDataSource(\n source: ImagePart['source'] | DocumentPart['source'],\n): source is ContentPartDataSource {\n return source.type === 'data'\n}\n\nfunction contentPartToBlock(part: ContentPart, docIndex: number): ContentBlock {\n if (isTextPart(part)) {\n return { text: part.content }\n }\n\n if (isImagePart(part)) {\n const { source } = part\n if (isFileSource(source)) throw unsupportedFileSourceError('bedrock')\n if (!isDataSource(source)) {\n throw new Error(\n 'Bedrock Converse requires inline image bytes; URL image sources are not supported.',\n )\n }\n return {\n image: {\n format: imageFormat(source.mimeType),\n source: { bytes: base64ToBytes(source.value) },\n },\n }\n }\n\n if (isDocumentPart(part)) {\n const { source } = part\n if (isFileSource(source)) throw unsupportedFileSourceError('bedrock')\n if (!isDataSource(source)) {\n throw new Error(\n 'Bedrock Converse requires inline document bytes; URL document sources are not supported.',\n )\n }\n return {\n document: {\n format: documentFormat(source.mimeType),\n name: `document-${docIndex}`,\n source: { bytes: base64ToBytes(source.value) },\n },\n }\n }\n\n // Fail loud for unsupported part types (audio, video, etc.)\n throw new Error(\n `Bedrock Converse does not support content part type \"${String(part.type)}\".`,\n )\n}\n\nfunction messageToBlocks(\n msg: ModelMessage,\n docCounter: { value: number },\n): Array<ContentBlock> {\n const blocks: Array<ContentBlock> = []\n\n if (msg.role === 'tool') {\n if (!msg.toolCallId) {\n throw new Error(\n 'Bedrock Converse: tool message is missing toolCallId. Every tool result must reference the tool use ID it is responding to.',\n )\n }\n const textContent = stringContent(msg.content)\n const toolResult: ToolResultContentBlock = { text: textContent }\n blocks.push({\n toolResult: {\n toolUseId: msg.toolCallId,\n content: [toolResult],\n status: msg.error !== undefined ? 'error' : 'success',\n },\n })\n return blocks\n }\n\n // Map content field to text/image/document blocks\n if (typeof msg.content === 'string') {\n if (msg.content !== '') {\n blocks.push({ text: msg.content })\n }\n } else if (Array.isArray(msg.content)) {\n for (const part of msg.content) {\n const docIndex = isDocumentPart(part) ? ++docCounter.value : 0\n blocks.push(contentPartToBlock(part, docIndex))\n if (isTextPart(part)) {\n const { cachePoint } = (part.metadata ?? {}) as BedrockTextMetadata\n if (cachePoint) blocks.push({ cachePoint })\n }\n }\n }\n // null → no text blocks\n\n // Append toolUse blocks for assistant tool calls. Malformed or non-object\n // arguments come from a prior assistant turn the engine already accepted, so\n // they signal a real upstream problem — throw rather than silently coercing to\n // `{}` and forwarding a corrupted tool call (the adapter's catch surfaces it\n // as a RUN_ERROR).\n if (msg.role === 'assistant' && msg.toolCalls) {\n for (const call of msg.toolCalls) {\n const rawArguments = call.function.arguments || '{}'\n let parsed: unknown\n try {\n parsed = JSON.parse(rawArguments)\n } catch (error: unknown) {\n throw new Error(\n `Bedrock Converse: tool call \"${call.function.name}\" has malformed JSON arguments (${String(error)}). Raw: ${rawArguments}`,\n )\n }\n if (\n parsed === null ||\n typeof parsed !== 'object' ||\n Array.isArray(parsed)\n ) {\n throw new Error(\n `Bedrock Converse: tool call \"${call.function.name}\" arguments must be a JSON object, got ${Array.isArray(parsed) ? 'array' : typeof parsed}.`,\n )\n }\n blocks.push({\n toolUse: {\n toolUseId: call.id,\n name: call.function.name,\n input: parsed as DocumentType,\n },\n })\n }\n }\n\n return blocks\n}\n\n// ---------------------------------------------------------------------------\n// Public API\n// ---------------------------------------------------------------------------\n\n/**\n * Convert TanStack AI messages + system prompts into the Converse API format.\n *\n * - System prompts are lifted into `SystemContentBlock[]`; a prompt whose\n * `metadata.cachePoint` is set is followed by a `cachePoint` block.\n * - `tool` role messages are remapped to `user` role `toolResult` blocks.\n * - Consecutive messages with the same Converse role are merged (Converse\n * requires strict user/assistant alternation).\n */\nexport function toConverseMessages(\n messages: Array<ModelMessage>,\n systemPrompts?: Array<SystemPrompt>,\n): { system: Array<SystemContentBlock>; messages: Array<Message> } {\n // Build system blocks (uses normalizeSystemPrompts for runtime validation)\n const system: Array<SystemContentBlock> =\n normalizeSystemPrompts<BedrockSystemPromptMetadata>(systemPrompts).flatMap(\n (p) =>\n p.metadata?.cachePoint\n ? [{ text: p.content }, { cachePoint: p.metadata.cachePoint }]\n : [{ text: p.content }],\n )\n\n // Convert each ModelMessage to a Converse Message, merging same-role pairs\n const converseMessages: Array<Message> = []\n // Global document counter: ensures every document block across all messages\n // gets a unique name, preventing Bedrock ValidationException for duplicate names.\n const docCounter = { value: 0 }\n\n for (const msg of messages) {\n // Map TanStack roles to Converse roles\n const converseRole: 'user' | 'assistant' =\n msg.role === 'assistant' ? 'assistant' : 'user'\n\n const blocks = messageToBlocks(msg, docCounter)\n\n // Skip messages that produce no content blocks (e.g. assistant with\n // null content and no toolCalls). Pushing an empty-content message to\n // Converse triggers a ValidationException.\n if (blocks.length === 0) continue\n\n const last = converseMessages[converseMessages.length - 1]\n if (last && last.role === converseRole) {\n // Merge into the previous message's content array\n last.content = [...(last.content ?? []), ...blocks]\n } else {\n converseMessages.push({ role: converseRole, content: blocks })\n }\n }\n\n return { system, messages: converseMessages }\n}\n"],"mappings":"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"}
|
|
@@ -3,10 +3,11 @@ import { TokenUsage as ConverseTokenUsage } from '@aws-sdk/client-bedrock-runtim
|
|
|
3
3
|
/**
|
|
4
4
|
* Build normalized {@link TokenUsage} from a Converse `usage` object.
|
|
5
5
|
*
|
|
6
|
-
* `
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* checkpoint
|
|
6
|
+
* `promptTokens` is the total input. Converse `inputTokens` is only the
|
|
7
|
+
* uncached part, so the cache reads and cache writes are added to it. The two
|
|
8
|
+
* cache parts also go on `promptTokensDetails`. Zero is kept, unlike the
|
|
9
|
+
* Anthropic and OpenAI builders. Bedrock leaves the fields out when no
|
|
10
|
+
* checkpoint applied and sends 0 when one did (a served checkpoint writes 0),
|
|
11
|
+
* so absent and zero are different results.
|
|
11
12
|
*/
|
|
12
13
|
export declare function buildConverseUsage(usage: ConverseTokenUsage): TokenUsage;
|
|
@@ -3,20 +3,23 @@ import { buildBaseUsage } from "@tanstack/ai";
|
|
|
3
3
|
/**
|
|
4
4
|
* Build normalized {@link TokenUsage} from a Converse `usage` object.
|
|
5
5
|
*
|
|
6
|
-
* `
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* checkpoint
|
|
6
|
+
* `promptTokens` is the total input. Converse `inputTokens` is only the
|
|
7
|
+
* uncached part, so the cache reads and cache writes are added to it. The two
|
|
8
|
+
* cache parts also go on `promptTokensDetails`. Zero is kept, unlike the
|
|
9
|
+
* Anthropic and OpenAI builders. Bedrock leaves the fields out when no
|
|
10
|
+
* checkpoint applied and sends 0 when one did (a served checkpoint writes 0),
|
|
11
|
+
* so absent and zero are different results.
|
|
11
12
|
*/
|
|
12
13
|
function buildConverseUsage(usage) {
|
|
13
|
-
const result = buildBaseUsage({
|
|
14
|
-
promptTokens: usage.inputTokens ?? 0,
|
|
15
|
-
completionTokens: usage.outputTokens ?? 0,
|
|
16
|
-
totalTokens: usage.totalTokens ?? 0
|
|
17
|
-
});
|
|
18
14
|
const cachedTokens = usage.cacheReadInputTokens;
|
|
19
15
|
const cacheWriteTokens = usage.cacheWriteInputTokens;
|
|
16
|
+
const promptTokens = (usage.inputTokens ?? 0) + (cachedTokens ?? 0) + (cacheWriteTokens ?? 0);
|
|
17
|
+
const completionTokens = usage.outputTokens ?? 0;
|
|
18
|
+
const result = buildBaseUsage({
|
|
19
|
+
promptTokens,
|
|
20
|
+
completionTokens,
|
|
21
|
+
totalTokens: Math.max(usage.totalTokens ?? 0, promptTokens + completionTokens)
|
|
22
|
+
});
|
|
20
23
|
const promptTokensDetails = {
|
|
21
24
|
...cachedTokens !== void 0 ? { cachedTokens } : {},
|
|
22
25
|
...cacheWriteTokens !== void 0 ? { cacheWriteTokens } : {}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.js","names":[],"sources":["../../../src/converse/usage.ts"],"sourcesContent":["import { buildBaseUsage } from '@tanstack/ai'\nimport type { TokenUsage } from '@tanstack/ai'\nimport type { TokenUsage as ConverseTokenUsage } from '@aws-sdk/client-bedrock-runtime'\n\n/**\n * Build normalized {@link TokenUsage} from a Converse `usage` object.\n *\n * `
|
|
1
|
+
{"version":3,"file":"usage.js","names":[],"sources":["../../../src/converse/usage.ts"],"sourcesContent":["import { buildBaseUsage } from '@tanstack/ai'\nimport type { TokenUsage } from '@tanstack/ai'\nimport type { TokenUsage as ConverseTokenUsage } from '@aws-sdk/client-bedrock-runtime'\n\n/**\n * Build normalized {@link TokenUsage} from a Converse `usage` object.\n *\n * `promptTokens` is the total input. Converse `inputTokens` is only the\n * uncached part, so the cache reads and cache writes are added to it. The two\n * cache parts also go on `promptTokensDetails`. Zero is kept, unlike the\n * Anthropic and OpenAI builders. Bedrock leaves the fields out when no\n * checkpoint applied and sends 0 when one did (a served checkpoint writes 0),\n * so absent and zero are different results.\n */\nexport function buildConverseUsage(usage: ConverseTokenUsage): TokenUsage {\n const cachedTokens = usage.cacheReadInputTokens\n const cacheWriteTokens = usage.cacheWriteInputTokens\n const promptTokens =\n (usage.inputTokens ?? 0) + (cachedTokens ?? 0) + (cacheWriteTokens ?? 0)\n const completionTokens = usage.outputTokens ?? 0\n const result = buildBaseUsage({\n promptTokens,\n completionTokens,\n // The provider total must not be lower than the sum of the parts.\n totalTokens: Math.max(\n usage.totalTokens ?? 0,\n promptTokens + completionTokens,\n ),\n })\n\n const promptTokensDetails = {\n ...(cachedTokens !== undefined ? { cachedTokens } : {}),\n ...(cacheWriteTokens !== undefined ? { cacheWriteTokens } : {}),\n }\n if (Object.keys(promptTokensDetails).length > 0) {\n result.promptTokensDetails = promptTokensDetails\n }\n\n return result\n}\n"],"mappings":";;;;;;;;;;;;AAcA,SAAgB,mBAAmB,OAAuC;CACxE,MAAM,eAAe,MAAM;CAC3B,MAAM,mBAAmB,MAAM;CAC/B,MAAM,gBACH,MAAM,eAAe,MAAM,gBAAgB,MAAM,oBAAoB;CACxE,MAAM,mBAAmB,MAAM,gBAAgB;CAC/C,MAAM,SAAS,eAAe;EAC5B;EACA;EAEA,aAAa,KAAK,IAChB,MAAM,eAAe,GACrB,eAAe,gBACjB;CACF,CAAC;CAED,MAAM,sBAAsB;EAC1B,GAAI,iBAAiB,KAAA,IAAY,EAAE,aAAa,IAAI,CAAC;EACrD,GAAI,qBAAqB,KAAA,IAAY,EAAE,iBAAiB,IAAI,CAAC;CAC/D;CACA,IAAI,OAAO,KAAK,mBAAmB,CAAC,CAAC,SAAS,GAC5C,OAAO,sBAAsB;CAG/B,OAAO;AACT"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tanstack/ai-bedrock",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.5.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Amazon Bedrock adapter for TanStack AI — OpenAI-compatible chat, responses, tools, and reasoning.",
|
|
6
6
|
"author": "",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"vite": "^8.2.1"
|
|
44
44
|
},
|
|
45
45
|
"peerDependencies": {
|
|
46
|
-
"@tanstack/ai": "^0.
|
|
46
|
+
"@tanstack/ai": "^0.68.0"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"@aws-crypto/sha256-js": "^5.2.0",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
"@smithy/signature-v4": "^5.4.5",
|
|
53
53
|
"@smithy/types": "^4.14.2",
|
|
54
54
|
"openai": "^7.30.0",
|
|
55
|
-
"@tanstack/openai-base": "^0.
|
|
55
|
+
"@tanstack/openai-base": "^0.13.1"
|
|
56
56
|
},
|
|
57
57
|
"scripts": {
|
|
58
58
|
"build": "vite build",
|
|
@@ -55,12 +55,11 @@ export class BedrockResponsesTextAdapter<
|
|
|
55
55
|
constructor(config: BedrockResponsesConfig, model: TModel) {
|
|
56
56
|
// Responses is mantle-only — force the mantle base URL (an explicit
|
|
57
57
|
// config.baseURL still wins, e.g. E2E pointing at aimock).
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
)
|
|
58
|
+
const options = withBedrockDefaults(config, 'mantle', model)
|
|
59
|
+
super(model, 'bedrock-responses', new OpenAI(options), {
|
|
60
|
+
...config,
|
|
61
|
+
fetch: options.fetch,
|
|
62
|
+
})
|
|
64
63
|
}
|
|
65
64
|
}
|
|
66
65
|
|
package/src/adapters/text.ts
CHANGED
|
@@ -54,12 +54,11 @@ export class BedrockTextAdapter<
|
|
|
54
54
|
|
|
55
55
|
constructor(config: BedrockTextConfig, model: TModel) {
|
|
56
56
|
// No `forced` -> honors config.endpoint ('runtime' default, 'mantle' allowed).
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
)
|
|
57
|
+
const options = withBedrockDefaults(config, undefined, model)
|
|
58
|
+
super(model, 'bedrock', new OpenAI(options), {
|
|
59
|
+
...config,
|
|
60
|
+
fetch: options.fetch,
|
|
61
|
+
})
|
|
63
62
|
}
|
|
64
63
|
|
|
65
64
|
/**
|
package/src/converse/usage.ts
CHANGED
|
@@ -5,21 +5,29 @@ import type { TokenUsage as ConverseTokenUsage } from '@aws-sdk/client-bedrock-r
|
|
|
5
5
|
/**
|
|
6
6
|
* Build normalized {@link TokenUsage} from a Converse `usage` object.
|
|
7
7
|
*
|
|
8
|
-
* `
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
* checkpoint
|
|
8
|
+
* `promptTokens` is the total input. Converse `inputTokens` is only the
|
|
9
|
+
* uncached part, so the cache reads and cache writes are added to it. The two
|
|
10
|
+
* cache parts also go on `promptTokensDetails`. Zero is kept, unlike the
|
|
11
|
+
* Anthropic and OpenAI builders. Bedrock leaves the fields out when no
|
|
12
|
+
* checkpoint applied and sends 0 when one did (a served checkpoint writes 0),
|
|
13
|
+
* so absent and zero are different results.
|
|
13
14
|
*/
|
|
14
15
|
export function buildConverseUsage(usage: ConverseTokenUsage): TokenUsage {
|
|
16
|
+
const cachedTokens = usage.cacheReadInputTokens
|
|
17
|
+
const cacheWriteTokens = usage.cacheWriteInputTokens
|
|
18
|
+
const promptTokens =
|
|
19
|
+
(usage.inputTokens ?? 0) + (cachedTokens ?? 0) + (cacheWriteTokens ?? 0)
|
|
20
|
+
const completionTokens = usage.outputTokens ?? 0
|
|
15
21
|
const result = buildBaseUsage({
|
|
16
|
-
promptTokens
|
|
17
|
-
completionTokens
|
|
18
|
-
|
|
22
|
+
promptTokens,
|
|
23
|
+
completionTokens,
|
|
24
|
+
// The provider total must not be lower than the sum of the parts.
|
|
25
|
+
totalTokens: Math.max(
|
|
26
|
+
usage.totalTokens ?? 0,
|
|
27
|
+
promptTokens + completionTokens,
|
|
28
|
+
),
|
|
19
29
|
})
|
|
20
30
|
|
|
21
|
-
const cachedTokens = usage.cacheReadInputTokens
|
|
22
|
-
const cacheWriteTokens = usage.cacheWriteInputTokens
|
|
23
31
|
const promptTokensDetails = {
|
|
24
32
|
...(cachedTokens !== undefined ? { cachedTokens } : {}),
|
|
25
33
|
...(cacheWriteTokens !== undefined ? { cacheWriteTokens } : {}),
|