Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

assistant2: Use ChatMessage component to render chat messages (#11193)

Browse source 
This PR updates the new assistant panel to use the `ChatMessage`
component to render its chat messages.

This also lays the foundation for collapsing the messages, though that
has yet to be wired up.

Adapted from the work on the `assistant-chat-ui` branch.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-04-29 18:47:16 -04:00 • committed by GitHub
parent ae650342ce
commit 089ea7852d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 150 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

33
crates/assistant2/src/assistant2.rs
View file

@ -22,7 +22,6 @@ use semantic_index::{CloudEmbeddingProvider, SemanticIndex};
use serde::Deserialize;
use settings::Settings;
use std::sync::Arc;
use theme::ThemeSettings;
use tools::ProjectIndexTool;
use ui::Composer;
use util::{paths::EMBEDDINGS_DIR, ResultExt};
@ -33,7 +32,7 @@ use workspace::{
pub use assistant_settings::AssistantSettings;
use crate::ui::{ChatMessageHeader, UserOrAssistant};
use crate::ui::UserOrAssistant;
const MAX_COMPLETION_CALLS_PER_SUBMISSION: usize = 5;
@ -526,19 +525,15 @@ impl AssistantChat {
let is_last = ix == self.messages.len() - 1;
match &self.messages[ix] {
ChatMessage::User(UserMessage { body, .. }) => div()
ChatMessage::User(UserMessage { id, body }) => div()
.when(!is_last, |element| element.mb_2())
.child(ChatMessageHeader::new(UserOrAssistant::User(
self.user_store.read(cx).current_user(),
)))
.child(
div()
.p_2()
.text_color(cx.theme().colors().editor_foreground)
.font(ThemeSettings::get_global(cx).buffer_font.clone())
.bg(cx.theme().colors().editor_background)
.child(body.clone()),
)
.child(crate::ui::ChatMessage::new(
*id,
UserOrAssistant::User(self.user_store.read(cx).current_user()),
body.clone().into_any_element(),
false,
Box::new(|_, _| {}),
))
.into_any(),
ChatMessage::Assistant(AssistantMessage {
id,
@ -555,8 +550,14 @@ impl AssistantChat {
div()
.when(!is_last, |element| element.mb_2())
.child(ChatMessageHeader::new(UserOrAssistant::Assistant))
.child(assistant_body)
.child(crate::ui::ChatMessage::new(
*id,
UserOrAssistant::Assistant,
assistant_body.into_any_element(),
false,
Box::new(|_, _| {}),
))
// TODO: Should the errors and tool calls get passed into `ChatMessage`?
.child(self.render_error(error.clone(), ix, cx))
.children(tool_calls.iter().map(|tool_call| {
let result = &tool_call.result;