fmt: cleaned up graph implementation
This commit is contained in:
@@ -94,21 +94,21 @@ impl MessageContent {
|
||||
match self {
|
||||
MessageContent::Text(text) => multiline_text(text),
|
||||
MessageContent::Array(list) => {
|
||||
let (mut concated_text, mut files) = (String::new(), vec![]);
|
||||
let (mut concatenated_text, mut files) = (String::new(), vec![]);
|
||||
for item in list {
|
||||
match item {
|
||||
MessageContentPart::Text { text } => {
|
||||
concated_text = format!("{concated_text} {text}")
|
||||
concatenated_text = format!("{concatenated_text} {text}")
|
||||
}
|
||||
MessageContentPart::ImageUrl { image_url } => {
|
||||
files.push(resolve_url_fn(&image_url.url))
|
||||
}
|
||||
}
|
||||
}
|
||||
if !concated_text.is_empty() {
|
||||
concated_text = format!(" -- {}", multiline_text(&concated_text))
|
||||
if !concatenated_text.is_empty() {
|
||||
concatenated_text = format!(" -- {}", multiline_text(&concatenated_text))
|
||||
}
|
||||
format!(".file {}{}", files.join(" "), concated_text)
|
||||
format!(".file {}{}", files.join(" "), concatenated_text)
|
||||
}
|
||||
MessageContent::ToolCalls(MessageContentToolCalls {
|
||||
tool_results, text, ..
|
||||
@@ -230,9 +230,11 @@ pub fn extract_system_message(messages: &mut Vec<Message>) -> Option<String> {
|
||||
if messages.is_empty() {
|
||||
return None;
|
||||
}
|
||||
|
||||
if messages[0].role.is_system() {
|
||||
let system_message = messages.remove(0);
|
||||
return Some(system_message.content.to_text());
|
||||
}
|
||||
|
||||
None
|
||||
}
|
||||
|
||||
@@ -33,11 +33,6 @@ impl SseHandler {
|
||||
}
|
||||
}
|
||||
|
||||
/// Suppresses stdout streaming of incoming tokens. Tokens are still buffered
|
||||
/// internally (so the caller's `.take()` still returns the full response) —
|
||||
/// only the per-token send to the SSE renderer is skipped. Used by parallel
|
||||
/// graph super-step branches so concurrent LLM calls don't interleave on
|
||||
/// stdout.
|
||||
pub fn set_silent(&mut self, silent: bool) {
|
||||
self.silent = silent;
|
||||
}
|
||||
@@ -47,10 +42,11 @@ impl SseHandler {
|
||||
return Ok(());
|
||||
}
|
||||
self.buffer.push_str(text);
|
||||
|
||||
if self.silent {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
|
||||
let ret = self
|
||||
.sender
|
||||
.send(SseEvent::Text(text.to_string()))
|
||||
|
||||
Reference in New Issue
Block a user