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

Jump to bottom

assistant: Add Bedrock support #21092

Merged

maxdeviant merged 90 commits into zed-industries:main from 5herlocked:feature/bedrock-provider

Feb 24, 2025

Contributor

5herlocked commented Nov 23, 2024 •

edited by maxdeviant

Loading

Closes #16544

Release Notes:

Added support for AWS Bedrock to the Assistant.

Contributor Author

5herlocked commented Nov 23, 2024

This still needs to be updated to the new method of managing models, going to spend the next couple of weeks migrating to it.

Contributor Author

5herlocked commented Nov 23, 2024 •

edited

Loading

Zed maintainers, would appreciate some guidance on how the ZedPro things are setup and if it makes sense to pass the Bedrock models into it.

On a cursory reading of the feature, i don't believe it does -- however, i am open to working with the bedrock service team to make it a reality.

maxdeviant changed the title ~~feature: Bedrock Cloud Model provider~~ Add Bedrock Cloud Model provider

Member

rgbkrk commented Nov 23, 2024

I don't think you need to pass through the bedrock models through the collab service, as Zed would need to run their own bedrock setup. I'd just do the API key / AWS credentials route.

Contributor

SomeoneToIgnore commented Nov 23, 2024

Unfortunately, our CLA bot is broken, so I have to substitute for it for a while:

We require contributors to sign our Contributor License Agreement, and we don't have @5herlocked on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

Contributor Author

5herlocked commented Nov 23, 2024

