diff --git a/crates/anthropic/src/anthropic.rs b/crates/anthropic/src/anthropic.rs index d6efdff779e386879134607b2339b7d006a911fd..2d9bd311b89b21a56b8b2cdbd602597b148ec7f9 100644 --- a/crates/anthropic/src/anthropic.rs +++ b/crates/anthropic/src/anthropic.rs @@ -100,21 +100,13 @@ impl From for String { #[derive(Debug, Serialize)] pub struct Request { - #[serde(serialize_with = "serialize_request_model")] - pub model: Model, + pub model: String, pub messages: Vec, pub stream: bool, pub system: String, pub max_tokens: u32, } -fn serialize_request_model(model: &Model, serializer: S) -> Result -where - S: serde::Serializer, -{ - serializer.serialize_str(&model.id()) -} - #[derive(Serialize, Deserialize, Debug, Eq, PartialEq)] pub struct RequestMessage { pub role: Role, diff --git a/crates/collab/src/rpc.rs b/crates/collab/src/rpc.rs index 863ac1071b0932565b8fd07cd38f41bc4573c3f0..3ec13ce04573a04c15bb4093f50046026d01ed37 100644 --- a/crates/collab/src/rpc.rs +++ b/crates/collab/src/rpc.rs @@ -4697,8 +4697,6 @@ async fn complete_with_anthropic( session: UserSession, api_key: Arc, ) -> Result<()> { - let model = anthropic::Model::from_id(&request.model)?; - let mut system_message = String::new(); let messages = request .messages @@ -4734,7 +4732,7 @@ async fn complete_with_anthropic( anthropic::ANTHROPIC_API_URL, &api_key, anthropic::Request { - model, + model: request.model, messages, stream: true, system: system_message, diff --git a/crates/completion/src/completion.rs b/crates/completion/src/completion.rs index e2fe9b27c6e01220701f75d420fbf6395a81282e..376f8d9f73466a462980bf9916f740f547cb11b7 100644 --- a/crates/completion/src/completion.rs +++ b/crates/completion/src/completion.rs @@ -27,7 +27,7 @@ pub struct LanguageModelCompletionProvider { const MAX_CONCURRENT_COMPLETION_REQUESTS: usize = 4; pub struct LanguageModelCompletionResponse { - pub inner: BoxStream<'static, Result>, + inner: BoxStream<'static, Result>, _lock: SemaphoreGuardArc, } diff --git a/crates/language_model/src/provider/anthropic.rs b/crates/language_model/src/provider/anthropic.rs index 145d0ec8cf0488073c547ecfa2b0fb1bd28d834b..52ac22b29f33c53d0b871592e184dbc5c78a0d40 100644 --- a/crates/language_model/src/provider/anthropic.rs +++ b/crates/language_model/src/provider/anthropic.rs @@ -174,7 +174,7 @@ impl AnthropicModel { } Request { - model: self.model.clone(), + model: self.model.id().to_string(), messages: request .messages .iter()