Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bedrock: Use Claude 3.0 Haiku where Haiku 3.5 is not available (#33214)

Browse source 
Closes: https://github.com/zed-industries/zed/issues/33183

@kuzaxak Can you confirm this works for you?

Release Notes:

- bedrock: Use Anthropic Haiku 3.0 in AWS regions where Haiku 3.5 is
unavailable
This commit is contained in:
Peter Tripp 2025-06-22 15:15:20 -04:00 • committed by GitHub
parent 1047d8adec
commit 595f61f0d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/bedrock/src/models.rs
View file

@ -108,8 +108,12 @@ pub enum Model {
} }
impl Model { impl Model {
pub fn default_fast() -> Self { pub fn default_fast(region: &str) -> Self {
Self::Claude3_5Haiku if region.starts_with("us-") {
Self::Claude3_5Haiku
} else {
Self::Claude3Haiku
}
} }
pub fn from_id(id: &str) -> anyhow::Result<Self> { pub fn from_id(id: &str) -> anyhow::Result<Self> {

33
crates/language_models/src/provider/bedrock.rs
View file

@ -229,6 +229,17 @@ impl State {
Ok(()) Ok(())
}) })
} }
fn get_region(&self) -> String {
// Get region - from credentials or directly from settings
let credentials_region = self.credentials.as_ref().map(|s| s.region.clone());
let settings_region = self.settings.as_ref().and_then(|s| s.region.clone());
// Use credentials region if available, otherwise use settings region, finally fall back to default
credentials_region
.or(settings_region)
.unwrap_or(String::from("us-east-1"))
}
} }
pub struct BedrockLanguageModelProvider { pub struct BedrockLanguageModelProvider {
@ -289,8 +300,9 @@ impl LanguageModelProvider for BedrockLanguageModelProvider {
Some(self.create_language_model(bedrock::Model::default())) Some(self.create_language_model(bedrock::Model::default()))
} }
fn default_fast_model(&self, _cx: &App) -> Option<Arc<dyn LanguageModel>> { fn default_fast_model(&self, cx: &App) -> Option<Arc<dyn LanguageModel>> {
Some(self.create_language_model(bedrock::Model::default_fast())) let region = self.state.read(cx).get_region();
Some(self.create_language_model(bedrock::Model::default_fast(region.as_str())))
} }
fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> { fn provided_models(&self, cx: &App) -> Vec<Arc<dyn LanguageModel>> {
@ -377,11 +389,7 @@ impl BedrockModel {
let endpoint = state.settings.as_ref().and_then(|s| s.endpoint.clone()); let endpoint = state.settings.as_ref().and_then(|s| s.endpoint.clone());
let region = state let region = state.get_region();
.settings
.as_ref()
.and_then(|s| s.region.clone())
.unwrap_or(String::from("us-east-1"));
( (
auth_method, auth_method,
@ -530,16 +538,7 @@ impl LanguageModel for BedrockModel {
LanguageModelCompletionError, LanguageModelCompletionError,
>, >,
> { > {
let Ok(region) = cx.read_entity(&self.state, |state, _cx| { let Ok(region) = cx.read_entity(&self.state, |state, _cx| state.get_region()) else {
// Get region - from credentials or directly from settings
let credentials_region = state.credentials.as_ref().map(|s| s.region.clone());
let settings_region = state.settings.as_ref().and_then(|s| s.region.clone());
// Use credentials region if available, otherwise use settings region, finally fall back to default
credentials_region
.or(settings_region)
.unwrap_or(String::from("us-east-1"))
}) else {
return async move { Err(anyhow::anyhow!("App State Dropped").into()) }.boxed(); return async move { Err(anyhow::anyhow!("App State Dropped").into()) }.boxed();
}; };