Will get it done post a legal review of the docs (just want to make sure AWS doesn't have an issue with it)

Contributor Author

5herlocked commented Nov 25, 2024

notpeter added the cla-signed label

rgbkrk reviewed

View reviewed changes

crates/bedrock/src/bedrock.rs Outdated Show resolved Hide resolved

rgbkrk reviewed

View reviewed changes

crates/collab/src/llm.rs Outdated Show resolved Hide resolved

rgbkrk reviewed

View reviewed changes

crates/language_models/src/provider/cloud.rs Outdated Show resolved Hide resolved

ConradIrwin assigned rgbkrk

Contributor Author

5herlocked commented Jan 17, 2025

Some conversations with the AWS SDK team later, the best recommendation from them is to SigV4 the requests manually and then just interact with the raw API, will pivot to that in the coming weeks.

5herlocked force-pushed the feature/bedrock-provider branch from cd86db4 to 61c31d8 Compare

January 17, 2025 17:30

cla-bot bot commented Jan 17, 2025

We require contributors to sign our Contributor License Agreement, and we don't have @deepsource-io[bot] on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

cla-bot bot removed the cla-signed label

Contributor Author

5herlocked commented Jan 17, 2025

cla-bot bot commented Jan 17, 2025

We require contributors to sign our Contributor License Agreement, and we don't have @deepsource-io[bot] on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

cla-bot bot commented Jan 17, 2025

The cla-bot has been summoned, and re-checked this pull request!

cla-bot bot commented Jan 17, 2025

We require contributors to sign our Contributor License Agreement, and we don't have @deepsource-io[bot] on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

maxdeviant reviewed

View reviewed changes

crates/http_client/Cargo.toml Outdated Show resolved Hide resolved

cla-bot bot commented Jan 19, 2025

We require contributors to sign our Contributor License Agreement, and we don't have @deepsource-io[bot] on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

Contributor Author

5herlocked commented Jan 19, 2025

@SomeoneToIgnore Please call off the cla-bot 😂

Contributor

SomeoneToIgnore commented Jan 20, 2025

I'm afraid I was only able to act like one when it was down.
I suspect you need to alter f798bf4 commit's author or ask that bot to sign the CLA 🙂

cla-bot bot commented Jan 20, 2025

We require contributors to sign our Contributor License Agreement, and we don't have @deepsource-io[bot] on file. You can sign our CLA at https://zed.dev/cla. Once you've signed, post a comment here that says '@cla-bot check'.

5herlocked added 5 commits

January 20, 2025 15:46


          Added Bedrock UI elements, credential storage and a few other things

264ea71


          Compiles with the appropriate UI fields + saves credentials

c8a650f


          Starting the transpose to the Bedrock SDK

db5e220


          Added Bedrock Error enum that transparently exposes SDK Errors as Bed…

4edb624

…rock errors, while also letting us include it


          Had Q Dev rewrite most of the model enums based on the AWS Bedrock li…

46e817a

…st of FMs

5herlocked and others added 10 commits

February 19, 2025 10:56


          Merge branch 'main' into feature/bedrock-provider

a6a0b6c

# Conflicts:
#	crates/language_model/src/request.rs
#	crates/language_models/src/language_models.rs


          Merge catchup, moved gpui_tokio into an optional dependency for works…

23c2e5c

…pace


          Merge branch 'main' into pr/21092

c35c1b8


          Implement default_model for Bedrock

2bda901

Co-authored-by: Anthony <[email protected]>


          Remove gpui_tokio dependency from workspace

388e27b

Co-authored-by: Anthony <[email protected]>


          Sort Cargo.toml entries

d1a4b42

Co-authored-by: Anthony Eid <[email protected]>


          Add trailing newline

bdcf3e3

Co-authored-by: Anthony Eid <[email protected]>


          Resize the Bedrock SVG (with Claude)

d3bcffe

Co-authored-by: Anthony Eid <[email protected]>


          Prompt unwrap to an expect

ad39548

Co-authored-by: Anthony Eid <[email protected]>


          Clean up environment variable constants

4bebd71

Co-authored-by: Anthony Eid <[email protected]>

Contributor Author

5herlocked commented Feb 24, 2025

The feature feels stable, I've been using it for weeks -- and I've got 3-4 internal AWS folks testing the macos build for a similar duration

Once y'all think the feature + code is good to go, feel free to send it 🫡

maxdeviant mentioned this pull request

Add aws_http_client and bedrock crates #25490

Merged

Member

maxdeviant commented Feb 24, 2025

The feature feels stable, I've been using it for weeks -- and I've got 3-4 internal AWS folks testing the macos build for a similar duration

Once y'all think the feature + code is good to go, feel free to send it 🫡

Thank you for all the work on this!

I'm looking to get it merged now. Hoping to have it done in the next day or two.

maxdeviant added a commit that referenced this pull request


          Add aws_http_client and bedrock crates (#25490)

cdd07fd

This PR adds new `aws_http_client` and `bedrock` crates for supporting
AWS Bedrock.

Pulling out of #21092 to make
it easier to land.

Release Notes:

- N/A

---------

Co-authored-by: Shardul Vaidya <[email protected]>
Co-authored-by: Anthony Eid <[email protected]>

maxdeviant added 9 commits

February 24, 2025 15:31


          Merge branch 'main' into pr/21092

47b0a0b


          Revert changes to gpui_tokio

38d4096


          Do some more clean up

41cffec


          Use CredentialsProvider

f1f4557


          Move changes out of language_model and put them in language_models


          Insert in alphabetical order

0384a27


          Merge branch 'main' into pr/21092

0b5b157


          Merge branch 'main' into pr/21092

963419c


          Run gpui_tokio::init in tests

14d2b45

maxdeviant changed the title ~~Add Bedrock Cloud Model provider~~ assistant: Add Bedrock support

maxdeviant assigned maxdeviant and unassigned rgbkrk

maxdeviant dismissed mikayla-maki’s stale review

February 24, 2025 23:01

Resolved.

maxdeviant approved these changes

View reviewed changes

Member

maxdeviant left a comment

🚀

maxdeviant merged commit eda2333 into zed-industries:main

14 checks passed

ChrisDryden mentioned this pull request

Add support for Amazon Bedrock from AWS getcursor/cursor#1249

Open

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels