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.

client: Refresh cloud models on websocket reconnect (#57528)

Tom Houlé32f25930473e
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 093eb894483..36c5a49602a 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -333,6 +333,9 @@ impl Status {
struct ClientState {
credentials: Option<Credentials>,
status: (watch::Sender<Status>, watch::Receiver<Status>),
+ /// Bumped each time the cloud websocket finishes its handshake. Starts at `0` so
+ /// subscribers can distinguish "no connection yet" from a real reconnect.
+ cloud_connection_id: (watch::Sender<u64>, watch::Receiver<u64>),
_reconnect_task: Option<Task<()>>,
_cloud_connection_task: Option<Task<()>>,
}
@@ -435,6 +438,7 @@ impl Default for ClientState {
Self {
credentials: None,
status: watch::channel_with(Status::SignedOut),
+ cloud_connection_id: watch::channel_with(0),
_reconnect_task: None,
_cloud_connection_task: None,
}
@@ -668,6 +672,14 @@ impl Client {
self.state.read().status.1.clone()
}
+ /// Watches successful cloud websocket reconnections.
+ ///
+ /// The value is bumped each time the websocket handshake completes. The
+ /// initial `0` means no reconnection yet.
+ pub fn cloud_connection_id(&self) -> watch::Receiver<u64> {
+ self.state.read().cloud_connection_id.1.clone()
+ }
+
fn set_status(self: &Arc<Self>, status: Status, cx: &AsyncApp) {
log::info!("set status on client {}: {:?}", self.id(), status);
let mut state = self.state.write();
@@ -1006,6 +1018,12 @@ impl Client {
let (mut messages, _cloud_io_task) = cx.update(|cx| connection.spawn(cx));
+ {
+ let mut state = self.state.write();
+ let mut cloud_connection_id = state.cloud_connection_id.0.borrow_mut();
+ *cloud_connection_id = cloud_connection_id.saturating_add(1);
+ }
+
while let Some(message) = messages.next().await {
if let Some(message) = message.log_err() {
self.handle_message_to_client(message, cx);
diff --git a/crates/language_models/src/provider/cloud.rs b/crates/language_models/src/provider/cloud.rs
index 78b4220eb03..7a4f292c2ac 100644
--- a/crates/language_models/src/provider/cloud.rs
+++ b/crates/language_models/src/provider/cloud.rs
@@ -14,16 +14,19 @@ use language_model::{
ZED_CLOUD_PROVIDER_ID, ZED_CLOUD_PROVIDER_NAME,
};
use language_models_cloud::{CloudLlmTokenProvider, CloudModelProvider};
+use rand::{Rng as _, SeedableRng as _, rngs::StdRng};
use release_channel::AppVersion;
use settings::SettingsStore;
pub use settings::ZedDotDevAvailableModel as AvailableModel;
pub use settings::ZedDotDevAvailableProvider as AvailableProvider;
use std::sync::Arc;
+use std::time::Duration;
use ui::{TintColor, prelude::*};
const PROVIDER_ID: LanguageModelProviderId = ZED_CLOUD_PROVIDER_ID;
const PROVIDER_NAME: LanguageModelProviderName = ZED_CLOUD_PROVIDER_NAME;
+const MODELS_REFRESH_DEBOUNCE: Duration = Duration::from_secs(5 * 60);
struct ClientTokenProvider {
client: Arc<Client>,
@@ -84,10 +87,12 @@ pub struct State {
user_store: Entity<UserStore>,
status: client::Status,
provider: Entity<CloudModelProvider<ClientTokenProvider>>,
+ pending_models_refresh: Option<Task<()>>,
_user_store_subscription: Subscription,
_settings_subscription: Subscription,
_llm_token_subscription: Subscription,
_provider_subscription: Subscription,
+ _cloud_reconnect_task: Task<()>,
}
impl State {
@@ -112,10 +117,32 @@ impl State {
)
});
+ let cloud_reconnect_task = cx.spawn({
+ let client = client.clone();
+ async move |this, cx| {
+ let mut connection_id_rx = client.cloud_connection_id();
+ while let Some(connection_id) = connection_id_rx.next().await {
+ // The initial value `0` means no connection has been
+ // established since this `Client` was created; only real
+ // reconnects trigger a refresh.
+ if connection_id == 0 {
+ continue;
+ }
+ if this
+ .update(cx, |this, cx| this.schedule_debounced_models_refresh(cx))
+ .is_err()
+ {
+ break;
+ }
+ }
+ }
+ });
+
Self {
client: client.clone(),
user_store: user_store.clone(),
status,
+ pending_models_refresh: None,
_provider_subscription: cx.observe(&provider, |_, _, cx| cx.notify()),
provider,
_user_store_subscription: cx.subscribe(
@@ -141,6 +168,7 @@ impl State {
this.refresh_models(cx);
},
),
+ _cloud_reconnect_task: cloud_reconnect_task,
}
}
@@ -167,6 +195,24 @@ impl State {
provider.refresh_models(cx).detach_and_log_err(cx);
});
}
+
+ /// Schedules a model list refresh, replacing any previously scheduled
+ /// refresh.
+ fn schedule_debounced_models_refresh(&mut self, cx: &mut Context<Self>) {
+ self.pending_models_refresh = Some(cx.spawn(async move |this, cx| {
+ #[cfg(any(test, feature = "test-support"))]
+ let mut rng = StdRng::seed_from_u64(0);
+ #[cfg(not(any(test, feature = "test-support")))]
+ let mut rng = StdRng::from_os_rng();
+ let jitter = Duration::from_millis(
+ rng.random_range(0..MODELS_REFRESH_DEBOUNCE.as_millis() as u64),
+ );
+ cx.background_executor()
+ .timer(MODELS_REFRESH_DEBOUNCE + jitter)
+ .await;
+ this.update(cx, |this, cx| this.refresh_models(cx)).ok();
+ }));
+ }
}
impl CloudLanguageModelProvider {