From 4d0f2c1ae67f34bbb751099e65b1bd01a68f021d Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 29 Jun 2025 23:24:47 -0400 Subject: [PATCH] optimize imports --- .../commands/app_preferences/get_app_preferences_command.rs | 2 +- .../app_preferences/update_app_preference_command.rs | 2 +- .../core/commands/enqueue/image/handle_image_artcraft.rs | 2 +- .../core/commands/enqueue/object/handle_object_artcraft.rs | 2 +- .../core/commands/enqueue/video/handle_video_artcraft.rs | 2 +- .../core/commands/providers/get_provider_order_command.rs | 2 +- .../core/commands/providers/set_provider_order_command.rs | 6 +++--- .../state/app_preferences/preferred_download_directory.rs | 2 +- .../services/fal/commands/fal_background_removal_command.rs | 2 +- .../fal/commands/fal_hunyuan_image_to_3d_command.rs | 4 ++-- .../fal/commands/fal_kling_image_to_video_command.rs | 4 ++-- .../src/services/fal/commands/get_fal_api_key_command.rs | 6 +++--- .../src/services/fal/commands/set_fal_api_key_command.rs | 4 ++-- .../src/services/fal/threads/fal_task_polling_thread.rs | 4 ++-- .../src/services/sora/commands/sora_image_remix_command.rs | 2 +- .../src/services/sora/commands/sora_logout_command.rs | 2 +- .../src/services/sora/threads/sora_task_polling_thread.rs | 2 +- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/crates/desktop/artcraft/src/core/commands/app_preferences/get_app_preferences_command.rs b/crates/desktop/artcraft/src/core/commands/app_preferences/get_app_preferences_command.rs index c0757e9e93..3ea0245037 100644 --- a/crates/desktop/artcraft/src/core/commands/app_preferences/get_app_preferences_command.rs +++ b/crates/desktop/artcraft/src/core/commands/app_preferences/get_app_preferences_command.rs @@ -3,7 +3,7 @@ use crate::core::state::app_preferences::preferred_download_directory::Preferred use errors::AnyhowResult; use log::{error, info}; use serde_derive::Serialize; -use tauri::{State}; +use tauri::State; #[derive(Serialize)] pub struct GetAppPreferencesResponse { diff --git a/crates/desktop/artcraft/src/core/commands/app_preferences/update_app_preference_command.rs b/crates/desktop/artcraft/src/core/commands/app_preferences/update_app_preference_command.rs index 7e15e999e6..ca924db5f3 100644 --- a/crates/desktop/artcraft/src/core/commands/app_preferences/update_app_preference_command.rs +++ b/crates/desktop/artcraft/src/core/commands/app_preferences/update_app_preference_command.rs @@ -5,7 +5,7 @@ use anyhow::anyhow; use errors::AnyhowResult; use log::{error, info}; use serde_derive::{Deserialize, Serialize}; -use tauri::{State}; +use tauri::State; /// For now, we'll only update a single preference at a time. #[derive(Deserialize)] diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image/handle_image_artcraft.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image/handle_image_artcraft.rs index 600f4bd2fc..64426db4c2 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image/handle_image_artcraft.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image/handle_image_artcraft.rs @@ -20,7 +20,7 @@ use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::gene use storyteller_client::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image; use storyteller_client::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image; use storyteller_client::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image; -use tauri::{AppHandle}; +use tauri::AppHandle; pub async fn handle_image_artcraft( request: EnqueueTextToImageRequest, diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/object/handle_object_artcraft.rs b/crates/desktop/artcraft/src/core/commands/enqueue/object/handle_object_artcraft.rs index 11eb235538..ab437aaf4d 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/object/handle_object_artcraft.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/object/handle_object_artcraft.rs @@ -14,7 +14,7 @@ use log::{error, info}; use storyteller_client::generate::object::generate_hunyuan_3d_2_0_image_to_3d::generate_hunyuan3d_2_0_image_to_3d; use storyteller_client::generate::object::generate_hunyuan_3d_2_1_image_to_3d::generate_hunyuan3d_2_1_image_to_3d; use storyteller_client::utils::api_host::ApiHost; -use tauri::{AppHandle}; +use tauri::AppHandle; pub async fn handle_object_artcraft( request: EnqueueImageTo3dObjectRequest, diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/video/handle_video_artcraft.rs b/crates/desktop/artcraft/src/core/commands/enqueue/video/handle_video_artcraft.rs index cc7671d7d7..a773f427cb 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/video/handle_video_artcraft.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/video/handle_video_artcraft.rs @@ -23,7 +23,7 @@ use storyteller_client::generate::video::generate_kling_21_pro_image_to_video::g use storyteller_client::generate::video::generate_seedance_1_0_lite_image_to_video::generate_seedance_1_0_lite_image_to_video; use storyteller_client::generate::video::generate_veo_2_image_to_video::generate_veo_2_image_to_video; use storyteller_client::utils::api_host::ApiHost; -use tauri::{AppHandle}; +use tauri::AppHandle; pub async fn handle_video_artcraft( request: EnqueueImageToVideoRequest, diff --git a/crates/desktop/artcraft/src/core/commands/providers/get_provider_order_command.rs b/crates/desktop/artcraft/src/core/commands/providers/get_provider_order_command.rs index ef2dc7fc42..0b7d69c170 100644 --- a/crates/desktop/artcraft/src/core/commands/providers/get_provider_order_command.rs +++ b/crates/desktop/artcraft/src/core/commands/providers/get_provider_order_command.rs @@ -3,7 +3,7 @@ use crate::core::commands::response::success_response_wrapper::SerializeMarker; use crate::core::state::provider_priority::{Provider, ProviderPriorityStore}; use log::{error, info}; use serde_derive::Serialize; -use tauri::{State}; +use tauri::State; #[derive(Serialize)] pub struct GetProviderOrderResponse { diff --git a/crates/desktop/artcraft/src/core/commands/providers/set_provider_order_command.rs b/crates/desktop/artcraft/src/core/commands/providers/set_provider_order_command.rs index 6c2628ae3c..de5892d926 100644 --- a/crates/desktop/artcraft/src/core/commands/providers/set_provider_order_command.rs +++ b/crates/desktop/artcraft/src/core/commands/providers/set_provider_order_command.rs @@ -1,9 +1,9 @@ -use crate::core::commands::response::shorthand::{SuccessOrErrorMessage}; +use crate::core::commands::response::shorthand::SuccessOrErrorMessage; use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::core::state::provider_priority::{Provider, ProviderPriorityStore}; use log::{error, info}; -use serde_derive::{Deserialize}; -use tauri::{State}; +use serde_derive::Deserialize; +use tauri::State; #[derive(Deserialize)] pub struct SetProviderOrderRequest { diff --git a/crates/desktop/artcraft/src/core/state/app_preferences/preferred_download_directory.rs b/crates/desktop/artcraft/src/core/state/app_preferences/preferred_download_directory.rs index 0e8f68d085..f8c2a950cb 100644 --- a/crates/desktop/artcraft/src/core/state/app_preferences/preferred_download_directory.rs +++ b/crates/desktop/artcraft/src/core/state/app_preferences/preferred_download_directory.rs @@ -60,7 +60,7 @@ impl Display for SystemDownloadDirectory { mod tests { use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory; use crate::core::state::app_preferences::preferred_download_directory::SystemDownloadDirectory; - + mod json { use super::*; diff --git a/crates/desktop/artcraft/src/services/fal/commands/fal_background_removal_command.rs b/crates/desktop/artcraft/src/services/fal/commands/fal_background_removal_command.rs index 54dbfef42c..e248fc2ecd 100644 --- a/crates/desktop/artcraft/src/services/fal/commands/fal_background_removal_command.rs +++ b/crates/desktop/artcraft/src/services/fal/commands/fal_background_removal_command.rs @@ -18,7 +18,7 @@ use crate::services::storyteller::state::storyteller_credential_manager::Storyte use anyhow::anyhow; use base64::prelude::BASE64_STANDARD; use base64::{DecodeError, Engine}; -use errors::{AnyhowError}; +use errors::AnyhowError; use fal_client::error::fal_error_plus::FalErrorPlus; use fal_client::requests::queue::remove_background_rembg::remove_background_rembg; use filesys::file_read_bytes::file_read_bytes; diff --git a/crates/desktop/artcraft/src/services/fal/commands/fal_hunyuan_image_to_3d_command.rs b/crates/desktop/artcraft/src/services/fal/commands/fal_hunyuan_image_to_3d_command.rs index 292b8fe42c..04c0ba156c 100644 --- a/crates/desktop/artcraft/src/services/fal/commands/fal_hunyuan_image_to_3d_command.rs +++ b/crates/desktop/artcraft/src/services/fal/commands/fal_hunyuan_image_to_3d_command.rs @@ -14,8 +14,8 @@ use crate::services::fal::state::fal_credential_manager::FalCredentialManager; use crate::services::fal::state::fal_task_queue::FalTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use anyhow::anyhow; -use base64::{DecodeError}; -use errors::{AnyhowError}; +use base64::DecodeError; +use errors::AnyhowError; use fal_client::error::fal_error_plus::FalErrorPlus; use fal_client::requests::queue::enqueue_hunyuan2_image_to_3d::{enqueue_hunyuan2_image_to_3d, Hunyuan2Args}; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/services/fal/commands/fal_kling_image_to_video_command.rs b/crates/desktop/artcraft/src/services/fal/commands/fal_kling_image_to_video_command.rs index f3543ae9d2..b87a133f33 100644 --- a/crates/desktop/artcraft/src/services/fal/commands/fal_kling_image_to_video_command.rs +++ b/crates/desktop/artcraft/src/services/fal/commands/fal_kling_image_to_video_command.rs @@ -14,8 +14,8 @@ use crate::services::fal::state::fal_credential_manager::FalCredentialManager; use crate::services::fal::state::fal_task_queue::FalTaskQueue; use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager; use anyhow::anyhow; -use base64::{DecodeError}; -use errors::{AnyhowError}; +use base64::DecodeError; +use errors::AnyhowError; use fal_client::error::fal_error_plus::FalErrorPlus; use fal_client::requests::queue::video_gen::enqueue_kling_16_pro_image_to_video::{enqueue_kling_16_pro_image_to_video, Kling16ProArgs, Kling16ProAspectRatio, Kling16ProDuration}; use log::{error, info, warn}; diff --git a/crates/desktop/artcraft/src/services/fal/commands/get_fal_api_key_command.rs b/crates/desktop/artcraft/src/services/fal/commands/get_fal_api_key_command.rs index 1feabdc6ef..939ec396be 100644 --- a/crates/desktop/artcraft/src/services/fal/commands/get_fal_api_key_command.rs +++ b/crates/desktop/artcraft/src/services/fal/commands/get_fal_api_key_command.rs @@ -2,9 +2,9 @@ use crate::core::commands::response::shorthand::Response; use crate::core::commands::response::success_response_wrapper::SerializeMarker; use crate::services::fal::state::fal_credential_manager::FalCredentialManager; use errors::AnyhowResult; -use log::{error}; -use serde_derive::{Serialize}; -use tauri::{State}; +use log::error; +use serde_derive::Serialize; +use tauri::State; #[derive(Serialize)] pub struct GetFalApiKeyResponse { diff --git a/crates/desktop/artcraft/src/services/fal/commands/set_fal_api_key_command.rs b/crates/desktop/artcraft/src/services/fal/commands/set_fal_api_key_command.rs index 1dcaeeeda9..6b4fc211a7 100644 --- a/crates/desktop/artcraft/src/services/fal/commands/set_fal_api_key_command.rs +++ b/crates/desktop/artcraft/src/services/fal/commands/set_fal_api_key_command.rs @@ -3,8 +3,8 @@ use crate::services::fal::state::fal_credential_manager::FalCredentialManager; use errors::AnyhowResult; use fal_client::creds::fal_api_key::FalApiKey; use log::{error, info}; -use serde_derive::{Deserialize}; -use tauri::{State}; +use serde_derive::Deserialize; +use tauri::State; /// For now, we'll only update a single preference at a time. #[derive(Deserialize)] diff --git a/crates/desktop/artcraft/src/services/fal/threads/fal_task_polling_thread.rs b/crates/desktop/artcraft/src/services/fal/threads/fal_task_polling_thread.rs index 92e6807db3..0c27c76ab0 100644 --- a/crates/desktop/artcraft/src/services/fal/threads/fal_task_polling_thread.rs +++ b/crates/desktop/artcraft/src/services/fal/threads/fal_task_polling_thread.rs @@ -1,5 +1,5 @@ use crate::core::events::basic_sendable_event_trait::BasicSendableEvent; -use crate::core::events::generation_events::common::{GenerationServiceProvider}; +use crate::core::events::generation_events::common::GenerationServiceProvider; use crate::core::events::generation_events::generation_complete_event::GenerationCompleteEvent; use crate::core::state::data_dir::app_data_root::AppDataRoot; use crate::core::utils::download_url_to_temp_dir::download_url_to_temp_dir; @@ -13,7 +13,7 @@ use fal_client::utils::queue_status_checker::QueueStatusChecker; use log::{error, info, warn}; use storyteller_client::recipes::upload_media_file_from_file::upload_media_file_from_file; use storyteller_client::utils::api_host::ApiHost; -use tauri::{AppHandle}; +use tauri::AppHandle; use tokens::tokens::media_files::MediaFileToken; pub async fn fal_task_polling_thread( diff --git a/crates/desktop/artcraft/src/services/sora/commands/sora_image_remix_command.rs b/crates/desktop/artcraft/src/services/sora/commands/sora_image_remix_command.rs index 1a27c13bc7..73b9315b56 100644 --- a/crates/desktop/artcraft/src/services/sora/commands/sora_image_remix_command.rs +++ b/crates/desktop/artcraft/src/services/sora/commands/sora_image_remix_command.rs @@ -11,7 +11,7 @@ use crate::core::utils::get_url_file_extension::get_url_file_extension; use crate::core::utils::simple_http_download::simple_http_download; use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use crate::services::sora::state::sora_task_queue::SoraTaskQueue; -use errors::{AnyhowError}; +use errors::AnyhowError; use log::{error, info, warn}; use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest}; use openai_sora_client::recipes::image_upload_from_file_with_session_auto_renew::{image_upload_from_file_with_session_auto_renew, ImageUploadFromFileAutoRenewRequest}; diff --git a/crates/desktop/artcraft/src/services/sora/commands/sora_logout_command.rs b/crates/desktop/artcraft/src/services/sora/commands/sora_logout_command.rs index f5f5c3f657..cfd8a51c2e 100644 --- a/crates/desktop/artcraft/src/services/sora/commands/sora_logout_command.rs +++ b/crates/desktop/artcraft/src/services/sora/commands/sora_logout_command.rs @@ -1,7 +1,7 @@ use crate::core::commands::response::shorthand::SimpleResponse; use crate::services::sora::state::sora_credential_manager::SoraCredentialManager; use log::{error, info}; -use tauri::{State}; +use tauri::State; #[tauri::command] pub async fn sora_logout_command( diff --git a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling_thread.rs b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling_thread.rs index b4e83e6eeb..c5e92df493 100644 --- a/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling_thread.rs +++ b/crates/desktop/artcraft/src/services/sora/threads/sora_task_polling_thread.rs @@ -18,7 +18,7 @@ use std::io::Write; use std::path::PathBuf; use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file; use storyteller_client::utils::api_host::ApiHost; -use tauri::{AppHandle}; +use tauri::AppHandle; use tempdir::TempDir; pub async fn sora_task_polling_thread(