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

Switch GitHub Copilot Chat from o1-mini to o3-mini (#24080)

Browse source 
Co-authored-by: SkywardSyntax <87048477+SkywardSyntax@users.noreply.github.com>
This commit is contained in:
Peter Tripp 2025-02-01 12:49:24 -05:00 • committed by GitHub
parent af461f8165
commit 2f82374926
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/copilot/src/copilot_chat.rs
View file

@ -36,8 +36,8 @@ pub enum Model {
Gpt3_5Turbo, Gpt3_5Turbo,
#[serde(alias = "o1", rename = "o1")] #[serde(alias = "o1", rename = "o1")]
O1, O1,
#[serde(alias = "o1-mini", rename = "o1-mini")] #[serde(alias = "o1-mini", rename = "o3-mini")]
O1Mini, O3Mini,
#[serde(alias = "claude-3-5-sonnet", rename = "claude-3.5-sonnet")] #[serde(alias = "claude-3-5-sonnet", rename = "claude-3.5-sonnet")]
Claude3_5Sonnet, Claude3_5Sonnet,
} }
@ -46,7 +46,7 @@ impl Model {
pub fn uses_streaming(&self) -> bool { pub fn uses_streaming(&self) -> bool {
match self { match self {
Self::Gpt4o | Self::Gpt4 | Self::Gpt3_5Turbo | Self::Claude3_5Sonnet => true, Self::Gpt4o | Self::Gpt4 | Self::Gpt3_5Turbo | Self::Claude3_5Sonnet => true,
Self::O1Mini | Self::O1 => false, Self::O3Mini | Self::O1 => false,
} }
} }
@ -56,7 +56,7 @@ impl Model {
"gpt-4" => Ok(Self::Gpt4), "gpt-4" => Ok(Self::Gpt4),
"gpt-3.5-turbo" => Ok(Self::Gpt3_5Turbo), "gpt-3.5-turbo" => Ok(Self::Gpt3_5Turbo),
"o1" => Ok(Self::O1), "o1" => Ok(Self::O1),
"o1-mini" => Ok(Self::O1Mini), "o3-mini" => Ok(Self::O3Mini),
"claude-3-5-sonnet" => Ok(Self::Claude3_5Sonnet), "claude-3-5-sonnet" => Ok(Self::Claude3_5Sonnet),
_ => Err(anyhow!("Invalid model id: {}", id)), _ => Err(anyhow!("Invalid model id: {}", id)),
} }
@ -67,7 +67,7 @@ impl Model {
Self::Gpt3_5Turbo => "gpt-3.5-turbo", Self::Gpt3_5Turbo => "gpt-3.5-turbo",
Self::Gpt4 => "gpt-4", Self::Gpt4 => "gpt-4",
Self::Gpt4o => "gpt-4o", Self::Gpt4o => "gpt-4o",
Self::O1Mini => "o1-mini", Self::O3Mini => "o3-mini",
Self::O1 => "o1", Self::O1 => "o1",
Self::Claude3_5Sonnet => "claude-3-5-sonnet", Self::Claude3_5Sonnet => "claude-3-5-sonnet",
} }
@ -78,7 +78,7 @@ impl Model {
Self::Gpt3_5Turbo => "GPT-3.5", Self::Gpt3_5Turbo => "GPT-3.5",
Self::Gpt4 => "GPT-4", Self::Gpt4 => "GPT-4",
Self::Gpt4o => "GPT-4o", Self::Gpt4o => "GPT-4o",
Self::O1Mini => "o1-mini", Self::O3Mini => "o3-mini",
Self::O1 => "o1", Self::O1 => "o1",
Self::Claude3_5Sonnet => "Claude 3.5 Sonnet", Self::Claude3_5Sonnet => "Claude 3.5 Sonnet",
} }
@ -89,7 +89,7 @@ impl Model {
Self::Gpt4o => 64000, Self::Gpt4o => 64000,
Self::Gpt4 => 32768, Self::Gpt4 => 32768,
Self::Gpt3_5Turbo => 12288, Self::Gpt3_5Turbo => 12288,
Self::O1Mini => 20000, Self::O3Mini => 20000,
Self::O1 => 20000, Self::O1 => 20000,
Self::Claude3_5Sonnet => 200_000, Self::Claude3_5Sonnet => 200_000,
} }

2
crates/language_models/src/provider/copilot_chat.rs
View file

@ -179,7 +179,7 @@ impl LanguageModel for CopilotChatLanguageModel {
CopilotChatModel::Gpt4o => open_ai::Model::FourOmni, CopilotChatModel::Gpt4o => open_ai::Model::FourOmni,
CopilotChatModel::Gpt4 => open_ai::Model::Four, CopilotChatModel::Gpt4 => open_ai::Model::Four,
CopilotChatModel::Gpt3_5Turbo => open_ai::Model::ThreePointFiveTurbo, CopilotChatModel::Gpt3_5Turbo => open_ai::Model::ThreePointFiveTurbo,
CopilotChatModel::O1 | CopilotChatModel::O1Mini => open_ai::Model::Four, CopilotChatModel::O1 | CopilotChatModel::O3Mini => open_ai::Model::Four,
CopilotChatModel::Claude3_5Sonnet => unreachable!(), CopilotChatModel::Claude3_5Sonnet => unreachable!(),
}; };
count_open_ai_tokens(request, model, cx) count_open_ai_tokens(request, model, cx)