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

open_ai: Move from o1-preview to o1 for OpenAI Assistant provider (#23425)

Browse source 
- Closes: https://github.com/zed-industries/zed/issues/22521
- Follow-up to: https://github.com/zed-industries/zed/pull/22376
This commit is contained in:
Peter Tripp 2025-01-21 15:05:21 -05:00 • committed by GitHub
parent 6eaaced60d
commit c450cd51ea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/open_ai/src/open_ai.rs
View file

@ -72,8 +72,8 @@ pub enum Model {
FourOmni,
#[serde(rename = "gpt-4o-mini", alias = "gpt-4o-mini")]
FourOmniMini,
#[serde(rename = "o1-preview", alias = "o1-preview")]
O1Preview,
#[serde(rename = "o1", alias = "o1-preview")]
O1,
#[serde(rename = "o1-mini", alias = "o1-mini")]
O1Mini,
@ -96,7 +96,7 @@ impl Model {
"gpt-4-turbo-preview" => Ok(Self::FourTurbo),
"gpt-4o" => Ok(Self::FourOmni),
"gpt-4o-mini" => Ok(Self::FourOmniMini),
"o1-preview" => Ok(Self::O1Preview),
"o1" => Ok(Self::O1),
"o1-mini" => Ok(Self::O1Mini),
_ => Err(anyhow!("invalid model id")),
}
@ -109,7 +109,7 @@ impl Model {
Self::FourTurbo => "gpt-4-turbo",
Self::FourOmni => "gpt-4o",
Self::FourOmniMini => "gpt-4o-mini",
Self::O1Preview => "o1-preview",
Self::O1 => "o1",
Self::O1Mini => "o1-mini",
Self::Custom { name, .. } => name,
}
@ -122,7 +122,7 @@ impl Model {
Self::FourTurbo => "gpt-4-turbo",
Self::FourOmni => "gpt-4o",
Self::FourOmniMini => "gpt-4o-mini",
Self::O1Preview => "o1-preview",
Self::O1 => "o1",
Self::O1Mini => "o1-mini",
Self::Custom {
name, display_name, ..
@ -137,7 +137,7 @@ impl Model {
Self::FourTurbo => 128000,
Self::FourOmni => 128000,
Self::FourOmniMini => 128000,
Self::O1Preview => 128000,
Self::O1 => 128000,
Self::O1Mini => 128000,
Self::Custom { max_tokens, .. } => *max_tokens,
}
@ -475,7 +475,7 @@ pub async fn stream_completion(
api_key: &str,
request: Request,
) -> Result<BoxStream<'static, Result<ResponseStreamEvent>>> {
if request.model == "o1-preview" || request.model == "o1-mini" {
if request.model.starts_with("o1") {
let response = complete(client, api_url, api_key, request).await;
let response_stream_event = response.map(adapt_response_to_stream);
return Ok(stream::once(future::ready(response_stream_event)).boxed());