Skip to content

armgit / zed

Public Imported from GitHub
0

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

language_models: Honor images capability for custom OpenAI models (#54223)

Matt Van Hornadab7b887108
diff --git a/crates/language_models/src/provider/open_ai.rs b/crates/language_models/src/provider/open_ai.rs
index f5ee65c8d85..97bb5ef1e4d 100644
--- a/crates/language_models/src/provider/open_ai.rs
+++ b/crates/language_models/src/provider/open_ai.rs
@@ -182,6 +182,7 @@ impl LanguageModelProvider for OpenAiLanguageModelProvider {
max_completion_tokens: model.max_completion_tokens,
reasoning_effort: model.reasoning_effort,
supports_chat_completions: model.capabilities.chat_completions,
+ supports_images: model.capabilities.images,
},
);
}
@@ -328,11 +329,10 @@ impl LanguageModel for OpenAiLanguageModel {
| Model::FivePointFourPro
| Model::O1
| Model::O3 => true,
- Model::ThreePointFiveTurbo
- | Model::Four
- | Model::FourTurbo
- | Model::O3Mini
- | Model::Custom { .. } => false,
+ Model::ThreePointFiveTurbo | Model::Four | Model::FourTurbo | Model::O3Mini => false,
+ Model::Custom {
+ supports_images, ..
+ } => *supports_images,
}
}
diff --git a/crates/open_ai/src/open_ai.rs b/crates/open_ai/src/open_ai.rs
index 0109efbe293..cc54d20a915 100644
--- a/crates/open_ai/src/open_ai.rs
+++ b/crates/open_ai/src/open_ai.rs
@@ -106,6 +106,8 @@ pub enum Model {
reasoning_effort: Option<ReasoningEffort>,
#[serde(default = "default_supports_chat_completions")]
supports_chat_completions: bool,
+ #[serde(default = "default_supports_images")]
+ supports_images: bool,
},
}
@@ -113,6 +115,10 @@ const fn default_supports_chat_completions() -> bool {
true
}
+const fn default_supports_images() -> bool {
+ true
+}
+
impl Model {
pub fn default_fast() -> Self {
Self::FiveMini
diff --git a/crates/settings_content/src/language_model.rs b/crates/settings_content/src/language_model.rs
index 635b58f988d..c14f854a724 100644
--- a/crates/settings_content/src/language_model.rs
+++ b/crates/settings_content/src/language_model.rs
@@ -257,12 +257,15 @@ pub struct OpenAiCompatibleSettingsContent {
pub struct OpenAiModelCapabilities {
#[serde(default = "default_true")]
pub chat_completions: bool,
+ #[serde(default = "default_true")]
+ pub images: bool,
}
impl Default for OpenAiModelCapabilities {
fn default() -> Self {
Self {
chat_completions: default_true(),
+ images: default_true(),
}
}
}