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

Fix interaction with Anthropic models when using it via zed.dev (#15009)

Browse source 
Release Notes:

- N/A

---------

Co-authored-by: Bennet <bennet@zed.dev>
This commit is contained in:
Antonio Scandurra 2024-07-23 15:47:38 +02:00 • committed by GitHub
parent dde9d37cf9
commit 728650f94a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

31
crates/completion/src/cloud.rs
View file

@ -101,7 +101,7 @@ impl LanguageModelCompletionProvider for CloudCompletionProvider {
request: LanguageModelRequest,
cx: &AppContext,
) -> BoxFuture<'static, Result<usize>> {
match request.model {
match &request.model {
LanguageModel::Cloud(CloudModel::Gpt4)
| LanguageModel::Cloud(CloudModel::Gpt4Turbo)
| LanguageModel::Cloud(CloudModel::Gpt4Omni)
@ -118,19 +118,24 @@ impl LanguageModelCompletionProvider for CloudCompletionProvider {
count_open_ai_tokens(request, cx.background_executor())
}
LanguageModel::Cloud(CloudModel::Custom { name, .. }) => {
let request = self.client.request(proto::CountTokensWithLanguageModel {
model: name,
messages: request
.messages
.iter()
.map(|message| message.to_proto())
.collect(),
});
async move {
let response = request.await?;
Ok(response.token_count as usize)
if name.starts_with("anthropic/") {
// Can't find a tokenizer for Anthropic models, so for now just use the same as OpenAI's as an approximation.
count_open_ai_tokens(request, cx.background_executor())
} else {
let request = self.client.request(proto::CountTokensWithLanguageModel {
model: name.clone(),
messages: request
.messages
.iter()
.map(|message| message.to_proto())
.collect(),
});
async move {
let response = request.await?;
Ok(response.token_count as usize)
}
.boxed()
}
.boxed()
}
_ => future::ready(Err(anyhow!("invalid model"))).boxed(),
}