@tanstack/ai-bedrock 1.1.0 → 1.2.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -0
- package/dist/esm/adapters/converse-text.js +17 -14
- package/dist/esm/adapters/converse-text.js.map +1 -1
- package/dist/esm/adapters/embedding.js +2 -5
- package/dist/esm/adapters/embedding.js.map +1 -1
- package/dist/esm/adapters/responses-text.d.ts +1 -1
- package/dist/esm/adapters/responses-text.js +3 -4
- package/dist/esm/adapters/responses-text.js.map +1 -1
- package/dist/esm/adapters/text.d.ts +1 -1
- package/dist/esm/adapters/text.js +3 -4
- package/dist/esm/adapters/text.js.map +1 -1
- package/dist/esm/converse/stream-processor.js +1 -1
- package/dist/esm/converse/stream-processor.js.map +1 -1
- package/dist/esm/utils/auth.d.ts +6 -0
- package/dist/esm/utils/auth.js +17 -5
- package/dist/esm/utils/auth.js.map +1 -1
- package/dist/esm/utils/client.js +1 -1
- package/dist/esm/utils/client.js.map +1 -1
- package/dist/esm/utils/openai-sigv4-fetch.d.ts +2 -2
- package/dist/esm/utils/openai-sigv4-fetch.js +12 -23
- package/dist/esm/utils/openai-sigv4-fetch.js.map +1 -1
- package/dist/esm/utils/sigv4.d.ts +28 -0
- package/dist/esm/utils/sigv4.js +133 -0
- package/dist/esm/utils/sigv4.js.map +1 -0
- package/package.json +22 -7
- package/src/adapters/converse-text.ts +23 -13
- package/src/adapters/embedding.ts +2 -2
- package/src/adapters/responses-text.ts +6 -4
- package/src/adapters/text.ts +6 -4
- package/src/converse/stream-processor.ts +2 -1
- package/src/utils/auth.ts +19 -3
- package/src/utils/client.ts +1 -1
- package/src/utils/openai-sigv4-fetch.ts +14 -34
- package/src/utils/sigv4.ts +202 -0
|
@@ -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, 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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"}
|
|
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 stopReason === 'guardrail_intervened'\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/dist/esm/utils/auth.d.ts
CHANGED
|
@@ -11,6 +11,12 @@ export type ResolvedBedrockAuth = {
|
|
|
11
11
|
service: string;
|
|
12
12
|
credentials: AwsCredentialIdentityProvider;
|
|
13
13
|
};
|
|
14
|
+
/**
|
|
15
|
+
* Loads an optional peer dependency of this package (the AWS SDK parts). If
|
|
16
|
+
* the import fails, throws an error that names the package to install. The
|
|
17
|
+
* original error is kept as `cause`.
|
|
18
|
+
*/
|
|
19
|
+
export declare function importOptionalPeer<T>(mod: string): Promise<T>;
|
|
14
20
|
export interface BedrockAuthConfig {
|
|
15
21
|
apiKey?: string;
|
|
16
22
|
region?: string;
|
package/dist/esm/utils/auth.js
CHANGED
|
@@ -3,6 +3,21 @@
|
|
|
3
3
|
function sigv4Service(endpoint) {
|
|
4
4
|
return endpoint === "mantle" ? "bedrock-mantle" : "bedrock";
|
|
5
5
|
}
|
|
6
|
+
/**
|
|
7
|
+
* Loads an optional peer dependency of this package (the AWS SDK parts). If
|
|
8
|
+
* the import fails, throws an error that names the package to install. The
|
|
9
|
+
* original error is kept as `cause`.
|
|
10
|
+
*/
|
|
11
|
+
async function importOptionalPeer(mod) {
|
|
12
|
+
try {
|
|
13
|
+
return await import(
|
|
14
|
+
/* @vite-ignore */
|
|
15
|
+
mod
|
|
16
|
+
);
|
|
17
|
+
} catch (cause) {
|
|
18
|
+
throw new Error(`@tanstack/ai-bedrock could not load "${mod}". It is an optional peer dependency. Install it: npm install ${mod}`, { cause });
|
|
19
|
+
}
|
|
20
|
+
}
|
|
6
21
|
var DEFAULT_REGION = "us-east-1";
|
|
7
22
|
function readApiKeyFromEnv() {
|
|
8
23
|
const env = typeof process !== "undefined" ? process.env : void 0;
|
|
@@ -25,15 +40,12 @@ function resolveBedrockAuth(config, endpoint) {
|
|
|
25
40
|
region,
|
|
26
41
|
service: sigv4Service(endpoint),
|
|
27
42
|
credentials: async (...args) => {
|
|
28
|
-
const { fromNodeProviderChain } = await
|
|
29
|
-
/* @vite-ignore */
|
|
30
|
-
"@aws-sdk/credential-providers"
|
|
31
|
-
);
|
|
43
|
+
const { fromNodeProviderChain } = await importOptionalPeer("@aws-sdk/credential-providers");
|
|
32
44
|
return fromNodeProviderChain()(...args);
|
|
33
45
|
}
|
|
34
46
|
};
|
|
35
47
|
}
|
|
36
48
|
//#endregion
|
|
37
|
-
export { resolveBedrockAuth, sigv4Service };
|
|
49
|
+
export { importOptionalPeer, resolveBedrockAuth, sigv4Service };
|
|
38
50
|
|
|
39
51
|
//# sourceMappingURL=auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","names":[],"sources":["../../../src/utils/auth.ts"],"sourcesContent":["import type { AwsCredentialIdentityProvider } from '@smithy/types'\nimport type * as CredentialProviders from '@aws-sdk/credential-providers'\n\nexport type BedrockEndpoint = 'runtime' | 'mantle'\n\n/** SigV4 service name differs per endpoint. */\nexport function sigv4Service(endpoint: BedrockEndpoint): string {\n return endpoint === 'mantle' ? 'bedrock-mantle' : 'bedrock'\n}\n\nexport type ResolvedBedrockAuth =\n | { kind: 'bearer'; token: string }\n | {\n kind: 'sigv4'\n region: string\n service: string\n credentials: AwsCredentialIdentityProvider\n }\n\nconst DEFAULT_REGION = 'us-east-1'\n\nfunction readApiKeyFromEnv(): string | undefined {\n // Bedrock is server-only (the AWS SDK is Node-only), so the key always comes\n // from process.env. Read it directly: a property access never throws, so —\n // unlike the previous try/catch around getApiKeyFromEnv — we no longer swallow\n // unrelated errors as \"key not set\". Each var is blank-checked independently\n // so a present-but-blank BEDROCK_API_KEY falls through to\n // AWS_BEARER_TOKEN_BEDROCK (and only then to SigV4) rather than masking it.\n const env = typeof process !== 'undefined' ? process.env : undefined\n for (const value of [env?.BEDROCK_API_KEY, env?.AWS_BEARER_TOKEN_BEDROCK]) {\n if (value && value.trim() !== '') return value\n }\n return undefined\n}\n\nexport interface BedrockAuthConfig {\n apiKey?: string\n region?: string\n auth?: 'apikey' | 'sigv4' | 'auto'\n}\n\n/** apiKey -> BEDROCK_API_KEY -> AWS_BEARER_TOKEN_BEDROCK -> SigV4 (credential chain). */\nexport function resolveBedrockAuth(\n config: BedrockAuthConfig,\n endpoint: BedrockEndpoint,\n): ResolvedBedrockAuth {\n const mode = config.auth ?? 'auto'\n const region = config.region ?? DEFAULT_REGION\n\n if (mode !== 'sigv4') {\n const token = config.apiKey ?? readApiKeyFromEnv()\n if (token) return { kind: 'bearer', token }\n if (mode === 'apikey') {\n throw new Error(\n 'No Bedrock API key found. Set BEDROCK_API_KEY (or ' +\n 'AWS_BEARER_TOKEN_BEDROCK), pass `apiKey`, or use auth: \"sigv4\".',\n )\n }\n }\n\n return {\n kind: 'sigv4',\n region,\n service: sigv4Service(endpoint),\n // Lazy credential provider: the AWS SDK is Node/server-only, so we defer the\n // dynamic import until SigV4 actually needs to resolve credentials. The\n // specifier is held in a variable (not a string literal) so bundler dep\n // scanners (e.g. Vite/esbuild optimizeDeps) cannot statically discover the\n // AWS SDK and try to pre-bundle it for the browser — it would fail on the\n // SDK's Node-only `fromTokenFile` export chain. `typeof import(...)` is a\n // type-only reference (erased at emit) so we keep full typing.\n credentials: async (...args) => {\n const mod = '@aws-sdk/credential-providers'\n const { fromNodeProviderChain }
|
|
1
|
+
{"version":3,"file":"auth.js","names":[],"sources":["../../../src/utils/auth.ts"],"sourcesContent":["import type { AwsCredentialIdentityProvider } from '@smithy/types'\nimport type * as CredentialProviders from '@aws-sdk/credential-providers'\n\nexport type BedrockEndpoint = 'runtime' | 'mantle'\n\n/** SigV4 service name differs per endpoint. */\nexport function sigv4Service(endpoint: BedrockEndpoint): string {\n return endpoint === 'mantle' ? 'bedrock-mantle' : 'bedrock'\n}\n\nexport type ResolvedBedrockAuth =\n | { kind: 'bearer'; token: string }\n | {\n kind: 'sigv4'\n region: string\n service: string\n credentials: AwsCredentialIdentityProvider\n }\n\n/**\n * Loads an optional peer dependency of this package (the AWS SDK parts). If\n * the import fails, throws an error that names the package to install. The\n * original error is kept as `cause`.\n */\nexport async function importOptionalPeer<T>(mod: string): Promise<T> {\n try {\n return (await import(/* @vite-ignore */ mod)) as T\n } catch (cause) {\n throw new Error(\n `@tanstack/ai-bedrock could not load \"${mod}\". It is an optional peer ` +\n `dependency. Install it: npm install ${mod}`,\n { cause },\n )\n }\n}\n\nconst DEFAULT_REGION = 'us-east-1'\n\nfunction readApiKeyFromEnv(): string | undefined {\n // Bedrock is server-only (the AWS SDK is Node-only), so the key always comes\n // from process.env. Read it directly: a property access never throws, so —\n // unlike the previous try/catch around getApiKeyFromEnv — we no longer swallow\n // unrelated errors as \"key not set\". Each var is blank-checked independently\n // so a present-but-blank BEDROCK_API_KEY falls through to\n // AWS_BEARER_TOKEN_BEDROCK (and only then to SigV4) rather than masking it.\n const env = typeof process !== 'undefined' ? process.env : undefined\n for (const value of [env?.BEDROCK_API_KEY, env?.AWS_BEARER_TOKEN_BEDROCK]) {\n if (value && value.trim() !== '') return value\n }\n return undefined\n}\n\nexport interface BedrockAuthConfig {\n apiKey?: string\n region?: string\n auth?: 'apikey' | 'sigv4' | 'auto'\n}\n\n/** apiKey -> BEDROCK_API_KEY -> AWS_BEARER_TOKEN_BEDROCK -> SigV4 (credential chain). */\nexport function resolveBedrockAuth(\n config: BedrockAuthConfig,\n endpoint: BedrockEndpoint,\n): ResolvedBedrockAuth {\n const mode = config.auth ?? 'auto'\n const region = config.region ?? DEFAULT_REGION\n\n if (mode !== 'sigv4') {\n const token = config.apiKey ?? readApiKeyFromEnv()\n if (token) return { kind: 'bearer', token }\n if (mode === 'apikey') {\n throw new Error(\n 'No Bedrock API key found. Set BEDROCK_API_KEY (or ' +\n 'AWS_BEARER_TOKEN_BEDROCK), pass `apiKey`, or use auth: \"sigv4\".',\n )\n }\n }\n\n return {\n kind: 'sigv4',\n region,\n service: sigv4Service(endpoint),\n // Lazy credential provider: the AWS SDK is Node/server-only, so we defer the\n // dynamic import until SigV4 actually needs to resolve credentials. The\n // specifier is held in a variable (not a string literal) so bundler dep\n // scanners (e.g. Vite/esbuild optimizeDeps) cannot statically discover the\n // AWS SDK and try to pre-bundle it for the browser — it would fail on the\n // SDK's Node-only `fromTokenFile` export chain. `typeof import(...)` is a\n // type-only reference (erased at emit) so we keep full typing.\n credentials: async (...args) => {\n const mod = '@aws-sdk/credential-providers'\n const { fromNodeProviderChain } =\n await importOptionalPeer<typeof CredentialProviders>(mod)\n return fromNodeProviderChain()(...args)\n },\n }\n}\n"],"mappings":";;AAMA,SAAgB,aAAa,UAAmC;CAC9D,OAAO,aAAa,WAAW,mBAAmB;AACpD;;;;;;AAgBA,eAAsB,mBAAsB,KAAyB;CACnE,IAAI;EACF,OAAQ,MAAM;;GAA0B;;CAC1C,SAAS,OAAO;EACd,MAAM,IAAI,MACR,wCAAwC,IAAI,gEACH,OACzC,EAAE,MAAM,CACV;CACF;AACF;AAEA,IAAM,iBAAiB;AAEvB,SAAS,oBAAwC;CAO/C,MAAM,MAAM,OAAO,YAAY,cAAc,QAAQ,MAAM,KAAA;CAC3D,KAAK,MAAM,SAAS,CAAC,KAAK,iBAAiB,KAAK,wBAAwB,GACtE,IAAI,SAAS,MAAM,KAAK,MAAM,IAAI,OAAO;AAG7C;;AASA,SAAgB,mBACd,QACA,UACqB;CACrB,MAAM,OAAO,OAAO,QAAQ;CAC5B,MAAM,SAAS,OAAO,UAAU;CAEhC,IAAI,SAAS,SAAS;EACpB,MAAM,QAAQ,OAAO,UAAU,kBAAkB;EACjD,IAAI,OAAO,OAAO;GAAE,MAAM;GAAU;EAAM;EAC1C,IAAI,SAAS,UACX,MAAM,IAAI,MACR,qHAEF;CAEJ;CAEA,OAAO;EACL,MAAM;EACN;EACA,SAAS,aAAa,QAAQ;EAQ9B,aAAa,OAAO,GAAG,SAAS;GAE9B,MAAM,EAAE,0BACN,MAAM,mBAA+C,+BAAG;GAC1D,OAAO,sBAAsB,CAAC,CAAC,GAAG,IAAI;EACxC;CACF;AACF"}
|
package/dist/esm/utils/client.js
CHANGED
|
@@ -3,7 +3,7 @@ import { createSigV4Fetch } from "./openai-sigv4-fetch.js";
|
|
|
3
3
|
import { mantlePathForModel } from "../api-compatibility.js";
|
|
4
4
|
//#region src/utils/client.ts
|
|
5
5
|
var DEFAULT_REGION = "us-east-1";
|
|
6
|
-
/** OpenAI
|
|
6
|
+
/** The OpenAI client requires a non-empty apiKey even when a signed fetch overrides Authorization. */
|
|
7
7
|
var SIGV4_PLACEHOLDER_KEY = "bedrock-sigv4";
|
|
8
8
|
function buildBaseURL(region, endpoint, model) {
|
|
9
9
|
return endpoint === "mantle" ? `https://bedrock-mantle.${region}.api.aws${mantlePathForModel(model)}` : `https://bedrock-runtime.${region}.amazonaws.com/openai/v1`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","names":[],"sources":["../../../src/utils/client.ts"],"sourcesContent":["import { resolveBedrockAuth } from './auth'\nimport { createSigV4Fetch } from './openai-sigv4-fetch'\nimport { mantlePathForModel } from '../api-compatibility'\nimport type { ClientOptions } from 'openai'\nimport type { BedrockEndpoint } from './auth'\n\nexport type { BedrockEndpoint } from './auth'\nexport { resolveBedrockAuth } from './auth'\nexport type { ResolvedBedrockAuth } from './auth'\n\nexport interface BedrockClientConfig extends Omit<\n ClientOptions,\n 'apiKey' | 'baseURL'\n> {\n /** Bedrock API key (bearer). Optional — falls back to env, then SigV4. */\n apiKey?: string\n /** Full AWS region (e.g. 'us-east-1'). Default 'us-east-1'. */\n region?: string\n /** Chat adapter only; the responses adapter forces 'mantle'. Default 'runtime'. */\n endpoint?: BedrockEndpoint\n /** Auth strategy. Default 'auto' (apiKey → env → SigV4). */\n auth?: 'apikey' | 'sigv4' | 'auto'\n /** Explicit override; wins over the computed endpoint URL (used by E2E → aimock). */\n baseURL?: string\n}\n\nconst DEFAULT_REGION = 'us-east-1'\n/** OpenAI
|
|
1
|
+
{"version":3,"file":"client.js","names":[],"sources":["../../../src/utils/client.ts"],"sourcesContent":["import { resolveBedrockAuth } from './auth'\nimport { createSigV4Fetch } from './openai-sigv4-fetch'\nimport { mantlePathForModel } from '../api-compatibility'\nimport type { ClientOptions } from 'openai'\nimport type { BedrockEndpoint } from './auth'\n\nexport type { BedrockEndpoint } from './auth'\nexport { resolveBedrockAuth } from './auth'\nexport type { ResolvedBedrockAuth } from './auth'\n\nexport interface BedrockClientConfig extends Omit<\n ClientOptions,\n 'apiKey' | 'baseURL'\n> {\n /** Bedrock API key (bearer). Optional — falls back to env, then SigV4. */\n apiKey?: string\n /** Full AWS region (e.g. 'us-east-1'). Default 'us-east-1'. */\n region?: string\n /** Chat adapter only; the responses adapter forces 'mantle'. Default 'runtime'. */\n endpoint?: BedrockEndpoint\n /** Auth strategy. Default 'auto' (apiKey → env → SigV4). */\n auth?: 'apikey' | 'sigv4' | 'auto'\n /** Explicit override; wins over the computed endpoint URL (used by E2E → aimock). */\n baseURL?: string\n}\n\nconst DEFAULT_REGION = 'us-east-1'\n/** The OpenAI client requires a non-empty apiKey even when a signed fetch overrides Authorization. */\nconst SIGV4_PLACEHOLDER_KEY = 'bedrock-sigv4'\n\nfunction buildBaseURL(\n region: string,\n endpoint: BedrockEndpoint,\n model?: string,\n): string {\n return endpoint === 'mantle'\n ? `https://bedrock-mantle.${region}.api.aws${mantlePathForModel(model)}`\n : `https://bedrock-runtime.${region}.amazonaws.com/openai/v1`\n}\n\n/** Builds OpenAI ClientOptions for the requested endpoint. `forced` pins the endpoint (responses → 'mantle'). */\nexport function withBedrockDefaults(\n config: BedrockClientConfig,\n forced?: BedrockEndpoint,\n model?: string,\n): ClientOptions {\n const { region, endpoint, auth, apiKey, baseURL, fetch, ...rest } = config\n const resolvedRegion = region ?? DEFAULT_REGION\n const resolvedEndpoint = forced ?? endpoint ?? 'runtime'\n const resolved = resolveBedrockAuth(\n { apiKey, region: resolvedRegion, auth },\n resolvedEndpoint,\n )\n const resolvedBaseURL =\n baseURL ?? buildBaseURL(resolvedRegion, resolvedEndpoint, model)\n if (resolved.kind === 'bearer') {\n return {\n ...rest,\n baseURL: resolvedBaseURL,\n apiKey: resolved.token,\n ...(fetch ? { fetch } : {}),\n }\n }\n return {\n ...rest,\n baseURL: resolvedBaseURL,\n apiKey: SIGV4_PLACEHOLDER_KEY,\n fetch: fetch ?? createSigV4Fetch(resolved),\n }\n}\n\n/**\n * True when an error from Bedrock's OpenAI-compatible endpoints says the input\n * does not fit in the model's context window. They have no error code for it.\n * They answer `validation_error` for every bad request, so the message text\n * is the only signal.\n */\nexport function isBedrockOpenAIContextOverflow(error: {\n message: string\n code: string | undefined\n}): boolean {\n return (\n error.code === 'validation_error' &&\n error.message.includes('maximum context length')\n )\n}\n"],"mappings":";;;;AA0BA,IAAM,iBAAiB;;AAEvB,IAAM,wBAAwB;AAE9B,SAAS,aACP,QACA,UACA,OACQ;CACR,OAAO,aAAa,WAChB,0BAA0B,OAAO,UAAU,mBAAmB,KAAK,MACnE,2BAA2B,OAAO;AACxC;;AAGA,SAAgB,oBACd,QACA,QACA,OACe;CACf,MAAM,EAAE,QAAQ,UAAU,MAAM,QAAQ,SAAS,OAAO,GAAG,SAAS;CACpE,MAAM,iBAAiB,UAAU;CACjC,MAAM,mBAAmB,UAAU,YAAY;CAC/C,MAAM,WAAW,mBACf;EAAE;EAAQ,QAAQ;EAAgB;CAAK,GACvC,gBACF;CACA,MAAM,kBACJ,WAAW,aAAa,gBAAgB,kBAAkB,KAAK;CACjE,IAAI,SAAS,SAAS,UACpB,OAAO;EACL,GAAG;EACH,SAAS;EACT,QAAQ,SAAS;EACjB,GAAI,QAAQ,EAAE,MAAM,IAAI,CAAC;CAC3B;CAEF,OAAO;EACL,GAAG;EACH,SAAS;EACT,QAAQ;EACR,OAAO,SAAS,iBAAiB,QAAQ;CAC3C;AACF;;;;;;;AAQA,SAAgB,+BAA+B,OAGnC;CACV,OACE,MAAM,SAAS,sBACf,MAAM,QAAQ,SAAS,wBAAwB;AAEnD"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { ResolvedBedrockAuth } from './auth.js';
|
|
2
2
|
type FetchLike = typeof fetch;
|
|
3
3
|
/**
|
|
4
|
-
* Wraps a fetch so each request is SigV4-signed
|
|
5
|
-
*
|
|
4
|
+
* Wraps a fetch so each request is SigV4-signed with the resolved AWS
|
|
5
|
+
* credentials (WebCrypto signer in `./sigv4`).
|
|
6
6
|
*/
|
|
7
7
|
export declare function createSigV4Fetch(auth: Extract<ResolvedBedrockAuth, {
|
|
8
8
|
kind: 'sigv4';
|
|
@@ -1,36 +1,25 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Sha256 } from "@aws-crypto/sha256-js";
|
|
1
|
+
import { signSigV4 } from "./sigv4.js";
|
|
3
2
|
//#region src/utils/openai-sigv4-fetch.ts
|
|
4
3
|
/**
|
|
5
|
-
* Wraps a fetch so each request is SigV4-signed
|
|
6
|
-
*
|
|
4
|
+
* Wraps a fetch so each request is SigV4-signed with the resolved AWS
|
|
5
|
+
* credentials (WebCrypto signer in `./sigv4`).
|
|
7
6
|
*/
|
|
8
7
|
function createSigV4Fetch(auth, baseFetch = fetch) {
|
|
9
|
-
const signer = new SignatureV4({
|
|
10
|
-
service: auth.service,
|
|
11
|
-
region: auth.region,
|
|
12
|
-
credentials: auth.credentials,
|
|
13
|
-
sha256: Sha256
|
|
14
|
-
});
|
|
15
8
|
return async (input, init) => {
|
|
16
9
|
const href = typeof input === "string" ? input : input instanceof Request ? input.url : input.toString();
|
|
17
10
|
const url = new URL(href);
|
|
18
|
-
const headers = {
|
|
19
|
-
new Headers(init?.headers).forEach((v, k) => headers[k] = v);
|
|
20
|
-
headers["host"] = url.host;
|
|
21
|
-
const body = init?.body ?? void 0;
|
|
22
|
-
const request = {
|
|
11
|
+
const headers = await signSigV4({
|
|
23
12
|
method: init?.method ?? "GET",
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
13
|
+
url,
|
|
14
|
+
headers: init?.headers,
|
|
15
|
+
body: init?.body
|
|
16
|
+
}, await auth.credentials(), {
|
|
17
|
+
service: auth.service,
|
|
18
|
+
region: auth.region
|
|
19
|
+
});
|
|
31
20
|
return baseFetch(url.toString(), {
|
|
32
21
|
...init,
|
|
33
|
-
headers
|
|
22
|
+
headers
|
|
34
23
|
});
|
|
35
24
|
};
|
|
36
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai-sigv4-fetch.js","names":[],"sources":["../../../src/utils/openai-sigv4-fetch.ts"],"sourcesContent":["import {
|
|
1
|
+
{"version":3,"file":"openai-sigv4-fetch.js","names":[],"sources":["../../../src/utils/openai-sigv4-fetch.ts"],"sourcesContent":["import { signSigV4 } from './sigv4'\nimport type { ResolvedBedrockAuth } from './auth'\n\ntype FetchLike = typeof fetch\n\n/**\n * Wraps a fetch so each request is SigV4-signed with the resolved AWS\n * credentials (WebCrypto signer in `./sigv4`).\n */\nexport function createSigV4Fetch(\n auth: Extract<ResolvedBedrockAuth, { kind: 'sigv4' }>,\n baseFetch: FetchLike = fetch,\n): FetchLike {\n return async (input, init) => {\n // Request.toString() returns '[object Request]', not the URL — use .url instead.\n const href =\n typeof input === 'string'\n ? input\n : input instanceof Request\n ? input.url\n : input.toString()\n const url = new URL(href)\n const headers = await signSigV4(\n {\n method: init?.method ?? 'GET',\n url,\n headers: init?.headers,\n body: init?.body,\n },\n await auth.credentials(),\n { service: auth.service, region: auth.region },\n )\n return baseFetch(url.toString(), { ...init, headers })\n }\n}\n"],"mappings":";;;;;;AASA,SAAgB,iBACd,MACA,YAAuB,OACZ;CACX,OAAO,OAAO,OAAO,SAAS;EAE5B,MAAM,OACJ,OAAO,UAAU,WACb,QACA,iBAAiB,UACf,MAAM,MACN,MAAM,SAAS;EACvB,MAAM,MAAM,IAAI,IAAI,IAAI;EACxB,MAAM,UAAU,MAAM,UACpB;GACE,QAAQ,MAAM,UAAU;GACxB;GACA,SAAS,MAAM;GACf,MAAM,MAAM;EACd,GACA,MAAM,KAAK,YAAY,GACvB;GAAE,SAAS,KAAK;GAAS,QAAQ,KAAK;EAAO,CAC/C;EACA,OAAO,UAAU,IAAI,SAAS,GAAG;GAAE,GAAG;GAAM;EAAQ,CAAC;CACvD;AACF"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { AwsCredentialIdentity } from '@smithy/types';
|
|
2
|
+
/**
|
|
3
|
+
* Signs an HTTP request with AWS Signature Version 4 (header auth).
|
|
4
|
+
*
|
|
5
|
+
* @param request - The request to sign. `host` always comes from `url`.
|
|
6
|
+
* @param credentials - Resolved AWS credentials. `sessionToken` adds `x-amz-security-token`.
|
|
7
|
+
* @param options - SigV4 `service` and `region`. `date` defaults to now.
|
|
8
|
+
* @returns The request headers plus `host`, `x-amz-date`,
|
|
9
|
+
* `x-amz-content-sha256`, `x-amz-security-token` (with a session token),
|
|
10
|
+
* and `authorization`.
|
|
11
|
+
*
|
|
12
|
+
* @example
|
|
13
|
+
* const headers = await signSigV4(
|
|
14
|
+
* { method: 'POST', url, headers: { 'content-type': 'application/json' }, body },
|
|
15
|
+
* await credentials(),
|
|
16
|
+
* { service: 'bedrock', region: 'us-east-1' },
|
|
17
|
+
* )
|
|
18
|
+
*/
|
|
19
|
+
export declare function signSigV4(request: {
|
|
20
|
+
method: string;
|
|
21
|
+
url: URL | string;
|
|
22
|
+
headers?: HeadersInit;
|
|
23
|
+
body?: BodyInit | null;
|
|
24
|
+
}, credentials: AwsCredentialIdentity, options: {
|
|
25
|
+
service: string;
|
|
26
|
+
region: string;
|
|
27
|
+
date?: Date;
|
|
28
|
+
}): Promise<Headers>;
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
//#region src/utils/sigv4.ts
|
|
2
|
+
var EMPTY_SHA256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
|
|
3
|
+
var UNSIGNABLE_HEADERS = /* @__PURE__ */ new Set([
|
|
4
|
+
"authorization",
|
|
5
|
+
"cache-control",
|
|
6
|
+
"connection",
|
|
7
|
+
"expect",
|
|
8
|
+
"from",
|
|
9
|
+
"keep-alive",
|
|
10
|
+
"max-forwards",
|
|
11
|
+
"pragma",
|
|
12
|
+
"referer",
|
|
13
|
+
"te",
|
|
14
|
+
"trailer",
|
|
15
|
+
"transfer-encoding",
|
|
16
|
+
"upgrade",
|
|
17
|
+
"user-agent",
|
|
18
|
+
"x-amzn-trace-id"
|
|
19
|
+
]);
|
|
20
|
+
var encoder = new TextEncoder();
|
|
21
|
+
function toHex(bytes) {
|
|
22
|
+
return Array.from(new Uint8Array(bytes), (byte) => byte.toString(16).padStart(2, "0")).join("");
|
|
23
|
+
}
|
|
24
|
+
async function sha256Hex(data) {
|
|
25
|
+
return toHex(await crypto.subtle.digest("SHA-256", data));
|
|
26
|
+
}
|
|
27
|
+
async function hmac(key, data) {
|
|
28
|
+
const cryptoKey = await crypto.subtle.importKey("raw", key, {
|
|
29
|
+
name: "HMAC",
|
|
30
|
+
hash: "SHA-256"
|
|
31
|
+
}, false, ["sign"]);
|
|
32
|
+
return crypto.subtle.sign("HMAC", cryptoKey, encoder.encode(data));
|
|
33
|
+
}
|
|
34
|
+
function escapeUri(value) {
|
|
35
|
+
return encodeURIComponent(value).replace(/[!'()*]/g, (char) => `%${char.charCodeAt(0).toString(16).toUpperCase()}`);
|
|
36
|
+
}
|
|
37
|
+
function canonicalPath(pathname) {
|
|
38
|
+
const segments = [];
|
|
39
|
+
for (const segment of pathname.split("/")) {
|
|
40
|
+
if (segment === "" || segment === ".") continue;
|
|
41
|
+
if (segment === "..") segments.pop();
|
|
42
|
+
else segments.push(segment);
|
|
43
|
+
}
|
|
44
|
+
const trailingSlash = segments.length > 0 && pathname.endsWith("/") ? "/" : "";
|
|
45
|
+
return escapeUri(`/${segments.join("/")}${trailingSlash}`).replace(/%2F/g, "/");
|
|
46
|
+
}
|
|
47
|
+
function canonicalQuery(search) {
|
|
48
|
+
const pairs = search.slice(1).split("&").filter((pair) => pair !== "").map((pair) => {
|
|
49
|
+
const equals = pair.indexOf("=");
|
|
50
|
+
const key = equals === -1 ? pair : pair.slice(0, equals);
|
|
51
|
+
const value = equals === -1 ? "" : pair.slice(equals + 1);
|
|
52
|
+
return [escapeUri(decodeURIComponent(key)), escapeUri(decodeURIComponent(value))];
|
|
53
|
+
});
|
|
54
|
+
pairs.sort(([keyA = "", valueA = ""], [keyB = "", valueB = ""]) => {
|
|
55
|
+
if (keyA !== keyB) return keyA < keyB ? -1 : 1;
|
|
56
|
+
if (valueA === valueB) return 0;
|
|
57
|
+
return valueA < valueB ? -1 : 1;
|
|
58
|
+
});
|
|
59
|
+
return pairs.map(([key, value]) => `${key}=${value}`).join("&");
|
|
60
|
+
}
|
|
61
|
+
async function payloadHash(body) {
|
|
62
|
+
if (body === null || body === void 0) return EMPTY_SHA256;
|
|
63
|
+
if (typeof body === "string") return sha256Hex(encoder.encode(body));
|
|
64
|
+
if (body instanceof ArrayBuffer || ArrayBuffer.isView(body)) return sha256Hex(body);
|
|
65
|
+
return "UNSIGNED-PAYLOAD";
|
|
66
|
+
}
|
|
67
|
+
/**
|
|
68
|
+
* Signs an HTTP request with AWS Signature Version 4 (header auth).
|
|
69
|
+
*
|
|
70
|
+
* @param request - The request to sign. `host` always comes from `url`.
|
|
71
|
+
* @param credentials - Resolved AWS credentials. `sessionToken` adds `x-amz-security-token`.
|
|
72
|
+
* @param options - SigV4 `service` and `region`. `date` defaults to now.
|
|
73
|
+
* @returns The request headers plus `host`, `x-amz-date`,
|
|
74
|
+
* `x-amz-content-sha256`, `x-amz-security-token` (with a session token),
|
|
75
|
+
* and `authorization`.
|
|
76
|
+
*
|
|
77
|
+
* @example
|
|
78
|
+
* const headers = await signSigV4(
|
|
79
|
+
* { method: 'POST', url, headers: { 'content-type': 'application/json' }, body },
|
|
80
|
+
* await credentials(),
|
|
81
|
+
* { service: 'bedrock', region: 'us-east-1' },
|
|
82
|
+
* )
|
|
83
|
+
*/
|
|
84
|
+
async function signSigV4(request, credentials, options) {
|
|
85
|
+
const url = new URL(request.url);
|
|
86
|
+
const headers = new Headers(request.headers);
|
|
87
|
+
headers.delete("authorization");
|
|
88
|
+
headers.delete("date");
|
|
89
|
+
headers.set("host", url.host);
|
|
90
|
+
const longDate = (options.date ?? /* @__PURE__ */ new Date()).toISOString().replace(/\.\d{3}Z$/, "Z").replace(/[-:]/g, "");
|
|
91
|
+
const shortDate = longDate.slice(0, 8);
|
|
92
|
+
const scope = `${shortDate}/${options.region}/${options.service}/aws4_request`;
|
|
93
|
+
headers.set("x-amz-date", longDate);
|
|
94
|
+
if (credentials.sessionToken) headers.set("x-amz-security-token", credentials.sessionToken);
|
|
95
|
+
const bodyHash = headers.get("x-amz-content-sha256") ?? await payloadHash(request.body);
|
|
96
|
+
headers.set("x-amz-content-sha256", bodyHash);
|
|
97
|
+
const signed = [];
|
|
98
|
+
for (const [name, value] of headers) {
|
|
99
|
+
if (UNSIGNABLE_HEADERS.has(name) || /^(proxy|sec)-/.test(name)) continue;
|
|
100
|
+
signed.push([name, value.trim().replace(/\s+/g, " ")]);
|
|
101
|
+
}
|
|
102
|
+
const signedHeaders = signed.map(([name]) => name).join(";");
|
|
103
|
+
const canonicalRequest = [
|
|
104
|
+
request.method,
|
|
105
|
+
canonicalPath(url.pathname),
|
|
106
|
+
canonicalQuery(url.search),
|
|
107
|
+
...signed.map(([name, value]) => `${name}:${value}`),
|
|
108
|
+
"",
|
|
109
|
+
signedHeaders,
|
|
110
|
+
bodyHash
|
|
111
|
+
].join("\n");
|
|
112
|
+
const stringToSign = [
|
|
113
|
+
"AWS4-HMAC-SHA256",
|
|
114
|
+
longDate,
|
|
115
|
+
scope,
|
|
116
|
+
await sha256Hex(encoder.encode(canonicalRequest))
|
|
117
|
+
].join("\n");
|
|
118
|
+
let signingKey = encoder.encode(`AWS4${credentials.secretAccessKey}`);
|
|
119
|
+
const scopeParts = [
|
|
120
|
+
shortDate,
|
|
121
|
+
options.region,
|
|
122
|
+
options.service,
|
|
123
|
+
"aws4_request"
|
|
124
|
+
];
|
|
125
|
+
for (const part of scopeParts) signingKey = await hmac(signingKey, part);
|
|
126
|
+
const signature = toHex(await hmac(signingKey, stringToSign));
|
|
127
|
+
headers.set("authorization", `AWS4-HMAC-SHA256 Credential=${credentials.accessKeyId}/${scope}, SignedHeaders=${signedHeaders}, Signature=${signature}`);
|
|
128
|
+
return headers;
|
|
129
|
+
}
|
|
130
|
+
//#endregion
|
|
131
|
+
export { signSigV4 };
|
|
132
|
+
|
|
133
|
+
//# sourceMappingURL=sigv4.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sigv4.js","names":[],"sources":["../../../src/utils/sigv4.ts"],"sourcesContent":["import type { AwsCredentialIdentity } from '@smithy/types'\n\n// SigV4 header signing with WebCrypto. This is a port of the part of\n// `@smithy/signature-v4` `sign()` that the Bedrock fetch wrapper uses: default\n// options (path escape on, `x-amz-content-sha256` on), headers only.\n// ponytail: no signing-key cache. Add one if the 5 HMAC steps per request show up in a profile.\n\nconst EMPTY_SHA256 =\n 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'\n\n// SigV4 never signs these headers. Same list as `@smithy/signature-v4`.\nconst UNSIGNABLE_HEADERS = new Set([\n 'authorization',\n 'cache-control',\n 'connection',\n 'expect',\n 'from',\n 'keep-alive',\n 'max-forwards',\n 'pragma',\n 'referer',\n 'te',\n 'trailer',\n 'transfer-encoding',\n 'upgrade',\n 'user-agent',\n 'x-amzn-trace-id',\n])\n\nconst encoder = new TextEncoder()\n\nfunction toHex(bytes: ArrayBuffer) {\n return Array.from(new Uint8Array(bytes), (byte) =>\n byte.toString(16).padStart(2, '0'),\n ).join('')\n}\n\nasync function sha256Hex(data: BufferSource) {\n return toHex(await crypto.subtle.digest('SHA-256', data))\n}\n\nasync function hmac(key: BufferSource, data: string) {\n const cryptoKey = await crypto.subtle.importKey(\n 'raw',\n key,\n { name: 'HMAC', hash: 'SHA-256' },\n false,\n ['sign'],\n )\n return crypto.subtle.sign('HMAC', cryptoKey, encoder.encode(data))\n}\n\n// encodeURIComponent also encodes ! ' ( ) * for RFC 3986.\nfunction escapeUri(value: string) {\n return encodeURIComponent(value).replace(\n /[!'()*]/g,\n (char) => `%${char.charCodeAt(0).toString(16).toUpperCase()}`,\n )\n}\n\n// Remove empty, \".\" and \"..\" segments, then encode the path a second time.\n// The wire path is already encoded once, and AWS (not S3) wants it twice.\nfunction canonicalPath(pathname: string) {\n const segments: Array<string> = []\n for (const segment of pathname.split('/')) {\n if (segment === '' || segment === '.') continue\n if (segment === '..') segments.pop()\n else segments.push(segment)\n }\n const trailingSlash = segments.length > 0 && pathname.endsWith('/') ? '/' : ''\n return escapeUri(`/${segments.join('/')}${trailingSlash}`).replace(\n /%2F/g,\n '/',\n )\n}\n\n// Decode each pair, encode it with the SigV4 rules, sort by key, then by value.\nfunction canonicalQuery(search: string) {\n const pairs = search\n .slice(1)\n .split('&')\n .filter((pair) => pair !== '')\n .map((pair) => {\n const equals = pair.indexOf('=')\n const key = equals === -1 ? pair : pair.slice(0, equals)\n const value = equals === -1 ? '' : pair.slice(equals + 1)\n return [\n escapeUri(decodeURIComponent(key)),\n escapeUri(decodeURIComponent(value)),\n ]\n })\n pairs.sort(([keyA = '', valueA = ''], [keyB = '', valueB = '']) => {\n if (keyA !== keyB) return keyA < keyB ? -1 : 1\n if (valueA === valueB) return 0\n return valueA < valueB ? -1 : 1\n })\n return pairs.map(([key, value]) => `${key}=${value}`).join('&')\n}\n\n// A stream, Blob, or FormData body cannot be hashed before it is sent.\nasync function payloadHash(body: BodyInit | null | undefined) {\n if (body === null || body === undefined) return EMPTY_SHA256\n if (typeof body === 'string') return sha256Hex(encoder.encode(body))\n if (body instanceof ArrayBuffer || ArrayBuffer.isView(body)) {\n return sha256Hex(body)\n }\n return 'UNSIGNED-PAYLOAD'\n}\n\n/**\n * Signs an HTTP request with AWS Signature Version 4 (header auth).\n *\n * @param request - The request to sign. `host` always comes from `url`.\n * @param credentials - Resolved AWS credentials. `sessionToken` adds `x-amz-security-token`.\n * @param options - SigV4 `service` and `region`. `date` defaults to now.\n * @returns The request headers plus `host`, `x-amz-date`,\n * `x-amz-content-sha256`, `x-amz-security-token` (with a session token),\n * and `authorization`.\n *\n * @example\n * const headers = await signSigV4(\n * { method: 'POST', url, headers: { 'content-type': 'application/json' }, body },\n * await credentials(),\n * { service: 'bedrock', region: 'us-east-1' },\n * )\n */\nexport async function signSigV4(\n request: {\n method: string\n url: URL | string\n headers?: HeadersInit\n body?: BodyInit | null\n },\n credentials: AwsCredentialIdentity,\n options: { service: string; region: string; date?: Date },\n) {\n const url = new URL(request.url)\n const headers = new Headers(request.headers)\n headers.delete('authorization')\n headers.delete('date')\n headers.set('host', url.host)\n\n const longDate = (options.date ?? new Date())\n .toISOString()\n .replace(/\\.\\d{3}Z$/, 'Z')\n .replace(/[-:]/g, '')\n const shortDate = longDate.slice(0, 8)\n const scope = `${shortDate}/${options.region}/${options.service}/aws4_request`\n headers.set('x-amz-date', longDate)\n if (credentials.sessionToken) {\n headers.set('x-amz-security-token', credentials.sessionToken)\n }\n const bodyHash =\n headers.get('x-amz-content-sha256') ?? (await payloadHash(request.body))\n headers.set('x-amz-content-sha256', bodyHash)\n\n // Headers iterate with lowercase names in sorted order, as SigV4 needs.\n const signed: Array<[string, string]> = []\n for (const [name, value] of headers) {\n const isUnsignable =\n UNSIGNABLE_HEADERS.has(name) || /^(proxy|sec)-/.test(name)\n if (isUnsignable) continue\n signed.push([name, value.trim().replace(/\\s+/g, ' ')])\n }\n const signedHeaders = signed.map(([name]) => name).join(';')\n const canonicalRequest = [\n request.method,\n canonicalPath(url.pathname),\n canonicalQuery(url.search),\n ...signed.map(([name, value]) => `${name}:${value}`),\n '',\n signedHeaders,\n bodyHash,\n ].join('\\n')\n\n const stringToSign = [\n 'AWS4-HMAC-SHA256',\n longDate,\n scope,\n await sha256Hex(encoder.encode(canonicalRequest)),\n ].join('\\n')\n let signingKey: BufferSource = encoder.encode(\n `AWS4${credentials.secretAccessKey}`,\n )\n const scopeParts = [\n shortDate,\n options.region,\n options.service,\n 'aws4_request',\n ]\n for (const part of scopeParts) {\n signingKey = await hmac(signingKey, part)\n }\n const signature = toHex(await hmac(signingKey, stringToSign))\n\n headers.set(\n 'authorization',\n `AWS4-HMAC-SHA256 Credential=${credentials.accessKeyId}/${scope}, ` +\n `SignedHeaders=${signedHeaders}, Signature=${signature}`,\n )\n return headers\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": "1.1
|
|
3
|
+
"version": "1.2.1",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Amazon Bedrock adapter for TanStack AI — OpenAI-compatible chat, responses, tools, and reasoning.",
|
|
6
6
|
"author": "",
|
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
"import": "./dist/esm/byok.js"
|
|
23
23
|
}
|
|
24
24
|
},
|
|
25
|
+
"sideEffects": false,
|
|
25
26
|
"files": [
|
|
26
27
|
"dist",
|
|
27
28
|
"src"
|
|
@@ -39,20 +40,34 @@
|
|
|
39
40
|
"tool-calling"
|
|
40
41
|
],
|
|
41
42
|
"devDependencies": {
|
|
43
|
+
"@aws-crypto/sha256-js": "^5.2.0",
|
|
44
|
+
"@aws-sdk/client-bedrock-runtime": "^3.1057.0",
|
|
45
|
+
"@aws-sdk/credential-providers": "^3.1057.0",
|
|
46
|
+
"@smithy/signature-v4": "^5.4.5",
|
|
47
|
+
"@smithy/types": "^4.14.2",
|
|
42
48
|
"@vitest/coverage-v8": "4.1.10",
|
|
43
49
|
"vite": "^8.2.1"
|
|
44
50
|
},
|
|
45
51
|
"peerDependencies": {
|
|
46
|
-
"@tanstack/ai": "^1.1.0"
|
|
47
|
-
},
|
|
48
|
-
"dependencies": {
|
|
49
|
-
"@aws-crypto/sha256-js": "^5.2.0",
|
|
50
52
|
"@aws-sdk/client-bedrock-runtime": "^3.1057.0",
|
|
51
53
|
"@aws-sdk/credential-providers": "^3.1057.0",
|
|
52
|
-
"@smithy/signature-v4": "^5.4.5",
|
|
53
54
|
"@smithy/types": "^4.14.2",
|
|
55
|
+
"@tanstack/ai": "^1.3.0"
|
|
56
|
+
},
|
|
57
|
+
"peerDependenciesMeta": {
|
|
58
|
+
"@aws-sdk/client-bedrock-runtime": {
|
|
59
|
+
"optional": true
|
|
60
|
+
},
|
|
61
|
+
"@aws-sdk/credential-providers": {
|
|
62
|
+
"optional": true
|
|
63
|
+
},
|
|
64
|
+
"@smithy/types": {
|
|
65
|
+
"optional": true
|
|
66
|
+
}
|
|
67
|
+
},
|
|
68
|
+
"dependencies": {
|
|
54
69
|
"openai": "^7.30.0",
|
|
55
|
-
"@tanstack/openai-base": "^1.0.
|
|
70
|
+
"@tanstack/openai-base": "^1.0.3"
|
|
56
71
|
},
|
|
57
72
|
"scripts": {
|
|
58
73
|
"build": "vite build",
|
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
} from '@tanstack/ai'
|
|
6
6
|
import { BaseTextAdapter } from '@tanstack/ai/adapters'
|
|
7
7
|
import { toRunErrorPayload } from '@tanstack/ai/adapter-internals'
|
|
8
|
-
import { resolveBedrockAuth } from '../utils/auth'
|
|
8
|
+
import { importOptionalPeer, resolveBedrockAuth } from '../utils/auth'
|
|
9
9
|
import {
|
|
10
10
|
toConverseMessages,
|
|
11
11
|
toolBlocksToText,
|
|
@@ -148,7 +148,7 @@ export class BedrockConverseTextAdapter<
|
|
|
148
148
|
*/
|
|
149
149
|
protected importBedrockRuntime(): Promise<typeof BedrockRuntime> {
|
|
150
150
|
const mod = '@aws-sdk/client-bedrock-runtime'
|
|
151
|
-
return
|
|
151
|
+
return importOptionalPeer<typeof BedrockRuntime>(mod)
|
|
152
152
|
}
|
|
153
153
|
|
|
154
154
|
/**
|
|
@@ -476,7 +476,8 @@ export class BedrockConverseTextAdapter<
|
|
|
476
476
|
finishReason =
|
|
477
477
|
stopReason === 'max_tokens'
|
|
478
478
|
? 'length'
|
|
479
|
-
: stopReason === 'content_filtered'
|
|
479
|
+
: stopReason === 'content_filtered' ||
|
|
480
|
+
stopReason === 'guardrail_intervened'
|
|
480
481
|
? 'content_filter'
|
|
481
482
|
: 'stop'
|
|
482
483
|
continue
|
|
@@ -532,18 +533,20 @@ export class BedrockConverseTextAdapter<
|
|
|
532
533
|
}
|
|
533
534
|
|
|
534
535
|
if (accumulatedRaw.length === 0) {
|
|
536
|
+
const blocked = finishReason === 'content_filter'
|
|
537
|
+
const message = blocked
|
|
538
|
+
? `${this.name}.structuredOutputStream: the response was blocked by a content filter`
|
|
539
|
+
: `${this.name}.structuredOutputStream: response contained no content`
|
|
540
|
+
const code = blocked ? 'content_filter' : 'empty-response'
|
|
535
541
|
yield {
|
|
536
542
|
type: EventType.RUN_ERROR,
|
|
537
543
|
metadata: this.sourceMetadata(chatOptions.model),
|
|
538
544
|
runId,
|
|
539
545
|
model: chatOptions.model,
|
|
540
546
|
timestamp: Date.now(),
|
|
541
|
-
message
|
|
542
|
-
code
|
|
543
|
-
error: {
|
|
544
|
-
message: `${this.name}.structuredOutputStream: response contained no content`,
|
|
545
|
-
code: 'empty-response',
|
|
546
|
-
},
|
|
547
|
+
message,
|
|
548
|
+
code,
|
|
549
|
+
error: { message, code },
|
|
547
550
|
...(usage && { usage }),
|
|
548
551
|
}
|
|
549
552
|
return
|
|
@@ -553,17 +556,24 @@ export class BedrockConverseTextAdapter<
|
|
|
553
556
|
try {
|
|
554
557
|
parsed = JSON.parse(accumulatedRaw)
|
|
555
558
|
} catch {
|
|
559
|
+
const blocked = finishReason === 'content_filter'
|
|
560
|
+
const message = blocked
|
|
561
|
+
? `${this.name}.structuredOutputStream: the response was blocked by a content filter`
|
|
562
|
+
: `Failed to parse structured output as JSON. Content: ${accumulatedRaw.slice(0, 200)}${accumulatedRaw.length > 200 ? '...' : ''}`
|
|
563
|
+
const code = blocked ? 'content_filter' : 'parse-error'
|
|
556
564
|
yield {
|
|
557
565
|
type: EventType.RUN_ERROR,
|
|
558
566
|
metadata: this.sourceMetadata(chatOptions.model),
|
|
559
567
|
runId,
|
|
560
568
|
model: chatOptions.model,
|
|
561
569
|
timestamp: Date.now(),
|
|
562
|
-
message
|
|
563
|
-
code
|
|
570
|
+
message,
|
|
571
|
+
code,
|
|
564
572
|
error: {
|
|
565
|
-
message:
|
|
566
|
-
|
|
573
|
+
message: blocked
|
|
574
|
+
? message
|
|
575
|
+
: 'Failed to parse structured output as JSON',
|
|
576
|
+
code,
|
|
567
577
|
},
|
|
568
578
|
...(usage && { usage }),
|
|
569
579
|
}
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
resolveEmbeddingInput,
|
|
7
7
|
unsupportedFileSourceError,
|
|
8
8
|
} from '@tanstack/ai'
|
|
9
|
-
import { resolveBedrockAuth } from '../utils/auth'
|
|
9
|
+
import { importOptionalPeer, resolveBedrockAuth } from '../utils/auth'
|
|
10
10
|
import { BEDROCK_EMBEDDING_MODELS } from '../model-meta'
|
|
11
11
|
import type * as BedrockRuntime from '@aws-sdk/client-bedrock-runtime'
|
|
12
12
|
import type {
|
|
@@ -104,7 +104,7 @@ export class BedrockEmbeddingAdapter<
|
|
|
104
104
|
*/
|
|
105
105
|
protected importBedrockRuntime(): Promise<typeof BedrockRuntime> {
|
|
106
106
|
const mod = '@aws-sdk/client-bedrock-runtime'
|
|
107
|
-
return
|
|
107
|
+
return importOptionalPeer<typeof BedrockRuntime>(mod)
|
|
108
108
|
}
|
|
109
109
|
|
|
110
110
|
/**
|