fmt

src/controller/determination/mod.rs

@@ -42,9 +42,7 @@ pub fn determine_controller(
                 .text_generation_prefix_requirement_type();
 
             match prefix_requirement_type {
-                TextGenerationPrefixRequirementType::CommandPrefix => {
-                    ControllerType::Ignore
-                }
+                TextGenerationPrefixRequirementType::CommandPrefix => ControllerType::Ignore,
                 TextGenerationPrefixRequirementType::No => {
                     ControllerType::ChatCompletion(ChatCompletionControllerType::Image)
                 }

src/controller/dispatching.rs

@@ -78,13 +78,8 @@ pub async fn dispatch_controller(
             .await
         }
         ControllerType::ImageEdit(prompt) => {
-            super::image::edit::handle(
-                bot,
-                bot.matrix_link().clone(),
-                message_context,
-                prompt,
-            )
-            .await
+            super::image::edit::handle(bot, bot.matrix_link().clone(), message_context, prompt)
+                .await
         }
         ControllerType::StickerGeneration(prompt) => {
             super::image::generation::handle_sticker(

src/controller/image/determination/mod.rs

@@ -1,9 +1,7 @@
 use crate::controller::ControllerType;
 mod tests;
 
-pub fn determine_controller(
-    text: &str,
-) -> ControllerType {
+pub fn determine_controller(text: &str) -> ControllerType {
     let text = text.trim();
 
     if let Some(prompt) = text.strip_prefix("create") {

src/controller/image/determination/tests.rs

@@ -22,11 +22,12 @@ fn determine_controller() {
             input: "create Some prompt",
             expected: super::ControllerType::ImageGeneration("Some prompt".to_owned()),
         },
-
         TestCase {
             name: "Image edit triggered by edit prefix",
             input: "edit Turn this into an anime-style image",
-            expected: super::ControllerType::ImageEdit("Turn this into an anime-style image".to_owned()),
+            expected: super::ControllerType::ImageEdit(
+                "Turn this into an anime-style image".to_owned(),
+            ),
         },
     ];
 

src/controller/image/edit.rs

@@ -2,15 +2,15 @@ use mxlink::{MatrixLink, MessageResponseType};
 
 use tracing::Instrument;
 
-use crate::agent::provider::ImageSource;
 use crate::agent::AgentPurpose;
 use crate::agent::ControllerTrait;
 use crate::agent::provider::ImageEditParams;
+use crate::agent::provider::ImageSource;
 use crate::controller::utils::agent::get_effective_agent_for_purpose_or_complain;
-use crate::utils::mime::get_file_extension;
 use crate::conversation::create_llm_conversation_for_matrix_thread;
 use crate::conversation::matrix::MatrixMessageProcessingParams;
 use crate::strings;
+use crate::utils::mime::get_file_extension;
 use crate::{Bot, entity::MessageContext};
 
 pub async fn handle(
@@ -69,23 +69,25 @@ pub async fn handle(
         }
     });
 
-    let image_sources: Vec<ImageSource> = conversation.messages.iter().filter_map(|message| {
-        if let crate::conversation::llm::MessageContent::Image(image_content) = &message.content {
-            Some(image_content.clone().into())
-        } else {
-            None
-        }
-    }).collect();
+    let image_sources: Vec<ImageSource> = conversation
+        .messages
+        .iter()
+        .filter_map(|message| {
+            if let crate::conversation::llm::MessageContent::Image(image_content) = &message.content
+            {
+                Some(image_content.clone().into())
+            } else {
+                None
+            }
+        })
+        .collect();
 
     if !got_go_signal || image_sources.is_empty() {
         // We don't send the guide again here to avoid being annoying.
         return Ok(());
     }
 
-    let span = tracing::debug_span!(
-        "image_edit",
-        agent_id = agent.identifier().as_string()
-    );
+    let span = tracing::debug_span!("image_edit", agent_id = agent.identifier().as_string());
 
     let result = agent
         .controller()
@@ -147,10 +149,7 @@ pub async fn handle(
     Ok(())
 }
 
-async fn send_guide(
-    bot: &Bot,
-    message_context: &MessageContext,
-) -> anyhow::Result<()> {
+async fn send_guide(bot: &Bot, message_context: &MessageContext) -> anyhow::Result<()> {
     bot.messaging()
         .send_text_markdown_no_fail(
             message_context.room(),

src/controller/image/generation.rs

@@ -6,10 +6,10 @@ use crate::agent::AgentPurpose;
 use crate::agent::ControllerTrait;
 use crate::agent::provider::ImageGenerationParams;
 use crate::controller::utils::agent::get_effective_agent_for_purpose_or_complain;
-use crate::utils::mime::get_file_extension;
 use crate::conversation::create_llm_conversation_for_matrix_thread;
 use crate::conversation::matrix::MatrixMessageProcessingParams;
 use crate::strings;
+use crate::utils::mime::get_file_extension;
 use crate::{Bot, entity::MessageContext};
 
 // We may make this configurable (per room, etc.) in the future, but for now it's hardcoded.

src/controller/image/mod.rs

@@ -1,6 +1,6 @@
-pub mod generation;
-pub mod edit;
-mod prompt;
 mod determination;
+pub mod edit;
+pub mod generation;
+mod prompt;
 
 pub use determination::determine_controller;

src/controller/image/prompt.rs

@@ -29,9 +29,7 @@ pub fn build(original_prompt: &str, other_messages: Vec<Message>) -> String {
         prompt.push_str("\nOther criteria:");
         for message in other_messages {
             if let MessageContent::Text(text) = &message.content {
-                prompt.push_str(
-                    format!("\n- {}", text.replace("\n", ". ").as_str()).as_str(),
-                );
+                prompt.push_str(format!("\n- {}", text.replace("\n", ". ").as_str()).as_str());
             }
         }
     }
@@ -87,7 +85,9 @@ mod tests {
                     },
                     Message {
                         author: Author::User,
-                        content: MessageContent::Text("Must be 3-legged.\nMust be flying.".to_owned()),
+                        content: MessageContent::Text(
+                            "Must be 3-legged.\nMust be flying.".to_owned(),
+                        ),
                         timestamp,
                     },
                 ],