@tanstack/ai-bedrock 0.6.2 → 1.0.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.js +1 -1
- package/dist/esm/adapters/converse-text.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/package.json +3 -3
- package/src/adapters/converse-text.ts +1 -1
- package/src/converse/stream-processor.ts +2 -30
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 ?? '')
|
|
@@ -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;
|
|
@@ -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 ): 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\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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"}
|
|
@@ -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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tanstack/ai-bedrock",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "1.0.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": "^0.
|
|
46
|
+
"@tanstack/ai": "^1.0.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.0"
|
|
56
56
|
},
|
|
57
57
|
"scripts": {
|
|
58
58
|
"build": "vite build",
|
|
@@ -385,7 +385,7 @@ export class BedrockConverseTextAdapter<
|
|
|
385
385
|
): AsyncIterable<AdapterYieldChunk> {
|
|
386
386
|
const { chatOptions, outputSchema } = options
|
|
387
387
|
const runId = this.generateId()
|
|
388
|
-
const threadId = chatOptions.threadId
|
|
388
|
+
const threadId = chatOptions.threadId
|
|
389
389
|
const messageId = this.generateId()
|
|
390
390
|
|
|
391
391
|
let hasEmittedRunStarted = false
|
|
@@ -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)
|