Skip to content

feat(ai-bedrock): add AWS Bedrock adapter with ConverseStream and tool-calling support #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
srmurali002 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(ai-bedrock): add AWS Bedrock adapter with ConverseStream and tool-calling support #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19bb9b9
feat(ai-bedrock): add AWS Bedrock adapter with ConverseStream and too…
srmurali002 Jan 12, 2026
72e5969
Update packages/typescript/ai-bedrock/package.json
srmurali002 Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/bedrock-adapter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@tanstack/ai-bedrock": minor
---

Add Amazon Bedrock adapter.
33 changes: 25 additions & 8 deletions knip.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
{
"$schema": "https://unpkg.com/knip@5/schema.json",
"ignoreDependencies": ["@faker-js/faker"],
"ignoreWorkspaces": ["examples/**", "testing/**", "**/smoke-tests/**"],
"ignoreDependencies": [
"@faker-js/faker"
],
"ignoreWorkspaces": [
"examples/**",
"testing/**",
"**/smoke-tests/**"
],
"ignore": [
"packages/typescript/ai-bedrock/live-tests/**",
"packages/typescript/ai-openai/live-tests/**",
"packages/typescript/ai-openai/src/**/*.test.ts",
"packages/typescript/ai-openai/src/audio/audio-provider-options.ts",
Expand All @@ -19,19 +26,29 @@
"ignore": []
},
"packages/typescript/ai-anthropic": {
"ignore": ["src/tools/**"]
"ignore": [
"src/tools/**"
]
},
"packages/typescript/ai-gemini": {
"ignore": ["src/tools/**"]
"ignore": [
"src/tools/**"
]
},
"packages/typescript/ai-openai": {
"ignore": ["src/tools/**"]
"ignore": [
"src/tools/**"
]
},
"packages/typescript/ai-react-ui": {
"ignoreDependencies": ["react-dom"]
"ignoreDependencies": [
"react-dom"
]
},
"packages/typescript/ai-vue-ui": {
"ignore": ["src/use-chat-context.ts"]
"ignore": [
"src/use-chat-context.ts"
]
}
}
}
}
36 changes: 36 additions & 0 deletions packages/typescript/ai-bedrock/live-tests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# Bedrock Live Tests

These tests verify that the Bedrock adapter correctly handles tool calling and multimodal inputs with various models (Nova, Claude).

## Setup

1. Create a `.env.local` file in this directory with your AWS credentials:

```
AWS_ACCESS_KEY_ID=...
AWS_SECRET_ACCESS_KEY=...
AWS_REGION=us-east-1
```

2. Install dependencies:
```bash
pnpm install
```

## Tests

### `tool-test.ts`
Tests basic tool calling with Claude 3.5 Sonnet.

### `tool-test-nova.ts`
Tests Amazon Nova Pro with multimodal inputs (if applicable) and tool calling.

## Running Tests

```bash
# Run Claude tool test
pnpm test

# Run Nova tool test
pnpm test:nova
```
15 changes: 15 additions & 0 deletions packages/typescript/ai-bedrock/live-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "@tanstack/ai-bedrock-live-tests",
"version": "0.0.1",
"private": true,
"type": "module",
"scripts": {
"test": "tsx tool-test.ts",
"test:nova": "tsx tool-test-nova.ts"
},
"devDependencies": {
"tsx": "^4.7.1",
"typescript": "^5.4.2",
"zod": "^4.2.1"
}
}
86 changes: 86 additions & 0 deletions packages/typescript/ai-bedrock/live-tests/tool-test-haiku.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
// import 'dotenv/config'
import { bedrockText } from '../src/bedrock-chat'
import { z } from 'zod'
import { chat } from '@tanstack/ai'

function throwMissingEnv(name: string): never {
throw new Error(`Missing required environment variable: ${name}`)
}

async function main() {
const accessKeyId = process.env.AWS_ACCESS_KEY_ID ?? throwMissingEnv('AWS_ACCESS_KEY_ID')
const secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY ?? throwMissingEnv('AWS_SECRET_ACCESS_KEY')

const modelId = 'anthropic.claude-haiku-4-5-20251001-v1:0'
console.log(`Running tool test for: ${modelId}`)

const stream = await chat({
adapter: bedrockText(modelId, {
region: process.env.AWS_REGION || 'us-east-1',
credentials: {
accessKeyId,
secretAccessKey,
},
}),
modelOptions: {
thinking: {
type: 'enabled',
budget_tokens: 1024
}
},
messages: [
{
role: 'user',
content: 'Use the `get_weather` tool to find the weather in New York and explain it.',
},
],
tools: [
{
name: 'get_weather',
description: 'Get the current weather in a location',
inputSchema: z.object({
location: z.string().describe('The city and state, e.g. New York, NY'),
}),
execute: async ({ location }) => {
console.log(`\n[TOOL Weather] Fetching weather for ${location}...`)
return {
temperature: 45,
unit: 'F',
condition: 'Cloudy',
}
},
},
],
stream: true
})

let finalContent = ''
let hasThinking = false
let toolCallCount = 0

console.log('--- Stream Output ---')
for await (const chunk of stream) {
if (chunk.type === 'thinking') {
hasThinking = true
} else if (chunk.type === 'content') {
process.stdout.write(chunk.delta)
finalContent += chunk.delta
} else if (chunk.type === 'tool_call') {
toolCallCount++
}
}

console.log('--- Results ---')
console.log('Thinking:', hasThinking)
console.log('Tool calls:', toolCallCount)
console.log('Content length:', finalContent.length)

if (!finalContent || finalContent.trim().length === 0) {
console.error('Test failed: No final content')
process.exit(1)
}

console.log('Test passed')
}

