diff --git a/src/bot/messaging.rs b/src/bot/messaging.rs index 623254f..9dfab5e 100644 --- a/src/bot/messaging.rs +++ b/src/bot/messaging.rs @@ -2,7 +2,8 @@ use mxlink::matrix_sdk::{ Room, room::edit::EditedContent, ruma::{ - EventId, OwnedEventId, api::client::receipt::create_receipt::v3::ReceiptType, + EventId, OwnedEventId, + api::client::receipt::create_receipt::v3::ReceiptType, events::room::message::{ OriginalSyncRoomMessageEvent, RoomMessageEventContentWithoutRelation, }, diff --git a/src/controller/chat_completion/mod.rs b/src/controller/chat_completion/mod.rs index 1d99c39..dca9d3f 100644 --- a/src/controller/chat_completion/mod.rs +++ b/src/controller/chat_completion/mod.rs @@ -558,7 +558,9 @@ async fn handle_stage_text_generation( // loop exits the instant generation resolves, so there is no detached task and no late edit can // ever clobber the real answer. `placeholder` is the event we must finalize in every exit path. let (result, placeholder) = if let Some(notice_prompt_variables) = notice_prompt_variables { - let generation = controller.generate_text(conversation, params).instrument(span); + let generation = controller + .generate_text(conversation, params) + .instrument(span); tokio::pin!(generation); let mut placeholder: Option = None; diff --git a/src/strings/thinking.rs b/src/strings/thinking.rs index 9be6649..c39bebb 100644 --- a/src/strings/thinking.rs +++ b/src/strings/thinking.rs @@ -84,11 +84,23 @@ mod tests { // Boundaries: light below 30s, medium [30s, 90s), deep at/after 90s. // The pools have distinct content, so value comparison identifies the tier. assert_eq!(messages_for_elapsed(Duration::from_secs(0)), MESSAGES_LIGHT); - assert_eq!(messages_for_elapsed(Duration::from_secs(29)), MESSAGES_LIGHT); - assert_eq!(messages_for_elapsed(Duration::from_secs(30)), MESSAGES_MEDIUM); - assert_eq!(messages_for_elapsed(Duration::from_secs(89)), MESSAGES_MEDIUM); + assert_eq!( + messages_for_elapsed(Duration::from_secs(29)), + MESSAGES_LIGHT + ); + assert_eq!( + messages_for_elapsed(Duration::from_secs(30)), + MESSAGES_MEDIUM + ); + assert_eq!( + messages_for_elapsed(Duration::from_secs(89)), + MESSAGES_MEDIUM + ); assert_eq!(messages_for_elapsed(Duration::from_secs(90)), MESSAGES_DEEP); - assert_eq!(messages_for_elapsed(Duration::from_secs(600)), MESSAGES_DEEP); + assert_eq!( + messages_for_elapsed(Duration::from_secs(600)), + MESSAGES_DEEP + ); } #[test]