Implement persistent native A2UI chat surfaces

This commit is contained in:
2026-07-19 16:57:43 +02:00
parent ac611e3f7f
commit fd4fd744e0
25 changed files with 2571 additions and 18 deletions

View File

@@ -334,6 +334,26 @@ pub enum Message {
ChatSend,
ChatCancel,
ChatLinkClicked(String),
ChatSurfaceFieldChanged {
surface_id: String,
field: String,
value: serde_json::Value,
},
ChatSurfaceTextareaAction {
surface_id: String,
field: String,
action: iced::widget::text_editor::Action,
},
ChatSurfaceTabSelected {
surface_id: String,
index: usize,
},
ChatSurfaceDismissed(String),
ChatSurfaceAction {
surface_id: String,
action: String,
payload: serde_json::Value,
},
ChatFinished {
conversation_id: String,
result: Result<engine::chat::ChatTurnResult, String>,
@@ -1317,6 +1337,103 @@ impl BdsApp {
}
Task::none()
}
Message::ChatSurfaceFieldChanged {
surface_id,
field,
value,
} => {
if let Some(state) = self.active_chat_state_mut() {
state
.surface_state
.surface_data
.entry(surface_id)
.or_default()
.insert(field, value);
state.surface_state_dirty_since = Some(std::time::Instant::now());
state.rebuild_surfaces();
}
Task::none()
}
Message::ChatSurfaceTextareaAction {
surface_id,
field,
action,
} => {
if let Some(state) = self.active_chat_state_mut()
&& let Some(content) = state
.surface_textareas
.get_mut(&crate::views::chat_view::textarea_key(&surface_id, &field))
{
content.perform(action);
let value = content.text();
state
.surface_state
.surface_data
.entry(surface_id)
.or_default()
.insert(field, value.into());
state.surface_state_dirty_since = Some(std::time::Instant::now());
}
Task::none()
}
Message::ChatSurfaceTabSelected { surface_id, index } => {
let Some(conversation_id) = self.active_chat_id().map(str::to_string) else {
return Task::none();
};
if let Some(state) = self.chat_editors.get_mut(&conversation_id) {
state.surface_state.surface_tabs.insert(surface_id, index);
state.rebuild_surfaces();
}
self.persist_chat_surface_state(&conversation_id);
Task::none()
}
Message::ChatSurfaceDismissed(surface_id) => {
let Some(conversation_id) = self.active_chat_id().map(str::to_string) else {
return Task::none();
};
if let Some(state) = self.chat_editors.get_mut(&conversation_id) {
state.surface_state.dismissed_surfaces.insert(surface_id);
state.rebuild_surfaces();
}
self.persist_chat_surface_state(&conversation_id);
Task::none()
}
Message::ChatSurfaceAction {
surface_id,
action,
payload,
} => {
let result = self
.active_chat_id()
.and_then(|id| self.chat_editors.get(id))
.map(|state| {
let payload = engine::chat_surfaces::merge_form_data(
payload,
&surface_id,
&state.surface_state,
);
engine::chat_surfaces::resolve_surface_action(&action, &payload)
});
match result {
Some(Ok(navigation)) => self.dispatch_chat_navigation(
&navigation.destination,
navigation.entity_id.as_deref(),
),
Some(Err(reason)) => {
let message = tw(
self.ui_locale,
"chat.surface.actionRefused",
&[("reason", &reason)],
);
if let Some(state) = self.active_chat_state_mut() {
state.error = Some(message.clone());
}
self.notify(ToastLevel::Error, &message);
}
None => {}
}
Task::none()
}
Message::ChatFinished {
conversation_id,
result,
@@ -2011,6 +2128,7 @@ impl BdsApp {
self.task_manager.evict_expired();
self.refresh_task_snapshots();
self.process_chat_events();
self.persist_due_chat_surface_state();
if !self.search_index_rebuild_running {
self.auto_save_due_post_editors();
}
@@ -2654,6 +2772,48 @@ impl BdsApp {
.unwrap_or_default();
}
fn persist_due_chat_surface_state(&mut self) {
let due = self
.chat_editors
.iter()
.filter_map(|(id, state)| {
state.surface_state_dirty_since.and_then(|since| {
(since.elapsed() >= std::time::Duration::from_millis(500)).then(|| id.clone())
})
})
.collect::<Vec<_>>();
for id in due {
self.persist_chat_surface_state(&id);
}
}
fn persist_chat_surface_state(&mut self, conversation_id: &str) {
let Some(surface_state) = self
.chat_editors
.get(conversation_id)
.map(|state| state.surface_state.clone())
else {
return;
};
let result = self
.db
.as_ref()
.ok_or_else(|| "database unavailable".to_string())
.and_then(|db| {
engine::chat::put_surface_state(db.conn(), conversation_id, &surface_state)
.map_err(|error| error.to_string())
});
match result {
Ok(()) => {
if let Some(state) = self.chat_editors.get_mut(conversation_id) {
state.conversation.surface_state = serde_json::to_string(&surface_state).ok();
state.surface_state_dirty_since = None;
}
}
Err(error) => self.notify(ToastLevel::Error, &error),
}
}
fn chat_model_options(&self) -> Vec<ChatModelChoice> {
let mut models = self
.db
@@ -2826,9 +2986,12 @@ impl BdsApp {
engine::chat::ChatEvent::ToolStarted {
conversation_id,
name,
surface_id,
arguments,
} => {
if let Some(state) = self.chat_editors.get_mut(&conversation_id) {
state.active_tool = Some(name);
state.active_tool = Some(name.clone());
state.add_streaming_surface(&name, &arguments, surface_id);
}
}
engine::chat::ChatEvent::ToolFinished {
@@ -7800,6 +7963,7 @@ mod tests {
use crate::state::ToastLevel;
use crate::state::sidebar_filter::{MediaFilter, PostFilter};
use crate::state::tabs::{Tab, TabType};
use crate::views::chat_view::ChatEditorState;
use crate::views::media_editor::{MediaEditorMsg, MediaEditorState};
use crate::views::modal;
use crate::views::post_editor::{PostEditorMsg, PostEditorState};
@@ -7811,9 +7975,9 @@ mod tests {
use bds_core::db::queries::project::insert_project;
use bds_core::engine::generation::GenerationReport;
use bds_core::engine::task::{TaskStatus, TaskStatus::*};
use bds_core::engine::{ai, media, post, script, template, wordpress_import};
use bds_core::engine::{ai, chat, media, post, script, template, wordpress_import};
use bds_core::i18n::UiLocale;
use bds_core::model::{Project, ScriptKind, TemplateKind};
use bds_core::model::{ChatRole, Project, ScriptKind, TemplateKind};
use chrono::{Datelike, TimeZone};
use std::io::{Read, Write};
use std::net::TcpListener;
@@ -9725,4 +9889,116 @@ mod tests {
.is_empty()
);
}
#[test]
fn chat_surfaces_stream_persist_reopen_and_refuse_unknown_actions() {
let (db, project, tmp) = setup();
let conversation =
chat::create_conversation_titled(db.conn(), Some("test-model"), "Surfaces").unwrap();
let tool_calls = serde_json::json!([
{
"id": "form-call",
"type": "function",
"function": {
"name": "render_form",
"arguments": serde_json::json!({
"title": "Preferences",
"fields": [{"key": "topic", "label": "Topic", "inputType": "text"}],
"submitAction": "switchView"
}).to_string()
}
},
{
"id": "tabs-call",
"type": "function",
"function": {
"name": "render_tabs",
"arguments": serde_json::json!({
"tabs": [
{"label": "One", "content": [{"type": "text", "text": "First"}]},
{"label": "Two", "content": [{"type": "text", "text": "Second"}]}
]
}).to_string()
}
}
])
.to_string();
let message = chat::insert_message(
db.conn(),
&conversation.id,
ChatRole::Assistant,
Some("Structured answer"),
None,
Some(&tool_calls),
bds_core::engine::ai::TokenUsage::default(),
)
.unwrap();
let mut app = make_app(db, project, &tmp);
let tab = Tab {
id: conversation.id.clone(),
tab_type: TabType::Chat,
title: conversation.title.clone(),
is_transient: false,
is_dirty: false,
};
let _ = app.update(Message::OpenTab(tab));
let form_id = format!("{}-surface-0", message.id);
let tabs_id = format!("{}-surface-1", message.id);
{
let state = app.chat_editors.get_mut(&conversation.id).unwrap();
assert_eq!(state.message_surfaces[&message.id].len(), 2);
state.streaming = true;
state.add_streaming_surface(
"render_card",
&serde_json::json!({"title": "Later"}),
"later-message-surface-0".into(),
);
assert_eq!(state.message_surfaces[&message.id].len(), 2);
assert_eq!(state.streaming_surfaces.len(), 1);
}
let _ = app.update(Message::ChatSurfaceFieldChanged {
surface_id: form_id.clone(),
field: "topic".into(),
value: "Rust".into(),
});
app.chat_editors
.get_mut(&conversation.id)
.unwrap()
.surface_state_dirty_since =
Some(std::time::Instant::now() - std::time::Duration::from_millis(501));
let _ = app.update(Message::TaskTick);
let _ = app.update(Message::ChatSurfaceTabSelected {
surface_id: tabs_id.clone(),
index: 1,
});
let _ = app.update(Message::ChatSurfaceDismissed(form_id.clone()));
let reopened_conversation =
chat::get_conversation(app.db.as_ref().unwrap().conn(), &conversation.id).unwrap();
let reopened = ChatEditorState::new(
reopened_conversation,
chat::list_messages(app.db.as_ref().unwrap().conn(), &conversation.id).unwrap(),
vec![],
);
assert_eq!(
reopened.surface_state.surface_data[&form_id]["topic"],
"Rust"
);
assert_eq!(reopened.surface_state.surface_tabs[&tabs_id], 1);
assert!(reopened.surface_state.dismissed_surfaces.contains(&form_id));
assert_eq!(reopened.message_surfaces[&message.id].len(), 1);
let _ = app.update(Message::ChatSurfaceAction {
surface_id: form_id,
action: "runJavaScript".into(),
payload: serde_json::json!({"script": "alert(1)"}),
});
assert!(
app.chat_editors[&conversation.id]
.error
.as_deref()
.is_some_and(|error| error.contains("runJavaScript"))
);
}
}

View File

@@ -0,0 +1,926 @@
use std::collections::{HashMap, HashSet};
use std::f32::consts::{FRAC_PI_2, TAU};
use bds_core::engine::chat_surfaces::{
ChartSeries, ChartType, ChatSurfaceState, FormInputType, InlineSurface, MindmapNode,
SurfaceKind,
};
use bds_core::i18n::UiLocale;
use iced::widget::canvas::{self, Path, Stroke, path};
use iced::widget::{
Space, button, checkbox, column, container, row, scrollable, text, text_editor,
};
use iced::{
Alignment, Color, Element, Length, Point, Radians, Rectangle, Renderer, Size, Theme, mouse,
};
use crate::app::Message;
use crate::components::inputs;
use crate::i18n::t;
use crate::views::chat_view::textarea_key;
const CHART_COLORS: [Color; 7] = [
rgb8(0x4E, 0xA1, 0xE0),
rgb8(0x7B, 0xC9, 0x6F),
rgb8(0xF0, 0xB4, 0x4D),
rgb8(0xD9, 0x78, 0xAE),
rgb8(0x9B, 0x8A, 0xE6),
rgb8(0x54, 0xC6, 0xC0),
rgb8(0xE3, 0x73, 0x63),
];
const fn rgb8(red: u8, green: u8, blue: u8) -> Color {
Color {
r: red as f32 / 255.0,
g: green as f32 / 255.0,
b: blue as f32 / 255.0,
a: 1.0,
}
}
pub fn view<'a>(
surface: &'a InlineSurface,
state: &'a ChatSurfaceState,
textareas: &'a HashMap<String, text_editor::Content>,
locale: UiLocale,
) -> Element<'a, Message> {
surface_view(surface, state, textareas, locale, true)
}
fn surface_view<'a>(
surface: &'a InlineSurface,
state: &'a ChatSurfaceState,
textareas: &'a HashMap<String, text_editor::Content>,
locale: UiLocale,
dismissible: bool,
) -> Element<'a, Message> {
let has_title = surface.title.is_some();
let title = surface.title.clone().unwrap_or_else(|| {
t(
locale,
&format!("chat.surface.type.{}", surface.kind.as_str()),
)
});
let mut header = row![text(title).size(14), Space::with_width(Length::Fill),]
.spacing(8)
.align_y(Alignment::Center);
if has_title {
header = header.push(
text(t(
locale,
&format!("chat.surface.type.{}", surface.kind.as_str()),
))
.size(10)
.color(inputs::SECTION_COLOR),
);
}
if dismissible {
header = header.push(
button(text(t(locale, "chat.surface.dismiss")))
.on_press(Message::ChatSurfaceDismissed(surface.id.clone()))
.padding([4, 8])
.style(inputs::secondary_button),
);
}
let content = surface_content(surface, state, textareas, locale);
inputs::card(column![header, content].spacing(10)).into()
}
fn surface_content<'a>(
surface: &'a InlineSurface,
state: &'a ChatSurfaceState,
textareas: &'a HashMap<String, text_editor::Content>,
locale: UiLocale,
) -> Element<'a, Message> {
match surface.kind {
SurfaceKind::Card => {
let mut children = Vec::new();
if let Some(subtitle) = &surface.subtitle {
children.push(
text(subtitle.clone())
.size(12)
.color(inputs::SECTION_COLOR)
.into(),
);
}
if let Some(body) = &surface.body {
children.push(text(body.clone()).size(13).into());
}
if !surface.actions.is_empty() {
let actions = surface
.actions
.iter()
.fold(row![].spacing(8), |actions, item| {
actions.push(
button(text(item.label.clone()))
.on_press(Message::ChatSurfaceAction {
surface_id: surface.id.clone(),
action: item.action.clone(),
payload: item.payload.clone(),
})
.padding([7, 10])
.style(inputs::secondary_button),
)
});
children.push(actions.into());
}
empty_or_column(children, locale)
}
SurfaceKind::Chart => chart(surface),
SurfaceKind::Form => form(surface, textareas, locale),
SurfaceKind::List => {
let children = surface
.items
.iter()
.map(|item| text(format!("{item}")).size(13).into())
.collect();
empty_or_column(children, locale)
}
SurfaceKind::Metric => column![
text(surface.label.clone().unwrap_or_default())
.size(12)
.color(inputs::SECTION_COLOR),
text(surface.value.clone().unwrap_or_default()).size(28),
]
.spacing(4)
.into(),
SurfaceKind::Mindmap => mindmap(surface, locale),
SurfaceKind::Table => table(surface, locale),
SurfaceKind::Tabs => tabs(surface, state, textareas, locale),
SurfaceKind::Text => text(surface.body.clone().unwrap_or_default())
.size(13)
.into(),
SurfaceKind::Json => text(
surface
.raw
.as_ref()
.and_then(|value| serde_json::to_string_pretty(value).ok())
.unwrap_or_default(),
)
.size(12)
.shaping(iced::widget::text::Shaping::Advanced)
.into(),
}
}
fn empty_or_column<'a>(
mut children: Vec<Element<'a, Message>>,
locale: UiLocale,
) -> Element<'a, Message> {
if children.is_empty() {
children.push(
text(t(locale, "chat.surface.empty"))
.size(12)
.color(inputs::SECTION_COLOR)
.into(),
);
}
iced::widget::Column::with_children(children)
.spacing(7)
.into()
}
fn form<'a>(
surface: &'a InlineSurface,
textareas: &'a HashMap<String, text_editor::Content>,
locale: UiLocale,
) -> Element<'a, Message> {
let mut children: Vec<Element<'a, Message>> = Vec::new();
for field in &surface.fields {
let label = if field.required {
format!("{} *", field.label)
} else {
field.label.clone()
};
let surface_id = surface.id.clone();
let key = field.key.clone();
let control: Element<'a, Message> = match field.input_type {
FormInputType::Checkbox => checkbox(label, field.value.as_bool().unwrap_or(false))
.on_toggle(move |value| Message::ChatSurfaceFieldChanged {
surface_id: surface_id.clone(),
field: key.clone(),
value: value.into(),
})
.size(16)
.text_size(13)
.into(),
FormInputType::Select => {
let selected = field.options.iter().find(|option| {
field
.value
.as_str()
.is_some_and(|value| value == option.value)
});
inputs::labeled_select(&label, &field.options, selected, move |option| {
Message::ChatSurfaceFieldChanged {
surface_id: surface_id.clone(),
field: key.clone(),
value: option.value.into(),
}
})
}
FormInputType::Textarea => {
let content_key = textarea_key(&surface.id, &field.key);
if let Some(content) = textareas.get(&content_key) {
column![
text(label).size(12).color(inputs::LABEL_COLOR),
text_editor(content)
.placeholder(field.placeholder.clone().unwrap_or_default())
.on_action(move |action| Message::ChatSurfaceTextareaAction {
surface_id: surface_id.clone(),
field: key.clone(),
action,
})
.height(Length::Fixed(96.0))
.style(inputs::text_editor_style),
]
.spacing(6)
.into()
} else {
text(t(locale, "chat.surface.empty")).into()
}
}
FormInputType::Text | FormInputType::Date | FormInputType::Number => {
let value = match &field.value {
serde_json::Value::String(value) => value.clone(),
serde_json::Value::Number(value) => value.to_string(),
_ => String::new(),
};
let placeholder = field.placeholder.clone().unwrap_or_else(|| {
t(
locale,
match field.input_type {
FormInputType::Date => "chat.surface.form.datePlaceholder",
FormInputType::Number => "chat.surface.form.numberPlaceholder",
_ => "chat.surface.form.textPlaceholder",
},
)
});
inputs::labeled_input(&label, &placeholder, &value, move |value| {
let value = if field.input_type == FormInputType::Number {
value
.parse::<serde_json::Number>()
.map(serde_json::Value::Number)
.unwrap_or_else(|_| value.into())
} else {
value.into()
};
Message::ChatSurfaceFieldChanged {
surface_id: surface_id.clone(),
field: key.clone(),
value,
}
})
}
};
children.push(control);
}
if let Some(action) = &surface.submit_action {
children.push(
button(text(
surface
.submit_label
.clone()
.unwrap_or_else(|| t(locale, "chat.surface.form.submit")),
))
.on_press(Message::ChatSurfaceAction {
surface_id: surface.id.clone(),
action: action.clone(),
payload: serde_json::json!({}),
})
.padding([8, 12])
.style(inputs::primary_button)
.into(),
);
}
empty_or_column(children, locale)
}
fn table<'a>(surface: &'a InlineSurface, locale: UiLocale) -> Element<'a, Message> {
if surface.columns.is_empty() && surface.rows.is_empty() {
return text(t(locale, "chat.surface.empty"))
.size(12)
.color(inputs::SECTION_COLOR)
.into();
}
let header = iced::widget::Row::with_children(
surface
.columns
.iter()
.map(|value| {
container(text(value.clone()).size(12))
.width(Length::Fixed(140.0))
.into()
})
.collect::<Vec<_>>(),
)
.spacing(8);
let mut body: Vec<Element<'a, Message>> = vec![header.into()];
for values in &surface.rows {
body.push(
iced::widget::Row::with_children(
values
.iter()
.map(|value| {
container(text(value.clone()).size(12))
.width(Length::Fixed(140.0))
.into()
})
.collect::<Vec<_>>(),
)
.spacing(8)
.into(),
);
}
scrollable(iced::widget::Column::with_children(body).spacing(6))
.direction(scrollable::Direction::Horizontal(
scrollable::Scrollbar::default(),
))
.into()
}
fn mindmap<'a>(surface: &'a InlineSurface, locale: UiLocale) -> Element<'a, Message> {
let rows = mindmap_rows(&surface.nodes);
if rows.is_empty() {
return text(t(locale, "chat.surface.empty"))
.size(12)
.color(inputs::SECTION_COLOR)
.into();
}
iced::widget::Column::with_children(
rows.into_iter()
.map(|(depth, label)| {
row![
Space::with_width(Length::Fixed(depth as f32 * 18.0)),
text(if depth == 0 { "" } else { "" })
.size(11)
.color(inputs::SECTION_COLOR),
text(label).size(13),
]
.spacing(6)
.into()
})
.collect::<Vec<_>>(),
)
.spacing(6)
.into()
}
fn mindmap_rows(nodes: &[MindmapNode]) -> Vec<(usize, String)> {
let by_id = nodes
.iter()
.filter_map(|node| node.id.as_deref().map(|id| (id, node)))
.collect::<HashMap<_, _>>();
let children = nodes
.iter()
.flat_map(|node| node.children.iter().map(String::as_str))
.collect::<HashSet<_>>();
let roots = nodes
.iter()
.filter(|node| node.id.as_deref().is_none_or(|id| !children.contains(id)))
.collect::<Vec<_>>();
let mut rows = Vec::new();
let mut visited = HashSet::new();
fn walk(
node: &MindmapNode,
depth: usize,
by_id: &HashMap<&str, &MindmapNode>,
visited: &mut HashSet<String>,
rows: &mut Vec<(usize, String)>,
) {
if let Some(id) = &node.id
&& !visited.insert(id.clone())
{
return;
}
rows.push((depth, node.label.clone()));
for child in &node.children {
if let Some(node) = by_id.get(child.as_str()) {
walk(node, depth + 1, by_id, visited, rows);
}
}
}
for root in roots {
walk(root, 0, &by_id, &mut visited, &mut rows);
}
for node in nodes {
let missing = node.id.as_ref().is_some_and(|id| !visited.contains(id));
if missing {
walk(node, 0, &by_id, &mut visited, &mut rows);
}
}
rows
}
fn tabs<'a>(
surface: &'a InlineSurface,
state: &'a ChatSurfaceState,
textareas: &'a HashMap<String, text_editor::Content>,
locale: UiLocale,
) -> Element<'a, Message> {
if surface.tabs.is_empty() {
return text(t(locale, "chat.surface.empty")).into();
}
let selected = state
.surface_tabs
.get(&surface.id)
.copied()
.or(surface.selected_index)
.unwrap_or(0)
.min(surface.tabs.len() - 1);
let controls =
surface
.tabs
.iter()
.enumerate()
.fold(row![].spacing(6), |controls, (index, tab)| {
controls.push(
button(text(tab.label.clone()))
.on_press(Message::ChatSurfaceTabSelected {
surface_id: surface.id.clone(),
index,
})
.padding([6, 10])
.style(if index == selected {
inputs::primary_button
} else {
inputs::secondary_button
}),
)
});
let content = iced::widget::Column::with_children(
surface.tabs[selected]
.content
.iter()
.map(|child| surface_view(child, state, textareas, locale, false))
.collect::<Vec<_>>(),
)
.spacing(8);
column![controls, content].spacing(8).into()
}
fn chart<'a>(surface: &'a InlineSurface) -> Element<'a, Message> {
let chart_type = surface.chart_type.unwrap_or(ChartType::Bar);
let canvas = canvas::Canvas::new(NativeChart {
chart_type,
series: surface.series.clone(),
})
.width(Length::Fill)
.height(Length::Fixed(180.0));
let mut legend_items = Vec::new();
if chart_type == ChartType::Heatmap {
let (columns, rows) = heatmap_layout(&surface.series);
for (row_label, values) in rows {
for (column, value) in columns.iter().zip(values) {
legend_items.push(format!(
"{row_label} / {column}{}",
display_number(value)
));
}
}
} else if chart_type == ChartType::StackedBar {
for item in &surface.series {
if item.segments.is_empty() {
legend_items.push(format!("{}{}", item.label, display_number(item.value)));
} else {
for segment in &item.segments {
legend_items.push(format!(
"{} / {}{}",
item.label,
segment.label,
display_number(segment.value)
));
}
}
}
} else {
legend_items.extend(surface.series.iter().map(|item| {
format!(
"{}{}",
item.label,
display_number(chart_series_total(chart_type, item))
)
}));
}
let legend = legend_items.into_iter().enumerate().fold(
iced::widget::Column::new().spacing(4),
|legend, (index, item)| {
legend.push(
text(item)
.size(11)
.color(CHART_COLORS[index % CHART_COLORS.len()]),
)
},
);
column![canvas, legend].spacing(8).into()
}
fn display_number(value: f64) -> String {
if value.fract() == 0.0 {
format!("{value:.0}")
} else {
format!("{value:.2}")
}
}
fn chart_series_total(chart_type: ChartType, series: &ChartSeries) -> f64 {
if chart_type == ChartType::StackedBar && !series.segments.is_empty() {
series.segments.iter().map(|segment| segment.value).sum()
} else {
series.value
}
}
#[derive(Debug, Clone)]
struct NativeChart {
chart_type: ChartType,
series: Vec<ChartSeries>,
}
impl<Message> canvas::Program<Message> for NativeChart {
type State = ();
fn draw(
&self,
_state: &Self::State,
renderer: &Renderer,
_theme: &Theme,
bounds: Rectangle,
_cursor: mouse::Cursor,
) -> Vec<canvas::Geometry> {
let mut frame = canvas::Frame::new(renderer, bounds.size());
match self.chart_type {
ChartType::Bar => draw_bars(&mut frame, &self.series, false),
ChartType::StackedBar => draw_bars(&mut frame, &self.series, true),
ChartType::Line => draw_line(&mut frame, &self.series, false),
ChartType::Area => draw_line(&mut frame, &self.series, true),
ChartType::Pie => draw_pie(&mut frame, &self.series, false),
ChartType::Donut => draw_pie(&mut frame, &self.series, true),
ChartType::Heatmap => draw_heatmap(&mut frame, &self.series),
}
vec![frame.into_geometry()]
}
}
fn positive_max(series: &[ChartSeries], stacked: bool) -> f32 {
series
.iter()
.map(|item| {
if stacked && !item.segments.is_empty() {
item.segments.iter().map(|part| part.value.max(0.0)).sum()
} else {
item.value.max(0.0)
}
})
.fold(0.0_f64, f64::max)
.max(1.0) as f32
}
fn draw_bars(frame: &mut canvas::Frame, series: &[ChartSeries], stacked: bool) {
if series.is_empty() {
return;
}
let size = frame.size();
let gap = 8.0;
let width = ((size.width - gap * (series.len() as f32 + 1.0)) / series.len() as f32).max(3.0);
let max = positive_max(series, stacked);
for (index, item) in series.iter().enumerate() {
let x = gap + index as f32 * (width + gap);
if stacked && !item.segments.is_empty() {
let mut y = size.height - 8.0;
for (part_index, part) in item.segments.iter().enumerate() {
let height = (part.value.max(0.0) as f32 / max) * (size.height - 16.0);
y -= height;
frame.fill(
&Path::rectangle(Point::new(x, y), Size::new(width, height)),
CHART_COLORS[part_index % CHART_COLORS.len()],
);
}
} else {
let height = (item.value.max(0.0) as f32 / max) * (size.height - 16.0);
frame.fill(
&Path::rectangle(
Point::new(x, size.height - height - 8.0),
Size::new(width, height),
),
CHART_COLORS[index % CHART_COLORS.len()],
);
}
}
}
fn chart_points(size: Size, series: &[ChartSeries]) -> Vec<Point> {
let max = positive_max(series, false);
let denominator = series.len().saturating_sub(1).max(1) as f32;
series
.iter()
.enumerate()
.map(|(index, item)| {
Point::new(
8.0 + index as f32 / denominator * (size.width - 16.0),
size.height - 8.0 - item.value.max(0.0) as f32 / max * (size.height - 16.0),
)
})
.collect()
}
fn draw_line(frame: &mut canvas::Frame, series: &[ChartSeries], area: bool) {
let points = chart_points(frame.size(), series);
let Some(first) = points.first().copied() else {
return;
};
let line = Path::new(|builder| {
builder.move_to(first);
for point in points.iter().skip(1) {
builder.line_to(*point);
}
});
if area {
let size = frame.size();
let fill = Path::new(|builder| {
builder.move_to(Point::new(first.x, size.height - 8.0));
builder.line_to(first);
for point in points.iter().skip(1) {
builder.line_to(*point);
}
builder.line_to(Point::new(
points.last().map_or(first.x, |point| point.x),
size.height - 8.0,
));
builder.close();
});
frame.fill(&fill, CHART_COLORS[0].scale_alpha(0.28));
}
frame.stroke(
&line,
Stroke::default()
.with_color(CHART_COLORS[0])
.with_width(2.0)
.with_line_cap(canvas::LineCap::Round),
);
for point in points {
frame.fill(&Path::circle(point, 3.0), CHART_COLORS[0]);
}
}
fn draw_pie(frame: &mut canvas::Frame, series: &[ChartSeries], donut: bool) {
let values = series
.iter()
.map(|item| item.value.max(0.0) as f32)
.collect::<Vec<_>>();
let total = values.iter().sum::<f32>();
if total <= 0.0 {
return;
}
let center = frame.center();
let radius = (frame.width().min(frame.height()) / 2.0 - 8.0).max(1.0);
let mut start = -FRAC_PI_2;
for (index, value) in values.into_iter().enumerate() {
let end = start + value / total * TAU;
let wedge = Path::new(|builder| {
builder.move_to(center);
builder.line_to(Point::new(
center.x + radius * start.cos(),
center.y + radius * start.sin(),
));
builder.arc(path::Arc {
center,
radius,
start_angle: Radians(start),
end_angle: Radians(end),
});
builder.close();
});
frame.fill(&wedge, CHART_COLORS[index % CHART_COLORS.len()]);
start = end;
}
if donut {
frame.fill(
&Path::circle(center, radius * 0.54),
Color::from_rgb8(0x25, 0x25, 0x26),
);
}
}
fn draw_heatmap(frame: &mut canvas::Frame, series: &[ChartSeries]) {
let (columns, rows) = heatmap_layout(series);
if columns.is_empty() || rows.is_empty() {
return;
}
let cell_width = frame.width() / columns.len() as f32;
let cell_height = frame.height() / rows.len() as f32;
let max = rows
.iter()
.flat_map(|(_, values)| values)
.copied()
.fold(0.0_f64, f64::max)
.max(1.0);
for (row_index, (_, values)) in rows.iter().enumerate() {
for (column_index, value) in values.iter().enumerate() {
let alpha = if *value <= 0.0 {
0.08
} else {
0.18 + 0.82 * *value as f32 / max as f32
};
frame.fill(
&Path::rectangle(
Point::new(
column_index as f32 * cell_width + 2.0,
row_index as f32 * cell_height + 2.0,
),
Size::new(cell_width - 4.0, cell_height - 4.0),
),
CHART_COLORS[0].scale_alpha(alpha),
);
}
}
}
fn heatmap_layout(series: &[ChartSeries]) -> (Vec<String>, Vec<(String, Vec<f64>)>) {
let mut columns = Vec::new();
for item in series {
for segment in &item.segments {
if !columns.contains(&segment.label) {
columns.push(segment.label.clone());
}
}
}
let rows = series
.iter()
.filter(|item| !item.segments.is_empty())
.map(|item| {
let values = columns
.iter()
.map(|column| {
item.segments
.iter()
.find(|segment| segment.label == *column)
.map_or(0.0, |segment| segment.value)
})
.collect();
(item.label.clone(), values)
})
.collect();
(columns, rows)
}
#[cfg(test)]
mod tests {
use super::*;
use bds_core::engine::chat_surfaces::build_render_surface;
#[test]
fn chart_math_handles_every_fixed_chart_type() {
let series = vec![ChartSeries {
label: "A".into(),
value: 3.0,
segments: vec![],
}];
for chart_type in [
ChartType::Bar,
ChartType::StackedBar,
ChartType::Line,
ChartType::Area,
ChartType::Pie,
ChartType::Donut,
ChartType::Heatmap,
] {
assert_eq!(chart_series_total(chart_type, &series[0]), 3.0);
}
assert_eq!(chart_points(Size::new(100.0, 100.0), &series).len(), 1);
}
#[test]
fn heatmap_uses_labelled_segments_and_zero_fills_missing_cells() {
let series = vec![
ChartSeries {
label: "First".into(),
value: 0.0,
segments: vec![
bds_core::engine::chat_surfaces::ChartSegment {
label: "A".into(),
value: 2.0,
},
bds_core::engine::chat_surfaces::ChartSegment {
label: "B".into(),
value: 4.0,
},
],
},
ChartSeries {
label: "Second".into(),
value: 0.0,
segments: vec![bds_core::engine::chat_surfaces::ChartSegment {
label: "B".into(),
value: 3.0,
}],
},
];
let (columns, rows) = heatmap_layout(&series);
assert_eq!(columns, ["A", "B"]);
assert_eq!(rows[0], ("First".into(), vec![2.0, 4.0]));
assert_eq!(rows[1], ("Second".into(), vec![0.0, 3.0]));
}
#[test]
fn mindmap_is_cycle_safe_and_keeps_orphans() {
let nodes = vec![
MindmapNode {
id: Some("a".into()),
label: "A".into(),
children: vec!["b".into()],
},
MindmapNode {
id: Some("b".into()),
label: "B".into(),
children: vec!["a".into()],
},
MindmapNode {
id: None,
label: "Loose".into(),
children: vec![],
},
];
let rows = mindmap_rows(&nodes);
assert_eq!(rows.len(), 3);
assert!(rows.iter().any(|(_, label)| label == "Loose"));
}
#[test]
fn every_surface_chart_and_form_control_builds_a_native_widget() {
let state = ChatSurfaceState::default();
let form = serde_json::json!({
"fields": [
{"key": "text", "label": "Text", "inputType": "text"},
{"key": "notes", "label": "Notes", "inputType": "textarea"},
{"key": "choice", "label": "Choice", "inputType": "select", "options": [{"label": "A", "value": "a"}]},
{"key": "enabled", "label": "Enabled", "inputType": "checkbox"},
{"key": "date", "label": "Date", "inputType": "date"},
{"key": "count", "label": "Count", "inputType": "number"}
],
"submitAction": "switchView"
});
let cases = [
(
"render_card",
serde_json::json!({"body": "<script>plain text</script>"}),
),
("render_form", form),
("render_list", serde_json::json!({"items": ["One"]})),
(
"render_metric",
serde_json::json!({"label": "Count", "value": 2}),
),
(
"render_mindmap",
serde_json::json!({"nodes": [{"id": "a", "label": "A"}]}),
),
(
"render_table",
serde_json::json!({"columns": ["A"], "rows": [["B"]]}),
),
(
"render_tabs",
serde_json::json!({"tabs": [{"label": "Mixed", "content": ["plain", {"type": "future", "html": "<b>data</b>"}]}]}),
),
];
for (index, (name, arguments)) in cases.into_iter().enumerate() {
let surface =
build_render_surface(name, &arguments, format!("surface-{index}"), &state).unwrap();
let mut textareas = HashMap::new();
if name == "render_form" {
textareas.insert(
textarea_key(&surface.id, "notes"),
text_editor::Content::new(),
);
}
let _: Element<'_, Message> = view(&surface, &state, &textareas, UiLocale::En);
}
for (index, chart_type) in [
"bar",
"stacked-bar",
"line",
"area",
"pie",
"donut",
"heatmap",
]
.into_iter()
.enumerate()
{
let surface = build_render_surface(
"render_chart",
&serde_json::json!({
"chartType": chart_type,
"series": [{"label": "A", "value": 2, "segments": [{"label": "X", "value": 2}]}]
}),
format!("chart-{index}"),
&state,
)
.unwrap();
let textareas = HashMap::new();
let _: Element<'_, Message> = view(&surface, &state, &textareas, UiLocale::En);
}
}
}

