Merge branch 'main' into push-trzsxukkukpr
This commit is contained in:
commit
6522ef5456
142 changed files with 4750 additions and 2275 deletions
|
@ -136,6 +136,7 @@ impl State {
|
|||
cx: &mut Context<Self>,
|
||||
) -> Self {
|
||||
let refresh_llm_token_listener = RefreshLlmTokenListener::global(cx);
|
||||
let mut current_user = user_store.read(cx).watch_current_user();
|
||||
Self {
|
||||
client: client.clone(),
|
||||
llm_api_token: LlmApiToken::default(),
|
||||
|
@ -151,22 +152,14 @@ impl State {
|
|||
let (client, llm_api_token) = this
|
||||
.read_with(cx, |this, _cx| (client.clone(), this.llm_api_token.clone()))?;
|
||||
|
||||
loop {
|
||||
let is_authenticated = user_store
|
||||
.read_with(cx, |user_store, _cx| user_store.current_user().is_some())?;
|
||||
if is_authenticated {
|
||||
break;
|
||||
}
|
||||
|
||||
cx.background_executor()
|
||||
.timer(Duration::from_millis(100))
|
||||
.await;
|
||||
while current_user.borrow().is_none() {
|
||||
current_user.next().await;
|
||||
}
|
||||
|
||||
let response = Self::fetch_models(client, llm_api_token).await?;
|
||||
this.update(cx, |this, cx| {
|
||||
this.update_models(response, cx);
|
||||
})
|
||||
let response =
|
||||
Self::fetch_models(client.clone(), llm_api_token.clone()).await?;
|
||||
this.update(cx, |this, cx| this.update_models(response, cx))?;
|
||||
anyhow::Ok(())
|
||||
})
|
||||
.await
|
||||
.context("failed to fetch Zed models")
|
||||
|
@ -1267,8 +1260,16 @@ impl Render for ConfigurationView {
|
|||
}
|
||||
|
||||
impl Component for ZedAiConfiguration {
|
||||
fn name() -> &'static str {
|
||||
"AI Configuration Content"
|
||||
}
|
||||
|
||||
fn sort_name() -> &'static str {
|
||||
"AI Configuration Content"
|
||||
}
|
||||
|
||||
fn scope() -> ComponentScope {
|
||||
ComponentScope::Agent
|
||||
ComponentScope::Onboarding
|
||||
}
|
||||
|
||||
fn preview(_window: &mut Window, _cx: &mut App) -> Option<AnyElement> {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue