This PR improves the tracking of pending completions in `assistant2` such that we actually remove ones that have been completed. Release Notes: - N/A
154 lines
4.5 KiB
Rust
154 lines
4.5 KiB
Rust
use std::sync::Arc;
|
|
|
|
use futures::StreamExt as _;
|
|
use gpui::{AppContext, EventEmitter, ModelContext, Task};
|
|
use language_model::{
|
|
LanguageModel, LanguageModelCompletionEvent, LanguageModelRequest, LanguageModelRequestMessage,
|
|
MessageContent, Role, StopReason,
|
|
};
|
|
use util::{post_inc, ResultExt as _};
|
|
|
|
#[derive(Debug, Clone, Copy)]
|
|
pub enum RequestKind {
|
|
Chat,
|
|
}
|
|
|
|
/// A message in a [`Thread`].
|
|
pub struct Message {
|
|
pub role: Role,
|
|
pub text: String,
|
|
}
|
|
|
|
struct PendingCompletion {
|
|
id: usize,
|
|
_task: Task<()>,
|
|
}
|
|
|
|
/// A thread of conversation with the LLM.
|
|
pub struct Thread {
|
|
messages: Vec<Message>,
|
|
completion_count: usize,
|
|
pending_completions: Vec<PendingCompletion>,
|
|
}
|
|
|
|
impl Thread {
|
|
pub fn new(_cx: &mut ModelContext<Self>) -> Self {
|
|
Self {
|
|
messages: Vec::new(),
|
|
completion_count: 0,
|
|
pending_completions: Vec::new(),
|
|
}
|
|
}
|
|
|
|
pub fn messages(&self) -> impl Iterator<Item = &Message> {
|
|
self.messages.iter()
|
|
}
|
|
|
|
pub fn insert_user_message(&mut self, text: impl Into<String>) {
|
|
self.messages.push(Message {
|
|
role: Role::User,
|
|
text: text.into(),
|
|
});
|
|
}
|
|
|
|
pub fn to_completion_request(
|
|
&self,
|
|
_request_kind: RequestKind,
|
|
_cx: &AppContext,
|
|
) -> LanguageModelRequest {
|
|
let mut request = LanguageModelRequest {
|
|
messages: vec![],
|
|
tools: Vec::new(),
|
|
stop: Vec::new(),
|
|
temperature: None,
|
|
};
|
|
|
|
for message in &self.messages {
|
|
let mut request_message = LanguageModelRequestMessage {
|
|
role: message.role,
|
|
content: Vec::new(),
|
|
cache: false,
|
|
};
|
|
|
|
request_message
|
|
.content
|
|
.push(MessageContent::Text(message.text.clone()));
|
|
|
|
request.messages.push(request_message);
|
|
}
|
|
|
|
request
|
|
}
|
|
|
|
pub fn stream_completion(
|
|
&mut self,
|
|
request: LanguageModelRequest,
|
|
model: Arc<dyn LanguageModel>,
|
|
cx: &mut ModelContext<Self>,
|
|
) {
|
|
let pending_completion_id = post_inc(&mut self.completion_count);
|
|
|
|
let task = cx.spawn(|thread, mut cx| async move {
|
|
let stream = model.stream_completion(request, &cx);
|
|
let stream_completion = async {
|
|
let mut events = stream.await?;
|
|
let mut stop_reason = StopReason::EndTurn;
|
|
|
|
while let Some(event) = events.next().await {
|
|
let event = event?;
|
|
|
|
thread.update(&mut cx, |thread, cx| {
|
|
match event {
|
|
LanguageModelCompletionEvent::StartMessage { .. } => {
|
|
thread.messages.push(Message {
|
|
role: Role::Assistant,
|
|
text: String::new(),
|
|
});
|
|
}
|
|
LanguageModelCompletionEvent::Stop(reason) => {
|
|
stop_reason = reason;
|
|
}
|
|
LanguageModelCompletionEvent::Text(chunk) => {
|
|
if let Some(last_message) = thread.messages.last_mut() {
|
|
if last_message.role == Role::Assistant {
|
|
last_message.text.push_str(&chunk);
|
|
}
|
|
}
|
|
}
|
|
LanguageModelCompletionEvent::ToolUse(_tool_use) => {}
|
|
}
|
|
|
|
cx.emit(ThreadEvent::StreamedCompletion);
|
|
cx.notify();
|
|
})?;
|
|
|
|
smol::future::yield_now().await;
|
|
}
|
|
|
|
thread.update(&mut cx, |thread, _cx| {
|
|
thread
|
|
.pending_completions
|
|
.retain(|completion| completion.id != pending_completion_id);
|
|
})?;
|
|
|
|
anyhow::Ok(stop_reason)
|
|
};
|
|
|
|
let result = stream_completion.await;
|
|
let _ = result.log_err();
|
|
});
|
|
|
|
self.pending_completions.push(PendingCompletion {
|
|
id: pending_completion_id,
|
|
_task: task,
|
|
});
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone)]
|
|
pub enum ThreadEvent {
|
|
StreamedCompletion,
|
|
}
|
|
|
|
impl EventEmitter<ThreadEvent> for Thread {}
|