main().catch(console.error)
105 changes: 105 additions & 0 deletions packages/typescript/ai-bedrock/live-tests/tool-test-nova.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
import { bedrockText } from '../src/index'
import { z } from 'zod'
import { readFileSync } from 'fs'
import { join, dirname } from 'path'
import { fileURLToPath } from 'url'
import { chat } from '@tanstack/ai'

// Load environment variables from .env.local manually
const __dirname = dirname(fileURLToPath(import.meta.url))
try {
const envContent = readFileSync(join(__dirname, '.env.local'), 'utf-8')
envContent.split('\n').forEach((line) => {
const match = line.match(/^([^=]+)=(.*)$/)
if (match) {
process.env[match[1].trim()] = match[2].trim()
}
})
} catch (e) {
// .env.local not found
}

function throwMissingEnv(name: string): never {
throw new Error(`Missing required environment variable: ${name}`)
}

async function testBedrockNovaToolCalling() {
console.log('Testing Bedrock tool calling (Amazon Nova Pro)\n')

const accessKeyId = process.env.AWS_ACCESS_KEY_ID ?? throwMissingEnv('AWS_ACCESS_KEY_ID')
const secretAccessKey = process.env.AWS_SECRET_ACCESS_KEY ?? throwMissingEnv('AWS_SECRET_ACCESS_KEY')

const stream = await chat({
adapter: bedrockText('us.amazon.nova-pro-v1:0', {
region: process.env.AWS_REGION || 'us-east-1',
credentials: {
accessKeyId,
secretAccessKey,
}
}),
messages: [
{
role: 'user',
content: 'Use the `get_temperature` tool to find the temperature in New York and explain why it is the way it is.',
},
],
tools: [
{
name: 'get_temperature',
description: 'Get the current temperature for a specific location',
inputSchema: z.object({
location: z.string().describe('The city or location'),
unit: z.enum(['celsius', 'fahrenheit']).describe('The temperature unit'),
}),
execute: async ({ location, unit }: { location: string; unit: string }) => {
console.log(`\n[TOOL Temperature] Fetching for ${location}...`)
return {
temperature: 45,
unit: unit,
condition: 'Cloudy',
}
},
},
],
stream: true,
})

let finalContent = ''
let hasThinking = false
let toolCallCount = 0

console.log('--- Stream Output ---')
for await (const chunk of stream) {
if (chunk.type === 'thinking') {
hasThinking = true
} else if (chunk.type === 'content') {
process.stdout.write(chunk.delta)
finalContent += chunk.delta
} else if (chunk.type === 'tool_call') {
toolCallCount++
}
}

console.log('--- Test Results ---')
console.log('Thinking detected:', hasThinking)
console.log('Tool calls:', toolCallCount)
console.log('Final content length:', finalContent.length)

if (!hasThinking) {
console.warn('Warning: No thinking blocks detected')
}

if (finalContent.includes('<thinking>')) {
console.error('Test failed: Thinking tags found in final content')
process.exit(1)
}

if (!finalContent || finalContent.trim().length === 0) {
console.error('Test failed: No final content - model should explain the temperature')
process.exit(1)
}
Comment on lines +83 to +100
Copy link
Contributor

@coderabbitai coderabbitai bot Jan 19, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Consider asserting that the tool was actually invoked.

This test specifically validates "Bedrock tool calling" but doesn't assert that toolCallCount > 0. The test could pass even if the model responds without calling the tool, missing the core behavior under test.

🐛 Suggested assertion 
     console.log('--- Test Results ---')
     console.log('Thinking detected:', hasThinking)
     console.log('Tool calls:', toolCallCount)
     console.log('Final content length:', finalContent.length)

+    if (toolCallCount === 0) {
+        console.error('Test failed: No tool calls detected - model should have called get_temperature')
+        process.exit(1)
+    }
+
     if (!hasThinking) {
         console.warn('Warning: No thinking blocks detected')
     }
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
console.log('--- Test Results ---')
console.log('Thinking detected:', hasThinking)
console.log('Tool calls:', toolCallCount)
console.log('Final content length:', finalContent.length)
if (!hasThinking) {
console.warn('Warning: No thinking blocks detected')
}
if (finalContent.includes('<thinking>')) {
console.error('Test failed: Thinking tags found in final content')
process.exit(1)
}
if (!finalContent || finalContent.trim().length === 0) {
console.error('Test failed: No final content - model should explain the temperature')
process.exit(1)
}
console.log('--- Test Results ---')
console.log('Thinking detected:', hasThinking)
console.log('Tool calls:', toolCallCount)
console.log('Final content length:', finalContent.length)
if (toolCallCount === 0) {
console.error('Test failed: No tool calls detected - model should have called get_temperature')
process.exit(1)
}
if (!hasThinking) {
console.warn('Warning: No thinking blocks detected')
}
if (finalContent.includes('<thinking>')) {
console.error('Test failed: Thinking tags found in final content')
process.exit(1)
}
if (!finalContent || finalContent.trim().length === 0) {
console.error('Test failed: No final content - model should explain the temperature')
process.exit(1)
}
🤖 Prompt for AI Agents 
In `@packages/typescript/ai-bedrock/live-tests/tool-test-nova.ts` around lines 83
- 100, Test does not assert that the tool was invoked; add an assertion that
toolCallCount > 0 after computing toolCallCount (alongside existing checks for
hasThinking and finalContent) so the test fails if no tool calls occurred.
Locate the variables toolCallCount, hasThinking, and finalContent in this test
and, after the console logs, add a guard that logs an error like "Test failed:
No tool calls - model must call the tool" and calls process.exit(1) when
toolCallCount <= 0 (or alternatively throw an assertion error) to ensure the
Bedrock tool-calling behavior is actually validated.


console.log('Test passed')
}

testBedrockNovaToolCalling().catch(console.error)
Loading