mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-03 17:44:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

assistant: render api key editor if no credentials are set (#7197)

Browse source 
This hopefully reduces confusion for new users. I updated the docs just
this morning, but I figured it's probably better to fix the issue
itself.

So what this does is to render the API key editor whenever the assistant
panel is opened/focused and no credentials can be found.

See: https://github.com/zed-industries/zed/discussions/6943

Release Notes:

- Fixed assistant panel not showing dialog to enter API key when opened
without saved credentials.

---------

Co-authored-by: Piotr <piotr@zed.dev>
This commit is contained in:
Thorsten Ball 2024-02-01 11:16:03 +01:00 committed by GitHub
parent 8bafc61ef5
commit 6c93c4bd35
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
crates/assistant/src/assistant_panel.rs
View file

@ -199,9 +199,13 @@ impl AssistantPanel {
.update(cx, |toolbar, cx| toolbar.focus_changed(true, cx)); .update(cx, |toolbar, cx| toolbar.focus_changed(true, cx));
cx.notify(); cx.notify();
if self.focus_handle.is_focused(cx) { if self.focus_handle.is_focused(cx) {
if let Some(editor) = self.active_editor() { if self.has_credentials() {
cx.focus_view(editor); if let Some(editor) = self.active_editor() {
} else if let Some(api_key_editor) = self.api_key_editor.as_ref() { cx.focus_view(editor);
}
}
if let Some(api_key_editor) = self.api_key_editor.as_ref() {
cx.focus_view(api_key_editor); cx.focus_view(api_key_editor);
} }
} }
@ -777,6 +781,10 @@ impl AssistantPanel {
}); });
} }
fn build_api_key_editor(&mut self, cx: &mut WindowContext<'_>) {
self.api_key_editor = Some(build_api_key_editor(cx));
}
fn new_conversation(&mut self, cx: &mut ViewContext<Self>) -> View<ConversationEditor> { fn new_conversation(&mut self, cx: &mut ViewContext<Self>) -> View<ConversationEditor> {
let editor = cx.new_view(|cx| { let editor = cx.new_view(|cx| {
ConversationEditor::new( ConversationEditor::new(
@ -870,7 +878,7 @@ impl AssistantPanel {
cx.update(|cx| completion_provider.delete_credentials(cx))? cx.update(|cx| completion_provider.delete_credentials(cx))?
.await; .await;
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
this.api_key_editor = Some(build_api_key_editor(cx)); this.build_api_key_editor(cx);
this.focus_handle.focus(cx); this.focus_handle.focus(cx);
cx.notify(); cx.notify();
}) })
@ -1136,7 +1144,7 @@ impl AssistantPanel {
} }
} }
fn build_api_key_editor(cx: &mut ViewContext<AssistantPanel>) -> View<Editor> { fn build_api_key_editor(cx: &mut WindowContext) -> View<Editor> {
cx.new_view(|cx| { cx.new_view(|cx| {
let mut editor = Editor::single_line(cx); let mut editor = Editor::single_line(cx);
editor.set_placeholder_text("sk-000000000000000000000000000000000000000000000000", cx); editor.set_placeholder_text("sk-000000000000000000000000000000000000000000000000", cx);
@ -1147,9 +1155,10 @@ fn build_api_key_editor(cx: &mut ViewContext<AssistantPanel>) -> View<Editor> {
impl Render for AssistantPanel { impl Render for AssistantPanel {
fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement { fn render(&mut self, cx: &mut ViewContext<Self>) -> impl IntoElement {
if let Some(api_key_editor) = self.api_key_editor.clone() { if let Some(api_key_editor) = self.api_key_editor.clone() {
const INSTRUCTIONS: [&'static str; 5] = [ const INSTRUCTIONS: [&'static str; 6] = [
"To use the assistant panel or inline assistant, you need to add your OpenAI API key.", "To use the assistant panel or inline assistant, you need to add your OpenAI API key.",
" - You can create an API key at: platform.openai.com/api-keys", " - You can create an API key at: platform.openai.com/api-keys",
" - Make sure your OpenAI account has credits",
" - Having a subscription for another service like GitHub Copilot won't work.", " - Having a subscription for another service like GitHub Copilot won't work.",
" ", " ",
"Paste your OpenAI API key and press Enter to use the assistant:" "Paste your OpenAI API key and press Enter to use the assistant:"
@ -1342,7 +1351,9 @@ impl Panel for AssistantPanel {
cx.spawn(|this, mut cx| async move { cx.spawn(|this, mut cx| async move {
load_credentials.await; load_credentials.await;
this.update(&mut cx, |this, cx| { this.update(&mut cx, |this, cx| {
if this.editors.is_empty() { if !this.has_credentials() {
this.build_api_key_editor(cx);
} else if this.editors.is_empty() {
this.new_conversation(cx); this.new_conversation(cx);
} }
}) })