Add conditional check for `auto_discover` in Ollama provider (#55999)
Teslim Olunlade
created
Self-Review Checklist:
- [x] I've reviewed my own diff for quality, security, and reliability
- [x] Unsafe blocks (if any) have justifying comments
- [x] The content is consistent with the [UI/UX
checklist](https://github.com/zed-industries/zed/blob/main/CONTRIBUTING.md#uiux-checklist)
- [x] Tests cover the new/changed behavior
- [x] Performance impact has been considered and is acceptable
Closes #55998
Release Notes:
- ollama: Fixed issue where specifying `auto_discover: false` would
still auto discover models
@@ -269,13 +269,15 @@ impl LanguageModelProvider for OllamaLanguageModelProvider {
let mut models: HashMap<String, ollama::Model> = HashMap::new();
let settings = OllamaLanguageModelProvider::settings(cx);
- // Add models from the Ollama API- for model in self.state.read(cx).fetched_models.iter() {- let mut model = model.clone();- if let Some(context_window) = settings.context_window {- model.max_tokens = context_window;
+ if settings.auto_discover {
+ // Add models from the Ollama API
+ for model in self.state.read(cx).fetched_models.iter() {
+ let mut model = model.clone();
+ if let Some(context_window) = settings.context_window {
+ model.max_tokens = context_window;
+ }
+ models.insert(model.name.clone(), model);
}
- models.insert(model.name.clone(), model);
}
// Override with available models from settings