Ling0925
/
buster
mirror of https://github.com/buster-so/buster.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up merge conflict

This commit is contained in:
dal 2025-03-21 13:24:46 -06:00
parent 81f6e6cf9e
commit ff004035b1
No known key found for this signature in database
GPG Key ID: 16F4B0E1E9F61122
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
api/libs/handlers/src/chats/post_chat_handler.rs
View File

@ -559,21 +559,22 @@ async fn process_completed_files(
// Process files for database updates only // Process files for database updates only
for (container, _) in transformed_messages { for (container, _) in transformed_messages {
if let BusterContainer::ReasoningMessage(msg) = container { match &msg.reasoning { if let BusterContainer::ReasoningMessage(msg) = container {
BusterReasoningMessage::File(file) if file.message_type == "files" => { match &msg.reasoning {
for file_id in &file.file_ids { BusterReasoningMessage::File(file) if file.message_type == "files" => {
// Skip if we've already processed this file ID for file_id in &file.file_ids {
if !processed_file_ids.insert(file_id.clone()) { // Skip if we've already processed this file ID
continue; if !processed_file_ids.insert(file_id.clone()) {
} continue;
}
if let Some(_) = file.files.get(file_id) { if let Some(_file_content) = file.files.get(file_id) {
// Only process files that have completed reasoning // Only process files that have completed reasoning
// Create message-to-file association // Create message-to-file association
let message_to_file = MessageToFile { let message_to_file = MessageToFile {
id: Uuid::new_v4(), id: Uuid::new_v4(),
message_id: message.id, message_id: message.id,
file_id: Uuid::parse_str(&file_id)?, file_id: Uuid::parse_str(file_id)?,
created_at: Utc::now(), created_at: Utc::now(),
updated_at: Utc::now(), updated_at: Utc::now(),
deleted_at: None, deleted_at: None,
@ -586,9 +587,9 @@ async fn process_completed_files(
} }
} }
} }
_ => (),
} }
_ => (), }
} }
} }
Ok(()) Ok(())
@ -1425,8 +1426,6 @@ fn transform_assistant_tool_message(
let containers: Vec<BusterReasoningMessage> = messages let containers: Vec<BusterReasoningMessage> = messages
.into_iter() .into_iter()
.filter_map(|reasoning| { .filter_map(|reasoning| {
match reasoning { match reasoning {
BusterReasoningMessage::Text(mut text) => { BusterReasoningMessage::Text(mut text) => {
match progress { match progress {