View File

@@ -1,3 +1,9 @@
use std::collections::HashMap;
use std::time::Instant;
use bds_core::engine::chat_surfaces::{
ChatSurfaceState, InlineSurface, build_message_surfaces, build_render_surface,
};
use bds_core::i18n::UiLocale;
use bds_core::model::{ChatConversation, ChatMessage, ChatRole};
use iced::widget::text::Shaping;
@@ -22,6 +28,11 @@ pub struct ChatEditorState {
streaming_markdown: Vec<markdown::Item>,
pub active_tool: Option<String>,
pub error: Option<String>,
pub surface_state: ChatSurfaceState,
pub message_surfaces: HashMap<i32, Vec<InlineSurface>>,
pub streaming_surfaces: Vec<InlineSurface>,
pub surface_textareas: HashMap<String, text_editor::Content>,
pub surface_state_dirty_since: Option<Instant>,
}
#[derive(Debug, Clone, PartialEq, Eq)]
@@ -62,6 +73,13 @@ impl ChatEditorState {
)
})
.collect();
let surface_state = conversation
.surface_state
.as_deref()
.and_then(|value| serde_json::from_str(value).ok())
.unwrap_or_default();
let message_surfaces = build_surfaces(&messages, &surface_state);
let surface_textareas = build_textareas(&message_surfaces);
Self {
rename_input: conversation.title.clone(),
conversation,
@@ -74,6 +92,11 @@ impl ChatEditorState {
streaming_markdown: Vec::new(),
active_tool: None,
error: None,
surface_state,
message_surfaces,
streaming_surfaces: Vec::new(),
surface_textareas,
surface_state_dirty_since: None,
}
}
@@ -89,6 +112,7 @@ impl ChatEditorState {
})
.collect();
self.messages = messages;
self.rebuild_surfaces();
}
pub fn set_streaming_content(&mut self, content: String) {
@@ -99,6 +123,24 @@ impl ChatEditorState {
pub fn clear_streaming(&mut self) {
self.streaming_content.clear();
self.streaming_markdown.clear();
self.streaming_surfaces.clear();
}
pub fn add_streaming_surface(&mut self, name: &str, arguments: &serde_json::Value, id: String) {
if let Some(surface) = build_render_surface(name, arguments, id, &self.surface_state)
&& !self.surface_state.dismissed_surfaces.contains(&surface.id)
{
add_textareas(&mut self.surface_textareas, &surface);
self.streaming_surfaces.push(surface);
}
}
pub fn rebuild_surfaces(&mut self) {
self.message_surfaces = build_surfaces(&self.messages, &self.surface_state);
self.surface_textareas = build_textareas(&self.message_surfaces);
for surface in &self.streaming_surfaces {
add_textareas(&mut self.surface_textareas, surface);
}
}
pub fn token_totals(&self) -> (u64, u64, u64, u64) {
@@ -114,6 +156,50 @@ impl ChatEditorState {
}
}
fn build_surfaces(
messages: &[ChatMessage],
state: &ChatSurfaceState,
) -> HashMap<i32, Vec<InlineSurface>> {
messages
.iter()
.filter_map(|message| {
let surfaces = build_message_surfaces(message, state);
(!surfaces.is_empty()).then_some((message.id, surfaces))
})
.collect()
}
fn build_textareas(
surfaces: &HashMap<i32, Vec<InlineSurface>>,
) -> HashMap<String, text_editor::Content> {
let mut result = HashMap::new();
for surface in surfaces.values().flatten() {
add_textareas(&mut result, surface);
}
result
}
fn add_textareas(result: &mut HashMap<String, text_editor::Content>, surface: &InlineSurface) {
for field in &surface.fields {
if field.input_type == bds_core::engine::chat_surfaces::FormInputType::Textarea {
result
.entry(textarea_key(&surface.id, &field.key))
.or_insert_with(|| {
text_editor::Content::with_text(field.value.as_str().unwrap_or_default())
});
}
}
for tab in &surface.tabs {
for child in &tab.content {
add_textareas(result, child);
}
}
}
pub fn textarea_key(surface_id: &str, field: &str) -> String {
format!("{surface_id}\0{field}")
}
pub fn view<'a>(
state: &'a ChatEditorState,
locale: UiLocale,
@@ -197,6 +283,19 @@ pub fn view<'a>(
state.rendered_messages.get(&message.id),
locale,
));
if let Some(surfaces) = state.message_surfaces.get(&message.id) {
for surface in surfaces {
message_elements.push(crate::views::chat_surfaces::view(
surface,
&state.surface_state,
&state.surface_textareas,
locale,
));
}
}
if let Some(markers) = tool_markers_view(message, locale) {
message_elements.push(markers);
}
}
}
if state.streaming && !state.streaming_content.is_empty() {
@@ -205,6 +304,14 @@ pub fn view<'a>(
t(locale, "chat.streaming"),
));
}
for surface in &state.streaming_surfaces {
message_elements.push(crate::views::chat_surfaces::view(
surface,
&state.surface_state,
&state.surface_textareas,
locale,
));
}
if let Some(tool) = state.active_tool.as_deref() {
message_elements.push(
inputs::card(
@@ -341,10 +448,18 @@ fn message_view<'a>(
.shaping(Shaping::Advanced)
.into()
};
let mut children: Vec<Element<'a, Message>> = vec![
let children: Vec<Element<'a, Message>> = vec![
text(label).size(11).color(inputs::SECTION_COLOR).into(),
body,
];
inputs::card(iced::widget::Column::with_children(children).spacing(6)).into()
}
fn tool_markers_view<'a>(
message: &'a ChatMessage,
locale: UiLocale,
) -> Option<Element<'a, Message>> {
let mut markers = Vec::new();
if let Some(tool_calls) = message.tool_calls.as_deref()
&& let Ok(calls) = serde_json::from_str::<Vec<serde_json::Value>>(tool_calls)
{
@@ -371,10 +486,11 @@ fn message_view<'a>(
args_preview
)
};
children.push(text(marker).size(11).color(inputs::SECTION_COLOR).into());
markers.push(text(marker).size(11).color(inputs::SECTION_COLOR).into());
}
}
inputs::card(iced::widget::Column::with_children(children).spacing(6)).into()
(!markers.is_empty())
.then(|| inputs::card(iced::widget::Column::with_children(markers).spacing(4)).into())
}
fn assistant_card<'a>(items: &'a [markdown::Item], label: String) -> Element<'a, Message> {

View File

@@ -1,4 +1,5 @@
pub mod activity_bar;
pub mod chat_surfaces;
pub mod chat_view;
pub mod dashboard;
pub mod git;