diff --git a/crates/copilot/src/copilot_chat.rs b/crates/copilot/src/copilot_chat.rs index da92bf25e21f90f4e1bba18cd79d50570013546d..4391f0a955684cc2d2e5640e6770ad5380f214d6 100644 --- a/crates/copilot/src/copilot_chat.rs +++ b/crates/copilot/src/copilot_chat.rs @@ -34,8 +34,8 @@ pub enum Model { Gpt4, #[serde(alias = "gpt-3.5-turbo", rename = "gpt-3.5-turbo")] Gpt3_5Turbo, - #[serde(alias = "o1-preview", rename = "o1")] - O1Preview, + #[serde(alias = "o1", rename = "o1")] + O1, #[serde(alias = "o1-mini", rename = "o1-mini")] O1Mini, #[serde(alias = "claude-3-5-sonnet", rename = "claude-3.5-sonnet")] @@ -46,7 +46,7 @@ impl Model { pub fn uses_streaming(&self) -> bool { match self { Self::Gpt4o | Self::Gpt4 | Self::Gpt3_5Turbo | Self::Claude3_5Sonnet => true, - Self::O1Mini | Self::O1Preview => false, + Self::O1Mini | Self::O1 => false, } } @@ -55,7 +55,7 @@ impl Model { "gpt-4o" => Ok(Self::Gpt4o), "gpt-4" => Ok(Self::Gpt4), "gpt-3.5-turbo" => Ok(Self::Gpt3_5Turbo), - "o1-preview" => Ok(Self::O1Preview), + "o1" => Ok(Self::O1), "o1-mini" => Ok(Self::O1Mini), "claude-3-5-sonnet" => Ok(Self::Claude3_5Sonnet), _ => Err(anyhow!("Invalid model id: {}", id)), @@ -68,7 +68,7 @@ impl Model { Self::Gpt4 => "gpt-4", Self::Gpt4o => "gpt-4o", Self::O1Mini => "o1-mini", - Self::O1Preview => "o1-preview", + Self::O1 => "o1", Self::Claude3_5Sonnet => "claude-3-5-sonnet", } } @@ -79,7 +79,7 @@ impl Model { Self::Gpt4 => "GPT-4", Self::Gpt4o => "GPT-4o", Self::O1Mini => "o1-mini", - Self::O1Preview => "o1-preview", + Self::O1 => "o1", Self::Claude3_5Sonnet => "Claude 3.5 Sonnet", } } @@ -90,7 +90,7 @@ impl Model { Self::Gpt4 => 32768, Self::Gpt3_5Turbo => 12288, Self::O1Mini => 20000, - Self::O1Preview => 20000, + Self::O1 => 20000, Self::Claude3_5Sonnet => 200_000, } } diff --git a/crates/language_models/src/provider/copilot_chat.rs b/crates/language_models/src/provider/copilot_chat.rs index e35322d7552bc07aff45f0f8db439dae34509470..3f0777a4f635307fac1fccd550db1d2e4570c8ab 100644 --- a/crates/language_models/src/provider/copilot_chat.rs +++ b/crates/language_models/src/provider/copilot_chat.rs @@ -179,7 +179,7 @@ impl LanguageModel for CopilotChatLanguageModel { CopilotChatModel::Gpt4o => open_ai::Model::FourOmni, CopilotChatModel::Gpt4 => open_ai::Model::Four, CopilotChatModel::Gpt3_5Turbo => open_ai::Model::ThreePointFiveTurbo, - CopilotChatModel::O1Preview | CopilotChatModel::O1Mini => open_ai::Model::Four, + CopilotChatModel::O1 | CopilotChatModel::O1Mini => open_ai::Model::Four, CopilotChatModel::Claude3_5Sonnet => unreachable!(), }; count_open_ai_tokens(request, model, cx)