diff --git a/Cargo.lock b/Cargo.lock index 8b5ad1b64a..fb3e154d28 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -240,9 +240,9 @@ checksum = "e78f17bacc1bc7b91fef7b1885c10772eb2b9e4e989356f6f0f6a972240f97cd" [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" [[package]] name = "approx" @@ -1301,7 +1301,7 @@ checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" dependencies = [ "async-trait", "axum-core", - "base64 0.21.4", + "base64 0.21.7", "bitflags 1.3.2", "bytes 1.5.0", "futures-util", @@ -1396,9 +1396,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" @@ -3836,9 +3836,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fancy-regex" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2" +checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" dependencies = [ "bit-set", "regex", @@ -4854,7 +4854,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bytes 1.5.0", "headers-core", "http 0.2.9", @@ -7384,7 +7384,7 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a4a0cfc5fb21a09dc6af4bf834cf10d4a32fccd9e2ea468c4b1751a097487aa" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "indexmap 1.9.3", "line-wrap", "quick-xml 0.30.0", @@ -8184,7 +8184,7 @@ version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", "bytes 1.5.0", "encoding_rs", "futures-core", @@ -8566,7 +8566,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.4", + "base64 0.21.7", ] [[package]] @@ -9577,7 +9577,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ "atoi", - "base64 0.21.4", + "base64 0.21.7", "bigdecimal", "bitflags 2.4.2", "byteorder", @@ -9624,7 +9624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ "atoi", - "base64 0.21.4", + "base64 0.21.7", "bigdecimal", "bitflags 2.4.2", "byteorder", @@ -10346,12 +10346,12 @@ dependencies = [ [[package]] name = "tiktoken-rs" -version = "0.5.7" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4427b6b1c6b38215b92dd47a83a0ecc6735573d0a5a4c14acc0ac5b33b28adb" +checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" dependencies = [ "anyhow", - "base64 0.21.4", + "base64 0.21.7", "bstr", "fancy-regex", "lazy_static", diff --git a/Cargo.toml b/Cargo.toml index b4745c2ffb..84d0010f38 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -337,7 +337,7 @@ subtle = "2.5.0" sysinfo = "0.30.7" tempfile = "3.9.0" thiserror = "1.0.29" -tiktoken-rs = "0.5.7" +tiktoken-rs = "0.5.9" time = { version = "0.3", features = [ "macros", "parsing", diff --git a/crates/assistant/src/completion_provider/open_ai.rs b/crates/assistant/src/completion_provider/open_ai.rs index b456f3e08a..536ce88837 100644 --- a/crates/assistant/src/completion_provider/open_ai.rs +++ b/crates/assistant/src/completion_provider/open_ai.rs @@ -204,9 +204,7 @@ pub fn count_open_ai_tokens( .collect::>(); match request.model { - LanguageModel::OpenAi(OpenAiModel::FourOmni) - | LanguageModel::ZedDotDev(ZedDotDevModel::Gpt4Omni) - | LanguageModel::Anthropic(_) + LanguageModel::Anthropic(_) | LanguageModel::ZedDotDev(ZedDotDevModel::Claude3Opus) | LanguageModel::ZedDotDev(ZedDotDevModel::Claude3Sonnet) | LanguageModel::ZedDotDev(ZedDotDevModel::Claude3Haiku) => {