@tanstack/ai-bedrock 0.6.2 → 1.1.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/README.md +1 -0
- package/dist/esm/adapters/converse-text.d.ts +2 -2
- package/dist/esm/adapters/converse-text.js +20 -16
- package/dist/esm/adapters/converse-text.js.map +1 -1
- package/dist/esm/adapters/embedding.d.ts +1 -1
- package/dist/esm/adapters/embedding.js +5 -5
- package/dist/esm/adapters/embedding.js.map +1 -1
- package/dist/esm/converse/stream-processor.d.ts +2 -2
- package/dist/esm/converse/stream-processor.js +8 -33
- package/dist/esm/converse/stream-processor.js.map +1 -1
- package/dist/esm/converse/usage.js +3 -1
- package/dist/esm/converse/usage.js.map +1 -1
- package/package.json +3 -3
- package/src/adapters/converse-text.ts +24 -12
- package/src/adapters/embedding.ts +5 -3
- package/src/converse/stream-processor.ts +2 -30
- package/src/converse/usage.ts +5 -0
package/README.md
CHANGED
|
@@ -55,6 +55,7 @@ const adapter = bedrockText('us.anthropic.claude-haiku-4-5-20251001-v1:0', {
|
|
|
55
55
|
for await (const chunk of chat({
|
|
56
56
|
adapter,
|
|
57
57
|
messages: [{ role: 'user', content: 'Hello from Bedrock!' }],
|
|
58
|
+
threadId: 'thread-1',
|
|
58
59
|
})) {
|
|
59
60
|
if (chunk.type === 'TEXT_MESSAGE_CONTENT')
|
|
60
61
|
process.stdout.write(chunk.delta ?? '')
|
|
@@ -63,8 +63,8 @@ export declare class BedrockConverseTextAdapter<TModel extends BedrockConverseMo
|
|
|
63
63
|
* credential provider chain and the default scheme order.
|
|
64
64
|
*/
|
|
65
65
|
protected buildClientConfig(resolved: ResolvedBedrockAuth, region: string, endpoint: string | undefined): BedrockRuntimeClientConfig;
|
|
66
|
-
protected sendStream(input: ConverseStreamCommandInput): Promise<AsyncIterable<ConverseStreamOutput>>;
|
|
67
|
-
protected send(input: ConverseCommandInput): Promise<ConverseCommandOutput>;
|
|
66
|
+
protected sendStream(input: ConverseStreamCommandInput, signal?: AbortSignal | null): Promise<AsyncIterable<ConverseStreamOutput>>;
|
|
67
|
+
protected send(input: ConverseCommandInput, signal?: AbortSignal | null): Promise<ConverseCommandOutput>;
|
|
68
68
|
chatStream(options: TextOptions<TProviderOptions>): AsyncIterable<AdapterYieldChunk>;
|
|
69
69
|
/**
|
|
70
70
|
* Structured output via the forced-tool strategy. Converse has no native
|
|
@@ -100,21 +100,21 @@ var BedrockConverseTextAdapter = class extends BaseTextAdapter {
|
|
|
100
100
|
...endpoint ? { endpoint } : {}
|
|
101
101
|
};
|
|
102
102
|
}
|
|
103
|
-
async sendStream(input) {
|
|
103
|
+
async sendStream(input, signal) {
|
|
104
104
|
const { ConverseStreamCommand } = await this.importBedrockRuntime();
|
|
105
105
|
const client = await this.getClient();
|
|
106
106
|
const command = new ConverseStreamCommand(input);
|
|
107
107
|
addRestoreDocuments(command, input);
|
|
108
|
-
const res = await client.send(command);
|
|
108
|
+
const res = await client.send(command, { abortSignal: signal ?? void 0 });
|
|
109
109
|
if (!res.stream) throw new Error("Bedrock Converse: empty stream response");
|
|
110
110
|
return res.stream;
|
|
111
111
|
}
|
|
112
|
-
async send(input) {
|
|
112
|
+
async send(input, signal) {
|
|
113
113
|
const { ConverseCommand } = await this.importBedrockRuntime();
|
|
114
114
|
const client = await this.getClient();
|
|
115
115
|
const command = new ConverseCommand(input);
|
|
116
116
|
addRestoreDocuments(command, input);
|
|
117
|
-
return client.send(command);
|
|
117
|
+
return client.send(command, { abortSignal: signal ?? void 0 });
|
|
118
118
|
}
|
|
119
119
|
async *chatStream(options) {
|
|
120
120
|
try {
|
|
@@ -124,7 +124,7 @@ var BedrockConverseTextAdapter = class extends BaseTextAdapter {
|
|
|
124
124
|
});
|
|
125
125
|
const input = this.buildInput(options);
|
|
126
126
|
if (!input.toolConfig && input.messages) input.messages = toolBlocksToText(input.messages);
|
|
127
|
-
const stream = await this.sendStream(input);
|
|
127
|
+
const stream = await this.sendStream(input, options.request?.signal);
|
|
128
128
|
for await (const chunk of processConverseStream(stream, () => this.generateId(), {
|
|
129
129
|
threadId: options.threadId,
|
|
130
130
|
parentRunId: options.parentRunId,
|
|
@@ -171,15 +171,15 @@ var BedrockConverseTextAdapter = class extends BaseTextAdapter {
|
|
|
171
171
|
...this.buildInput(requestOptions),
|
|
172
172
|
toolConfig: buildStructuredToolConfig(outputSchema)
|
|
173
173
|
};
|
|
174
|
-
const res = await this.send(input);
|
|
175
|
-
|
|
174
|
+
const res = await this.send(input, chatOptions.request?.signal);
|
|
175
|
+
const usage = res.usage && buildConverseUsage(res.usage);
|
|
176
|
+
if (res.stopReason === "max_tokens") throw Object.assign(/* @__PURE__ */ new Error(`${this.name}.structuredOutput: the response was cut off because the maximum token limit was reached (stopReason=max_tokens); raise modelOptions.max_completion_tokens`), usage && { usage });
|
|
176
177
|
const structured = extractStructuredToolInput(res);
|
|
177
|
-
if (structured === void 0) throw new Error(`${this.name}.structuredOutput: response contained no forced-tool output`);
|
|
178
|
-
const usage = res.usage;
|
|
178
|
+
if (structured === void 0) throw Object.assign(/* @__PURE__ */ new Error(`${this.name}.structuredOutput: response contained no forced-tool output`), usage && { usage });
|
|
179
179
|
return {
|
|
180
180
|
data: structured,
|
|
181
181
|
rawText: JSON.stringify(structured),
|
|
182
|
-
...usage && { usage
|
|
182
|
+
...usage && { usage }
|
|
183
183
|
};
|
|
184
184
|
} catch (error) {
|
|
185
185
|
chatOptions.logger.errors(`${this.name}.structuredOutput fatal`, {
|
|
@@ -199,7 +199,7 @@ var BedrockConverseTextAdapter = class extends BaseTextAdapter {
|
|
|
199
199
|
async *structuredOutputStream(options) {
|
|
200
200
|
const { chatOptions, outputSchema } = options;
|
|
201
201
|
const runId = this.generateId();
|
|
202
|
-
const threadId = chatOptions.threadId
|
|
202
|
+
const threadId = chatOptions.threadId;
|
|
203
203
|
const messageId = this.generateId();
|
|
204
204
|
let hasEmittedRunStarted = false;
|
|
205
205
|
let hasEmittedTextMessageStart = false;
|
|
@@ -216,7 +216,7 @@ var BedrockConverseTextAdapter = class extends BaseTextAdapter {
|
|
|
216
216
|
...this.buildInput(requestOptions),
|
|
217
217
|
toolConfig: buildStructuredToolConfig(outputSchema)
|
|
218
218
|
};
|
|
219
|
-
const stream = await this.sendStream(input);
|
|
219
|
+
const stream = await this.sendStream(input, chatOptions.request?.signal);
|
|
220
220
|
for await (const ev of stream) {
|
|
221
221
|
if (!hasEmittedRunStarted) {
|
|
222
222
|
hasEmittedRunStarted = true;
|
|
@@ -299,7 +299,8 @@ var BedrockConverseTextAdapter = class extends BaseTextAdapter {
|
|
|
299
299
|
error: {
|
|
300
300
|
message,
|
|
301
301
|
code: "max_tokens"
|
|
302
|
-
}
|
|
302
|
+
},
|
|
303
|
+
...usage && { usage }
|
|
303
304
|
};
|
|
304
305
|
return;
|
|
305
306
|
}
|
|
@@ -315,7 +316,8 @@ var BedrockConverseTextAdapter = class extends BaseTextAdapter {
|
|
|
315
316
|
error: {
|
|
316
317
|
message: `${this.name}.structuredOutputStream: response contained no content`,
|
|
317
318
|
code: "empty-response"
|
|
318
|
-
}
|
|
319
|
+
},
|
|
320
|
+
...usage && { usage }
|
|
319
321
|
};
|
|
320
322
|
return;
|
|
321
323
|
}
|
|
@@ -334,7 +336,8 @@ var BedrockConverseTextAdapter = class extends BaseTextAdapter {
|
|
|
334
336
|
error: {
|
|
335
337
|
message: "Failed to parse structured output as JSON",
|
|
336
338
|
code: "parse-error"
|
|
337
|
-
}
|
|
339
|
+
},
|
|
340
|
+
...usage && { usage }
|
|
338
341
|
};
|
|
339
342
|
return;
|
|
340
343
|
}
|
|
@@ -387,7 +390,8 @@ var BedrockConverseTextAdapter = class extends BaseTextAdapter {
|
|
|
387
390
|
error: {
|
|
388
391
|
message: errorPayload.message,
|
|
389
392
|
...errorPayload.code !== void 0 && { code: errorPayload.code }
|
|
390
|
-
}
|
|
393
|
+
},
|
|
394
|
+
...usage && { usage }
|
|
391
395
|
};
|
|
392
396
|
}
|
|
393
397
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converse-text.js","names":[],"sources":["../../../src/adapters/converse-text.ts"],"sourcesContent":["import {\n CONTEXT_OVERFLOW_CODE,\n EventType,\n convertSchemaToJsonSchema,\n} from '@tanstack/ai'\nimport { BaseTextAdapter } from '@tanstack/ai/adapters'\nimport { toRunErrorPayload } from '@tanstack/ai/adapter-internals'\nimport { resolveBedrockAuth } from '../utils/auth'\nimport {\n toConverseMessages,\n toolBlocksToText,\n} from '../converse/message-converter'\nimport { toToolConfig } from '../converse/tool-converter'\nimport {\n processConverseStream,\n throwIfConverseStreamError,\n} from '../converse/stream-processor'\nimport { buildConverseUsage } from '../converse/usage'\nimport { converseThinking } from '../converse/reasoning'\nimport {\n BEDROCK_CLAUDE_NO_FORCED_TOOL_FAMILIES,\n BEDROCK_MODEL_INPUT_MODALITIES,\n BEDROCK_MODEL_REASONING,\n} from '../model-meta'\nimport { addPromptCachePoints } from '../converse/prompt-cache'\nimport {\n STRUCTURED_TOOL_NAME,\n buildStructuredToolConfig,\n} from '../converse/structured-output'\nimport type { ResolvedBedrockAuth } from '../utils/auth'\nimport type { ConverseToolInput } from '../converse/tool-converter'\nimport type * as BedrockRuntime from '@aws-sdk/client-bedrock-runtime'\nimport type {\n BedrockRuntimeClient,\n BedrockRuntimeClientConfig,\n ContentBlock,\n ConverseCommandInput,\n ConverseCommandOutput,\n ConverseStreamCommandInput,\n ConverseStreamOutput,\n} from '@aws-sdk/client-bedrock-runtime'\nimport type { MiddlewareStack } from '@smithy/types'\nimport type {\n JSONSchema,\n Modality,\n AdapterYieldChunk,\n TextOptions,\n TokenUsage,\n Tool,\n} from '@tanstack/ai'\nimport type {\n StructuredOutputOptions,\n StructuredOutputResult,\n} from '@tanstack/ai/adapters'\nimport type { BedrockClientConfig } from '../utils/client'\nimport type {\n BedrockMessageMetadataByModality,\n BedrockSystemPromptMetadata,\n BedrockToolMetadata,\n} from '../message-types'\nimport type {\n BedrockConverseModels,\n BedrockModelReasoningByName,\n ResolveConverseProviderOptions,\n ResolveInputModalities,\n} from '../model-meta'\n\n/** Config for the Converse adapter — same client config as the chat adapter. */\nexport interface BedrockConverseConfig extends BedrockClientConfig {}\n\n/**\n * Bedrock Converse text adapter. Wires the Converse translation modules (message\n * converter, tool converter, stream processor, structured-output forced-tool\n * builder) onto `@tanstack/ai`'s `BaseTextAdapter` and the\n * `@aws-sdk/client-bedrock-runtime` `BedrockRuntimeClient`.\n *\n * The success-path AG-UI lifecycle (`RUN_STARTED`..`RUN_FINISHED`) is owned by\n * `processConverseStream`; this adapter only owns the catch/`RUN_ERROR` path,\n * mirroring openai-base's `chatStream`.\n *\n * The actual SDK calls live behind two protected seams (`sendStream` / `send`)\n * so tests can subclass and inject canned Converse SDK shapes without a real\n * AWS request.\n */\n/** The reasoning levels of a model, for `chat({ reasoning })`. `never`: none. */\ntype ResolveReasoning<TModel extends string> =\n TModel extends keyof BedrockModelReasoningByName\n ? BedrockModelReasoningByName[TModel]\n : never\n\nexport class BedrockConverseTextAdapter<\n TModel extends BedrockConverseModels,\n // Constraint mirrors the chat adapter (text.ts): the base parameterises\n // `TProviderOptions extends Record<string, any>`, and our default\n // `ResolveConverseProviderOptions<TModel>` resolves to an interface lacking an\n // implicit index signature — which `Record<string, unknown>` would reject but\n // `Record<string, any>` accepts. Confined to the generic constraint (the\n // established adapter pattern) — no value `as` cast is introduced.\n TProviderOptions extends Record<string, any> =\n ResolveConverseProviderOptions<TModel>,\n TInputModalities extends ReadonlyArray<Modality> =\n ResolveInputModalities<TModel>,\n> extends BaseTextAdapter<\n TModel,\n TProviderOptions,\n TInputModalities,\n BedrockMessageMetadataByModality,\n // TToolCapabilities — Converse has no per-model tool-capability table; the\n // base default.\n ReadonlyArray<string>,\n // TToolCallMetadata — Converse has no tool-call metadata round-tripping.\n unknown,\n // TSystemPromptMetadata — narrows `systemPrompts[i].metadata` at the chat()\n // call site so users get `cachePoint` autocomplete.\n BedrockSystemPromptMetadata,\n ResolveReasoning<TModel>\n> {\n override readonly kind = 'text' as const\n override readonly name = 'bedrock-converse' as const\n override readonly api = 'bedrock-converse-stream'\n override readonly provider = 'amazon-bedrock'\n override readonly inputModalities = BEDROCK_MODEL_INPUT_MODALITIES[this.model]\n\n private sourceMetadata(model: string) {\n return {\n tanstack: { source: { provider: this.provider, api: this.api, model } },\n }\n }\n private clientPromise?: Promise<BedrockRuntimeClient>\n private readonly clientConfig: BedrockConverseConfig\n\n constructor(config: BedrockConverseConfig, model: TModel) {\n super({}, model)\n // Defer client construction and auth resolution: the AWS SDK is Node/\n // server-only, so we must not pull it into the static graph here. The\n // client (and its dynamic import) is built lazily on first SDK call.\n this.clientConfig = config\n }\n\n /**\n * Dynamically import `@aws-sdk/client-bedrock-runtime`. The specifier is held\n * in a variable (not a string literal) so bundler dep scanners (e.g. Vite/\n * esbuild optimizeDeps) cannot statically discover the AWS SDK and try to\n * pre-bundle it for the browser — it would fail on the SDK's Node-only\n * `fromTokenFile` export chain. The SDK is Node/server-only and is only\n * reached on a real request. `typeof import(...)` is a type-only reference\n * (erased at emit) so the imported members keep full typing.\n */\n protected importBedrockRuntime(): Promise<typeof BedrockRuntime> {\n const mod = '@aws-sdk/client-bedrock-runtime'\n return import(/* @vite-ignore */ mod) as Promise<typeof BedrockRuntime>\n }\n\n /**\n * Lazily construct the `BedrockRuntimeClient`. The dynamic import keeps\n * `@aws-sdk/client-bedrock-runtime` out of the static/browser graph and\n * defers `resolveBedrockAuth` until a real request is made.\n */\n protected async getClient(): Promise<BedrockRuntimeClient> {\n if (!this.clientPromise) {\n this.clientPromise = (async () => {\n const { BedrockRuntimeClient } = await this.importBedrockRuntime()\n const region = this.clientConfig.region ?? 'us-east-1'\n const resolved = resolveBedrockAuth(\n {\n apiKey: this.clientConfig.apiKey,\n region,\n auth: this.clientConfig.auth,\n },\n 'runtime',\n )\n const client = new BedrockRuntimeClient(\n this.buildClientConfig(resolved, region, this.clientConfig.baseURL),\n )\n const defaultHeaders = this.clientConfig.defaultHeaders\n if (defaultHeaders) {\n // `build` runs before SigV4 signing, so gateway headers are signed\n // along with the rest of the request.\n client.middlewareStack.add(\n (next) => (args) => {\n const request = args.request\n if (\n typeof request === 'object' &&\n request !== null &&\n 'headers' in request &&\n typeof request.headers === 'object' &&\n request.headers !== null\n ) {\n Object.assign(request.headers, defaultHeaders)\n }\n return next(args)\n },\n { step: 'build', name: 'tanstackDefaultHeaders' },\n )\n }\n return client\n })().catch((error: unknown) => {\n // Don't cache a rejected promise — clear it so a later call can retry\n // (e.g. after a transient import failure or fixed auth config).\n this.clientPromise = undefined\n throw error\n })\n }\n return this.clientPromise\n }\n\n /**\n * Map resolved auth + endpoint to a `BedrockRuntimeClientConfig`.\n *\n * Recent `@aws-sdk/client-bedrock-runtime` exposes a first-class `token`\n * config field for Bedrock API-key bearer auth. But the client's default\n * auth-scheme order is SigV4 first, then bearer — so passing `token` alone is\n * not enough: the SDK still resolves SigV4 and throws \"Could not load\n * credentials from any providers\". Pinning `authSchemePreference` to the\n * bearer scheme makes the API key actually get used. SigV4 uses the AWS\n * credential provider chain and the default scheme order.\n */\n protected buildClientConfig(\n resolved: ResolvedBedrockAuth,\n region: string,\n endpoint: string | undefined,\n ): BedrockRuntimeClientConfig {\n if (resolved.kind === 'bearer') {\n return {\n region,\n token: { token: resolved.token },\n authSchemePreference: ['httpBearerAuth'],\n ...(endpoint ? { endpoint } : {}),\n }\n }\n return {\n region: resolved.region,\n credentials: resolved.credentials,\n ...(endpoint ? { endpoint } : {}),\n }\n }\n\n // ---------------------------------------------------------------------------\n // SDK seams (overridden in tests so no real AWS call happens)\n // ---------------------------------------------------------------------------\n\n protected async sendStream(\n input: ConverseStreamCommandInput,\n ): Promise<AsyncIterable<ConverseStreamOutput>> {\n const { ConverseStreamCommand } = await this.importBedrockRuntime()\n const client = await this.getClient()\n const command = new ConverseStreamCommand(input)\n addRestoreDocuments(command, input)\n const res = await client.send(command)\n if (!res.stream) {\n throw new Error('Bedrock Converse: empty stream response')\n }\n return res.stream\n }\n\n protected async send(\n input: ConverseCommandInput,\n ): Promise<ConverseCommandOutput> {\n const { ConverseCommand } = await this.importBedrockRuntime()\n const client = await this.getClient()\n const command = new ConverseCommand(input)\n addRestoreDocuments(command, input)\n return client.send(command)\n }\n\n // ---------------------------------------------------------------------------\n // Public adapter surface\n // ---------------------------------------------------------------------------\n\n async *chatStream(\n options: TextOptions<TProviderOptions>,\n ): AsyncIterable<AdapterYieldChunk> {\n try {\n options.logger.request(\n `activity=chat provider=${this.name} model=${this.model} messages=${options.messages.length} tools=${options.tools?.length ?? 0} stream=true`,\n { provider: this.name, model: this.model },\n )\n const input = this.buildInput(options)\n // Bedrock rejects toolUse and toolResult blocks without a toolConfig,\n // so a request with no tools sends its tool history as text.\n if (!input.toolConfig && input.messages) {\n input.messages = toolBlocksToText(input.messages)\n }\n const stream = await this.sendStream(input)\n for await (const chunk of processConverseStream(\n stream,\n () => this.generateId(),\n {\n threadId: options.threadId,\n parentRunId: options.parentRunId,\n model: options.model,\n },\n )) {\n yield chunk.type === EventType.RUN_STARTED ||\n chunk.type === EventType.RUN_FINISHED\n ? { ...chunk, metadata: this.sourceMetadata(options.model) }\n : chunk\n }\n } catch (error: unknown) {\n const errorPayload = converseRunErrorPayload(\n error,\n `${this.name}.chatStream failed`,\n )\n options.logger.errors(`${this.name}.chatStream fatal`, {\n error: errorPayload,\n source: `${this.name}.chatStream`,\n })\n // Conditional `code` spread keeps the wire shape spec-compliant under\n // `exactOptionalPropertyTypes` (AG-UI's `RunErrorEvent.code` is optional).\n yield {\n type: EventType.RUN_ERROR,\n metadata: this.sourceMetadata(options.model),\n model: options.model,\n timestamp: Date.now(),\n message: errorPayload.message,\n ...(errorPayload.code !== undefined && { code: errorPayload.code }),\n error: {\n message: errorPayload.message,\n ...(errorPayload.code !== undefined && { code: errorPayload.code }),\n },\n }\n }\n }\n\n /**\n * Structured output via the forced-tool strategy. Converse has no native\n * json_schema response_format, so we force a single tool whose input schema\n * is the requested output schema and read the model's `toolUse.input` back as\n * the structured result.\n */\n async structuredOutput(\n options: StructuredOutputOptions<TProviderOptions>,\n ): Promise<StructuredOutputResult<unknown>> {\n const { chatOptions, outputSchema } = options\n try {\n chatOptions.logger.request(\n `activity=structuredOutput provider=${this.name} model=${this.model} messages=${chatOptions.messages.length}`,\n { provider: this.name, model: this.model },\n )\n // Claude rejects a forced tool while thinking is on, so the forced\n // structured-output tool goes without `chat({ reasoning })`.\n const { reasoning: _reasoning, ...requestOptions } = chatOptions\n const input: ConverseCommandInput = {\n ...this.buildInput(requestOptions),\n toolConfig: buildStructuredToolConfig(outputSchema),\n }\n const res = await this.send(input)\n // A forced tool call cut off at the output cap carries partial input,\n // which would read like a schema failure (issue #1426).\n if (res.stopReason === 'max_tokens') {\n throw new Error(\n `${this.name}.structuredOutput: the response was cut off because the maximum token limit was reached (stopReason=max_tokens); raise modelOptions.max_completion_tokens`,\n )\n }\n const structured = extractStructuredToolInput(res)\n if (structured === undefined) {\n throw new Error(\n `${this.name}.structuredOutput: response contained no forced-tool output`,\n )\n }\n const usage = res.usage\n return {\n data: structured,\n rawText: JSON.stringify(structured),\n ...(usage && { usage: buildConverseUsage(usage) }),\n }\n } catch (error: unknown) {\n chatOptions.logger.errors(`${this.name}.structuredOutput fatal`, {\n error: toRunErrorPayload(error, `${this.name}.structuredOutput failed`),\n source: `${this.name}.structuredOutput`,\n })\n throw error\n }\n }\n\n /**\n * Streaming structured output. Same forced-tool strategy as\n * `structuredOutput`, but streamed: the forced tool's `toolUse.input` JSON\n * fragments are accumulated from the Converse stream and a terminal\n * `CUSTOM 'structured-output.complete'` event carries `{ object, raw }`,\n * mirroring openai-base's `structuredOutputStream` contract exactly.\n */\n async *structuredOutputStream(\n options: StructuredOutputOptions<TProviderOptions>,\n ): AsyncIterable<AdapterYieldChunk> {\n const { chatOptions, outputSchema } = options\n const runId = this.generateId()\n const threadId = chatOptions.threadId ?? this.generateId()\n const messageId = this.generateId()\n\n let hasEmittedRunStarted = false\n let hasEmittedTextMessageStart = false\n let accumulatedRaw = ''\n let finishReason: 'stop' | 'length' | 'content_filter' = 'stop'\n // Usage arrives on the trailing `metadata` event, after the finish signal,\n // so it is captured during iteration and folded into RUN_FINISHED below.\n let usage: TokenUsage | undefined\n\n try {\n chatOptions.logger.request(\n `activity=structuredOutputStream provider=${this.name} model=${this.model} messages=${chatOptions.messages.length}`,\n { provider: this.name, model: this.model },\n )\n // Claude rejects a forced tool while thinking is on, so the forced\n // structured-output tool goes without `chat({ reasoning })`.\n const { reasoning: _reasoning, ...requestOptions } = chatOptions\n const input: ConverseStreamCommandInput = {\n ...this.buildInput(requestOptions),\n toolConfig: buildStructuredToolConfig(outputSchema),\n }\n const stream = await this.sendStream(input)\n\n // The forced tool streams its `input` as partial-JSON fragments inside\n // `contentBlockDelta.delta.toolUse.input`. We surface them as\n // TEXT_MESSAGE_CONTENT deltas (raw JSON text), matching openai-base which\n // carries the structured JSON as text deltas.\n for await (const ev of stream) {\n if (!hasEmittedRunStarted) {\n hasEmittedRunStarted = true\n yield {\n type: EventType.RUN_STARTED,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n threadId,\n model: chatOptions.model,\n timestamp: Date.now(),\n parentRunId: chatOptions.parentRunId,\n }\n }\n\n // Surface in-band server/throttle/validation errors instead of\n // letting them fall through and masquerade as an empty response.\n throwIfConverseStreamError(ev)\n\n if ('contentBlockDelta' in ev) {\n const delta = ev.contentBlockDelta?.delta\n const fragment =\n delta && 'toolUse' in delta ? delta.toolUse?.input : undefined\n if (fragment !== undefined) {\n if (!hasEmittedTextMessageStart) {\n hasEmittedTextMessageStart = true\n yield {\n type: EventType.TEXT_MESSAGE_START,\n messageId,\n role: 'assistant',\n model: chatOptions.model,\n timestamp: Date.now(),\n }\n }\n accumulatedRaw += fragment\n yield {\n type: EventType.TEXT_MESSAGE_CONTENT,\n messageId,\n delta: fragment,\n content: accumulatedRaw,\n model: chatOptions.model,\n timestamp: Date.now(),\n }\n }\n continue\n }\n\n if ('messageStop' in ev) {\n const stopReason = ev.messageStop?.stopReason\n // The forced structured-output tool produces stopReason 'tool_use' on\n // success, but that's an implementation detail — a cleanly-completed\n // structured run reports 'stop', matching openai-base's contract.\n finishReason =\n stopReason === 'max_tokens'\n ? 'length'\n : stopReason === 'content_filtered'\n ? 'content_filter'\n : 'stop'\n continue\n }\n\n if ('metadata' in ev) {\n const u = ev.metadata?.usage\n if (u) {\n usage = buildConverseUsage(u)\n }\n continue\n }\n }\n\n if (!hasEmittedRunStarted) {\n hasEmittedRunStarted = true\n yield {\n type: EventType.RUN_STARTED,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n threadId,\n model: chatOptions.model,\n timestamp: Date.now(),\n parentRunId: chatOptions.parentRunId,\n }\n }\n\n if (hasEmittedTextMessageStart) {\n yield {\n type: EventType.TEXT_MESSAGE_END,\n messageId,\n model: chatOptions.model,\n timestamp: Date.now(),\n }\n }\n\n // Same truncation check as `structuredOutput()`: report the token limit\n // before the empty-content and parse errors (issue #1426).\n if (finishReason === 'length') {\n const message = `${this.name}.structuredOutputStream: the response was cut off because the maximum token limit was reached (stopReason=max_tokens); raise modelOptions.max_completion_tokens`\n yield {\n type: EventType.RUN_ERROR,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n model: chatOptions.model,\n timestamp: Date.now(),\n message,\n code: 'max_tokens',\n error: { message, code: 'max_tokens' },\n }\n return\n }\n\n if (accumulatedRaw.length === 0) {\n yield {\n type: EventType.RUN_ERROR,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n model: chatOptions.model,\n timestamp: Date.now(),\n message: `${this.name}.structuredOutputStream: response contained no content`,\n code: 'empty-response',\n error: {\n message: `${this.name}.structuredOutputStream: response contained no content`,\n code: 'empty-response',\n },\n }\n return\n }\n\n let parsed: unknown\n try {\n parsed = JSON.parse(accumulatedRaw)\n } catch {\n yield {\n type: EventType.RUN_ERROR,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n model: chatOptions.model,\n timestamp: Date.now(),\n message: `Failed to parse structured output as JSON. Content: ${accumulatedRaw.slice(0, 200)}${accumulatedRaw.length > 200 ? '...' : ''}`,\n code: 'parse-error',\n error: {\n message: 'Failed to parse structured output as JSON',\n code: 'parse-error',\n },\n }\n return\n }\n\n yield {\n type: EventType.CUSTOM,\n name: 'structured-output.complete',\n value: {\n object: parsed,\n raw: accumulatedRaw,\n },\n model: chatOptions.model,\n timestamp: Date.now(),\n }\n\n yield {\n type: EventType.RUN_FINISHED,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n threadId,\n model: chatOptions.model,\n timestamp: Date.now(),\n finishReason,\n ...(usage && { usage }),\n }\n } catch (error: unknown) {\n if (!hasEmittedRunStarted) {\n hasEmittedRunStarted = true\n yield {\n type: EventType.RUN_STARTED,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n threadId,\n model: chatOptions.model,\n timestamp: Date.now(),\n parentRunId: chatOptions.parentRunId,\n }\n }\n const errorPayload = converseRunErrorPayload(\n error,\n `${this.name}.structuredOutputStream failed`,\n )\n chatOptions.logger.errors(`${this.name}.structuredOutputStream fatal`, {\n error: errorPayload,\n source: `${this.name}.structuredOutputStream`,\n })\n yield {\n type: EventType.RUN_ERROR,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n model: chatOptions.model,\n timestamp: Date.now(),\n message: errorPayload.message,\n ...(errorPayload.code !== undefined && { code: errorPayload.code }),\n error: {\n message: errorPayload.message,\n ...(errorPayload.code !== undefined && { code: errorPayload.code }),\n },\n }\n }\n }\n\n /**\n * Converse sends `tools` and a forced structured-output tool via two separate\n * mechanisms, never together. Declaring `false` makes the engine run the\n * agent loop without `outputSchema` and finalize via `structuredOutput` /\n * `structuredOutputStream`.\n */\n supportsCombinedToolsAndSchema(): boolean {\n return false\n }\n\n // ---------------------------------------------------------------------------\n // Request construction\n // ---------------------------------------------------------------------------\n\n /**\n * Translate `TextOptions` into a `ConverseCommandInput`. Shared by chatStream,\n * structuredOutput, and structuredOutputStream (the latter two override\n * `toolConfig` with the forced structured tool afterwards).\n */\n protected buildInput(\n options: TextOptions<TProviderOptions>,\n ): ConverseCommandInput {\n const { system, messages } = toConverseMessages(\n options.messages,\n options.systemPrompts,\n { model: options.model, provider: this.provider },\n )\n\n // Sampling options live on `modelOptions` (typed as the narrowed\n // `BedrockConverseProviderOptions`, which surfaces the OpenAI Chat\n // Completions field names); translate them into Converse's `inferenceConfig`,\n // which uses AWS-native camelCase keys.\n const modelOptions = options.modelOptions\n const temperature = modelOptions?.temperature\n const topP = modelOptions?.top_p\n // `chat({ reasoning })`: Claude's thinking fields. Budget thinking needs\n // `maxTokens` above the budget, so a smaller or missing value grows.\n const { additionalModelRequestFields, minMaxTokens } = converseThinking(\n this.model,\n options.reasoning,\n BEDROCK_MODEL_REASONING[this.model],\n )\n\n // `chat({ toolChoice })`. Converse has no `none` choice, so `none` sends\n // no tool config, and `chatStream` sends any tool history as text. Claude\n // rejects a forced tool while thinking is on (only Claude gets thinking\n // fields), and some Claude models reject it on every request. Then a\n // forced choice falls back to auto.\n const canForceTool =\n additionalModelRequestFields === undefined &&\n !BEDROCK_CLAUDE_NO_FORCED_TOOL_FAMILIES.some((name) =>\n this.model.includes(name),\n )\n const toolChoice =\n options.toolChoice === 'none' || canForceTool\n ? options.toolChoice\n : 'auto'\n const toolConfig = options.tools\n ? toToolConfig(convertTools(options.tools), toolChoice)\n : undefined\n\n const requestedMaxTokens = modelOptions?.max_completion_tokens\n const maxTokens =\n minMaxTokens !== undefined &&\n (requestedMaxTokens == null || requestedMaxTokens < minMaxTokens)\n ? minMaxTokens\n : requestedMaxTokens\n const stop = modelOptions?.stop\n const stopSequences =\n stop == null ? undefined : Array.isArray(stop) ? stop : [stop]\n\n const inferenceConfig =\n temperature != null ||\n topP != null ||\n maxTokens != null ||\n stopSequences != null\n ? {\n ...(temperature != null && { temperature }),\n ...(topP != null && { topP }),\n ...(maxTokens != null && { maxTokens }),\n ...(stopSequences != null && { stopSequences }),\n }\n : undefined\n\n const input: ConverseCommandInput = {\n modelId: this.model,\n messages,\n ...(system.length > 0 && { system }),\n ...(toolConfig && { toolConfig }),\n ...(inferenceConfig && { inferenceConfig }),\n ...(additionalModelRequestFields && { additionalModelRequestFields }),\n }\n return addPromptCachePoints(this.model, input, options.promptCache)\n }\n}\n\n/**\n * Convert TanStack `Tool[]` to the Converse tool-converter input shape. Reuses\n * the SAME `convertSchemaToJsonSchema` the other adapters use so the Converse\n * tool input schemas match what every other provider sends.\n */\n/**\n * The text Bedrock models use for a context overflow. Converse has no error\n * type for it: it is a `ValidationException` like every bad request, and over\n * a stream the SDK does not keep that name. So the message is the only signal.\n * Each model family has its own text.\n */\nconst CONTEXT_OVERFLOW_MESSAGE =\n /Input Tokens Exceeded|maximum context length|Input is too long for requested model|prompt is too long/\n\n/**\n * `toRunErrorPayload`, with `code` set to `CONTEXT_OVERFLOW_CODE` for a\n * context overflow. A `ThrottlingException` is never an overflow, whatever\n * its text says about tokens.\n */\nfunction converseRunErrorPayload(\n error: unknown,\n fallbackMessage: string,\n): { message: string; code: string | undefined } {\n const payload = toRunErrorPayload(error, fallbackMessage)\n const throttled =\n error instanceof Error && error.name === 'ThrottlingException'\n return !throttled && CONTEXT_OVERFLOW_MESSAGE.test(payload.message)\n ? { ...payload, code: CONTEXT_OVERFLOW_CODE }\n : payload\n}\n\nfunction convertTools(tools: Array<Tool>): Array<ConverseToolInput> {\n return tools.map((tool) => {\n const inputSchema: JSONSchema = convertSchemaToJsonSchema(\n tool.inputSchema,\n ) ?? { type: 'object', properties: {}, required: [] }\n const { cachePoint }: BedrockToolMetadata = tool.metadata ?? {}\n return {\n name: tool.name,\n description: tool.description,\n inputSchema,\n ...(cachePoint && { cachePoint }),\n }\n })\n}\n\n/**\n * Find the forced structured-output tool's `input` in a non-streaming Converse\n * response. SDK-boundary narrowing only — `ConverseOutput` is a tagged union\n * (`{ message }`) and a tool-use block is `{ toolUse: { input } }`.\n */\nfunction extractStructuredToolInput(\n res: ConverseCommandOutput,\n): unknown | undefined {\n const message =\n res.output && 'message' in res.output ? res.output.message : undefined\n const content: Array<ContentBlock> = message?.content ?? []\n for (const block of content) {\n if ('toolUse' in block && block.toolUse) {\n // Only accept the forced structured tool (an unnamed block is allowed,\n // since the forced tool is the only one configured). A differently-named\n // tool-use block is a hallucinated/leftover call whose arbitrary input\n // must not be returned as the validated result — leave it to the caller's\n // `throw` so the failure is accurate instead of silently wrong.\n if (\n block.toolUse.name === STRUCTURED_TOOL_NAME ||\n block.toolUse.name === undefined\n ) {\n return block.toolUse.input\n }\n }\n }\n return undefined\n}\n\n/** The parts of a Converse request that hold documents the adapter fills from user data. */\ntype ConverseDocuments = Pick<ConverseCommandInput, 'messages' | 'toolConfig'>\n\nfunction hasProtoKey(value: unknown): boolean {\n if (typeof value !== 'object' || value === null) return false\n return (\n Object.hasOwn(value, '__proto__') || Object.values(value).some(hasProtoKey)\n )\n}\n\n/**\n * The AWS SDK copies a document (tool input, tool input schema) with\n * `out[key] = value`. For an own key named `__proto__`, the assignment goes\n * to the `__proto__` setter and the key is lost. This puts each such\n * document back in the serialized body. `JSON.stringify` keeps own keys.\n */\nfunction restoreDocuments(request: unknown, input: ConverseDocuments): void {\n const documents = [\n ...(input.messages ?? []).flatMap((message) =>\n (message.content ?? []).map((block) => block.toolUse?.input),\n ),\n ...(input.toolConfig?.tools ?? []).map(\n (tool) => tool.toolSpec?.inputSchema?.json,\n ),\n ]\n // Skip the parse and re-serialize of the body, which can be large (for\n // example with image bytes), unless a document has the key.\n if (!documents.some(hasProtoKey)) return\n if (\n typeof request !== 'object' ||\n request === null ||\n !('body' in request) ||\n typeof request.body !== 'string'\n ) {\n throw new Error(\n 'Bedrock Converse: cannot keep a `__proto__` key because the request body is not a JSON string',\n )\n }\n // The SDK serialized this body from `input` one step earlier, so the two\n // line up by position.\n const body: ConverseDocuments = JSON.parse(request.body)\n body.messages?.forEach((message, i) =>\n message.content?.forEach((block, j) => {\n const source = input.messages?.[i]?.content?.[j]?.toolUse?.input\n if (block.toolUse && hasProtoKey(source)) block.toolUse.input = source\n }),\n )\n body.toolConfig?.tools?.forEach((tool, i) => {\n const source = input.toolConfig?.tools?.[i]?.toolSpec?.inputSchema?.json\n if (tool.toolSpec?.inputSchema && hasProtoKey(source))\n tool.toolSpec.inputSchema.json = source\n })\n request.body = JSON.stringify(body)\n}\n\n/**\n * Adds {@link restoreDocuments} to a command. It runs at `build` with high\n * priority, before the SDK sets Content-Length and signs the body.\n */\nfunction addRestoreDocuments<TInput extends object, TOutput extends object>(\n command: { middlewareStack: MiddlewareStack<TInput, TOutput> },\n input: ConverseDocuments,\n): void {\n command.middlewareStack.add(\n (next) => (args) => {\n restoreDocuments(args.request, input)\n return next(args)\n },\n { step: 'build', name: 'tanstackRestoreDocuments', priority: 'high' },\n )\n}\n\n/** Converse adapter with an explicit API key (low-level; mirrors createBedrockChat). */\nexport function createBedrockConverse<TModel extends BedrockConverseModels>(\n model: TModel,\n apiKey: string,\n config?: Omit<BedrockConverseConfig, 'apiKey'>,\n): BedrockConverseTextAdapter<TModel> {\n return new BedrockConverseTextAdapter({ ...config, apiKey }, model)\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"converse-text.js","names":[],"sources":["../../../src/adapters/converse-text.ts"],"sourcesContent":["import {\n CONTEXT_OVERFLOW_CODE,\n EventType,\n convertSchemaToJsonSchema,\n} from '@tanstack/ai'\nimport { BaseTextAdapter } from '@tanstack/ai/adapters'\nimport { toRunErrorPayload } from '@tanstack/ai/adapter-internals'\nimport { resolveBedrockAuth } from '../utils/auth'\nimport {\n toConverseMessages,\n toolBlocksToText,\n} from '../converse/message-converter'\nimport { toToolConfig } from '../converse/tool-converter'\nimport {\n processConverseStream,\n throwIfConverseStreamError,\n} from '../converse/stream-processor'\nimport { buildConverseUsage } from '../converse/usage'\nimport { converseThinking } from '../converse/reasoning'\nimport {\n BEDROCK_CLAUDE_NO_FORCED_TOOL_FAMILIES,\n BEDROCK_MODEL_INPUT_MODALITIES,\n BEDROCK_MODEL_REASONING,\n} from '../model-meta'\nimport { addPromptCachePoints } from '../converse/prompt-cache'\nimport {\n STRUCTURED_TOOL_NAME,\n buildStructuredToolConfig,\n} from '../converse/structured-output'\nimport type { ResolvedBedrockAuth } from '../utils/auth'\nimport type { ConverseToolInput } from '../converse/tool-converter'\nimport type * as BedrockRuntime from '@aws-sdk/client-bedrock-runtime'\nimport type {\n BedrockRuntimeClient,\n BedrockRuntimeClientConfig,\n ContentBlock,\n ConverseCommandInput,\n ConverseCommandOutput,\n ConverseStreamCommandInput,\n ConverseStreamOutput,\n} from '@aws-sdk/client-bedrock-runtime'\nimport type { MiddlewareStack } from '@smithy/types'\nimport type {\n JSONSchema,\n Modality,\n AdapterYieldChunk,\n TextOptions,\n TokenUsage,\n Tool,\n} from '@tanstack/ai'\nimport type {\n StructuredOutputOptions,\n StructuredOutputResult,\n} from '@tanstack/ai/adapters'\nimport type { BedrockClientConfig } from '../utils/client'\nimport type {\n BedrockMessageMetadataByModality,\n BedrockSystemPromptMetadata,\n BedrockToolMetadata,\n} from '../message-types'\nimport type {\n BedrockConverseModels,\n BedrockModelReasoningByName,\n ResolveConverseProviderOptions,\n ResolveInputModalities,\n} from '../model-meta'\n\n/** Config for the Converse adapter — same client config as the chat adapter. */\nexport interface BedrockConverseConfig extends BedrockClientConfig {}\n\n/**\n * Bedrock Converse text adapter. Wires the Converse translation modules (message\n * converter, tool converter, stream processor, structured-output forced-tool\n * builder) onto `@tanstack/ai`'s `BaseTextAdapter` and the\n * `@aws-sdk/client-bedrock-runtime` `BedrockRuntimeClient`.\n *\n * The success-path AG-UI lifecycle (`RUN_STARTED`..`RUN_FINISHED`) is owned by\n * `processConverseStream`; this adapter only owns the catch/`RUN_ERROR` path,\n * mirroring openai-base's `chatStream`.\n *\n * The actual SDK calls live behind two protected seams (`sendStream` / `send`)\n * so tests can subclass and inject canned Converse SDK shapes without a real\n * AWS request.\n */\n/** The reasoning levels of a model, for `chat({ reasoning })`. `never`: none. */\ntype ResolveReasoning<TModel extends string> =\n TModel extends keyof BedrockModelReasoningByName\n ? BedrockModelReasoningByName[TModel]\n : never\n\nexport class BedrockConverseTextAdapter<\n TModel extends BedrockConverseModels,\n // Constraint mirrors the chat adapter (text.ts): the base parameterises\n // `TProviderOptions extends Record<string, any>`, and our default\n // `ResolveConverseProviderOptions<TModel>` resolves to an interface lacking an\n // implicit index signature — which `Record<string, unknown>` would reject but\n // `Record<string, any>` accepts. Confined to the generic constraint (the\n // established adapter pattern) — no value `as` cast is introduced.\n TProviderOptions extends Record<string, any> =\n ResolveConverseProviderOptions<TModel>,\n TInputModalities extends ReadonlyArray<Modality> =\n ResolveInputModalities<TModel>,\n> extends BaseTextAdapter<\n TModel,\n TProviderOptions,\n TInputModalities,\n BedrockMessageMetadataByModality,\n // TToolCapabilities — Converse has no per-model tool-capability table; the\n // base default.\n ReadonlyArray<string>,\n // TToolCallMetadata — Converse has no tool-call metadata round-tripping.\n unknown,\n // TSystemPromptMetadata — narrows `systemPrompts[i].metadata` at the chat()\n // call site so users get `cachePoint` autocomplete.\n BedrockSystemPromptMetadata,\n ResolveReasoning<TModel>\n> {\n override readonly kind = 'text' as const\n override readonly name = 'bedrock-converse' as const\n override readonly api = 'bedrock-converse-stream'\n override readonly provider = 'amazon-bedrock'\n override readonly inputModalities = BEDROCK_MODEL_INPUT_MODALITIES[this.model]\n\n private sourceMetadata(model: string) {\n return {\n tanstack: { source: { provider: this.provider, api: this.api, model } },\n }\n }\n private clientPromise?: Promise<BedrockRuntimeClient>\n private readonly clientConfig: BedrockConverseConfig\n\n constructor(config: BedrockConverseConfig, model: TModel) {\n super({}, model)\n // Defer client construction and auth resolution: the AWS SDK is Node/\n // server-only, so we must not pull it into the static graph here. The\n // client (and its dynamic import) is built lazily on first SDK call.\n this.clientConfig = config\n }\n\n /**\n * Dynamically import `@aws-sdk/client-bedrock-runtime`. The specifier is held\n * in a variable (not a string literal) so bundler dep scanners (e.g. Vite/\n * esbuild optimizeDeps) cannot statically discover the AWS SDK and try to\n * pre-bundle it for the browser — it would fail on the SDK's Node-only\n * `fromTokenFile` export chain. The SDK is Node/server-only and is only\n * reached on a real request. `typeof import(...)` is a type-only reference\n * (erased at emit) so the imported members keep full typing.\n */\n protected importBedrockRuntime(): Promise<typeof BedrockRuntime> {\n const mod = '@aws-sdk/client-bedrock-runtime'\n return import(/* @vite-ignore */ mod) as Promise<typeof BedrockRuntime>\n }\n\n /**\n * Lazily construct the `BedrockRuntimeClient`. The dynamic import keeps\n * `@aws-sdk/client-bedrock-runtime` out of the static/browser graph and\n * defers `resolveBedrockAuth` until a real request is made.\n */\n protected async getClient(): Promise<BedrockRuntimeClient> {\n if (!this.clientPromise) {\n this.clientPromise = (async () => {\n const { BedrockRuntimeClient } = await this.importBedrockRuntime()\n const region = this.clientConfig.region ?? 'us-east-1'\n const resolved = resolveBedrockAuth(\n {\n apiKey: this.clientConfig.apiKey,\n region,\n auth: this.clientConfig.auth,\n },\n 'runtime',\n )\n const client = new BedrockRuntimeClient(\n this.buildClientConfig(resolved, region, this.clientConfig.baseURL),\n )\n const defaultHeaders = this.clientConfig.defaultHeaders\n if (defaultHeaders) {\n // `build` runs before SigV4 signing, so gateway headers are signed\n // along with the rest of the request.\n client.middlewareStack.add(\n (next) => (args) => {\n const request = args.request\n if (\n typeof request === 'object' &&\n request !== null &&\n 'headers' in request &&\n typeof request.headers === 'object' &&\n request.headers !== null\n ) {\n Object.assign(request.headers, defaultHeaders)\n }\n return next(args)\n },\n { step: 'build', name: 'tanstackDefaultHeaders' },\n )\n }\n return client\n })().catch((error: unknown) => {\n // Don't cache a rejected promise — clear it so a later call can retry\n // (e.g. after a transient import failure or fixed auth config).\n this.clientPromise = undefined\n throw error\n })\n }\n return this.clientPromise\n }\n\n /**\n * Map resolved auth + endpoint to a `BedrockRuntimeClientConfig`.\n *\n * Recent `@aws-sdk/client-bedrock-runtime` exposes a first-class `token`\n * config field for Bedrock API-key bearer auth. But the client's default\n * auth-scheme order is SigV4 first, then bearer — so passing `token` alone is\n * not enough: the SDK still resolves SigV4 and throws \"Could not load\n * credentials from any providers\". Pinning `authSchemePreference` to the\n * bearer scheme makes the API key actually get used. SigV4 uses the AWS\n * credential provider chain and the default scheme order.\n */\n protected buildClientConfig(\n resolved: ResolvedBedrockAuth,\n region: string,\n endpoint: string | undefined,\n ): BedrockRuntimeClientConfig {\n if (resolved.kind === 'bearer') {\n return {\n region,\n token: { token: resolved.token },\n authSchemePreference: ['httpBearerAuth'],\n ...(endpoint ? { endpoint } : {}),\n }\n }\n return {\n region: resolved.region,\n credentials: resolved.credentials,\n ...(endpoint ? { endpoint } : {}),\n }\n }\n\n // ---------------------------------------------------------------------------\n // SDK seams (overridden in tests so no real AWS call happens)\n // ---------------------------------------------------------------------------\n\n protected async sendStream(\n input: ConverseStreamCommandInput,\n signal?: AbortSignal | null,\n ): Promise<AsyncIterable<ConverseStreamOutput>> {\n const { ConverseStreamCommand } = await this.importBedrockRuntime()\n const client = await this.getClient()\n const command = new ConverseStreamCommand(input)\n addRestoreDocuments(command, input)\n const res = await client.send(command, { abortSignal: signal ?? undefined })\n if (!res.stream) {\n throw new Error('Bedrock Converse: empty stream response')\n }\n return res.stream\n }\n\n protected async send(\n input: ConverseCommandInput,\n signal?: AbortSignal | null,\n ): Promise<ConverseCommandOutput> {\n const { ConverseCommand } = await this.importBedrockRuntime()\n const client = await this.getClient()\n const command = new ConverseCommand(input)\n addRestoreDocuments(command, input)\n return client.send(command, { abortSignal: signal ?? undefined })\n }\n\n // ---------------------------------------------------------------------------\n // Public adapter surface\n // ---------------------------------------------------------------------------\n\n async *chatStream(\n options: TextOptions<TProviderOptions>,\n ): AsyncIterable<AdapterYieldChunk> {\n try {\n options.logger.request(\n `activity=chat provider=${this.name} model=${this.model} messages=${options.messages.length} tools=${options.tools?.length ?? 0} stream=true`,\n { provider: this.name, model: this.model },\n )\n const input = this.buildInput(options)\n // Bedrock rejects toolUse and toolResult blocks without a toolConfig,\n // so a request with no tools sends its tool history as text.\n if (!input.toolConfig && input.messages) {\n input.messages = toolBlocksToText(input.messages)\n }\n const stream = await this.sendStream(input, options.request?.signal)\n for await (const chunk of processConverseStream(\n stream,\n () => this.generateId(),\n {\n threadId: options.threadId,\n parentRunId: options.parentRunId,\n model: options.model,\n },\n )) {\n yield chunk.type === EventType.RUN_STARTED ||\n chunk.type === EventType.RUN_FINISHED\n ? { ...chunk, metadata: this.sourceMetadata(options.model) }\n : chunk\n }\n } catch (error: unknown) {\n const errorPayload = converseRunErrorPayload(\n error,\n `${this.name}.chatStream failed`,\n )\n options.logger.errors(`${this.name}.chatStream fatal`, {\n error: errorPayload,\n source: `${this.name}.chatStream`,\n })\n // Conditional `code` spread keeps the wire shape spec-compliant under\n // `exactOptionalPropertyTypes` (AG-UI's `RunErrorEvent.code` is optional).\n yield {\n type: EventType.RUN_ERROR,\n metadata: this.sourceMetadata(options.model),\n model: options.model,\n timestamp: Date.now(),\n message: errorPayload.message,\n ...(errorPayload.code !== undefined && { code: errorPayload.code }),\n error: {\n message: errorPayload.message,\n ...(errorPayload.code !== undefined && { code: errorPayload.code }),\n },\n }\n }\n }\n\n /**\n * Structured output via the forced-tool strategy. Converse has no native\n * json_schema response_format, so we force a single tool whose input schema\n * is the requested output schema and read the model's `toolUse.input` back as\n * the structured result.\n */\n async structuredOutput(\n options: StructuredOutputOptions<TProviderOptions>,\n ): Promise<StructuredOutputResult<unknown>> {\n const { chatOptions, outputSchema } = options\n try {\n chatOptions.logger.request(\n `activity=structuredOutput provider=${this.name} model=${this.model} messages=${chatOptions.messages.length}`,\n { provider: this.name, model: this.model },\n )\n // Claude rejects a forced tool while thinking is on, so the forced\n // structured-output tool goes without `chat({ reasoning })`.\n const { reasoning: _reasoning, ...requestOptions } = chatOptions\n const input: ConverseCommandInput = {\n ...this.buildInput(requestOptions),\n toolConfig: buildStructuredToolConfig(outputSchema),\n }\n const res = await this.send(input, chatOptions.request?.signal)\n const usage = res.usage && buildConverseUsage(res.usage)\n // A forced tool call cut off at the output cap carries partial input,\n // which would read like a schema failure (issue #1426).\n if (res.stopReason === 'max_tokens') {\n throw Object.assign(\n new Error(\n `${this.name}.structuredOutput: the response was cut off because the maximum token limit was reached (stopReason=max_tokens); raise modelOptions.max_completion_tokens`,\n ),\n usage && { usage },\n )\n }\n const structured = extractStructuredToolInput(res)\n if (structured === undefined) {\n throw Object.assign(\n new Error(\n `${this.name}.structuredOutput: response contained no forced-tool output`,\n ),\n usage && { usage },\n )\n }\n return {\n data: structured,\n rawText: JSON.stringify(structured),\n ...(usage && { usage }),\n }\n } catch (error: unknown) {\n chatOptions.logger.errors(`${this.name}.structuredOutput fatal`, {\n error: toRunErrorPayload(error, `${this.name}.structuredOutput failed`),\n source: `${this.name}.structuredOutput`,\n })\n throw error\n }\n }\n\n /**\n * Streaming structured output. Same forced-tool strategy as\n * `structuredOutput`, but streamed: the forced tool's `toolUse.input` JSON\n * fragments are accumulated from the Converse stream and a terminal\n * `CUSTOM 'structured-output.complete'` event carries `{ object, raw }`,\n * mirroring openai-base's `structuredOutputStream` contract exactly.\n */\n async *structuredOutputStream(\n options: StructuredOutputOptions<TProviderOptions>,\n ): AsyncIterable<AdapterYieldChunk> {\n const { chatOptions, outputSchema } = options\n const runId = this.generateId()\n const threadId = chatOptions.threadId\n const messageId = this.generateId()\n\n let hasEmittedRunStarted = false\n let hasEmittedTextMessageStart = false\n let accumulatedRaw = ''\n let finishReason: 'stop' | 'length' | 'content_filter' = 'stop'\n // Usage arrives on the trailing `metadata` event, after the finish signal,\n // so it is captured during iteration and folded into RUN_FINISHED below.\n let usage: TokenUsage | undefined\n\n try {\n chatOptions.logger.request(\n `activity=structuredOutputStream provider=${this.name} model=${this.model} messages=${chatOptions.messages.length}`,\n { provider: this.name, model: this.model },\n )\n // Claude rejects a forced tool while thinking is on, so the forced\n // structured-output tool goes without `chat({ reasoning })`.\n const { reasoning: _reasoning, ...requestOptions } = chatOptions\n const input: ConverseStreamCommandInput = {\n ...this.buildInput(requestOptions),\n toolConfig: buildStructuredToolConfig(outputSchema),\n }\n const stream = await this.sendStream(input, chatOptions.request?.signal)\n\n // The forced tool streams its `input` as partial-JSON fragments inside\n // `contentBlockDelta.delta.toolUse.input`. We surface them as\n // TEXT_MESSAGE_CONTENT deltas (raw JSON text), matching openai-base which\n // carries the structured JSON as text deltas.\n for await (const ev of stream) {\n if (!hasEmittedRunStarted) {\n hasEmittedRunStarted = true\n yield {\n type: EventType.RUN_STARTED,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n threadId,\n model: chatOptions.model,\n timestamp: Date.now(),\n parentRunId: chatOptions.parentRunId,\n }\n }\n\n // Surface in-band server/throttle/validation errors instead of\n // letting them fall through and masquerade as an empty response.\n throwIfConverseStreamError(ev)\n\n if ('contentBlockDelta' in ev) {\n const delta = ev.contentBlockDelta?.delta\n const fragment =\n delta && 'toolUse' in delta ? delta.toolUse?.input : undefined\n if (fragment !== undefined) {\n if (!hasEmittedTextMessageStart) {\n hasEmittedTextMessageStart = true\n yield {\n type: EventType.TEXT_MESSAGE_START,\n messageId,\n role: 'assistant',\n model: chatOptions.model,\n timestamp: Date.now(),\n }\n }\n accumulatedRaw += fragment\n yield {\n type: EventType.TEXT_MESSAGE_CONTENT,\n messageId,\n delta: fragment,\n content: accumulatedRaw,\n model: chatOptions.model,\n timestamp: Date.now(),\n }\n }\n continue\n }\n\n if ('messageStop' in ev) {\n const stopReason = ev.messageStop?.stopReason\n // The forced structured-output tool produces stopReason 'tool_use' on\n // success, but that's an implementation detail — a cleanly-completed\n // structured run reports 'stop', matching openai-base's contract.\n finishReason =\n stopReason === 'max_tokens'\n ? 'length'\n : stopReason === 'content_filtered'\n ? 'content_filter'\n : 'stop'\n continue\n }\n\n if ('metadata' in ev) {\n const u = ev.metadata?.usage\n if (u) {\n usage = buildConverseUsage(u)\n }\n continue\n }\n }\n\n if (!hasEmittedRunStarted) {\n hasEmittedRunStarted = true\n yield {\n type: EventType.RUN_STARTED,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n threadId,\n model: chatOptions.model,\n timestamp: Date.now(),\n parentRunId: chatOptions.parentRunId,\n }\n }\n\n if (hasEmittedTextMessageStart) {\n yield {\n type: EventType.TEXT_MESSAGE_END,\n messageId,\n model: chatOptions.model,\n timestamp: Date.now(),\n }\n }\n\n // Same truncation check as `structuredOutput()`: report the token limit\n // before the empty-content and parse errors (issue #1426).\n if (finishReason === 'length') {\n const message = `${this.name}.structuredOutputStream: the response was cut off because the maximum token limit was reached (stopReason=max_tokens); raise modelOptions.max_completion_tokens`\n yield {\n type: EventType.RUN_ERROR,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n model: chatOptions.model,\n timestamp: Date.now(),\n message,\n code: 'max_tokens',\n error: { message, code: 'max_tokens' },\n ...(usage && { usage }),\n }\n return\n }\n\n if (accumulatedRaw.length === 0) {\n yield {\n type: EventType.RUN_ERROR,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n model: chatOptions.model,\n timestamp: Date.now(),\n message: `${this.name}.structuredOutputStream: response contained no content`,\n code: 'empty-response',\n error: {\n message: `${this.name}.structuredOutputStream: response contained no content`,\n code: 'empty-response',\n },\n ...(usage && { usage }),\n }\n return\n }\n\n let parsed: unknown\n try {\n parsed = JSON.parse(accumulatedRaw)\n } catch {\n yield {\n type: EventType.RUN_ERROR,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n model: chatOptions.model,\n timestamp: Date.now(),\n message: `Failed to parse structured output as JSON. Content: ${accumulatedRaw.slice(0, 200)}${accumulatedRaw.length > 200 ? '...' : ''}`,\n code: 'parse-error',\n error: {\n message: 'Failed to parse structured output as JSON',\n code: 'parse-error',\n },\n ...(usage && { usage }),\n }\n return\n }\n\n yield {\n type: EventType.CUSTOM,\n name: 'structured-output.complete',\n value: {\n object: parsed,\n raw: accumulatedRaw,\n },\n model: chatOptions.model,\n timestamp: Date.now(),\n }\n\n yield {\n type: EventType.RUN_FINISHED,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n threadId,\n model: chatOptions.model,\n timestamp: Date.now(),\n finishReason,\n ...(usage && { usage }),\n }\n } catch (error: unknown) {\n if (!hasEmittedRunStarted) {\n hasEmittedRunStarted = true\n yield {\n type: EventType.RUN_STARTED,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n threadId,\n model: chatOptions.model,\n timestamp: Date.now(),\n parentRunId: chatOptions.parentRunId,\n }\n }\n const errorPayload = converseRunErrorPayload(\n error,\n `${this.name}.structuredOutputStream failed`,\n )\n chatOptions.logger.errors(`${this.name}.structuredOutputStream fatal`, {\n error: errorPayload,\n source: `${this.name}.structuredOutputStream`,\n })\n yield {\n type: EventType.RUN_ERROR,\n metadata: this.sourceMetadata(chatOptions.model),\n runId,\n model: chatOptions.model,\n timestamp: Date.now(),\n message: errorPayload.message,\n ...(errorPayload.code !== undefined && { code: errorPayload.code }),\n error: {\n message: errorPayload.message,\n ...(errorPayload.code !== undefined && { code: errorPayload.code }),\n },\n ...(usage && { usage }),\n }\n }\n }\n\n /**\n * Converse sends `tools` and a forced structured-output tool via two separate\n * mechanisms, never together. Declaring `false` makes the engine run the\n * agent loop without `outputSchema` and finalize via `structuredOutput` /\n * `structuredOutputStream`.\n */\n supportsCombinedToolsAndSchema(): boolean {\n return false\n }\n\n // ---------------------------------------------------------------------------\n // Request construction\n // ---------------------------------------------------------------------------\n\n /**\n * Translate `TextOptions` into a `ConverseCommandInput`. Shared by chatStream,\n * structuredOutput, and structuredOutputStream (the latter two override\n * `toolConfig` with the forced structured tool afterwards).\n */\n protected buildInput(\n options: TextOptions<TProviderOptions>,\n ): ConverseCommandInput {\n const { system, messages } = toConverseMessages(\n options.messages,\n options.systemPrompts,\n { model: options.model, provider: this.provider },\n )\n\n // Sampling options live on `modelOptions` (typed as the narrowed\n // `BedrockConverseProviderOptions`, which surfaces the OpenAI Chat\n // Completions field names); translate them into Converse's `inferenceConfig`,\n // which uses AWS-native camelCase keys.\n const modelOptions = options.modelOptions\n const temperature = modelOptions?.temperature\n const topP = modelOptions?.top_p\n // `chat({ reasoning })`: Claude's thinking fields. Budget thinking needs\n // `maxTokens` above the budget, so a smaller or missing value grows.\n const { additionalModelRequestFields, minMaxTokens } = converseThinking(\n this.model,\n options.reasoning,\n BEDROCK_MODEL_REASONING[this.model],\n )\n\n // `chat({ toolChoice })`. Converse has no `none` choice, so `none` sends\n // no tool config, and `chatStream` sends any tool history as text. Claude\n // rejects a forced tool while thinking is on (only Claude gets thinking\n // fields), and some Claude models reject it on every request. Then a\n // forced choice falls back to auto.\n const canForceTool =\n additionalModelRequestFields === undefined &&\n !BEDROCK_CLAUDE_NO_FORCED_TOOL_FAMILIES.some((name) =>\n this.model.includes(name),\n )\n const toolChoice =\n options.toolChoice === 'none' || canForceTool\n ? options.toolChoice\n : 'auto'\n const toolConfig = options.tools\n ? toToolConfig(convertTools(options.tools), toolChoice)\n : undefined\n\n const requestedMaxTokens = modelOptions?.max_completion_tokens\n const maxTokens =\n minMaxTokens !== undefined &&\n (requestedMaxTokens == null || requestedMaxTokens < minMaxTokens)\n ? minMaxTokens\n : requestedMaxTokens\n const stop = modelOptions?.stop\n const stopSequences =\n stop == null ? undefined : Array.isArray(stop) ? stop : [stop]\n\n const inferenceConfig =\n temperature != null ||\n topP != null ||\n maxTokens != null ||\n stopSequences != null\n ? {\n ...(temperature != null && { temperature }),\n ...(topP != null && { topP }),\n ...(maxTokens != null && { maxTokens }),\n ...(stopSequences != null && { stopSequences }),\n }\n : undefined\n\n const input: ConverseCommandInput = {\n modelId: this.model,\n messages,\n ...(system.length > 0 && { system }),\n ...(toolConfig && { toolConfig }),\n ...(inferenceConfig && { inferenceConfig }),\n ...(additionalModelRequestFields && { additionalModelRequestFields }),\n }\n return addPromptCachePoints(this.model, input, options.promptCache)\n }\n}\n\n/**\n * Convert TanStack `Tool[]` to the Converse tool-converter input shape. Reuses\n * the SAME `convertSchemaToJsonSchema` the other adapters use so the Converse\n * tool input schemas match what every other provider sends.\n */\n/**\n * The text Bedrock models use for a context overflow. Converse has no error\n * type for it: it is a `ValidationException` like every bad request, and over\n * a stream the SDK does not keep that name. So the message is the only signal.\n * Each model family has its own text.\n */\nconst CONTEXT_OVERFLOW_MESSAGE =\n /Input Tokens Exceeded|maximum context length|Input is too long for requested model|prompt is too long/\n\n/**\n * `toRunErrorPayload`, with `code` set to `CONTEXT_OVERFLOW_CODE` for a\n * context overflow. A `ThrottlingException` is never an overflow, whatever\n * its text says about tokens.\n */\nfunction converseRunErrorPayload(\n error: unknown,\n fallbackMessage: string,\n): { message: string; code: string | undefined } {\n const payload = toRunErrorPayload(error, fallbackMessage)\n const throttled =\n error instanceof Error && error.name === 'ThrottlingException'\n return !throttled && CONTEXT_OVERFLOW_MESSAGE.test(payload.message)\n ? { ...payload, code: CONTEXT_OVERFLOW_CODE }\n : payload\n}\n\nfunction convertTools(tools: Array<Tool>): Array<ConverseToolInput> {\n return tools.map((tool) => {\n const inputSchema: JSONSchema = convertSchemaToJsonSchema(\n tool.inputSchema,\n ) ?? { type: 'object', properties: {}, required: [] }\n const { cachePoint }: BedrockToolMetadata = tool.metadata ?? {}\n return {\n name: tool.name,\n description: tool.description,\n inputSchema,\n ...(cachePoint && { cachePoint }),\n }\n })\n}\n\n/**\n * Find the forced structured-output tool's `input` in a non-streaming Converse\n * response. SDK-boundary narrowing only — `ConverseOutput` is a tagged union\n * (`{ message }`) and a tool-use block is `{ toolUse: { input } }`.\n */\nfunction extractStructuredToolInput(\n res: ConverseCommandOutput,\n): unknown | undefined {\n const message =\n res.output && 'message' in res.output ? res.output.message : undefined\n const content: Array<ContentBlock> = message?.content ?? []\n for (const block of content) {\n if ('toolUse' in block && block.toolUse) {\n // Only accept the forced structured tool (an unnamed block is allowed,\n // since the forced tool is the only one configured). A differently-named\n // tool-use block is a hallucinated/leftover call whose arbitrary input\n // must not be returned as the validated result — leave it to the caller's\n // `throw` so the failure is accurate instead of silently wrong.\n if (\n block.toolUse.name === STRUCTURED_TOOL_NAME ||\n block.toolUse.name === undefined\n ) {\n return block.toolUse.input\n }\n }\n }\n return undefined\n}\n\n/** The parts of a Converse request that hold documents the adapter fills from user data. */\ntype ConverseDocuments = Pick<ConverseCommandInput, 'messages' | 'toolConfig'>\n\nfunction hasProtoKey(value: unknown): boolean {\n if (typeof value !== 'object' || value === null) return false\n return (\n Object.hasOwn(value, '__proto__') || Object.values(value).some(hasProtoKey)\n )\n}\n\n/**\n * The AWS SDK copies a document (tool input, tool input schema) with\n * `out[key] = value`. For an own key named `__proto__`, the assignment goes\n * to the `__proto__` setter and the key is lost. This puts each such\n * document back in the serialized body. `JSON.stringify` keeps own keys.\n */\nfunction restoreDocuments(request: unknown, input: ConverseDocuments): void {\n const documents = [\n ...(input.messages ?? []).flatMap((message) =>\n (message.content ?? []).map((block) => block.toolUse?.input),\n ),\n ...(input.toolConfig?.tools ?? []).map(\n (tool) => tool.toolSpec?.inputSchema?.json,\n ),\n ]\n // Skip the parse and re-serialize of the body, which can be large (for\n // example with image bytes), unless a document has the key.\n if (!documents.some(hasProtoKey)) return\n if (\n typeof request !== 'object' ||\n request === null ||\n !('body' in request) ||\n typeof request.body !== 'string'\n ) {\n throw new Error(\n 'Bedrock Converse: cannot keep a `__proto__` key because the request body is not a JSON string',\n )\n }\n // The SDK serialized this body from `input` one step earlier, so the two\n // line up by position.\n const body: ConverseDocuments = JSON.parse(request.body)\n body.messages?.forEach((message, i) =>\n message.content?.forEach((block, j) => {\n const source = input.messages?.[i]?.content?.[j]?.toolUse?.input\n if (block.toolUse && hasProtoKey(source)) block.toolUse.input = source\n }),\n )\n body.toolConfig?.tools?.forEach((tool, i) => {\n const source = input.toolConfig?.tools?.[i]?.toolSpec?.inputSchema?.json\n if (tool.toolSpec?.inputSchema && hasProtoKey(source))\n tool.toolSpec.inputSchema.json = source\n })\n request.body = JSON.stringify(body)\n}\n\n/**\n * Adds {@link restoreDocuments} to a command. It runs at `build` with high\n * priority, before the SDK sets Content-Length and signs the body.\n */\nfunction addRestoreDocuments<TInput extends object, TOutput extends object>(\n command: { middlewareStack: MiddlewareStack<TInput, TOutput> },\n input: ConverseDocuments,\n): void {\n command.middlewareStack.add(\n (next) => (args) => {\n restoreDocuments(args.request, input)\n return next(args)\n },\n { step: 'build', name: 'tanstackRestoreDocuments', priority: 'high' },\n )\n}\n\n/** Converse adapter with an explicit API key (low-level; mirrors createBedrockChat). */\nexport function createBedrockConverse<TModel extends BedrockConverseModels>(\n model: TModel,\n apiKey: string,\n config?: Omit<BedrockConverseConfig, 'apiKey'>,\n): BedrockConverseTextAdapter<TModel> {\n return new BedrockConverseTextAdapter({ ...config, apiKey }, model)\n}\n"],"mappings":"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"}
|
|
@@ -55,7 +55,7 @@ export declare class BedrockEmbeddingAdapter<TModel extends BedrockEmbeddingMode
|
|
|
55
55
|
*/
|
|
56
56
|
protected buildClientConfig(resolved: ResolvedBedrockAuth, region: string, endpoint: string | undefined): BedrockRuntimeClientConfig;
|
|
57
57
|
/** Send one InvokeModel call and parse its JSON response body. */
|
|
58
|
-
protected invokeModel(modelId: string, body: Record<string, unknown
|
|
58
|
+
protected invokeModel(modelId: string, body: Record<string, unknown>, abortSignal?: AbortSignal): Promise<unknown>;
|
|
59
59
|
createEmbeddings(options: EmbeddingOptions<TProviderOptions>): Promise<EmbeddingResult>;
|
|
60
60
|
/**
|
|
61
61
|
* `amazon.titan-embed-text-v2:0` — one text per InvokeModel call, fanned
|
|
@@ -99,14 +99,14 @@ var BedrockEmbeddingAdapter = class extends BaseEmbeddingAdapter {
|
|
|
99
99
|
};
|
|
100
100
|
}
|
|
101
101
|
/** Send one InvokeModel call and parse its JSON response body. */
|
|
102
|
-
async invokeModel(modelId, body) {
|
|
102
|
+
async invokeModel(modelId, body, abortSignal) {
|
|
103
103
|
const { InvokeModelCommand } = await this.importBedrockRuntime();
|
|
104
104
|
const response = await (await this.getClient()).send(new InvokeModelCommand({
|
|
105
105
|
modelId,
|
|
106
106
|
contentType: "application/json",
|
|
107
107
|
accept: "application/json",
|
|
108
108
|
body: JSON.stringify(body)
|
|
109
|
-
}));
|
|
109
|
+
}), abortSignal ? { abortSignal } : {});
|
|
110
110
|
return JSON.parse(new TextDecoder().decode(response.body));
|
|
111
111
|
}
|
|
112
112
|
async createEmbeddings(options) {
|
|
@@ -144,7 +144,7 @@ var BedrockEmbeddingAdapter = class extends BaseEmbeddingAdapter {
|
|
|
144
144
|
const body = { inputText: text };
|
|
145
145
|
if (dimensions !== void 0) body.dimensions = dimensions;
|
|
146
146
|
if (normalize !== void 0) body.normalize = normalize;
|
|
147
|
-
return readTitanEmbeddingBody(await this.invokeModel(model, body), `${this.name} ${model}`);
|
|
147
|
+
return readTitanEmbeddingBody(await this.invokeModel(model, body, options.abortSignal), `${this.name} ${model}`);
|
|
148
148
|
});
|
|
149
149
|
return this.toTitanResult(model, responses);
|
|
150
150
|
}
|
|
@@ -164,7 +164,7 @@ var BedrockEmbeddingAdapter = class extends BaseEmbeddingAdapter {
|
|
|
164
164
|
if (item.texts.length > 0) body.inputText = item.texts.join("\n");
|
|
165
165
|
const image = item.images[0];
|
|
166
166
|
if (image) body.inputImage = toTitanInputImage(image, model);
|
|
167
|
-
return readTitanEmbeddingBody(await this.invokeModel(model, body), `${this.name} ${model}`);
|
|
167
|
+
return readTitanEmbeddingBody(await this.invokeModel(model, body, options.abortSignal), `${this.name} ${model}`);
|
|
168
168
|
});
|
|
169
169
|
return this.toTitanResult(model, responses);
|
|
170
170
|
}
|
|
@@ -185,7 +185,7 @@ var BedrockEmbeddingAdapter = class extends BaseEmbeddingAdapter {
|
|
|
185
185
|
input_type: inputType
|
|
186
186
|
};
|
|
187
187
|
if (truncate !== void 0) body.truncate = truncate;
|
|
188
|
-
return readCohereEmbeddingBody(await this.invokeModel(model, body), `${this.name} ${model}`);
|
|
188
|
+
return readCohereEmbeddingBody(await this.invokeModel(model, body, options.abortSignal), `${this.name} ${model}`);
|
|
189
189
|
});
|
|
190
190
|
return {
|
|
191
191
|
id: this.generateId(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"embedding.js","names":[],"sources":["../../../src/adapters/embedding.ts"],"sourcesContent":["import { BaseEmbeddingAdapter } from '@tanstack/ai/adapters'\nimport { toRunErrorPayload } from '@tanstack/ai/adapter-internals'\nimport {\n isFileSource,\n requireTextOnlyEmbeddingInput,\n resolveEmbeddingInput,\n unsupportedFileSourceError,\n} from '@tanstack/ai'\nimport { resolveBedrockAuth } from '../utils/auth'\nimport { BEDROCK_EMBEDDING_MODELS } from '../model-meta'\nimport type * as BedrockRuntime from '@aws-sdk/client-bedrock-runtime'\nimport type {\n BedrockRuntimeClient,\n BedrockRuntimeClientConfig,\n} from '@aws-sdk/client-bedrock-runtime'\nimport type {\n EmbeddingOptions,\n EmbeddingResult,\n ImagePart,\n TokenUsage,\n} from '@tanstack/ai'\nimport type { ResolvedBedrockAuth } from '../utils/auth'\nimport type { BedrockClientConfig } from '../utils/client'\nimport type {\n BedrockEmbeddingModel,\n BedrockEmbeddingModelInputModalitiesByName,\n BedrockEmbeddingModelProviderOptionsByName,\n ResolveEmbeddingProviderOptions,\n} from '../model-meta'\n\n/**\n * Config for the Bedrock embedding adapter — the same auth surface as the\n * other Bedrock adapters (apiKey → env → SigV4 via `resolveBedrockAuth`),\n * minus the OpenAI-compat client options that don't apply to `InvokeModel`.\n */\nexport interface BedrockEmbeddingConfig extends Pick<\n BedrockClientConfig,\n 'apiKey' | 'region' | 'auth' | 'baseURL'\n> {}\n\n/** InvokeModel calls issued concurrently during a per-item fan-out. */\nconst MAX_CONCURRENT_INVOCATIONS = 5\n\n/** Valid `dimensions` for `amazon.titan-embed-text-v2:0`. */\nconst TITAN_TEXT_DIMENSIONS: ReadonlyArray<number> = [256, 512, 1024]\n\n/** Valid `dimensions` (outputEmbeddingLength) for `amazon.titan-embed-image-v1`. */\nconst TITAN_IMAGE_DIMENSIONS: ReadonlyArray<number> = [256, 384, 1024]\nconst TITAN_IMAGE_DEFAULT_DIMENSIONS = 1024\n\n/** Cohere embed accepts at most 96 texts per InvokeModel call. */\nconst COHERE_MAX_BATCH_SIZE = 96\n\n/**\n * Bedrock Embedding Adapter\n *\n * Tree-shakeable adapter for embeddings served through Bedrock's native\n * `InvokeModel` API (embedding models have no Converse surface). Each model\n * family has its own JSON body dialect:\n *\n * - `amazon.titan-embed-text-v2:0` — text-only, ONE text per call; the batch\n * is fanned out with a small concurrency cap and per-call\n * `inputTextTokenCount`s are summed into usage.\n * - `amazon.titan-embed-image-v1` — MULTIMODAL: text, image, or a fused\n * text+image item embedded into a single vector; one item per call.\n * - `cohere.embed-english-v3` / `cohere.embed-multilingual-v3` — text-only,\n * batched natively (chunked at 96 texts per call). `inputType` is required.\n *\n * The SDK call lives behind a protected `invokeModel` seam so tests can\n * subclass and inject canned response bodies without a real AWS request, and\n * the AWS SDK itself is imported lazily (it's Node/server-only).\n */\nexport class BedrockEmbeddingAdapter<\n TModel extends BedrockEmbeddingModel,\n // Same rationale as the text adapters: the base parameterises\n // `TProviderOptions extends object`, and the per-model options interfaces\n // lack implicit index signatures — `Record<string, any>` (not `unknown`)\n // accepts them. Confined to the generic constraint; no value cast.\n TProviderOptions extends Record<string, any> =\n ResolveEmbeddingProviderOptions<TModel>,\n> extends BaseEmbeddingAdapter<\n TModel,\n TProviderOptions,\n BedrockEmbeddingModelProviderOptionsByName,\n BedrockEmbeddingModelInputModalitiesByName\n> {\n readonly name = 'bedrock' as const\n private clientPromise?: Promise<BedrockRuntimeClient>\n private readonly clientConfig: BedrockEmbeddingConfig\n\n constructor(config: BedrockEmbeddingConfig, model: TModel) {\n super(model, {})\n // Defer client construction and auth resolution: the AWS SDK is Node/\n // server-only, so we must not pull it into the static graph here. The\n // client (and its dynamic import) is built lazily on first SDK call.\n this.clientConfig = config\n }\n\n /**\n * Dynamically import `@aws-sdk/client-bedrock-runtime`. The specifier is\n * held in a variable (not a string literal) so bundler dep scanners cannot\n * statically discover the AWS SDK and try to pre-bundle it for the browser.\n * Same pattern as the Converse text adapter.\n */\n protected importBedrockRuntime(): Promise<typeof BedrockRuntime> {\n const mod = '@aws-sdk/client-bedrock-runtime'\n return import(/* @vite-ignore */ mod) as Promise<typeof BedrockRuntime>\n }\n\n /**\n * Lazily construct the `BedrockRuntimeClient`, deferring\n * `resolveBedrockAuth` until a real request is made.\n */\n protected async getClient(): Promise<BedrockRuntimeClient> {\n if (!this.clientPromise) {\n this.clientPromise = (async () => {\n const { BedrockRuntimeClient } = await this.importBedrockRuntime()\n const region = this.clientConfig.region ?? 'us-east-1'\n const resolved = resolveBedrockAuth(\n {\n apiKey: this.clientConfig.apiKey,\n region,\n auth: this.clientConfig.auth,\n },\n 'runtime',\n )\n return new BedrockRuntimeClient(\n this.buildClientConfig(resolved, region, this.clientConfig.baseURL),\n )\n })().catch((error: unknown) => {\n // Don't cache a rejected promise — clear it so a later call can retry\n // (e.g. after a transient import failure or fixed auth config).\n this.clientPromise = undefined\n throw error\n })\n }\n return this.clientPromise\n }\n\n /**\n * Map resolved auth + endpoint to a `BedrockRuntimeClientConfig`. Bearer\n * auth needs `authSchemePreference` pinned or the SDK still tries SigV4\n * first — same reasoning as the Converse text adapter.\n */\n protected buildClientConfig(\n resolved: ResolvedBedrockAuth,\n region: string,\n endpoint: string | undefined,\n ): BedrockRuntimeClientConfig {\n if (resolved.kind === 'bearer') {\n return {\n region,\n token: { token: resolved.token },\n authSchemePreference: ['httpBearerAuth'],\n ...(endpoint ? { endpoint } : {}),\n }\n }\n return {\n region: resolved.region,\n credentials: resolved.credentials,\n ...(endpoint ? { endpoint } : {}),\n }\n }\n\n // ---------------------------------------------------------------------------\n // SDK seam (overridden in tests so no real AWS call happens)\n // ---------------------------------------------------------------------------\n\n /** Send one InvokeModel call and parse its JSON response body. */\n protected async invokeModel(\n modelId: string,\n body: Record<string, unknown>,\n ): Promise<unknown> {\n const { InvokeModelCommand } = await this.importBedrockRuntime()\n const client = await this.getClient()\n const response = await client.send(\n new InvokeModelCommand({\n modelId,\n contentType: 'application/json',\n accept: 'application/json',\n body: JSON.stringify(body),\n }),\n )\n return JSON.parse(new TextDecoder().decode(response.body))\n }\n\n // ---------------------------------------------------------------------------\n // Public adapter surface\n // ---------------------------------------------------------------------------\n\n async createEmbeddings(\n options: EmbeddingOptions<TProviderOptions>,\n ): Promise<EmbeddingResult> {\n const { model, logger } = options\n try {\n logger.request(\n `activity=embed provider=${this.name} model=${model} inputs=${options.input.length}`,\n { provider: this.name, model },\n )\n switch (model) {\n case 'amazon.titan-embed-text-v2:0':\n return await this.embedTitanText(options)\n case 'amazon.titan-embed-image-v1':\n return await this.embedTitanImage(options)\n case 'cohere.embed-english-v3':\n case 'cohere.embed-multilingual-v3':\n return await this.embedCohere(options)\n default:\n throw new Error(\n `Unknown Bedrock embedding model \"${model}\". Supported models: ` +\n `${BEDROCK_EMBEDDING_MODELS.join(', ')}.`,\n )\n }\n } catch (error: unknown) {\n logger.errors(`${this.name}.createEmbeddings fatal`, {\n error: toRunErrorPayload(error, `${this.name}.createEmbeddings failed`),\n source: `${this.name}.createEmbeddings`,\n })\n throw error\n }\n }\n\n // ---------------------------------------------------------------------------\n // Per-model request mapping\n // ---------------------------------------------------------------------------\n\n /**\n * `amazon.titan-embed-text-v2:0` — one text per InvokeModel call, fanned\n * out with a concurrency cap; result order matches input order and per-call\n * `inputTextTokenCount`s are summed into usage.\n */\n private async embedTitanText(\n options: EmbeddingOptions<TProviderOptions>,\n ): Promise<EmbeddingResult> {\n const { model, dimensions } = options\n if (\n dimensions !== undefined &&\n !TITAN_TEXT_DIMENSIONS.includes(dimensions)\n ) {\n throw new Error(\n `${model} supports dimensions 256, 512, or 1024; got ${dimensions}`,\n )\n }\n const normalize: boolean | undefined = options.modelOptions?.normalize\n const texts = requireTextOnlyEmbeddingInput(options.input, this.name, model)\n\n const responses = await mapWithConcurrency(\n texts,\n MAX_CONCURRENT_INVOCATIONS,\n async (text) => {\n // Built incrementally: exactOptionalPropertyTypes is on, and Titan\n // rejects explicit nulls/undefined for absent optional fields.\n const body: Record<string, unknown> = { inputText: text }\n if (dimensions !== undefined) body.dimensions = dimensions\n if (normalize !== undefined) body.normalize = normalize\n return readTitanEmbeddingBody(\n await this.invokeModel(model, body),\n `${this.name} ${model}`,\n )\n },\n )\n\n return this.toTitanResult(model, responses)\n }\n\n /**\n * `amazon.titan-embed-image-v1` (Titan Multimodal) — one item per\n * InvokeModel call. An item may carry text, an image, or both (a fused\n * item embedded into a single vector). Titan accepts at most one image per\n * request and never fetches remote URLs.\n */\n private async embedTitanImage(\n options: EmbeddingOptions<TProviderOptions>,\n ): Promise<EmbeddingResult> {\n const { model, dimensions } = options\n const outputEmbeddingLength = dimensions ?? TITAN_IMAGE_DEFAULT_DIMENSIONS\n if (!TITAN_IMAGE_DIMENSIONS.includes(outputEmbeddingLength)) {\n throw new Error(\n `${model} supports dimensions 256, 384, or 1024; got ${outputEmbeddingLength}`,\n )\n }\n const items = resolveEmbeddingInput(options.input)\n\n const responses = await mapWithConcurrency(\n items,\n MAX_CONCURRENT_INVOCATIONS,\n async (item, index) => {\n if (item.images.length > 1) {\n throw new Error(\n `${model} accepts at most one image per input item; input item ` +\n `at index ${index} contains ${item.images.length} images. ` +\n `Pass them as separate input items (one vector each).`,\n )\n }\n const body: Record<string, unknown> = {\n embeddingConfig: { outputEmbeddingLength },\n }\n if (item.texts.length > 0) body.inputText = item.texts.join('\\n')\n const image = item.images[0]\n if (image) body.inputImage = toTitanInputImage(image, model)\n return readTitanEmbeddingBody(\n await this.invokeModel(model, body),\n `${this.name} ${model}`,\n )\n },\n )\n\n return this.toTitanResult(model, responses)\n }\n\n /**\n * `cohere.embed-*-v3` — natively batched (chunked at 96 texts per call,\n * order preserved across chunks). `inputType` is required by the Cohere\n * API; output dimensionality is fixed, so `dimensions` is rejected.\n */\n private async embedCohere(\n options: EmbeddingOptions<TProviderOptions>,\n ): Promise<EmbeddingResult> {\n const { model, dimensions } = options\n if (dimensions !== undefined) {\n throw new Error(\n `${model} does not support the dimensions option; its output size is fixed`,\n )\n }\n const inputType: string | undefined = options.modelOptions?.inputType\n if (inputType === undefined) {\n throw new Error(\n `${model} requires modelOptions.inputType ('search_document' | ` +\n `'search_query' | 'classification' | 'clustering')`,\n )\n }\n const truncate: string | undefined = options.modelOptions?.truncate\n const texts = requireTextOnlyEmbeddingInput(options.input, this.name, model)\n const batches = chunk(texts, COHERE_MAX_BATCH_SIZE)\n\n const responses = await mapWithConcurrency(\n batches,\n MAX_CONCURRENT_INVOCATIONS,\n async (batch) => {\n const body: Record<string, unknown> = {\n texts: batch,\n input_type: inputType,\n }\n if (truncate !== undefined) body.truncate = truncate\n return readCohereEmbeddingBody(\n await this.invokeModel(model, body),\n `${this.name} ${model}`,\n )\n },\n )\n\n return {\n id: this.generateId(),\n model,\n embeddings: responses.flat().map((vector, index) => ({ vector, index })),\n }\n }\n\n /** Assemble an EmbeddingResult from per-item Titan responses. */\n private toTitanResult(\n model: string,\n responses: Array<TitanEmbeddingBody>,\n ): EmbeddingResult {\n let promptTokens = 0\n const embeddings = responses.map((response, index) => {\n promptTokens += response.inputTextTokenCount\n return { vector: response.embedding, index }\n })\n const usage: TokenUsage = {\n promptTokens,\n completionTokens: 0,\n totalTokens: promptTokens,\n }\n return { id: this.generateId(), model, embeddings, usage }\n }\n}\n\n// ---------------------------------------------------------------------------\n// Response-body narrowing (SDK JSON boundary)\n// ---------------------------------------------------------------------------\n\ninterface TitanEmbeddingBody {\n embedding: Array<number>\n /** 0 when the response omits it (e.g. image-only Titan Multimodal calls). */\n inputTextTokenCount: number\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n return typeof value === 'object' && value !== null\n}\n\n/** Narrow a Titan InvokeModel JSON body: `{ embedding, inputTextTokenCount? }`. */\nfunction readTitanEmbeddingBody(\n raw: unknown,\n context: string,\n): TitanEmbeddingBody {\n const embedding =\n isRecord(raw) && Array.isArray(raw.embedding) ? raw.embedding : undefined\n if (!embedding) {\n throw new Error(\n `${context}: response body is missing the \"embedding\" array`,\n )\n }\n const inputTextTokenCount =\n isRecord(raw) && typeof raw.inputTextTokenCount === 'number'\n ? raw.inputTextTokenCount\n : 0\n return { embedding, inputTextTokenCount }\n}\n\n/** Narrow a Cohere InvokeModel JSON body: `{ embeddings: number[][] }` (float). */\nfunction readCohereEmbeddingBody(\n raw: unknown,\n context: string,\n): Array<Array<number>> {\n const embeddings =\n isRecord(raw) && Array.isArray(raw.embeddings) ? raw.embeddings : undefined\n if (!embeddings) {\n throw new Error(\n `${context}: response body is missing the \"embeddings\" array`,\n )\n }\n return embeddings\n}\n\n// ---------------------------------------------------------------------------\n// Input mapping helpers\n// ---------------------------------------------------------------------------\n\n/**\n * Map an ImagePart to Titan's `inputImage` (RAW base64, no data: prefix).\n * Accepts `data` sources as-is and `url` sources ONLY when the value is a\n * `data:` URI; Titan cannot fetch remote http(s) URLs.\n */\nfunction toTitanInputImage(image: ImagePart, model: string): string {\n const source = image.source\n if (isFileSource(source)) throw unsupportedFileSourceError('bedrock')\n if (source.type === 'data') {\n return source.value\n }\n if (source.value.startsWith('data:')) {\n const comma = source.value.indexOf(',')\n if (comma !== -1) {\n return source.value.slice(comma + 1)\n }\n }\n throw new Error(\n `Bedrock Titan does not fetch remote image URLs; pass base64 data ` +\n `(a { type: 'data' } source or a data: URI) for ${model}.`,\n )\n}\n\n/** Split into runs of at most `size`, preserving order. */\nfunction chunk<T>(items: Array<T>, size: number): Array<Array<T>> {\n const chunks: Array<Array<T>> = []\n for (let i = 0; i < items.length; i += size) {\n chunks.push(items.slice(i, i + size))\n }\n return chunks\n}\n\n/**\n * Map `fn` over `items` with at most `limit` calls in flight, returning\n * results in input order (result[i] corresponds to items[i] regardless of\n * completion order). Rejects with the first error.\n */\nasync function mapWithConcurrency<T, TResult>(\n items: ReadonlyArray<T>,\n limit: number,\n fn: (item: T, index: number) => Promise<TResult>,\n): Promise<Array<TResult>> {\n const results = new Array<TResult>(items.length)\n let next = 0\n const worker = async (): Promise<void> => {\n while (next < items.length) {\n const index = next++\n const item = items[index]\n if (item === undefined) continue // unreachable: index < length\n results[index] = await fn(item, index)\n }\n }\n const workerCount = Math.max(1, Math.min(limit, items.length))\n await Promise.all(Array.from({ length: workerCount }, () => worker()))\n return results\n}\n\n// ---------------------------------------------------------------------------\n// Factories\n// ---------------------------------------------------------------------------\n\n/**\n * Creates a Bedrock embedding adapter with an explicit API key (bearer).\n * Type resolution happens here at the call site.\n *\n * @param model - The model name (e.g., 'amazon.titan-embed-text-v2:0')\n * @param apiKey - Your Bedrock API key\n * @param config - Optional additional configuration (region, baseURL, ...)\n * @returns Configured Bedrock embedding adapter instance with resolved types\n *\n * @example\n * ```typescript\n * const adapter = createBedrockEmbedding(\n * 'amazon.titan-embed-text-v2:0',\n * 'bedrock-api-key',\n * );\n *\n * const result = await embed({\n * adapter,\n * input: 'a red guitar',\n * });\n * ```\n */\nexport function createBedrockEmbedding<TModel extends BedrockEmbeddingModel>(\n model: TModel,\n apiKey: string,\n config?: Omit<BedrockEmbeddingConfig, 'apiKey'>,\n): BedrockEmbeddingAdapter<TModel> {\n // Explicit apiKey is authoritative — spread config first so it can't override.\n return new BedrockEmbeddingAdapter({ ...config, apiKey }, model)\n}\n\n/**\n * Creates a Bedrock embedding adapter using the ambient auth cascade:\n * `config.apiKey` → `BEDROCK_API_KEY` → `AWS_BEARER_TOKEN_BEDROCK` → SigV4\n * (AWS credential provider chain). Auth resolves lazily on the first\n * request, so `auth: 'sigv4'` never requires an API key.\n *\n * @param model - The model name (e.g., 'cohere.embed-english-v3')\n * @param config - Optional configuration (region, auth, baseURL, ...)\n * @returns Configured Bedrock embedding adapter instance with resolved types\n *\n * @example\n * ```typescript\n * const adapter = bedrockEmbedding('cohere.embed-english-v3');\n *\n * const result = await embed({\n * adapter,\n * input: ['a red guitar', 'a blue drum kit'],\n * modelOptions: { inputType: 'search_document' },\n * });\n *\n * console.log(result.embeddings[0].vector)\n * ```\n */\nexport function bedrockEmbedding<TModel extends BedrockEmbeddingModel>(\n model: TModel,\n config?: BedrockEmbeddingConfig,\n): BedrockEmbeddingAdapter<TModel> {\n return new BedrockEmbeddingAdapter(config ?? {}, model)\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"embedding.js","names":[],"sources":["../../../src/adapters/embedding.ts"],"sourcesContent":["import { BaseEmbeddingAdapter } from '@tanstack/ai/adapters'\nimport { toRunErrorPayload } from '@tanstack/ai/adapter-internals'\nimport {\n isFileSource,\n requireTextOnlyEmbeddingInput,\n resolveEmbeddingInput,\n unsupportedFileSourceError,\n} from '@tanstack/ai'\nimport { resolveBedrockAuth } from '../utils/auth'\nimport { BEDROCK_EMBEDDING_MODELS } from '../model-meta'\nimport type * as BedrockRuntime from '@aws-sdk/client-bedrock-runtime'\nimport type {\n BedrockRuntimeClient,\n BedrockRuntimeClientConfig,\n} from '@aws-sdk/client-bedrock-runtime'\nimport type {\n EmbeddingOptions,\n EmbeddingResult,\n ImagePart,\n TokenUsage,\n} from '@tanstack/ai'\nimport type { ResolvedBedrockAuth } from '../utils/auth'\nimport type { BedrockClientConfig } from '../utils/client'\nimport type {\n BedrockEmbeddingModel,\n BedrockEmbeddingModelInputModalitiesByName,\n BedrockEmbeddingModelProviderOptionsByName,\n ResolveEmbeddingProviderOptions,\n} from '../model-meta'\n\n/**\n * Config for the Bedrock embedding adapter — the same auth surface as the\n * other Bedrock adapters (apiKey → env → SigV4 via `resolveBedrockAuth`),\n * minus the OpenAI-compat client options that don't apply to `InvokeModel`.\n */\nexport interface BedrockEmbeddingConfig extends Pick<\n BedrockClientConfig,\n 'apiKey' | 'region' | 'auth' | 'baseURL'\n> {}\n\n/** InvokeModel calls issued concurrently during a per-item fan-out. */\nconst MAX_CONCURRENT_INVOCATIONS = 5\n\n/** Valid `dimensions` for `amazon.titan-embed-text-v2:0`. */\nconst TITAN_TEXT_DIMENSIONS: ReadonlyArray<number> = [256, 512, 1024]\n\n/** Valid `dimensions` (outputEmbeddingLength) for `amazon.titan-embed-image-v1`. */\nconst TITAN_IMAGE_DIMENSIONS: ReadonlyArray<number> = [256, 384, 1024]\nconst TITAN_IMAGE_DEFAULT_DIMENSIONS = 1024\n\n/** Cohere embed accepts at most 96 texts per InvokeModel call. */\nconst COHERE_MAX_BATCH_SIZE = 96\n\n/**\n * Bedrock Embedding Adapter\n *\n * Tree-shakeable adapter for embeddings served through Bedrock's native\n * `InvokeModel` API (embedding models have no Converse surface). Each model\n * family has its own JSON body dialect:\n *\n * - `amazon.titan-embed-text-v2:0` — text-only, ONE text per call; the batch\n * is fanned out with a small concurrency cap and per-call\n * `inputTextTokenCount`s are summed into usage.\n * - `amazon.titan-embed-image-v1` — MULTIMODAL: text, image, or a fused\n * text+image item embedded into a single vector; one item per call.\n * - `cohere.embed-english-v3` / `cohere.embed-multilingual-v3` — text-only,\n * batched natively (chunked at 96 texts per call). `inputType` is required.\n *\n * The SDK call lives behind a protected `invokeModel` seam so tests can\n * subclass and inject canned response bodies without a real AWS request, and\n * the AWS SDK itself is imported lazily (it's Node/server-only).\n */\nexport class BedrockEmbeddingAdapter<\n TModel extends BedrockEmbeddingModel,\n // Same rationale as the text adapters: the base parameterises\n // `TProviderOptions extends object`, and the per-model options interfaces\n // lack implicit index signatures — `Record<string, any>` (not `unknown`)\n // accepts them. Confined to the generic constraint; no value cast.\n TProviderOptions extends Record<string, any> =\n ResolveEmbeddingProviderOptions<TModel>,\n> extends BaseEmbeddingAdapter<\n TModel,\n TProviderOptions,\n BedrockEmbeddingModelProviderOptionsByName,\n BedrockEmbeddingModelInputModalitiesByName\n> {\n readonly name = 'bedrock' as const\n private clientPromise?: Promise<BedrockRuntimeClient>\n private readonly clientConfig: BedrockEmbeddingConfig\n\n constructor(config: BedrockEmbeddingConfig, model: TModel) {\n super(model, {})\n // Defer client construction and auth resolution: the AWS SDK is Node/\n // server-only, so we must not pull it into the static graph here. The\n // client (and its dynamic import) is built lazily on first SDK call.\n this.clientConfig = config\n }\n\n /**\n * Dynamically import `@aws-sdk/client-bedrock-runtime`. The specifier is\n * held in a variable (not a string literal) so bundler dep scanners cannot\n * statically discover the AWS SDK and try to pre-bundle it for the browser.\n * Same pattern as the Converse text adapter.\n */\n protected importBedrockRuntime(): Promise<typeof BedrockRuntime> {\n const mod = '@aws-sdk/client-bedrock-runtime'\n return import(/* @vite-ignore */ mod) as Promise<typeof BedrockRuntime>\n }\n\n /**\n * Lazily construct the `BedrockRuntimeClient`, deferring\n * `resolveBedrockAuth` until a real request is made.\n */\n protected async getClient(): Promise<BedrockRuntimeClient> {\n if (!this.clientPromise) {\n this.clientPromise = (async () => {\n const { BedrockRuntimeClient } = await this.importBedrockRuntime()\n const region = this.clientConfig.region ?? 'us-east-1'\n const resolved = resolveBedrockAuth(\n {\n apiKey: this.clientConfig.apiKey,\n region,\n auth: this.clientConfig.auth,\n },\n 'runtime',\n )\n return new BedrockRuntimeClient(\n this.buildClientConfig(resolved, region, this.clientConfig.baseURL),\n )\n })().catch((error: unknown) => {\n // Don't cache a rejected promise — clear it so a later call can retry\n // (e.g. after a transient import failure or fixed auth config).\n this.clientPromise = undefined\n throw error\n })\n }\n return this.clientPromise\n }\n\n /**\n * Map resolved auth + endpoint to a `BedrockRuntimeClientConfig`. Bearer\n * auth needs `authSchemePreference` pinned or the SDK still tries SigV4\n * first — same reasoning as the Converse text adapter.\n */\n protected buildClientConfig(\n resolved: ResolvedBedrockAuth,\n region: string,\n endpoint: string | undefined,\n ): BedrockRuntimeClientConfig {\n if (resolved.kind === 'bearer') {\n return {\n region,\n token: { token: resolved.token },\n authSchemePreference: ['httpBearerAuth'],\n ...(endpoint ? { endpoint } : {}),\n }\n }\n return {\n region: resolved.region,\n credentials: resolved.credentials,\n ...(endpoint ? { endpoint } : {}),\n }\n }\n\n // ---------------------------------------------------------------------------\n // SDK seam (overridden in tests so no real AWS call happens)\n // ---------------------------------------------------------------------------\n\n /** Send one InvokeModel call and parse its JSON response body. */\n protected async invokeModel(\n modelId: string,\n body: Record<string, unknown>,\n abortSignal?: AbortSignal,\n ): Promise<unknown> {\n const { InvokeModelCommand } = await this.importBedrockRuntime()\n const client = await this.getClient()\n const response = await client.send(\n new InvokeModelCommand({\n modelId,\n contentType: 'application/json',\n accept: 'application/json',\n body: JSON.stringify(body),\n }),\n abortSignal ? { abortSignal } : {},\n )\n return JSON.parse(new TextDecoder().decode(response.body))\n }\n\n // ---------------------------------------------------------------------------\n // Public adapter surface\n // ---------------------------------------------------------------------------\n\n async createEmbeddings(\n options: EmbeddingOptions<TProviderOptions>,\n ): Promise<EmbeddingResult> {\n const { model, logger } = options\n try {\n logger.request(\n `activity=embed provider=${this.name} model=${model} inputs=${options.input.length}`,\n { provider: this.name, model },\n )\n switch (model) {\n case 'amazon.titan-embed-text-v2:0':\n return await this.embedTitanText(options)\n case 'amazon.titan-embed-image-v1':\n return await this.embedTitanImage(options)\n case 'cohere.embed-english-v3':\n case 'cohere.embed-multilingual-v3':\n return await this.embedCohere(options)\n default:\n throw new Error(\n `Unknown Bedrock embedding model \"${model}\". Supported models: ` +\n `${BEDROCK_EMBEDDING_MODELS.join(', ')}.`,\n )\n }\n } catch (error: unknown) {\n logger.errors(`${this.name}.createEmbeddings fatal`, {\n error: toRunErrorPayload(error, `${this.name}.createEmbeddings failed`),\n source: `${this.name}.createEmbeddings`,\n })\n throw error\n }\n }\n\n // ---------------------------------------------------------------------------\n // Per-model request mapping\n // ---------------------------------------------------------------------------\n\n /**\n * `amazon.titan-embed-text-v2:0` — one text per InvokeModel call, fanned\n * out with a concurrency cap; result order matches input order and per-call\n * `inputTextTokenCount`s are summed into usage.\n */\n private async embedTitanText(\n options: EmbeddingOptions<TProviderOptions>,\n ): Promise<EmbeddingResult> {\n const { model, dimensions } = options\n if (\n dimensions !== undefined &&\n !TITAN_TEXT_DIMENSIONS.includes(dimensions)\n ) {\n throw new Error(\n `${model} supports dimensions 256, 512, or 1024; got ${dimensions}`,\n )\n }\n const normalize: boolean | undefined = options.modelOptions?.normalize\n const texts = requireTextOnlyEmbeddingInput(options.input, this.name, model)\n\n const responses = await mapWithConcurrency(\n texts,\n MAX_CONCURRENT_INVOCATIONS,\n async (text) => {\n // Built incrementally: exactOptionalPropertyTypes is on, and Titan\n // rejects explicit nulls/undefined for absent optional fields.\n const body: Record<string, unknown> = { inputText: text }\n if (dimensions !== undefined) body.dimensions = dimensions\n if (normalize !== undefined) body.normalize = normalize\n return readTitanEmbeddingBody(\n await this.invokeModel(model, body, options.abortSignal),\n `${this.name} ${model}`,\n )\n },\n )\n\n return this.toTitanResult(model, responses)\n }\n\n /**\n * `amazon.titan-embed-image-v1` (Titan Multimodal) — one item per\n * InvokeModel call. An item may carry text, an image, or both (a fused\n * item embedded into a single vector). Titan accepts at most one image per\n * request and never fetches remote URLs.\n */\n private async embedTitanImage(\n options: EmbeddingOptions<TProviderOptions>,\n ): Promise<EmbeddingResult> {\n const { model, dimensions } = options\n const outputEmbeddingLength = dimensions ?? TITAN_IMAGE_DEFAULT_DIMENSIONS\n if (!TITAN_IMAGE_DIMENSIONS.includes(outputEmbeddingLength)) {\n throw new Error(\n `${model} supports dimensions 256, 384, or 1024; got ${outputEmbeddingLength}`,\n )\n }\n const items = resolveEmbeddingInput(options.input)\n\n const responses = await mapWithConcurrency(\n items,\n MAX_CONCURRENT_INVOCATIONS,\n async (item, index) => {\n if (item.images.length > 1) {\n throw new Error(\n `${model} accepts at most one image per input item; input item ` +\n `at index ${index} contains ${item.images.length} images. ` +\n `Pass them as separate input items (one vector each).`,\n )\n }\n const body: Record<string, unknown> = {\n embeddingConfig: { outputEmbeddingLength },\n }\n if (item.texts.length > 0) body.inputText = item.texts.join('\\n')\n const image = item.images[0]\n if (image) body.inputImage = toTitanInputImage(image, model)\n return readTitanEmbeddingBody(\n await this.invokeModel(model, body, options.abortSignal),\n `${this.name} ${model}`,\n )\n },\n )\n\n return this.toTitanResult(model, responses)\n }\n\n /**\n * `cohere.embed-*-v3` — natively batched (chunked at 96 texts per call,\n * order preserved across chunks). `inputType` is required by the Cohere\n * API; output dimensionality is fixed, so `dimensions` is rejected.\n */\n private async embedCohere(\n options: EmbeddingOptions<TProviderOptions>,\n ): Promise<EmbeddingResult> {\n const { model, dimensions } = options\n if (dimensions !== undefined) {\n throw new Error(\n `${model} does not support the dimensions option; its output size is fixed`,\n )\n }\n const inputType: string | undefined = options.modelOptions?.inputType\n if (inputType === undefined) {\n throw new Error(\n `${model} requires modelOptions.inputType ('search_document' | ` +\n `'search_query' | 'classification' | 'clustering')`,\n )\n }\n const truncate: string | undefined = options.modelOptions?.truncate\n const texts = requireTextOnlyEmbeddingInput(options.input, this.name, model)\n const batches = chunk(texts, COHERE_MAX_BATCH_SIZE)\n\n const responses = await mapWithConcurrency(\n batches,\n MAX_CONCURRENT_INVOCATIONS,\n async (batch) => {\n const body: Record<string, unknown> = {\n texts: batch,\n input_type: inputType,\n }\n if (truncate !== undefined) body.truncate = truncate\n return readCohereEmbeddingBody(\n await this.invokeModel(model, body, options.abortSignal),\n `${this.name} ${model}`,\n )\n },\n )\n\n return {\n id: this.generateId(),\n model,\n embeddings: responses.flat().map((vector, index) => ({ vector, index })),\n }\n }\n\n /** Assemble an EmbeddingResult from per-item Titan responses. */\n private toTitanResult(\n model: string,\n responses: Array<TitanEmbeddingBody>,\n ): EmbeddingResult {\n let promptTokens = 0\n const embeddings = responses.map((response, index) => {\n promptTokens += response.inputTextTokenCount\n return { vector: response.embedding, index }\n })\n const usage: TokenUsage = {\n promptTokens,\n completionTokens: 0,\n totalTokens: promptTokens,\n }\n return { id: this.generateId(), model, embeddings, usage }\n }\n}\n\n// ---------------------------------------------------------------------------\n// Response-body narrowing (SDK JSON boundary)\n// ---------------------------------------------------------------------------\n\ninterface TitanEmbeddingBody {\n embedding: Array<number>\n /** 0 when the response omits it (e.g. image-only Titan Multimodal calls). */\n inputTextTokenCount: number\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n return typeof value === 'object' && value !== null\n}\n\n/** Narrow a Titan InvokeModel JSON body: `{ embedding, inputTextTokenCount? }`. */\nfunction readTitanEmbeddingBody(\n raw: unknown,\n context: string,\n): TitanEmbeddingBody {\n const embedding =\n isRecord(raw) && Array.isArray(raw.embedding) ? raw.embedding : undefined\n if (!embedding) {\n throw new Error(\n `${context}: response body is missing the \"embedding\" array`,\n )\n }\n const inputTextTokenCount =\n isRecord(raw) && typeof raw.inputTextTokenCount === 'number'\n ? raw.inputTextTokenCount\n : 0\n return { embedding, inputTextTokenCount }\n}\n\n/** Narrow a Cohere InvokeModel JSON body: `{ embeddings: number[][] }` (float). */\nfunction readCohereEmbeddingBody(\n raw: unknown,\n context: string,\n): Array<Array<number>> {\n const embeddings =\n isRecord(raw) && Array.isArray(raw.embeddings) ? raw.embeddings : undefined\n if (!embeddings) {\n throw new Error(\n `${context}: response body is missing the \"embeddings\" array`,\n )\n }\n return embeddings\n}\n\n// ---------------------------------------------------------------------------\n// Input mapping helpers\n// ---------------------------------------------------------------------------\n\n/**\n * Map an ImagePart to Titan's `inputImage` (RAW base64, no data: prefix).\n * Accepts `data` sources as-is and `url` sources ONLY when the value is a\n * `data:` URI; Titan cannot fetch remote http(s) URLs.\n */\nfunction toTitanInputImage(image: ImagePart, model: string): string {\n const source = image.source\n if (isFileSource(source)) throw unsupportedFileSourceError('bedrock')\n if (source.type === 'data') {\n return source.value\n }\n if (source.value.startsWith('data:')) {\n const comma = source.value.indexOf(',')\n if (comma !== -1) {\n return source.value.slice(comma + 1)\n }\n }\n throw new Error(\n `Bedrock Titan does not fetch remote image URLs; pass base64 data ` +\n `(a { type: 'data' } source or a data: URI) for ${model}.`,\n )\n}\n\n/** Split into runs of at most `size`, preserving order. */\nfunction chunk<T>(items: Array<T>, size: number): Array<Array<T>> {\n const chunks: Array<Array<T>> = []\n for (let i = 0; i < items.length; i += size) {\n chunks.push(items.slice(i, i + size))\n }\n return chunks\n}\n\n/**\n * Map `fn` over `items` with at most `limit` calls in flight, returning\n * results in input order (result[i] corresponds to items[i] regardless of\n * completion order). Rejects with the first error.\n */\nasync function mapWithConcurrency<T, TResult>(\n items: ReadonlyArray<T>,\n limit: number,\n fn: (item: T, index: number) => Promise<TResult>,\n): Promise<Array<TResult>> {\n const results = new Array<TResult>(items.length)\n let next = 0\n const worker = async (): Promise<void> => {\n while (next < items.length) {\n const index = next++\n const item = items[index]\n if (item === undefined) continue // unreachable: index < length\n results[index] = await fn(item, index)\n }\n }\n const workerCount = Math.max(1, Math.min(limit, items.length))\n await Promise.all(Array.from({ length: workerCount }, () => worker()))\n return results\n}\n\n// ---------------------------------------------------------------------------\n// Factories\n// ---------------------------------------------------------------------------\n\n/**\n * Creates a Bedrock embedding adapter with an explicit API key (bearer).\n * Type resolution happens here at the call site.\n *\n * @param model - The model name (e.g., 'amazon.titan-embed-text-v2:0')\n * @param apiKey - Your Bedrock API key\n * @param config - Optional additional configuration (region, baseURL, ...)\n * @returns Configured Bedrock embedding adapter instance with resolved types\n *\n * @example\n * ```typescript\n * const adapter = createBedrockEmbedding(\n * 'amazon.titan-embed-text-v2:0',\n * 'bedrock-api-key',\n * );\n *\n * const result = await embed({\n * adapter,\n * input: 'a red guitar',\n * });\n * ```\n */\nexport function createBedrockEmbedding<TModel extends BedrockEmbeddingModel>(\n model: TModel,\n apiKey: string,\n config?: Omit<BedrockEmbeddingConfig, 'apiKey'>,\n): BedrockEmbeddingAdapter<TModel> {\n // Explicit apiKey is authoritative — spread config first so it can't override.\n return new BedrockEmbeddingAdapter({ ...config, apiKey }, model)\n}\n\n/**\n * Creates a Bedrock embedding adapter using the ambient auth cascade:\n * `config.apiKey` → `BEDROCK_API_KEY` → `AWS_BEARER_TOKEN_BEDROCK` → SigV4\n * (AWS credential provider chain). Auth resolves lazily on the first\n * request, so `auth: 'sigv4'` never requires an API key.\n *\n * @param model - The model name (e.g., 'cohere.embed-english-v3')\n * @param config - Optional configuration (region, auth, baseURL, ...)\n * @returns Configured Bedrock embedding adapter instance with resolved types\n *\n * @example\n * ```typescript\n * const adapter = bedrockEmbedding('cohere.embed-english-v3');\n *\n * const result = await embed({\n * adapter,\n * input: ['a red guitar', 'a blue drum kit'],\n * modelOptions: { inputType: 'search_document' },\n * });\n *\n * console.log(result.embeddings[0].vector)\n * ```\n */\nexport function bedrockEmbedding<TModel extends BedrockEmbeddingModel>(\n model: TModel,\n config?: BedrockEmbeddingConfig,\n): BedrockEmbeddingAdapter<TModel> {\n return new BedrockEmbeddingAdapter(config ?? {}, model)\n}\n"],"mappings":"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"}
|
|
@@ -13,8 +13,8 @@ export declare function throwIfConverseStreamError(ev: ConverseStreamOutput): vo
|
|
|
13
13
|
* Keep signatures and encrypted bytes separate for each contentBlockIndex.
|
|
14
14
|
* Finish after trailing usage events. The adapter handles thrown errors.
|
|
15
15
|
*/
|
|
16
|
-
export declare function processConverseStream(stream: AsyncIterable<ConverseStreamOutput>, newMessageId: () => string, lifecycle
|
|
17
|
-
threadId
|
|
16
|
+
export declare function processConverseStream(stream: AsyncIterable<ConverseStreamOutput>, newMessageId: () => string, lifecycle: {
|
|
17
|
+
threadId: string;
|
|
18
18
|
parentRunId?: string;
|
|
19
19
|
model?: string;
|
|
20
20
|
}): AsyncIterable<AdapterYieldChunk>;
|
|
@@ -20,10 +20,9 @@ function throwIfConverseStreamError(ev) {
|
|
|
20
20
|
* Keep signatures and encrypted bytes separate for each contentBlockIndex.
|
|
21
21
|
* Finish after trailing usage events. The adapter handles thrown errors.
|
|
22
22
|
*/
|
|
23
|
-
async function* processConverseStream(stream, newMessageId, lifecycle
|
|
23
|
+
async function* processConverseStream(stream, newMessageId, lifecycle) {
|
|
24
24
|
const runId = newMessageId();
|
|
25
|
-
const threadId = lifecycle
|
|
26
|
-
const { parentRunId, model } = lifecycle;
|
|
25
|
+
const { threadId, parentRunId, model } = lifecycle;
|
|
27
26
|
const messageId = newMessageId();
|
|
28
27
|
let hasEmittedRunStarted = false;
|
|
29
28
|
let accumulatedContent = "";
|
|
@@ -55,7 +54,6 @@ async function* processConverseStream(stream, newMessageId, lifecycle = {}) {
|
|
|
55
54
|
entityId: reasoning.id,
|
|
56
55
|
subtype: "message",
|
|
57
56
|
encryptedValue: encrypted,
|
|
58
|
-
...reasoning.redacted && { stepId: reasoning.id.startsWith("redacted_thinking-") ? reasoning.id : "redacted_thinking-" + reasoning.id },
|
|
59
57
|
timestamp: Date.now()
|
|
60
58
|
};
|
|
61
59
|
}
|
|
@@ -65,14 +63,6 @@ async function* processConverseStream(stream, newMessageId, lifecycle = {}) {
|
|
|
65
63
|
yield* encryptedReasoning(blockIndex);
|
|
66
64
|
if (reasoning.closed) continue;
|
|
67
65
|
reasoning.closed = true;
|
|
68
|
-
yield {
|
|
69
|
-
type: EventType.STEP_FINISHED,
|
|
70
|
-
stepId: reasoning.id,
|
|
71
|
-
stepName: reasoning.id,
|
|
72
|
-
delta: "",
|
|
73
|
-
content: reasoning.text,
|
|
74
|
-
timestamp: Date.now()
|
|
75
|
-
};
|
|
76
66
|
yield {
|
|
77
67
|
type: EventType.REASONING_MESSAGE_END,
|
|
78
68
|
messageId: reasoning.id,
|
|
@@ -107,7 +97,6 @@ async function* processConverseStream(stream, newMessageId, lifecycle = {}) {
|
|
|
107
97
|
type: EventType.TOOL_CALL_START,
|
|
108
98
|
toolCallId: id,
|
|
109
99
|
toolCallName: name,
|
|
110
|
-
toolName: name,
|
|
111
100
|
timestamp: Date.now(),
|
|
112
101
|
index
|
|
113
102
|
};
|
|
@@ -138,20 +127,12 @@ async function* processConverseStream(stream, newMessageId, lifecycle = {}) {
|
|
|
138
127
|
const redacted = "redactedContent" in fragment && (fragment.redactedContent?.length ?? 0) > 0;
|
|
139
128
|
reasoning = {
|
|
140
129
|
id: (redacted ? "redacted_thinking-" : "") + newMessageId(),
|
|
141
|
-
text: "",
|
|
142
130
|
signature: "",
|
|
143
131
|
bytes: [],
|
|
144
132
|
redacted,
|
|
145
133
|
closed: false
|
|
146
134
|
};
|
|
147
135
|
reasoningByIndex.set(index, reasoning);
|
|
148
|
-
yield {
|
|
149
|
-
type: EventType.STEP_STARTED,
|
|
150
|
-
stepId: reasoning.id,
|
|
151
|
-
stepName: reasoning.id,
|
|
152
|
-
stepType: "thinking",
|
|
153
|
-
timestamp: Date.now()
|
|
154
|
-
};
|
|
155
136
|
yield {
|
|
156
137
|
type: EventType.REASONING_MESSAGE_START,
|
|
157
138
|
messageId: reasoning.id,
|
|
@@ -159,20 +140,16 @@ async function* processConverseStream(stream, newMessageId, lifecycle = {}) {
|
|
|
159
140
|
timestamp: Date.now()
|
|
160
141
|
};
|
|
161
142
|
}
|
|
162
|
-
if (!reasoning.redacted && "text" in fragment && fragment.text !== void 0) {
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
timestamp: Date.now()
|
|
169
|
-
};
|
|
170
|
-
}
|
|
143
|
+
if (!reasoning.redacted && "text" in fragment && fragment.text !== void 0) yield {
|
|
144
|
+
type: EventType.REASONING_MESSAGE_CONTENT,
|
|
145
|
+
messageId: reasoning.id,
|
|
146
|
+
delta: fragment.text,
|
|
147
|
+
timestamp: Date.now()
|
|
148
|
+
};
|
|
171
149
|
if (!reasoning.redacted && "signature" in fragment && fragment.signature !== void 0) reasoning.signature += fragment.signature;
|
|
172
150
|
if ("redactedContent" in fragment && fragment.redactedContent && fragment.redactedContent.length > 0) {
|
|
173
151
|
if (!reasoning.redacted) reasoning.encrypted = void 0;
|
|
174
152
|
reasoning.redacted = true;
|
|
175
|
-
reasoning.text = "";
|
|
176
153
|
reasoning.signature = "";
|
|
177
154
|
reasoning.bytes.push(fragment.redactedContent);
|
|
178
155
|
yield* encryptedReasoning(index);
|
|
@@ -211,7 +188,6 @@ async function* processConverseStream(stream, newMessageId, lifecycle = {}) {
|
|
|
211
188
|
toolCallId: toolCall.id,
|
|
212
189
|
args: toolCall.arguments,
|
|
213
190
|
toolCallName: toolCall.name,
|
|
214
|
-
toolName: toolCall.name,
|
|
215
191
|
timestamp: Date.now()
|
|
216
192
|
};
|
|
217
193
|
toolCallsByIndex.delete(stopIndex);
|
|
@@ -237,7 +213,6 @@ async function* processConverseStream(stream, newMessageId, lifecycle = {}) {
|
|
|
237
213
|
toolCallId: toolCall.id,
|
|
238
214
|
args: toolCall.arguments,
|
|
239
215
|
toolCallName: toolCall.name,
|
|
240
|
-
toolName: toolCall.name,
|
|
241
216
|
timestamp: Date.now()
|
|
242
217
|
};
|
|
243
218
|
toolCallsByIndex.delete(index);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream-processor.js","names":[],"sources":["../../../src/converse/stream-processor.ts"],"sourcesContent":["import { EventType } from '@tanstack/ai'\nimport { buildConverseUsage } from './usage'\nimport type { AdapterYieldChunk, TokenUsage } from '@tanstack/ai'\nimport type { ConverseStreamOutput } from '@aws-sdk/client-bedrock-runtime'\n\n/**\n * Converse delivers server-side failures — throttling, request validation,\n * mid-stream model faults, and service-unavailable — as in-band stream events\n * rather than thrown exceptions. If they were ignored the iterator would simply\n * end and the run would look like a clean, truncated success. Throw the\n * underlying exception (these SDK members extend `Error`) so the adapter's\n * `chatStream` / `structuredOutputStream` catch converts it into a `RUN_ERROR`.\n */\nexport function throwIfConverseStreamError(ev: ConverseStreamOutput): void {\n if ('internalServerException' in ev && ev.internalServerException) {\n throw ev.internalServerException\n }\n if ('modelStreamErrorException' in ev && ev.modelStreamErrorException) {\n throw ev.modelStreamErrorException\n }\n if ('validationException' in ev && ev.validationException) {\n throw ev.validationException\n }\n if ('throttlingException' in ev && ev.throttlingException) {\n throw ev.throttlingException\n }\n if ('serviceUnavailableException' in ev && ev.serviceUnavailableException) {\n throw ev.serviceUnavailableException\n }\n}\n\n/** Map Converse blocks to run, text, reasoning, and tool events.\n * Keep signatures and encrypted bytes separate for each contentBlockIndex.\n * Finish after trailing usage events. The adapter handles thrown errors.\n */\nexport async function* processConverseStream(\n stream: AsyncIterable<ConverseStreamOutput>,\n newMessageId: () => string,\n lifecycle: { threadId?: string; parentRunId?: string; model?: string } = {},\n): AsyncIterable<AdapterYieldChunk> {\n const runId = newMessageId()\n const threadId = lifecycle.threadId ?? newMessageId()\n const { parentRunId, model } = lifecycle\n const messageId = newMessageId()\n\n let hasEmittedRunStarted = false\n\n // Text lifecycle\n let accumulatedContent = ''\n let hasEmittedTextMessageStart = false\n\n // Reasoning lifecycle\n const reasoningByIndex = new Map<\n number,\n {\n id: string\n text: string\n signature: string\n bytes: Array<Uint8Array>\n redacted: boolean\n closed: boolean\n encrypted?: string\n }\n >()\n\n // Tool-call lifecycle, keyed by Converse contentBlockIndex. Converse opens a\n // tool-use block with `contentBlockStart`, streams arg fragments via\n // `contentBlockDelta`, and closes it with `contentBlockStop`.\n const toolCallsByIndex = new Map<\n number,\n {\n id: string\n name: string\n started: boolean\n arguments: string\n }\n >()\n\n // Usage + finish-reason are captured during iteration and folded into the\n // single terminal RUN_FINISHED, matching openai-base's deferred-finish\n // contract (usage may arrive after the finish signal).\n let usage: TokenUsage | undefined\n let finishReason: NonNullable<AdapterYieldChunk['finishReason']> | undefined\n\n // Lazily emit RUN_STARTED exactly once, before the first content event.\n function* ensureRunStarted(): Generator<AdapterYieldChunk> {\n if (hasEmittedRunStarted) return\n hasEmittedRunStarted = true\n yield {\n type: EventType.RUN_STARTED,\n runId,\n threadId,\n parentRunId,\n ...(model && { model }),\n timestamp: Date.now(),\n }\n }\n\n // Close an open reasoning message before text/tool content begins, mirroring\n // openai-base which always emits REASONING_MESSAGE_END before TEXT_MESSAGE_START.\n function* encryptedReasoning(index: number): Generator<AdapterYieldChunk> {\n const reasoning = reasoningByIndex.get(index)\n if (!reasoning) return\n const encrypted = reasoning.redacted\n ? Buffer.concat(reasoning.bytes).toString('base64')\n : reasoning.signature\n if (!encrypted || encrypted === reasoning.encrypted) return\n reasoning.encrypted = encrypted\n yield {\n type: EventType.REASONING_ENCRYPTED_VALUE,\n entityId: reasoning.id,\n subtype: 'message',\n encryptedValue: encrypted,\n ...(reasoning.redacted && {\n stepId: reasoning.id.startsWith('redacted_thinking-')\n ? reasoning.id\n : 'redacted_thinking-' + reasoning.id,\n }),\n timestamp: Date.now(),\n }\n }\n\n function* closeReasoning(index?: number): Generator<AdapterYieldChunk> {\n for (const [blockIndex, reasoning] of reasoningByIndex) {\n if (index !== undefined && index !== blockIndex) continue\n yield* encryptedReasoning(blockIndex)\n if (reasoning.closed) continue\n reasoning.closed = true\n yield {\n type: EventType.STEP_FINISHED,\n stepId: reasoning.id,\n stepName: reasoning.id,\n delta: '',\n content: reasoning.text,\n timestamp: Date.now(),\n }\n yield {\n type: EventType.REASONING_MESSAGE_END,\n messageId: reasoning.id,\n timestamp: Date.now(),\n }\n yield {\n type: EventType.REASONING_END,\n messageId: reasoning.id,\n timestamp: Date.now(),\n }\n }\n }\n\n for await (const ev of stream) {\n yield* ensureRunStarted()\n\n // Surface in-band server/throttle/validation errors instead of dropping them.\n throwIfConverseStreamError(ev)\n\n // messageStart carries only the role; no AG-UI event maps to it.\n if ('messageStart' in ev) continue\n\n if ('contentBlockStart' in ev) {\n const start = ev.contentBlockStart\n const toolUse = start?.start?.toolUse\n if (start && toolUse) {\n yield* closeReasoning()\n const id = toolUse.toolUseId ?? newMessageId()\n const name = toolUse.name ?? ''\n const index = start.contentBlockIndex ?? 0\n toolCallsByIndex.set(index, {\n id,\n name,\n started: true,\n arguments: '',\n })\n yield {\n type: EventType.TOOL_CALL_START,\n toolCallId: id,\n toolCallName: name,\n toolName: name,\n timestamp: Date.now(),\n index,\n }\n }\n continue\n }\n\n if ('contentBlockDelta' in ev) {\n const block = ev.contentBlockDelta\n const delta = block?.delta\n const index = block?.contentBlockIndex ?? 0\n\n // Tool-call argument fragments (partial JSON).\n if (delta && 'toolUse' in delta && delta.toolUse?.input !== undefined) {\n const toolCall = toolCallsByIndex.get(index)\n if (toolCall?.started) {\n toolCall.arguments += delta.toolUse.input\n yield {\n type: EventType.TOOL_CALL_ARGS,\n toolCallId: toolCall.id,\n timestamp: Date.now(),\n delta: delta.toolUse.input,\n }\n }\n continue\n }\n\n if (delta && 'reasoningContent' in delta && delta.reasoningContent) {\n const fragment = delta.reasoningContent\n let reasoning = reasoningByIndex.get(index)\n if (!reasoning) {\n const redacted =\n 'redactedContent' in fragment &&\n (fragment.redactedContent?.length ?? 0) > 0\n reasoning = {\n id: (redacted ? 'redacted_thinking-' : '') + newMessageId(),\n text: '',\n signature: '',\n bytes: [],\n redacted,\n closed: false,\n }\n reasoningByIndex.set(index, reasoning)\n yield {\n type: EventType.STEP_STARTED,\n stepId: reasoning.id,\n stepName: reasoning.id,\n stepType: 'thinking',\n timestamp: Date.now(),\n }\n yield {\n type: EventType.REASONING_MESSAGE_START,\n messageId: reasoning.id,\n role: 'reasoning',\n timestamp: Date.now(),\n }\n }\n if (\n !reasoning.redacted &&\n 'text' in fragment &&\n fragment.text !== undefined\n ) {\n reasoning.text += fragment.text\n yield {\n type: EventType.REASONING_MESSAGE_CONTENT,\n messageId: reasoning.id,\n delta: fragment.text,\n timestamp: Date.now(),\n }\n }\n if (\n !reasoning.redacted &&\n 'signature' in fragment &&\n fragment.signature !== undefined\n )\n reasoning.signature += fragment.signature\n if (\n 'redactedContent' in fragment &&\n fragment.redactedContent &&\n fragment.redactedContent.length > 0\n ) {\n if (!reasoning.redacted) reasoning.encrypted = undefined\n reasoning.redacted = true\n reasoning.text = ''\n reasoning.signature = ''\n reasoning.bytes.push(fragment.redactedContent)\n yield* encryptedReasoning(index)\n }\n continue\n }\n\n // Text content.\n if (delta && 'text' in delta && delta.text !== undefined) {\n yield* closeReasoning()\n if (!hasEmittedTextMessageStart) {\n hasEmittedTextMessageStart = true\n yield {\n type: EventType.TEXT_MESSAGE_START,\n messageId,\n role: 'assistant',\n timestamp: Date.now(),\n }\n }\n accumulatedContent += delta.text\n yield {\n type: EventType.TEXT_MESSAGE_CONTENT,\n messageId,\n delta: delta.text,\n content: accumulatedContent,\n timestamp: Date.now(),\n }\n }\n continue\n }\n\n if ('contentBlockStop' in ev) {\n const stopIndex = ev.contentBlockStop?.contentBlockIndex ?? 0\n yield* closeReasoning(stopIndex)\n const toolCall = toolCallsByIndex.get(stopIndex)\n if (toolCall?.started) {\n yield {\n type: EventType.TOOL_CALL_END,\n toolCallId: toolCall.id,\n args: toolCall.arguments,\n toolCallName: toolCall.name,\n toolName: toolCall.name,\n timestamp: Date.now(),\n }\n toolCallsByIndex.delete(stopIndex)\n }\n continue\n }\n\n if ('messageStop' in ev) {\n const stopReason = ev.messageStop?.stopReason\n // Map Converse stopReason to AG-UI's narrower finishReason vocabulary.\n finishReason =\n stopReason === 'tool_use'\n ? 'tool_calls'\n : stopReason === 'max_tokens'\n ? 'length'\n : stopReason === 'content_filtered'\n ? 'content_filter'\n : 'stop'\n continue\n }\n\n if ('metadata' in ev) {\n const u = ev.metadata?.usage\n if (u) {\n usage = buildConverseUsage(u)\n }\n continue\n }\n }\n\n // Stream ended (possibly without any content) — still emit RUN_STARTED so\n // consumers always see a run lifecycle.\n yield* ensureRunStarted()\n\n // Drain any tool call that opened but never received contentBlockStop.\n for (const [index, toolCall] of toolCallsByIndex) {\n if (!toolCall.started) continue\n yield {\n type: EventType.TOOL_CALL_END,\n toolCallId: toolCall.id,\n args: toolCall.arguments,\n toolCallName: toolCall.name,\n toolName: toolCall.name,\n timestamp: Date.now(),\n }\n toolCallsByIndex.delete(index)\n }\n\n // Close the text message lifecycle if it was opened.\n if (hasEmittedTextMessageStart) {\n yield {\n type: EventType.TEXT_MESSAGE_END,\n messageId,\n timestamp: Date.now(),\n }\n }\n\n // Close any reasoning lifecycle that text never closed.\n yield* closeReasoning()\n\n // Single terminal RUN_FINISHED. Conditional `usage` spread keeps the wire\n // shape spec-compliant (AG-UI's `usage` is optional with no `| undefined`).\n yield {\n type: EventType.RUN_FINISHED,\n runId,\n threadId,\n timestamp: Date.now(),\n finishReason: finishReason ?? 'stop',\n ...(usage && { usage }),\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"stream-processor.js","names":[],"sources":["../../../src/converse/stream-processor.ts"],"sourcesContent":["import { EventType } from '@tanstack/ai'\nimport { buildConverseUsage } from './usage'\nimport type { AdapterYieldChunk, TokenUsage } from '@tanstack/ai'\nimport type { ConverseStreamOutput } from '@aws-sdk/client-bedrock-runtime'\n\n/**\n * Converse delivers server-side failures — throttling, request validation,\n * mid-stream model faults, and service-unavailable — as in-band stream events\n * rather than thrown exceptions. If they were ignored the iterator would simply\n * end and the run would look like a clean, truncated success. Throw the\n * underlying exception (these SDK members extend `Error`) so the adapter's\n * `chatStream` / `structuredOutputStream` catch converts it into a `RUN_ERROR`.\n */\nexport function throwIfConverseStreamError(ev: ConverseStreamOutput): void {\n if ('internalServerException' in ev && ev.internalServerException) {\n throw ev.internalServerException\n }\n if ('modelStreamErrorException' in ev && ev.modelStreamErrorException) {\n throw ev.modelStreamErrorException\n }\n if ('validationException' in ev && ev.validationException) {\n throw ev.validationException\n }\n if ('throttlingException' in ev && ev.throttlingException) {\n throw ev.throttlingException\n }\n if ('serviceUnavailableException' in ev && ev.serviceUnavailableException) {\n throw ev.serviceUnavailableException\n }\n}\n\n/** Map Converse blocks to run, text, reasoning, and tool events.\n * Keep signatures and encrypted bytes separate for each contentBlockIndex.\n * Finish after trailing usage events. The adapter handles thrown errors.\n */\nexport async function* processConverseStream(\n stream: AsyncIterable<ConverseStreamOutput>,\n newMessageId: () => string,\n lifecycle: { threadId: string; parentRunId?: string; model?: string },\n): AsyncIterable<AdapterYieldChunk> {\n const runId = newMessageId()\n const { threadId, parentRunId, model } = lifecycle\n const messageId = newMessageId()\n\n let hasEmittedRunStarted = false\n\n // Text lifecycle\n let accumulatedContent = ''\n let hasEmittedTextMessageStart = false\n\n // Reasoning lifecycle\n const reasoningByIndex = new Map<\n number,\n {\n id: string\n signature: string\n bytes: Array<Uint8Array>\n redacted: boolean\n closed: boolean\n encrypted?: string\n }\n >()\n\n // Tool-call lifecycle, keyed by Converse contentBlockIndex. Converse opens a\n // tool-use block with `contentBlockStart`, streams arg fragments via\n // `contentBlockDelta`, and closes it with `contentBlockStop`.\n const toolCallsByIndex = new Map<\n number,\n {\n id: string\n name: string\n started: boolean\n arguments: string\n }\n >()\n\n // Usage + finish-reason are captured during iteration and folded into the\n // single terminal RUN_FINISHED, matching openai-base's deferred-finish\n // contract (usage may arrive after the finish signal).\n let usage: TokenUsage | undefined\n let finishReason: NonNullable<AdapterYieldChunk['finishReason']> | undefined\n\n // Lazily emit RUN_STARTED exactly once, before the first content event.\n function* ensureRunStarted(): Generator<AdapterYieldChunk> {\n if (hasEmittedRunStarted) return\n hasEmittedRunStarted = true\n yield {\n type: EventType.RUN_STARTED,\n runId,\n threadId,\n parentRunId,\n ...(model && { model }),\n timestamp: Date.now(),\n }\n }\n\n // Close an open reasoning message before text/tool content begins, mirroring\n // openai-base which always emits REASONING_MESSAGE_END before TEXT_MESSAGE_START.\n function* encryptedReasoning(index: number): Generator<AdapterYieldChunk> {\n const reasoning = reasoningByIndex.get(index)\n if (!reasoning) return\n const encrypted = reasoning.redacted\n ? Buffer.concat(reasoning.bytes).toString('base64')\n : reasoning.signature\n if (!encrypted || encrypted === reasoning.encrypted) return\n reasoning.encrypted = encrypted\n yield {\n type: EventType.REASONING_ENCRYPTED_VALUE,\n entityId: reasoning.id,\n subtype: 'message',\n encryptedValue: encrypted,\n timestamp: Date.now(),\n }\n }\n\n function* closeReasoning(index?: number): Generator<AdapterYieldChunk> {\n for (const [blockIndex, reasoning] of reasoningByIndex) {\n if (index !== undefined && index !== blockIndex) continue\n yield* encryptedReasoning(blockIndex)\n if (reasoning.closed) continue\n reasoning.closed = true\n yield {\n type: EventType.REASONING_MESSAGE_END,\n messageId: reasoning.id,\n timestamp: Date.now(),\n }\n yield {\n type: EventType.REASONING_END,\n messageId: reasoning.id,\n timestamp: Date.now(),\n }\n }\n }\n\n for await (const ev of stream) {\n yield* ensureRunStarted()\n\n // Surface in-band server/throttle/validation errors instead of dropping them.\n throwIfConverseStreamError(ev)\n\n // messageStart carries only the role; no AG-UI event maps to it.\n if ('messageStart' in ev) continue\n\n if ('contentBlockStart' in ev) {\n const start = ev.contentBlockStart\n const toolUse = start?.start?.toolUse\n if (start && toolUse) {\n yield* closeReasoning()\n const id = toolUse.toolUseId ?? newMessageId()\n const name = toolUse.name ?? ''\n const index = start.contentBlockIndex ?? 0\n toolCallsByIndex.set(index, {\n id,\n name,\n started: true,\n arguments: '',\n })\n yield {\n type: EventType.TOOL_CALL_START,\n toolCallId: id,\n toolCallName: name,\n timestamp: Date.now(),\n index,\n }\n }\n continue\n }\n\n if ('contentBlockDelta' in ev) {\n const block = ev.contentBlockDelta\n const delta = block?.delta\n const index = block?.contentBlockIndex ?? 0\n\n // Tool-call argument fragments (partial JSON).\n if (delta && 'toolUse' in delta && delta.toolUse?.input !== undefined) {\n const toolCall = toolCallsByIndex.get(index)\n if (toolCall?.started) {\n toolCall.arguments += delta.toolUse.input\n yield {\n type: EventType.TOOL_CALL_ARGS,\n toolCallId: toolCall.id,\n timestamp: Date.now(),\n delta: delta.toolUse.input,\n }\n }\n continue\n }\n\n if (delta && 'reasoningContent' in delta && delta.reasoningContent) {\n const fragment = delta.reasoningContent\n let reasoning = reasoningByIndex.get(index)\n if (!reasoning) {\n const redacted =\n 'redactedContent' in fragment &&\n (fragment.redactedContent?.length ?? 0) > 0\n reasoning = {\n id: (redacted ? 'redacted_thinking-' : '') + newMessageId(),\n signature: '',\n bytes: [],\n redacted,\n closed: false,\n }\n reasoningByIndex.set(index, reasoning)\n yield {\n type: EventType.REASONING_MESSAGE_START,\n messageId: reasoning.id,\n role: 'reasoning',\n timestamp: Date.now(),\n }\n }\n if (\n !reasoning.redacted &&\n 'text' in fragment &&\n fragment.text !== undefined\n ) {\n yield {\n type: EventType.REASONING_MESSAGE_CONTENT,\n messageId: reasoning.id,\n delta: fragment.text,\n timestamp: Date.now(),\n }\n }\n if (\n !reasoning.redacted &&\n 'signature' in fragment &&\n fragment.signature !== undefined\n )\n reasoning.signature += fragment.signature\n if (\n 'redactedContent' in fragment &&\n fragment.redactedContent &&\n fragment.redactedContent.length > 0\n ) {\n if (!reasoning.redacted) reasoning.encrypted = undefined\n reasoning.redacted = true\n reasoning.signature = ''\n reasoning.bytes.push(fragment.redactedContent)\n yield* encryptedReasoning(index)\n }\n continue\n }\n\n // Text content.\n if (delta && 'text' in delta && delta.text !== undefined) {\n yield* closeReasoning()\n if (!hasEmittedTextMessageStart) {\n hasEmittedTextMessageStart = true\n yield {\n type: EventType.TEXT_MESSAGE_START,\n messageId,\n role: 'assistant',\n timestamp: Date.now(),\n }\n }\n accumulatedContent += delta.text\n yield {\n type: EventType.TEXT_MESSAGE_CONTENT,\n messageId,\n delta: delta.text,\n content: accumulatedContent,\n timestamp: Date.now(),\n }\n }\n continue\n }\n\n if ('contentBlockStop' in ev) {\n const stopIndex = ev.contentBlockStop?.contentBlockIndex ?? 0\n yield* closeReasoning(stopIndex)\n const toolCall = toolCallsByIndex.get(stopIndex)\n if (toolCall?.started) {\n yield {\n type: EventType.TOOL_CALL_END,\n toolCallId: toolCall.id,\n args: toolCall.arguments,\n toolCallName: toolCall.name,\n timestamp: Date.now(),\n }\n toolCallsByIndex.delete(stopIndex)\n }\n continue\n }\n\n if ('messageStop' in ev) {\n const stopReason = ev.messageStop?.stopReason\n // Map Converse stopReason to AG-UI's narrower finishReason vocabulary.\n finishReason =\n stopReason === 'tool_use'\n ? 'tool_calls'\n : stopReason === 'max_tokens'\n ? 'length'\n : stopReason === 'content_filtered'\n ? 'content_filter'\n : 'stop'\n continue\n }\n\n if ('metadata' in ev) {\n const u = ev.metadata?.usage\n if (u) {\n usage = buildConverseUsage(u)\n }\n continue\n }\n }\n\n // Stream ended (possibly without any content) — still emit RUN_STARTED so\n // consumers always see a run lifecycle.\n yield* ensureRunStarted()\n\n // Drain any tool call that opened but never received contentBlockStop.\n for (const [index, toolCall] of toolCallsByIndex) {\n if (!toolCall.started) continue\n yield {\n type: EventType.TOOL_CALL_END,\n toolCallId: toolCall.id,\n args: toolCall.arguments,\n toolCallName: toolCall.name,\n timestamp: Date.now(),\n }\n toolCallsByIndex.delete(index)\n }\n\n // Close the text message lifecycle if it was opened.\n if (hasEmittedTextMessageStart) {\n yield {\n type: EventType.TEXT_MESSAGE_END,\n messageId,\n timestamp: Date.now(),\n }\n }\n\n // Close any reasoning lifecycle that text never closed.\n yield* closeReasoning()\n\n // Single terminal RUN_FINISHED. Conditional `usage` spread keeps the wire\n // shape spec-compliant (AG-UI's `usage` is optional with no `| undefined`).\n yield {\n type: EventType.RUN_FINISHED,\n runId,\n threadId,\n timestamp: Date.now(),\n finishReason: finishReason ?? 'stop',\n ...(usage && { usage }),\n }\n}\n"],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ import { buildBaseUsage } from "@tanstack/ai";
|
|
|
13
13
|
function buildConverseUsage(usage) {
|
|
14
14
|
const cachedTokens = usage.cacheReadInputTokens;
|
|
15
15
|
const cacheWriteTokens = usage.cacheWriteInputTokens;
|
|
16
|
+
const cacheWrite1hTokens = usage.cacheDetails?.find((detail) => detail.ttl === "1h")?.inputTokens;
|
|
16
17
|
const promptTokens = (usage.inputTokens ?? 0) + (cachedTokens ?? 0) + (cacheWriteTokens ?? 0);
|
|
17
18
|
const completionTokens = usage.outputTokens ?? 0;
|
|
18
19
|
const result = buildBaseUsage({
|
|
@@ -22,7 +23,8 @@ function buildConverseUsage(usage) {
|
|
|
22
23
|
});
|
|
23
24
|
const promptTokensDetails = {
|
|
24
25
|
...cachedTokens !== void 0 ? { cachedTokens } : {},
|
|
25
|
-
...cacheWriteTokens !== void 0 ? { cacheWriteTokens } : {}
|
|
26
|
+
...cacheWriteTokens !== void 0 ? { cacheWriteTokens } : {},
|
|
27
|
+
...cacheWrite1hTokens !== void 0 ? { cacheWrite1hTokens } : {}
|
|
26
28
|
};
|
|
27
29
|
if (Object.keys(promptTokensDetails).length > 0) result.promptTokensDetails = promptTokensDetails;
|
|
28
30
|
return result;
|
|
@@ -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 * `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;
|
|
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 // The 1-hour part of the cache write.\n const cacheWrite1hTokens = usage.cacheDetails?.find(\n (detail) => detail.ttl === '1h',\n )?.inputTokens\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 ...(cacheWrite1hTokens !== undefined ? { cacheWrite1hTokens } : {}),\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;CAE/B,MAAM,qBAAqB,MAAM,cAAc,MAC5C,WAAW,OAAO,QAAQ,IAC7B,CAAC,EAAE;CACH,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;EAC7D,GAAI,uBAAuB,KAAA,IAAY,EAAE,mBAAmB,IAAI,CAAC;CACnE;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": "
|
|
3
|
+
"version": "1.1.0",
|
|
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": "^
|
|
46
|
+
"@tanstack/ai": "^1.1.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": "^1.0.1"
|
|
56
56
|
},
|
|
57
57
|
"scripts": {
|
|
58
58
|
"build": "vite build",
|
|
@@ -241,12 +241,13 @@ export class BedrockConverseTextAdapter<
|
|
|
241
241
|
|
|
242
242
|
protected async sendStream(
|
|
243
243
|
input: ConverseStreamCommandInput,
|
|
244
|
+
signal?: AbortSignal | null,
|
|
244
245
|
): Promise<AsyncIterable<ConverseStreamOutput>> {
|
|
245
246
|
const { ConverseStreamCommand } = await this.importBedrockRuntime()
|
|
246
247
|
const client = await this.getClient()
|
|
247
248
|
const command = new ConverseStreamCommand(input)
|
|
248
249
|
addRestoreDocuments(command, input)
|
|
249
|
-
const res = await client.send(command)
|
|
250
|
+
const res = await client.send(command, { abortSignal: signal ?? undefined })
|
|
250
251
|
if (!res.stream) {
|
|
251
252
|
throw new Error('Bedrock Converse: empty stream response')
|
|
252
253
|
}
|
|
@@ -255,12 +256,13 @@ export class BedrockConverseTextAdapter<
|
|
|
255
256
|
|
|
256
257
|
protected async send(
|
|
257
258
|
input: ConverseCommandInput,
|
|
259
|
+
signal?: AbortSignal | null,
|
|
258
260
|
): Promise<ConverseCommandOutput> {
|
|
259
261
|
const { ConverseCommand } = await this.importBedrockRuntime()
|
|
260
262
|
const client = await this.getClient()
|
|
261
263
|
const command = new ConverseCommand(input)
|
|
262
264
|
addRestoreDocuments(command, input)
|
|
263
|
-
return client.send(command)
|
|
265
|
+
return client.send(command, { abortSignal: signal ?? undefined })
|
|
264
266
|
}
|
|
265
267
|
|
|
266
268
|
// ---------------------------------------------------------------------------
|
|
@@ -281,7 +283,7 @@ export class BedrockConverseTextAdapter<
|
|
|
281
283
|
if (!input.toolConfig && input.messages) {
|
|
282
284
|
input.messages = toolBlocksToText(input.messages)
|
|
283
285
|
}
|
|
284
|
-
const stream = await this.sendStream(input)
|
|
286
|
+
const stream = await this.sendStream(input, options.request?.signal)
|
|
285
287
|
for await (const chunk of processConverseStream(
|
|
286
288
|
stream,
|
|
287
289
|
() => this.generateId(),
|
|
@@ -344,25 +346,31 @@ export class BedrockConverseTextAdapter<
|
|
|
344
346
|
...this.buildInput(requestOptions),
|
|
345
347
|
toolConfig: buildStructuredToolConfig(outputSchema),
|
|
346
348
|
}
|
|
347
|
-
const res = await this.send(input)
|
|
349
|
+
const res = await this.send(input, chatOptions.request?.signal)
|
|
350
|
+
const usage = res.usage && buildConverseUsage(res.usage)
|
|
348
351
|
// A forced tool call cut off at the output cap carries partial input,
|
|
349
352
|
// which would read like a schema failure (issue #1426).
|
|
350
353
|
if (res.stopReason === 'max_tokens') {
|
|
351
|
-
throw
|
|
352
|
-
|
|
354
|
+
throw Object.assign(
|
|
355
|
+
new Error(
|
|
356
|
+
`${this.name}.structuredOutput: the response was cut off because the maximum token limit was reached (stopReason=max_tokens); raise modelOptions.max_completion_tokens`,
|
|
357
|
+
),
|
|
358
|
+
usage && { usage },
|
|
353
359
|
)
|
|
354
360
|
}
|
|
355
361
|
const structured = extractStructuredToolInput(res)
|
|
356
362
|
if (structured === undefined) {
|
|
357
|
-
throw
|
|
358
|
-
|
|
363
|
+
throw Object.assign(
|
|
364
|
+
new Error(
|
|
365
|
+
`${this.name}.structuredOutput: response contained no forced-tool output`,
|
|
366
|
+
),
|
|
367
|
+
usage && { usage },
|
|
359
368
|
)
|
|
360
369
|
}
|
|
361
|
-
const usage = res.usage
|
|
362
370
|
return {
|
|
363
371
|
data: structured,
|
|
364
372
|
rawText: JSON.stringify(structured),
|
|
365
|
-
...(usage && { usage
|
|
373
|
+
...(usage && { usage }),
|
|
366
374
|
}
|
|
367
375
|
} catch (error: unknown) {
|
|
368
376
|
chatOptions.logger.errors(`${this.name}.structuredOutput fatal`, {
|
|
@@ -385,7 +393,7 @@ export class BedrockConverseTextAdapter<
|
|
|
385
393
|
): AsyncIterable<AdapterYieldChunk> {
|
|
386
394
|
const { chatOptions, outputSchema } = options
|
|
387
395
|
const runId = this.generateId()
|
|
388
|
-
const threadId = chatOptions.threadId
|
|
396
|
+
const threadId = chatOptions.threadId
|
|
389
397
|
const messageId = this.generateId()
|
|
390
398
|
|
|
391
399
|
let hasEmittedRunStarted = false
|
|
@@ -408,7 +416,7 @@ export class BedrockConverseTextAdapter<
|
|
|
408
416
|
...this.buildInput(requestOptions),
|
|
409
417
|
toolConfig: buildStructuredToolConfig(outputSchema),
|
|
410
418
|
}
|
|
411
|
-
const stream = await this.sendStream(input)
|
|
419
|
+
const stream = await this.sendStream(input, chatOptions.request?.signal)
|
|
412
420
|
|
|
413
421
|
// The forced tool streams its `input` as partial-JSON fragments inside
|
|
414
422
|
// `contentBlockDelta.delta.toolUse.input`. We surface them as
|
|
@@ -518,6 +526,7 @@ export class BedrockConverseTextAdapter<
|
|
|
518
526
|
message,
|
|
519
527
|
code: 'max_tokens',
|
|
520
528
|
error: { message, code: 'max_tokens' },
|
|
529
|
+
...(usage && { usage }),
|
|
521
530
|
}
|
|
522
531
|
return
|
|
523
532
|
}
|
|
@@ -535,6 +544,7 @@ export class BedrockConverseTextAdapter<
|
|
|
535
544
|
message: `${this.name}.structuredOutputStream: response contained no content`,
|
|
536
545
|
code: 'empty-response',
|
|
537
546
|
},
|
|
547
|
+
...(usage && { usage }),
|
|
538
548
|
}
|
|
539
549
|
return
|
|
540
550
|
}
|
|
@@ -555,6 +565,7 @@ export class BedrockConverseTextAdapter<
|
|
|
555
565
|
message: 'Failed to parse structured output as JSON',
|
|
556
566
|
code: 'parse-error',
|
|
557
567
|
},
|
|
568
|
+
...(usage && { usage }),
|
|
558
569
|
}
|
|
559
570
|
return
|
|
560
571
|
}
|
|
@@ -613,6 +624,7 @@ export class BedrockConverseTextAdapter<
|
|
|
613
624
|
message: errorPayload.message,
|
|
614
625
|
...(errorPayload.code !== undefined && { code: errorPayload.code }),
|
|
615
626
|
},
|
|
627
|
+
...(usage && { usage }),
|
|
616
628
|
}
|
|
617
629
|
}
|
|
618
630
|
}
|
|
@@ -170,6 +170,7 @@ export class BedrockEmbeddingAdapter<
|
|
|
170
170
|
protected async invokeModel(
|
|
171
171
|
modelId: string,
|
|
172
172
|
body: Record<string, unknown>,
|
|
173
|
+
abortSignal?: AbortSignal,
|
|
173
174
|
): Promise<unknown> {
|
|
174
175
|
const { InvokeModelCommand } = await this.importBedrockRuntime()
|
|
175
176
|
const client = await this.getClient()
|
|
@@ -180,6 +181,7 @@ export class BedrockEmbeddingAdapter<
|
|
|
180
181
|
accept: 'application/json',
|
|
181
182
|
body: JSON.stringify(body),
|
|
182
183
|
}),
|
|
184
|
+
abortSignal ? { abortSignal } : {},
|
|
183
185
|
)
|
|
184
186
|
return JSON.parse(new TextDecoder().decode(response.body))
|
|
185
187
|
}
|
|
@@ -254,7 +256,7 @@ export class BedrockEmbeddingAdapter<
|
|
|
254
256
|
if (dimensions !== undefined) body.dimensions = dimensions
|
|
255
257
|
if (normalize !== undefined) body.normalize = normalize
|
|
256
258
|
return readTitanEmbeddingBody(
|
|
257
|
-
await this.invokeModel(model, body),
|
|
259
|
+
await this.invokeModel(model, body, options.abortSignal),
|
|
258
260
|
`${this.name} ${model}`,
|
|
259
261
|
)
|
|
260
262
|
},
|
|
@@ -299,7 +301,7 @@ export class BedrockEmbeddingAdapter<
|
|
|
299
301
|
const image = item.images[0]
|
|
300
302
|
if (image) body.inputImage = toTitanInputImage(image, model)
|
|
301
303
|
return readTitanEmbeddingBody(
|
|
302
|
-
await this.invokeModel(model, body),
|
|
304
|
+
await this.invokeModel(model, body, options.abortSignal),
|
|
303
305
|
`${this.name} ${model}`,
|
|
304
306
|
)
|
|
305
307
|
},
|
|
@@ -343,7 +345,7 @@ export class BedrockEmbeddingAdapter<
|
|
|
343
345
|
}
|
|
344
346
|
if (truncate !== undefined) body.truncate = truncate
|
|
345
347
|
return readCohereEmbeddingBody(
|
|
346
|
-
await this.invokeModel(model, body),
|
|
348
|
+
await this.invokeModel(model, body, options.abortSignal),
|
|
347
349
|
`${this.name} ${model}`,
|
|
348
350
|
)
|
|
349
351
|
},
|
|
@@ -36,11 +36,10 @@ export function throwIfConverseStreamError(ev: ConverseStreamOutput): void {
|
|
|
36
36
|
export async function* processConverseStream(
|
|
37
37
|
stream: AsyncIterable<ConverseStreamOutput>,
|
|
38
38
|
newMessageId: () => string,
|
|
39
|
-
lifecycle: { threadId
|
|
39
|
+
lifecycle: { threadId: string; parentRunId?: string; model?: string },
|
|
40
40
|
): AsyncIterable<AdapterYieldChunk> {
|
|
41
41
|
const runId = newMessageId()
|
|
42
|
-
const threadId = lifecycle
|
|
43
|
-
const { parentRunId, model } = lifecycle
|
|
42
|
+
const { threadId, parentRunId, model } = lifecycle
|
|
44
43
|
const messageId = newMessageId()
|
|
45
44
|
|
|
46
45
|
let hasEmittedRunStarted = false
|
|
@@ -54,7 +53,6 @@ export async function* processConverseStream(
|
|
|
54
53
|
number,
|
|
55
54
|
{
|
|
56
55
|
id: string
|
|
57
|
-
text: string
|
|
58
56
|
signature: string
|
|
59
57
|
bytes: Array<Uint8Array>
|
|
60
58
|
redacted: boolean
|
|
@@ -111,11 +109,6 @@ export async function* processConverseStream(
|
|
|
111
109
|
entityId: reasoning.id,
|
|
112
110
|
subtype: 'message',
|
|
113
111
|
encryptedValue: encrypted,
|
|
114
|
-
...(reasoning.redacted && {
|
|
115
|
-
stepId: reasoning.id.startsWith('redacted_thinking-')
|
|
116
|
-
? reasoning.id
|
|
117
|
-
: 'redacted_thinking-' + reasoning.id,
|
|
118
|
-
}),
|
|
119
112
|
timestamp: Date.now(),
|
|
120
113
|
}
|
|
121
114
|
}
|
|
@@ -126,14 +119,6 @@ export async function* processConverseStream(
|
|
|
126
119
|
yield* encryptedReasoning(blockIndex)
|
|
127
120
|
if (reasoning.closed) continue
|
|
128
121
|
reasoning.closed = true
|
|
129
|
-
yield {
|
|
130
|
-
type: EventType.STEP_FINISHED,
|
|
131
|
-
stepId: reasoning.id,
|
|
132
|
-
stepName: reasoning.id,
|
|
133
|
-
delta: '',
|
|
134
|
-
content: reasoning.text,
|
|
135
|
-
timestamp: Date.now(),
|
|
136
|
-
}
|
|
137
122
|
yield {
|
|
138
123
|
type: EventType.REASONING_MESSAGE_END,
|
|
139
124
|
messageId: reasoning.id,
|
|
@@ -174,7 +159,6 @@ export async function* processConverseStream(
|
|
|
174
159
|
type: EventType.TOOL_CALL_START,
|
|
175
160
|
toolCallId: id,
|
|
176
161
|
toolCallName: name,
|
|
177
|
-
toolName: name,
|
|
178
162
|
timestamp: Date.now(),
|
|
179
163
|
index,
|
|
180
164
|
}
|
|
@@ -211,20 +195,12 @@ export async function* processConverseStream(
|
|
|
211
195
|
(fragment.redactedContent?.length ?? 0) > 0
|
|
212
196
|
reasoning = {
|
|
213
197
|
id: (redacted ? 'redacted_thinking-' : '') + newMessageId(),
|
|
214
|
-
text: '',
|
|
215
198
|
signature: '',
|
|
216
199
|
bytes: [],
|
|
217
200
|
redacted,
|
|
218
201
|
closed: false,
|
|
219
202
|
}
|
|
220
203
|
reasoningByIndex.set(index, reasoning)
|
|
221
|
-
yield {
|
|
222
|
-
type: EventType.STEP_STARTED,
|
|
223
|
-
stepId: reasoning.id,
|
|
224
|
-
stepName: reasoning.id,
|
|
225
|
-
stepType: 'thinking',
|
|
226
|
-
timestamp: Date.now(),
|
|
227
|
-
}
|
|
228
204
|
yield {
|
|
229
205
|
type: EventType.REASONING_MESSAGE_START,
|
|
230
206
|
messageId: reasoning.id,
|
|
@@ -237,7 +213,6 @@ export async function* processConverseStream(
|
|
|
237
213
|
'text' in fragment &&
|
|
238
214
|
fragment.text !== undefined
|
|
239
215
|
) {
|
|
240
|
-
reasoning.text += fragment.text
|
|
241
216
|
yield {
|
|
242
217
|
type: EventType.REASONING_MESSAGE_CONTENT,
|
|
243
218
|
messageId: reasoning.id,
|
|
@@ -258,7 +233,6 @@ export async function* processConverseStream(
|
|
|
258
233
|
) {
|
|
259
234
|
if (!reasoning.redacted) reasoning.encrypted = undefined
|
|
260
235
|
reasoning.redacted = true
|
|
261
|
-
reasoning.text = ''
|
|
262
236
|
reasoning.signature = ''
|
|
263
237
|
reasoning.bytes.push(fragment.redactedContent)
|
|
264
238
|
yield* encryptedReasoning(index)
|
|
@@ -300,7 +274,6 @@ export async function* processConverseStream(
|
|
|
300
274
|
toolCallId: toolCall.id,
|
|
301
275
|
args: toolCall.arguments,
|
|
302
276
|
toolCallName: toolCall.name,
|
|
303
|
-
toolName: toolCall.name,
|
|
304
277
|
timestamp: Date.now(),
|
|
305
278
|
}
|
|
306
279
|
toolCallsByIndex.delete(stopIndex)
|
|
@@ -343,7 +316,6 @@ export async function* processConverseStream(
|
|
|
343
316
|
toolCallId: toolCall.id,
|
|
344
317
|
args: toolCall.arguments,
|
|
345
318
|
toolCallName: toolCall.name,
|
|
346
|
-
toolName: toolCall.name,
|
|
347
319
|
timestamp: Date.now(),
|
|
348
320
|
}
|
|
349
321
|
toolCallsByIndex.delete(index)
|
package/src/converse/usage.ts
CHANGED
|
@@ -15,6 +15,10 @@ import type { TokenUsage as ConverseTokenUsage } from '@aws-sdk/client-bedrock-r
|
|
|
15
15
|
export function buildConverseUsage(usage: ConverseTokenUsage): TokenUsage {
|
|
16
16
|
const cachedTokens = usage.cacheReadInputTokens
|
|
17
17
|
const cacheWriteTokens = usage.cacheWriteInputTokens
|
|
18
|
+
// The 1-hour part of the cache write.
|
|
19
|
+
const cacheWrite1hTokens = usage.cacheDetails?.find(
|
|
20
|
+
(detail) => detail.ttl === '1h',
|
|
21
|
+
)?.inputTokens
|
|
18
22
|
const promptTokens =
|
|
19
23
|
(usage.inputTokens ?? 0) + (cachedTokens ?? 0) + (cacheWriteTokens ?? 0)
|
|
20
24
|
const completionTokens = usage.outputTokens ?? 0
|
|
@@ -31,6 +35,7 @@ export function buildConverseUsage(usage: ConverseTokenUsage): TokenUsage {
|
|
|
31
35
|
const promptTokensDetails = {
|
|
32
36
|
...(cachedTokens !== undefined ? { cachedTokens } : {}),
|
|
33
37
|
...(cacheWriteTokens !== undefined ? { cacheWriteTokens } : {}),
|
|
38
|
+
...(cacheWrite1hTokens !== undefined ? { cacheWrite1hTokens } : {}),
|
|
34
39
|
}
|
|
35
40
|
if (Object.keys(promptTokensDetails).length > 0) {
|
|
36
41
|
result.promptTokensDetails = promptTokensDetails
|