mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-02-11 04:36:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Insert reply after the currently selected user message

Browse source
This commit is contained in:
Nathan Sobo 2023-06-16 12:41:07 -06:00
parent 75b5ac8488
commit 54c71c1a35
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
crates/ai/src/assistant.rs
View file

@ -22,7 +22,7 @@ use gpui::{
Subscription, Task, View, ViewContext, ViewHandle, WeakViewHandle, WindowContext, Subscription, Task, View, ViewContext, ViewHandle, WeakViewHandle, WindowContext,
}; };
use isahc::{http::StatusCode, Request, RequestExt}; use isahc::{http::StatusCode, Request, RequestExt};
use language::{language_settings::SoftWrap, Buffer, LanguageRegistry, ToOffset as _}; use language::{language_settings::SoftWrap, Buffer, LanguageRegistry, Selection, ToOffset as _};
use serde::Deserialize; use serde::Deserialize;
use settings::SettingsStore; use settings::SettingsStore;
use std::{ use std::{
@ -589,7 +589,11 @@ impl Assistant {
cx.notify(); cx.notify();
} }
fn assist(&mut self, cx: &mut ModelContext<Self>) -> Option<(MessageAnchor, MessageAnchor)> { fn assist(
&mut self,
selection: Selection<usize>,
cx: &mut ModelContext<Self>,
) -> Option<(MessageAnchor, MessageAnchor)> {
let request = OpenAIRequest { let request = OpenAIRequest {
model: self.model.clone(), model: self.model.clone(),
messages: self.open_ai_request_messages(cx), messages: self.open_ai_request_messages(cx),
@ -598,9 +602,13 @@ impl Assistant {
let api_key = self.api_key.borrow().clone()?; let api_key = self.api_key.borrow().clone()?;
let stream = stream_completion(api_key, cx.background().clone(), request); let stream = stream_completion(api_key, cx.background().clone(), request);
let assistant_message = let assistant_message = self.insert_message_after(
self.insert_message_after(self.message_anchors.last()?.id, Role::Assistant, cx)?; self.message_for_offset(selection.head(), cx)?.id,
Role::Assistant,
cx,
)?;
let user_message = self.insert_message_after(assistant_message.id, Role::User, cx)?; let user_message = self.insert_message_after(assistant_message.id, Role::User, cx)?;
let task = cx.spawn_weak({ let task = cx.spawn_weak({
|this, mut cx| async move { |this, mut cx| async move {
let assistant_message_id = assistant_message.id; let assistant_message_id = assistant_message.id;
@ -979,8 +987,9 @@ impl AssistantEditor {
} }
fn assist(&mut self, _: &Assist, cx: &mut ViewContext<Self>) { fn assist(&mut self, _: &Assist, cx: &mut ViewContext<Self>) {
let selection = self.editor.read(cx).selections.newest(cx);
let user_message = self.assistant.update(cx, |assistant, cx| { let user_message = self.assistant.update(cx, |assistant, cx| {
let (_, user_message) = assistant.assist(cx)?; let (_, user_message) = assistant.assist(selection, cx)?;
Some(user_message) Some(user_message)
}); });