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

ollama: Ensure only single task fetches models (#19830)

Browse source 
Before this change, we'd see a ton of requests from the Ollama provider
trying to fetch models:

```
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: https://api.zed.dev/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
[2024-10-28T15:00:52+01:00 DEBUG reqwest::connect] starting new connection: http://localhost:11434/
```

Turns out we'd send a request on *every* change to settings.

Now, with this change, we only send a single request.

Release Notes:

- N/A

Co-authored-by: Bennet <bennet@zed.dev>
This commit is contained in:
Thorsten Ball 2024-10-28 15:40:50 +01:00 • committed by GitHub
parent 8a96ea25c4
commit 6686f66949
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

34
crates/language_model/src/provider/ollama.rs
View file

@ -54,6 +54,7 @@ pub struct OllamaLanguageModelProvider {
pub struct State { pub struct State {
http_client: Arc<dyn HttpClient>, http_client: Arc<dyn HttpClient>,
available_models: Vec<ollama::Model>, available_models: Vec<ollama::Model>,
fetch_model_task: Option<Task<Result<()>>>,
_subscription: Subscription, _subscription: Subscription,
} }
@ -89,6 +90,11 @@ impl State {
}) })
} }
fn restart_fetch_models_task(&mut self, cx: &mut ModelContext<Self>) {
let task = self.fetch_models(cx);
self.fetch_model_task.replace(task);
}
fn authenticate(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> { fn authenticate(&mut self, cx: &mut ModelContext<Self>) -> Task<Result<()>> {
if self.is_authenticated() { if self.is_authenticated() {
Task::ready(Ok(())) Task::ready(Ok(()))
@ -102,17 +108,29 @@ impl OllamaLanguageModelProvider {
pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut AppContext) -> Self { pub fn new(http_client: Arc<dyn HttpClient>, cx: &mut AppContext) -> Self {
let this = Self { let this = Self {
http_client: http_client.clone(), http_client: http_client.clone(),
state: cx.new_model(|cx| State { state: cx.new_model(|cx| {
http_client, let subscription = cx.observe_global::<SettingsStore>({
available_models: Default::default(), let mut settings = AllLanguageModelSettings::get_global(cx).ollama.clone();
_subscription: cx.observe_global::<SettingsStore>(|this: &mut State, cx| { move |this: &mut State, cx| {
this.fetch_models(cx).detach(); let new_settings = &AllLanguageModelSettings::get_global(cx).ollama;
cx.notify(); if &settings != new_settings {
}), settings = new_settings.clone();
this.restart_fetch_models_task(cx);
cx.notify();
}
}
});
State {
http_client,
available_models: Default::default(),
fetch_model_task: None,
_subscription: subscription,
}
}), }),
}; };
this.state this.state
.update(cx, |state, cx| state.fetch_models(cx).detach()); .update(cx, |state, cx| state.restart_fetch_models_task(cx));
this this
} }
} }