-
-
Notifications
You must be signed in to change notification settings - Fork 13.4k
✨ feat: add claude 3 to bedrock provider #1551
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0f8ee3e
:sparkles: feat: new claude 3 models in bedrock
danielglh 853ca52
:sparkles: support claude 3 params and stream handling
danielglh e6745a3
:recycle: fix: remove useless condition check
danielglh 30ccd9a
:sparkles: feat: add haiku to both bedrock and anthropic provider
danielglh File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,217 @@ | ||
// @vitest-environment node | ||
import { Mock, afterEach, beforeEach, describe, expect, it, vi } from 'vitest'; | ||
|
||
import { | ||
InvokeModelWithResponseStreamCommand, | ||
} from '@aws-sdk/client-bedrock-runtime'; | ||
import * as debugStreamModule from '../utils/debugStream'; | ||
import { LobeBedrockAI } from './index'; | ||
|
||
const provider = 'bedrock'; | ||
|
||
// Mock the console.error to avoid polluting test output | ||
vi.spyOn(console, 'error').mockImplementation(() => {}); | ||
|
||
vi.mock("@aws-sdk/client-bedrock-runtime", async (importOriginal) => { | ||
const module = await importOriginal(); | ||
return { | ||
...(module as any), | ||
InvokeModelWithResponseStreamCommand: vi.fn() | ||
} | ||
}) | ||
|
||
let instance: LobeBedrockAI; | ||
|
||
beforeEach(() => { | ||
instance = new LobeBedrockAI({ | ||
region: 'us-west-2', | ||
accessKeyId: 'test-access-key-id', | ||
accessKeySecret: 'test-access-key-secret', | ||
}); | ||
|
||
vi.spyOn(instance['client'], 'send').mockReturnValue(new ReadableStream() as any); | ||
}); | ||
|
||
afterEach(() => { | ||
vi.clearAllMocks(); | ||
}); | ||
|
||
describe('LobeBedrockAI', () => { | ||
describe('init', () => { | ||
it('should correctly initialize with AWS credentials', async () => { | ||
const instance = new LobeBedrockAI({ | ||
region: 'us-west-2', | ||
accessKeyId: 'test-access-key-id', | ||
accessKeySecret: 'test-access-key-secret', | ||
}); | ||
expect(instance).toBeInstanceOf(LobeBedrockAI); | ||
}); | ||
}); | ||
|
||
describe('chat', () => { | ||
|
||
describe('Claude model', () => { | ||
|
||
it('should return a Response on successful API call', async () => { | ||
const result = await instance.chat({ | ||
messages: [{ content: 'Hello', role: 'user' }], | ||
model: 'anthropic.claude-v2:1', | ||
temperature: 0, | ||
}); | ||
|
||
// Assert | ||
expect(result).toBeInstanceOf(Response); | ||
}); | ||
|
||
it('should handle text messages correctly', async () => { | ||
// Arrange | ||
const mockStream = new ReadableStream({ | ||
start(controller) { | ||
controller.enqueue('Hello, world!'); | ||
controller.close(); | ||
}, | ||
}); | ||
const mockResponse = Promise.resolve(mockStream); | ||
(instance['client'].send as Mock).mockResolvedValue(mockResponse); | ||
|
||
// Act | ||
const result = await instance.chat({ | ||
messages: [{ content: 'Hello', role: 'user' }], | ||
model: 'anthropic.claude-v2:1', | ||
temperature: 0, | ||
top_p: 1, | ||
}); | ||
|
||
// Assert | ||
expect(InvokeModelWithResponseStreamCommand).toHaveBeenCalledWith({ | ||
accept: 'application/json', | ||
body: JSON.stringify({ | ||
anthropic_version: "bedrock-2023-05-31", | ||
max_tokens: 4096, | ||
messages: [{ content: 'Hello', role: 'user' }], | ||
temperature: 0, | ||
top_p: 1, | ||
}), | ||
contentType: 'application/json', | ||
modelId: 'anthropic.claude-v2:1', | ||
}); | ||
expect(result).toBeInstanceOf(Response); | ||
}); | ||
|
||
it('should handle system prompt correctly', async () => { | ||
// Arrange | ||
const mockStream = new ReadableStream({ | ||
start(controller) { | ||
controller.enqueue('Hello, world!'); | ||
controller.close(); | ||
}, | ||
}); | ||
const mockResponse = Promise.resolve(mockStream); | ||
(instance['client'].send as Mock).mockResolvedValue(mockResponse); | ||
|
||
// Act | ||
const result = await instance.chat({ | ||
messages: [ | ||
{ content: 'You are an awesome greeter', role: 'system' }, | ||
{ content: 'Hello', role: 'user' }, | ||
], | ||
model: 'anthropic.claude-v2:1', | ||
temperature: 0, | ||
top_p: 1, | ||
}); | ||
|
||
// Assert | ||
expect(InvokeModelWithResponseStreamCommand).toHaveBeenCalledWith({ | ||
accept: 'application/json', | ||
body: JSON.stringify({ | ||
anthropic_version: "bedrock-2023-05-31", | ||
max_tokens: 4096, | ||
messages: [{ content: 'Hello', role: 'user' }], | ||
system: 'You are an awesome greeter', | ||
temperature: 0, | ||
top_p: 1, | ||
}), | ||
contentType: 'application/json', | ||
modelId: 'anthropic.claude-v2:1', | ||
}); | ||
expect(result).toBeInstanceOf(Response); | ||
}); | ||
|
||
it('should call Anthropic model with supported opions', async () => { | ||
// Arrange | ||
const mockStream = new ReadableStream({ | ||
start(controller) { | ||
controller.enqueue('Hello, world!'); | ||
controller.close(); | ||
}, | ||
}); | ||
const mockResponse = Promise.resolve(mockStream); | ||
(instance['client'].send as Mock).mockResolvedValue(mockResponse); | ||
|
||
// Act | ||
const result = await instance.chat({ | ||
max_tokens: 2048, | ||
messages: [{ content: 'Hello', role: 'user' }], | ||
model: 'anthropic.claude-v2:1', | ||
temperature: 0.5, | ||
top_p: 1, | ||
}); | ||
|
||
// Assert | ||
expect(InvokeModelWithResponseStreamCommand).toHaveBeenCalledWith({ | ||
accept: 'application/json', | ||
body: JSON.stringify({ | ||
anthropic_version: "bedrock-2023-05-31", | ||
max_tokens: 2048, | ||
messages: [{ content: 'Hello', role: 'user' }], | ||
temperature: 0.5, | ||
top_p: 1, | ||
}), | ||
contentType: 'application/json', | ||
modelId: 'anthropic.claude-v2:1', | ||
}); | ||
expect(result).toBeInstanceOf(Response); | ||
}); | ||
|
||
it('should call Anthropic model without unsupported opions', async () => { | ||
// Arrange | ||
const mockStream = new ReadableStream({ | ||
start(controller) { | ||
controller.enqueue('Hello, world!'); | ||
controller.close(); | ||
}, | ||
}); | ||
const mockResponse = Promise.resolve(mockStream); | ||
(instance['client'].send as Mock).mockResolvedValue(mockResponse); | ||
|
||
// Act | ||
const result = await instance.chat({ | ||
frequency_penalty: 0.5, // Unsupported option | ||
max_tokens: 2048, | ||
messages: [{ content: 'Hello', role: 'user' }], | ||
model: 'anthropic.claude-v2:1', | ||
presence_penalty: 0.5, | ||
temperature: 0.5, | ||
top_p: 1, | ||
}); | ||
|
||
// Assert | ||
expect(InvokeModelWithResponseStreamCommand).toHaveBeenCalledWith({ | ||
accept: 'application/json', | ||
body: JSON.stringify({ | ||
anthropic_version: "bedrock-2023-05-31", | ||
max_tokens: 2048, | ||
messages: [{ content: 'Hello', role: 'user' }], | ||
temperature: 0.5, | ||
top_p: 1, | ||
}), | ||
contentType: 'application/json', | ||
modelId: 'anthropic.claude-v2:1', | ||
}); | ||
expect(result).toBeInstanceOf(Response); | ||
}); | ||
|
||
}); | ||
|
||
}); | ||
}); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.