optimize imports

crates/desktop/artcraft/Cargo.toml

@@ -9,6 +9,9 @@ edition = "2021"
 rust-version = "1.77.2"
 publish = false
 
+# [lints.rust]
+# unused_imports = "forbid"
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [lib]

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::{AppHandle, State};
+use tauri::State;
 
 #[derive(Serialize)]
 pub struct GetAppPreferencesResponse {

crates/desktop/artcraft/src/core/commands/app_preferences/update_app_preference_command.rs

@@ -4,9 +4,8 @@ use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{error, info};
-use openai_sora_client::sora_error::SoraError::AnyhowError;
 use serde_derive::{Deserialize, Serialize};
-use tauri::{AppHandle, State};
+use tauri::State;
 
 /// For now, we'll only update a single preference at a time.
 #[derive(Deserialize)]

crates/desktop/artcraft/src/core/commands/enqueue/image/enqueue_text_to_image_command.rs

@@ -3,7 +3,6 @@ use crate::core::commands::enqueue::image::handle_image_fal::handle_image_fal;
 use crate::core::commands::enqueue::image::handle_image_sora::handle_image_sora;
 use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
 use crate::core::commands::enqueue::image::success_event::SuccessEvent;
-use crate::core::commands::enqueue::object::handle_object_artcraft::handle_object_artcraft;
 use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
 use crate::core::commands::response::shorthand::Response;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
@@ -14,56 +13,16 @@ use crate::core::events::sendable_event_trait::SendableEvent;
 use crate::core::model::image_models::ImageModel;
 use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
-use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
-use crate::core::utils::get_url_file_extension::get_url_file_extension;
-use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
-use crate::core::utils::simple_http_download::simple_http_download;
-use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use anyhow::anyhow;
-use base64::prelude::BASE64_STANDARD;
-use base64::{DecodeError, Engine};
-use errors::{AnyhowError, AnyhowResult};
-use fal_client::error::fal_error_plus::FalErrorPlus;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
-use filesys::file_read_bytes::file_read_bytes;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, EncodableLayout, ImageReader};
-use log::{debug, error, info, warn};
-use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
-use openai_sora_client::credentials::SoraCredentials;
-use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
-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};
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
-use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
-use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
-use openai_sora_client::sora_error::SoraError;
-use reqwest::Url;
+use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
-use std::fs::read_to_string;
-use std::io::{Cursor, Read, Write};
-use std::ops::Add;
-use std::path::PathBuf;
-use std::time::Duration;
-use storyteller_client::error::api_error::ApiError;
-use storyteller_client::error::api_error::ApiError::InternalServerError;
-use storyteller_client::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
-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, Emitter, Manager, State};
-use tempfile::NamedTempFile;
+use tauri::{AppHandle, State};
 
 #[derive(Deserialize)]
 pub struct EnqueueTextToImageRequest {

crates/desktop/artcraft/src/core/commands/enqueue/image/handle_image_artcraft.rs

@@ -2,40 +2,25 @@ use crate::core::commands::enqueue::image::enqueue_text_to_image_command::Enqueu
 use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
 use crate::core::commands::enqueue::image::success_event::SuccessEvent;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationModel, GenerationServiceProvider};
+use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
-use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::model::image_models::ImageModel;
 use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
-use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
-use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
 use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::GenerateFlux1DevTextToImageRequest;
 use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::GenerateFlux1SchnellTextToImageRequest;
 use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageRequest;
 use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageRequest;
-use artcraft_api_defs::generate::object::generate_hunyuan_2_0_image_to_3d::GenerateHunyuan20ImageTo3dRequest;
-use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::GenerateKling16ProImageToVideoRequest;
-use fal_client::creds::fal_api_key::FalApiKey;
-use fal_client::requests::queue::enqueue_hunyuan2_image_to_3d::{enqueue_hunyuan2_image_to_3d, Hunyuan2Args};
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
 use idempotency::uuid::generate_random_uuid;
-use log::{error, info, warn};
+use log::{error, info};
 use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
 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 storyteller_client::generate::object::generate_hunyuan_3d_2_0_image_to_3d::generate_hunyuan3d_2_0_image_to_3d;
-use storyteller_client::generate::video::generate_kling_16_pro_image_to_video::generate_kling_16_pro_image_to_video;
-use storyteller_client::utils::api_host::ApiHost;
-use tauri::{AppHandle, State};
+use tauri::AppHandle;
 
 pub async fn handle_image_artcraft(
   request: EnqueueTextToImageRequest,

crates/desktop/artcraft/src/core/commands/enqueue/image/handle_image_fal.rs

@@ -4,19 +4,13 @@ use crate::core::commands::enqueue::image::success_event::SuccessEvent;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
 use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
-use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::model::image_models::ImageModel;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
-use fal_client::creds::fal_api_key::FalApiKey;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
 use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
-use log::{error, info, warn};
+use log::{error, info};
 use tauri::AppHandle;
 
 pub async fn handle_image_fal(

crates/desktop/artcraft/src/core/commands/enqueue/image/handle_image_sora.rs

@@ -1,25 +1,15 @@
-use crate::core::commands::enqueue::image::enqueue_text_to_image_command::{EnqueueTextToImageRequest};
+use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
 use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
 use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
-use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::fal::state::fal_task_queue::FalTaskQueue;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use anyhow::anyhow;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
-use log::{error, info, warn};
-use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
-use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest};
+use log::{error, info};
 use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
 use openai_sora_client::recipes::simple_image_gen_with_session_auto_renew::{simple_image_gen_with_session_auto_renew, SimpleImageGenAutoRenewRequest};
-use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages, SoraImageGenResponse};
-use openai_sora_client::sora_error::SoraError;
+use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
 use std::time::Duration;
 use tauri::AppHandle;
 

crates/desktop/artcraft/src/core/commands/enqueue/object/enqueue_image_to_3d_object_command.rs

@@ -4,61 +4,17 @@ use crate::core::commands::enqueue::object::internal_object_error::InternalObjec
 use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
 use crate::core::commands::response::shorthand::Response;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
-use crate::core::events::sendable_event_trait::SendableEvent;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
-use crate::core::utils::get_url_file_extension::get_url_file_extension;
-use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
-use crate::core::utils::simple_http_download::simple_http_download;
-use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
+use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use anyhow::anyhow;
-use base64::prelude::BASE64_STANDARD;
-use base64::{DecodeError, Engine};
-use errors::{AnyhowError, AnyhowResult};
-use fal_client::error::fal_error_plus::FalErrorPlus;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
-use filesys::file_read_bytes::file_read_bytes;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, EncodableLayout, ImageReader};
-use log::{debug, error, info, warn};
-use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
-use openai_sora_client::credentials::SoraCredentials;
-use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
-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};
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
-use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
-use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
-use openai_sora_client::sora_error::SoraError;
-use reqwest::Url;
+use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
-use std::fs::read_to_string;
-use std::io::{Cursor, Read, Write};
-use std::ops::Add;
-use std::path::PathBuf;
-use std::time::Duration;
-use storyteller_client::error::api_error::ApiError;
-use storyteller_client::error::api_error::ApiError::InternalServerError;
-use storyteller_client::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
-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, Emitter, Manager, State};
-use tempfile::NamedTempFile;
+use tauri::{AppHandle, State};
 use tokens::tokens::media_files::MediaFileToken;
-use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageErrorType;
-use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
-use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
 
 #[derive(Deserialize)]
 pub struct EnqueueImageTo3dObjectRequest {

crates/desktop/artcraft/src/core/commands/enqueue/object/handle_object_artcraft.rs

@@ -5,26 +5,16 @@ use crate::core::events::generation_events::common::{GenerationAction, Generatio
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
 use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
-use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
-use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use anyhow::anyhow;
 use artcraft_api_defs::generate::object::generate_hunyuan_2_0_image_to_3d::GenerateHunyuan20ImageTo3dRequest;
 use artcraft_api_defs::generate::object::generate_hunyuan_2_1_image_to_3d::GenerateHunyuan21ImageTo3dRequest;
-use fal_client::creds::fal_api_key::FalApiKey;
-use fal_client::requests::queue::enqueue_hunyuan2_image_to_3d::{enqueue_hunyuan2_image_to_3d, Hunyuan2Args};
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
 use idempotency::uuid::generate_random_uuid;
-use log::{error, info, warn};
+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, State};
+use tauri::AppHandle;
 
 pub async fn handle_object_artcraft(
   request: EnqueueImageTo3dObjectRequest,

crates/desktop/artcraft/src/core/commands/enqueue/object/handle_object_fal.rs

@@ -6,18 +6,12 @@ use crate::core::events::generation_events::generation_enqueue_failure_event::Ge
 use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
-use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
-use fal_client::creds::fal_api_key::FalApiKey;
 use fal_client::requests::queue::enqueue_hunyuan2_image_to_3d::{enqueue_hunyuan2_image_to_3d, Hunyuan2Args};
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
-use log::{error, info, warn};
+use log::{error, info};
 use tauri::AppHandle;
 
 pub async fn handle_object_fal(

crates/desktop/artcraft/src/core/commands/enqueue/video/enqueue_image_to_video_command.rs

@@ -6,59 +6,16 @@ use crate::core::commands::response::shorthand::Response;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
 use crate::core::model::video_models::VideoModel;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
-use crate::core::utils::get_url_file_extension::get_url_file_extension;
-use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
-use crate::core::utils::simple_http_download::simple_http_download;
-use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
+use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use anyhow::anyhow;
-use base64::prelude::BASE64_STANDARD;
-use base64::{DecodeError, Engine};
-use errors::{AnyhowError, AnyhowResult};
-use fal_client::error::fal_error_plus::FalErrorPlus;
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
-use filesys::file_read_bytes::file_read_bytes;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, EncodableLayout, ImageReader};
-use log::{debug, error, info, warn};
-use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
-use openai_sora_client::credentials::SoraCredentials;
-use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
-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};
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
-use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
-use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
-use openai_sora_client::sora_error::SoraError;
-use reqwest::Url;
+use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
-use std::fs::read_to_string;
-use std::io::{Cursor, Read, Write};
-use std::ops::Add;
-use std::path::PathBuf;
-use std::time::Duration;
-use storyteller_client::error::api_error::ApiError;
-use storyteller_client::error::api_error::ApiError::InternalServerError;
-use storyteller_client::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
-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, Emitter, Manager, State};
-use tempfile::NamedTempFile;
+use tauri::{AppHandle, State};
 use tokens::tokens::media_files::MediaFileToken;
-use crate::core::commands::enqueue::object::enqueue_image_to_3d_object_command::EnqueueImageTo3dObjectErrorType;
-use crate::core::commands::enqueue::object::internal_object_error::InternalObjectError;
-use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
 
 #[derive(Deserialize)]
 pub struct EnqueueImageToVideoRequest {

crates/desktop/artcraft/src/core/commands/enqueue/video/handle_video_artcraft.rs

@@ -1,4 +1,3 @@
-use crate::core::commands::enqueue::object::enqueue_image_to_3d_object_command::{EnqueueImageTo3dObjectModel, EnqueueImageTo3dObjectRequest};
 use crate::core::commands::enqueue::video::enqueue_image_to_video_command::EnqueueImageToVideoRequest;
 use crate::core::commands::enqueue::video::internal_video_error::InternalVideoError;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
@@ -7,36 +6,24 @@ use crate::core::events::generation_events::generation_enqueue_failure_event::Ge
 use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::model::video_models::VideoModel;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
-use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
-use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use anyhow::anyhow;
-use artcraft_api_defs::generate::object::generate_hunyuan_2_0_image_to_3d::GenerateHunyuan20ImageTo3dRequest;
 use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest};
 use artcraft_api_defs::generate::video::generate_kling_2_1_master_image_to_video::{GenerateKling21MasterAspectRatio, GenerateKling21MasterImageToVideoRequest};
 use artcraft_api_defs::generate::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProAspectRatio, GenerateKling21ProImageToVideoRequest};
 use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::GenerateSeedance10LiteImageToVideoRequest;
 use artcraft_api_defs::generate::video::generate_veo_2_image_to_video::{GenerateVeo2AspectRatio, GenerateVeo2ImageToVideoRequest};
-use fal_client::creds::fal_api_key::FalApiKey;
-use fal_client::requests::queue::enqueue_hunyuan2_image_to_3d::{enqueue_hunyuan2_image_to_3d, Hunyuan2Args};
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
 use fal_client::requests::queue::video_gen::enqueue_kling_16_pro_image_to_video::Kling16ProAspectRatio;
 use fal_client::requests::webhook::video::enqueue_veo_2_image_to_video_webhook::Veo2AspectRatio;
 use idempotency::uuid::generate_random_uuid;
-use log::{error, info, warn};
-use storyteller_client::generate::object::generate_hunyuan_3d_2_0_image_to_3d::generate_hunyuan3d_2_0_image_to_3d;
+use log::{error, info};
 use storyteller_client::generate::video::generate_kling_16_pro_image_to_video::generate_kling_16_pro_image_to_video;
 use storyteller_client::generate::video::generate_kling_21_master_image_to_video::generate_kling_21_master_image_to_video;
 use storyteller_client::generate::video::generate_kling_21_pro_image_to_video::generate_kling_21_pro_image_to_video;
 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, State};
+use tauri::AppHandle;
 
 pub async fn handle_video_artcraft(
   request: EnqueueImageToVideoRequest,

crates/desktop/artcraft/src/core/commands/enqueue/video/handle_video_fal.rs

@@ -7,19 +7,12 @@ use crate::core::events::generation_events::generation_enqueue_success_event::Ge
 use crate::core::model::video_models::VideoModel;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
-use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
-use fal_client::creds::fal_api_key::FalApiKey;
-use fal_client::requests::queue::enqueue_hunyuan2_image_to_3d::{enqueue_hunyuan2_image_to_3d, Hunyuan2Args};
 use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
 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};
+use log::{error, info};
 use tauri::AppHandle;
 
 pub async fn handle_video_fal(

crates/desktop/artcraft/src/core/commands/get_app_info_command.rs

@@ -1,16 +1,9 @@
 use crate::core::commands::response::shorthand::InfallibleResponse;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
 use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
-use crate::core::state::os_platform::OsPlatform;
-use crate::services::fal::commands::fal_background_removal_command::FalBackgroundRemovalSuccessResponse;
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
 use chrono::{DateTime, Utc};
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::ImageReader;
 use log::info;
 use serde_derive::Serialize;
-use std::io::Cursor;
 use tauri::State;
 
 #[derive(Debug, Serialize)]

crates/desktop/artcraft/src/core/commands/platform_info_command.rs

@@ -1,13 +1,8 @@
 use crate::core::commands::response::shorthand::InfallibleResponse;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
 use crate::core::state::os_platform::OsPlatform;
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::ImageReader;
 use log::info;
 use serde_derive::Serialize;
-use std::io::Cursor;
 
 #[derive(Debug, Serialize)]
 pub struct PlatformInfoResponse {

crates/desktop/artcraft/src/core/commands/providers/get_provider_order_command.rs

@@ -1,12 +1,9 @@
 use crate::core::commands::response::shorthand::ResponseOrErrorMessage;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
-use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
 use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
-use errors::AnyhowResult;
 use log::{error, info};
 use serde_derive::Serialize;
-use tauri::{AppHandle, State};
+use tauri::State;
 
 #[derive(Serialize)]
 pub struct GetProviderOrderResponse {

crates/desktop/artcraft/src/core/commands/providers/set_provider_order_command.rs

@@ -1,14 +1,9 @@
-use crate::core::commands::response::shorthand::{ResponseOrErrorMessage, SuccessOrErrorMessage};
-use crate::core::commands::response::success_response_wrapper::SerializeMarker;
-use crate::core::model::image_models::ImageModel;
-use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
+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 errors::AnyhowResult;
 use log::{error, info};
-use serde_derive::{Deserialize, Serialize};
-use tauri::{AppHandle, State};
+use serde_derive::Deserialize;
+use tauri::State;
 
 #[derive(Deserialize)]
 pub struct SetProviderOrderRequest {

crates/desktop/artcraft/src/core/state/app_env_configs/app_env_configs.rs

@@ -1,8 +1,7 @@
-use log::info;
-use errors::AnyhowResult;
-use storyteller_client::utils::api_host::ApiHost;
 use crate::core::state::app_env_configs::app_env_configs_serializeable::{AppEnvConfigsSerializable, StorytellerApiHost};
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use errors::AnyhowResult;
+use storyteller_client::utils::api_host::ApiHost;
 
 #[derive(Clone)]
 pub struct AppEnvConfigs {

crates/desktop/artcraft/src/core/state/app_env_configs/app_env_configs_serializeable.rs

@@ -1,6 +1,6 @@
-use serde_derive::{Deserialize, Serialize};
-use errors::AnyhowResult;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use errors::AnyhowResult;
+use serde_derive::{Deserialize, Serialize};
 
 const CURRENT_VERSION: &str = "1";
 

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;
-  use std::str::FromStr;
+
 
   mod json {
     use super::*;

crates/desktop/artcraft/src/core/state/expanduser.rs

@@ -43,11 +43,11 @@ pub fn home_dir() -> io::Result<PathBuf> {
 
 #[cfg(test)]
 mod tests {
-    use crate::core::state::expanduser::expanduser;
-    use std::env;
-    use std::path::PathBuf;
+  use crate::core::state::expanduser::expanduser;
+  use std::env;
+  use std::path::PathBuf;
 
-    #[test]
+  #[test]
     #[serial_test::serial]
     fn test_success() {
         let old_home = env::var("HOME").expect("no home dir set");

crates/desktop/artcraft/src/core/threads/main_window_thread/main_window_thread.rs

@@ -5,13 +5,11 @@ use crate::core::state::main_window_size::MainWindowSize;
 use crate::core::threads::main_window_thread::persist_storyteller_cookies_task::persist_storyteller_cookies_task;
 use crate::core::threads::main_window_thread::persist_window_position_task::persist_window_position_task;
 use crate::core::threads::main_window_thread::persist_window_resize_task::persist_window_resize_task;
-use crate::core::utils::clear_all_webview_cookies::clear_all_webview_cookies;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{error, info, warn};
 use memory_store::clone_slot::CloneSlot;
-use tauri::{AppHandle, Manager, Webview, Window};
+use tauri::{AppHandle, Manager, Window};
 
 const MAIN_WINDOW_NAME : &str = "main";
 

crates/desktop/artcraft/src/core/threads/main_window_thread/persist_storyteller_cookies_task.rs

@@ -1,18 +1,15 @@
 use crate::core::state::app_startup_time::AppStartupTime;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
 use chrono::TimeDelta;
 use errors::AnyhowResult;
-use log::{debug, error, info};
+use log::{error, info};
 use once_cell::sync::Lazy;
 use reqwest::Url;
-use std::fs;
-use std::sync::LockResult;
 use storyteller_client::credentials::storyteller_avt_cookie::StorytellerAvtCookie;
 use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use storyteller_client::credentials::storyteller_session_cookie::StorytellerSessionCookie;
-use tauri::{AppHandle, Manager, Webview, Window};
+use tauri::{AppHandle, Manager};
 use tauri_plugin_http::reqwest_cookie_store::CookieStore;
 use tauri_plugin_http::Http;
 

crates/desktop/artcraft/src/core/threads/main_window_thread/persist_window_position_task.rs

@@ -1,7 +1,5 @@
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::state::main_window_position::MainWindowPosition;
-use crate::core::state::main_window_size::MainWindowSize;
-use crate::core::utils::best_window_size_heuristic::best_window_size_heuristic;
 use errors::AnyhowResult;
 use log::info;
 use memory_store::clone_slot::CloneSlot;

crates/desktop/artcraft/src/core/utils/best_window_size_heuristic.rs

@@ -1,5 +1,5 @@
-use tauri::{PhysicalSize, Window};
 use errors::AnyhowResult;
+use tauri::{PhysicalSize, Window};
 
 // A typical height difference when dev tools are open:
 //   Window inner size = PhysicalSize { width: 3704, height: 732 }

crates/desktop/artcraft/src/core/utils/clear_all_webview_cookies.rs

@@ -1,5 +1,5 @@
-use tauri::Webview;
 use errors::AnyhowResult;
+use tauri::Webview;
 
 pub fn clear_all_webview_cookies(webview: &Webview) -> AnyhowResult<()> {
   webview.clear_all_browsing_data()?;

crates/desktop/artcraft/src/core/utils/get_url_file_extension.rs

@@ -1,5 +1,5 @@
-use std::path::Path;
 use reqwest::Url;
+use std::path::Path;
 
 pub fn get_url_file_extension(url: &Url) -> Option<&str> {
   Path::new(url.path())

crates/desktop/artcraft/src/core/utils/large_file_transfer/download.rs

@@ -11,8 +11,6 @@ use reqwest::header::{
 };
 use reqwest::Url;
 use std::collections::HashMap;
-use std::fmt::Display;
-use std::fs::remove_file;
 use std::io::SeekFrom;
 use std::path::Path;
 use std::sync::atomic::{AtomicUsize, Ordering};

crates/desktop/artcraft/src/core/utils/large_file_transfer/error.rs

@@ -1,7 +1,7 @@
 //! Implemented from https://github.com/huggingface/hf_transfer/blob/main/src/lib.rs
 
-use std::fmt::Display;
 use reqwest::header::ToStrError;
+use std::fmt::Display;
 
 #[derive(Debug)]
 pub enum Error {

crates/desktop/artcraft/src/core/utils/large_file_transfer/upload.rs

@@ -6,7 +6,6 @@ use futures::stream::FuturesUnordered;
 use futures::StreamExt;
 use reqwest::header::CONTENT_LENGTH;
 use std::collections::HashMap;
-use std::fmt::Display;
 use std::io::SeekFrom;
 use std::sync::Arc;
 use std::time::Duration;

crates/desktop/artcraft/src/core/utils/large_file_transfer/util.rs

@@ -1,7 +1,6 @@
 //! Implemented from https://github.com/huggingface/hf_transfer/blob/main/src/lib.rs
 
 use rand::{thread_rng, Rng};
-use std::fmt::Display;
 
 pub const BASE_WAIT_TIME: usize = 300;
 pub const MAX_WAIT_TIME: usize = 10_000;

crates/desktop/artcraft/src/core/utils/simple_http_download.rs

@@ -1,9 +1,9 @@
+use errors::AnyhowResult;
+use reqwest::Client;
+use reqwest::Url;
 use std::fs::OpenOptions;
 use std::io::Write;
 use std::path::Path;
-use reqwest::Url;
-use reqwest::Client;
-use errors::AnyhowResult;
 
 const USER_AGENT: &str = "storyteller-client/1.0";
 

crates/desktop/artcraft/src/services/fal/commands/fal_background_removal_command.rs

@@ -12,50 +12,25 @@ use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
 use crate::core::utils::get_url_file_extension::get_url_file_extension;
 use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
-use crate::core::utils::simple_http_download::simple_http_download;
 use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
 use base64::prelude::BASE64_STANDARD;
 use base64::{DecodeError, Engine};
-use errors::{AnyhowError, AnyhowResult};
+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;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, EncodableLayout, ImageReader};
-use log::{debug, error, info, warn};
-use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
-use openai_sora_client::credentials::SoraCredentials;
-use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
-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};
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
-use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
-use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
-use openai_sora_client::sora_error::SoraError;
+use image::{EncodableLayout, ImageReader};
+use log::{error, info, warn};
 use reqwest::Url;
 use serde_derive::{Deserialize, Serialize};
-use std::fs::read_to_string;
-use std::io::{Cursor, Read, Write};
-use std::ops::Add;
-use std::path::PathBuf;
-use std::time::Duration;
-use storyteller_client::error::api_error::ApiError;
-use storyteller_client::error::api_error::ApiError::InternalServerError;
 use storyteller_client::error::storyteller_error::StorytellerError;
 use storyteller_client::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
 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, Emitter, Manager, State};
-use tempfile::NamedTempFile;
+use tauri::{AppHandle, Manager, State};
 use tokens::tokens::media_files::MediaFileToken;
 
 #[derive(Deserialize)]

crates/desktop/artcraft/src/services/fal/commands/fal_hunyuan_image_to_3d_command.rs

@@ -9,53 +9,19 @@ use crate::core::events::sendable_event_trait::SendableEvent;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
-use crate::core::utils::get_url_file_extension::get_url_file_extension;
 use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
-use crate::core::utils::simple_http_download::simple_http_download;
-use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
-use base64::prelude::BASE64_STANDARD;
-use base64::{DecodeError, Engine};
-use errors::{AnyhowError, AnyhowResult};
+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 filesys::file_read_bytes::file_read_bytes;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, EncodableLayout, ImageReader};
-use log::{debug, error, info, warn};
-use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
-use openai_sora_client::credentials::SoraCredentials;
-use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
-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};
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
-use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
-use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
-use openai_sora_client::sora_error::SoraError;
-use reqwest::Url;
+use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
-use std::fs::read_to_string;
-use std::io::{Cursor, Read, Write};
-use std::ops::Add;
-use std::path::PathBuf;
-use std::time::Duration;
-use storyteller_client::error::api_error::ApiError;
-use storyteller_client::error::api_error::ApiError::InternalServerError;
 use storyteller_client::error::storyteller_error::StorytellerError;
-use storyteller_client::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
-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, Emitter, Manager, State};
-use tempfile::NamedTempFile;
+use tauri::{AppHandle, Manager, State};
 use tokens::tokens::media_files::MediaFileToken;
 
 #[derive(Deserialize)]

crates/desktop/artcraft/src/services/fal/commands/fal_kling_image_to_video_command.rs

@@ -9,53 +9,19 @@ use crate::core::events::sendable_event_trait::SendableEvent;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
-use crate::core::utils::get_url_file_extension::get_url_file_extension;
 use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
-use crate::core::utils::simple_http_download::simple_http_download;
-use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
-use base64::prelude::BASE64_STANDARD;
-use base64::{DecodeError, Engine};
-use errors::{AnyhowError, AnyhowResult};
+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 filesys::file_read_bytes::file_read_bytes;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, EncodableLayout, ImageReader};
-use log::{debug, error, info, warn};
-use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
-use openai_sora_client::credentials::SoraCredentials;
-use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
-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};
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
-use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
-use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
-use openai_sora_client::sora_error::SoraError;
-use reqwest::Url;
+use log::{error, info, warn};
 use serde_derive::{Deserialize, Serialize};
-use std::fs::read_to_string;
-use std::io::{Cursor, Read, Write};
-use std::ops::Add;
-use std::path::PathBuf;
-use std::time::Duration;
-use storyteller_client::error::api_error::ApiError;
-use storyteller_client::error::api_error::ApiError::InternalServerError;
 use storyteller_client::error::storyteller_error::StorytellerError;
-use storyteller_client::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
-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, Emitter, Manager, State};
-use tempfile::NamedTempFile;
+use tauri::{AppHandle, Manager, State};
 use tokens::tokens::media_files::MediaFileToken;
 
 #[derive(Deserialize)]

crates/desktop/artcraft/src/services/fal/commands/get_fal_api_key_command.rs

@@ -1,17 +1,10 @@
 use crate::core::commands::response::shorthand::Response;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
-use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use anyhow::anyhow;
 use errors::AnyhowResult;
-use fal_client::creds::fal_api_key::FalApiKey;
-use log::{error, info};
-use openai_sora_client::sora_error::SoraError::AnyhowError;
-use primitives::traits::trim_or_emptyable::TrimOrEmptyable;
-use serde_derive::{Deserialize, Serialize};
-use tauri::{AppHandle, State};
+use log::error;
+use serde_derive::Serialize;
+use tauri::State;
 
 #[derive(Serialize)]
 pub struct GetFalApiKeyResponse {

crates/desktop/artcraft/src/services/fal/commands/set_fal_api_key_command.rs

@@ -1,15 +1,10 @@
 use crate::core::commands::response::shorthand::Response;
-use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::core::state::app_preferences::preferred_download_directory::PreferredDownloadDirectory;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use anyhow::anyhow;
 use errors::AnyhowResult;
 use fal_client::creds::fal_api_key::FalApiKey;
 use log::{error, info};
-use openai_sora_client::sora_error::SoraError::AnyhowError;
-use serde_derive::{Deserialize, Serialize};
-use tauri::{AppHandle, State};
+use serde_derive::Deserialize;
+use tauri::State;
 
 /// For now, we'll only update a single preference at a time.
 #[derive(Deserialize)]

crates/desktop/artcraft/src/services/fal/state/fal_credential_manager.rs

@@ -6,7 +6,6 @@ use fal_client::creds::fal_api_key::FalApiKey;
 use memory_store::clone_slot::CloneSlot;
 use std::fs::OpenOptions;
 use std::io::Write;
-use std::path::Path;
 use std::{fs, io};
 
 #[derive(Clone)]

crates/desktop/artcraft/src/services/fal/threads/fal_task_polling_thread.rs

@@ -1,38 +1,20 @@
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, 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::state::data_dir::trait_data_subdir::DataSubdir;
 use crate::core::utils::download_url_to_temp_dir::download_url_to_temp_dir;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use errors::AnyhowResult;
-use fal_client::error::fal_error_plus::FalErrorPlus;
 use fal_client::export::queue::Status;
 use fal_client::model::fal_request_id::FalRequestId;
 use fal_client::utils::queue_status_checker::QueueStatusChecker;
 use log::{error, info, warn};
-use mimetypes::mimetype_for_file::get_mimetype_for_file;
-use mimetypes::mimetype_info::file_extension::FileExtension;
-use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
-use openai_sora_client::requests::image_gen::image_gen_status::{Generation, TaskId, TaskStatus};
-use serde_derive::Serialize;
-use std::fs::File;
-use std::io::Write;
-use std::path::PathBuf;
-use storyteller_client::error::api_error::ApiError;
-use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
-use storyteller_client::media_files::upload_new_engine_asset_from_file::upload_new_engine_asset_from_file;
-use storyteller_client::media_files::upload_video_media_file_from_file::{upload_video_media_file_from_file, UploadVideoMediaFileSuccessResponse};
 use storyteller_client::recipes::upload_media_file_from_file::upload_media_file_from_file;
 use storyteller_client::utils::api_host::ApiHost;
-use tauri::{AppHandle, Emitter};
-use tempdir::TempDir;
-use tempfile::NamedTempFile;
+use tauri::AppHandle;
 use tokens::tokens::media_files::MediaFileToken;
-use url::Url;
 
 pub async fn fal_task_polling_thread(
   app_handle: AppHandle,

crates/desktop/artcraft/src/services/sora/commands/check_sora_session_command.rs

@@ -1,13 +1,7 @@
-use crate::core::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::services::sora::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
-use chrono::{DateTime, TimeDelta, Utc};
+use chrono::{TimeDelta, Utc};
 use errors::AnyhowResult;
 use log::{error, info};
-use once_cell::sync::Lazy;
-use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
 use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
 use openai_sora_client::requests::list_media::list_media::list_media;
 use serde_derive::Serialize;

crates/desktop/artcraft/src/services/sora/commands/open_sora_login_command.rs

@@ -1,10 +1,8 @@
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
 use errors::AnyhowResult;
 use log::{error, info};
-use once_cell::sync::Lazy;
 use tauri::{AppHandle, State};
 
 #[tauri::command]

crates/desktop/artcraft/src/services/sora/commands/sora_image_generation_command.rs

@@ -1,21 +1,16 @@
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
 use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use errors::AnyhowResult;
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, ImageReader};
 use log::{error, info};
-use openai_sora_client::credentials::SoraCredentials;
 use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
 use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
 use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
 use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use std::fs::read_to_string;
-use std::io::Cursor;
 use std::time::Duration;
-use tauri::{AppHandle, Manager, State};
+use tauri::{AppHandle, State};
 
 const SORA_IMAGE_UPLOAD_TIMEOUT: Duration = Duration::from_millis(1000 * 30); // 30 seconds
 

crates/desktop/artcraft/src/services/sora/commands/sora_image_remix_command.rs

@@ -9,37 +9,21 @@ use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
 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::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use base64::prelude::BASE64_STANDARD;
-use base64::Engine;
-use errors::{AnyhowError, AnyhowResult};
-use image::codecs::png::{CompressionType, FilterType, PngEncoder};
-use image::{DynamicImage, ImageReader};
-use log::{debug, error, info, warn};
-use openai_sora_client::credentials::SoraCredentials;
-use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
+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};
 use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
 use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
-use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
-use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
-use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
 use openai_sora_client::sora_error::SoraError;
 use serde_derive::{Deserialize, Serialize};
-use std::fs::read_to_string;
-use std::io::Cursor;
-use std::ops::Add;
 use std::time::Duration;
-use storyteller_client::error::api_error::ApiError;
-use storyteller_client::error::api_error::ApiError::InternalServerError;
+use storyteller_client::error::storyteller_error::StorytellerError;
 use storyteller_client::media_files::get_media_file::get_media_file;
 use storyteller_client::utils::api_host::ApiHost;
-use tauri::{AppHandle, Emitter, Manager, State};
-use storyteller_client::error::storyteller_error::StorytellerError;
+use tauri::{AppHandle, Manager, State};
 use tokens::tokens::media_files::MediaFileToken;
 
 const SORA_IMAGE_UPLOAD_TIMEOUT: Duration = Duration::from_millis(1000 * 30); // 30 seconds

crates/desktop/artcraft/src/services/sora/commands/sora_logout_command.rs

@@ -1,18 +1,7 @@
-use crate::core::commands::app_preferences::get_app_preferences_command::AppPreferencesPayload;
 use crate::core::commands::response::shorthand::SimpleResponse;
-use crate::core::state::app_preferences::app_preferences_manager::AppPreferencesManager;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::windows::sora_login_window::open_sora_login_window::open_sora_login_window;
-use errors::{AnyhowError, AnyhowResult};
 use log::{error, info};
-use once_cell::sync::Lazy;
-use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::requests::list_media::list_media::list_media;
-use serde_derive::Serialize;
-use std::fmt::format;
-use tauri::{AppHandle, State};
+use tauri::State;
 
 #[tauri::command]
 pub async fn sora_logout_command(

crates/desktop/artcraft/src/services/sora/state/sora_credential_manager.rs

@@ -1,8 +1,7 @@
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
 use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
 use crate::services::sora::state::sora_credential_stats::SoraCredentialStats;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{error, info, warn};
 use memory_store::clone_cell::CloneCell;

crates/desktop/artcraft/src/services/sora/threads/sora_task_polling_thread.rs

@@ -13,15 +13,13 @@ use log::{error, info};
 use openai_sora_client::recipes::list_sora_task_status_with_session_auto_renew::{list_sora_task_status_with_session_auto_renew, StatusRequestArgs};
 use openai_sora_client::requests::image_gen::image_gen_status::{Generation, TaskId, TaskStatus};
 use reqwest::Url;
-use serde_derive::Serialize;
 use std::fs::File;
 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, Emitter};
+use tauri::AppHandle;
 use tempdir::TempDir;
-use tokens::tokens::media_files::MediaFileToken;
 
 pub async fn sora_task_polling_thread(
   app_handle: AppHandle,

crates/desktop/artcraft/src/services/sora/windows/sora_login_window/clear_browsing_on_test_domain.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
+use errors::AnyhowResult;
 use log::info;
 use tauri::Webview;
-use errors::AnyhowResult;
 
 // This is just so we have a way to clear browsing data while debugging / building.
 pub fn clear_browsing_data_on_test_domain(webview: &Webview) -> AnyhowResult<()> {

crates/desktop/artcraft/src/services/sora/windows/sora_login_window/open_sora_login_window.rs

@@ -1,6 +1,6 @@
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::core::utils::clear_all_webview_cookies::clear_all_webview_cookies;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::windows::sora_login_window::sora_login_thread::sora_login_thread;
 use anyhow::anyhow;
 use errors::AnyhowResult;

crates/desktop/artcraft/src/services/sora/windows/sora_login_window/sora_login_thread.rs

@@ -1,25 +1,16 @@
 use crate::core::events::sendable_event_trait::SendableEvent;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::sora::events::sora_login_success_event::SoraLoginSuccessEvent;
-use crate::services::sora::state::initialize_sora_jwt_bearer_token::initialize_sora_jwt_bearer_token;
-use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::windows::sora_login_window::extract_sora_webview_cookies::extract_sora_webview_cookies;
 use crate::services::sora::windows::sora_login_window::open_sora_login_window::LOGIN_WINDOW_NAME;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
-use chrono::{DateTime, NaiveDateTime, TimeDelta};
 use errors::AnyhowResult;
-use log::{error, info, warn};
-use once_cell::sync::Lazy;
+use log::{error, info};
 use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
 use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
 use openai_sora_client::utils::has_session_cookie::{has_session_cookie, SessionCookiePresence};
-use reqwest::Url;
-use std::fs;
-use std::fs::{read_to_string, OpenOptions};
-use std::io::Write;
-use std::ops::Sub;
-use tauri::{AppHandle, Manager, Webview, WebviewWindow};
+use tauri::{AppHandle, Manager, WebviewWindow};
 
 pub async fn sora_login_thread(
   app: AppHandle,

crates/desktop/artcraft/src/services/storyteller/state/storyteller_credential_manager.rs

@@ -1,11 +1,8 @@
-use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
-use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::storyteller::state::read_storyteller_credentials_from_disk::read_storyteller_credentials_from_disk;
 use crate::services::storyteller::state::storyteller_credential_holder::StorytellerCredentialHolder;
-use anyhow::anyhow;
 use errors::AnyhowResult;
-use log::{error, info, warn};
+use log::{info, warn};
 use std::fs::OpenOptions;
 use std::io::Write;
 use storyteller_client::credentials::storyteller_avt_cookie::StorytellerAvtCookie;

crates/lib/api_clients/storyteller_client/Cargo.toml

@@ -8,6 +8,9 @@ authors = [
 ]
 publish = false
 
+# [lints.rust]
+# unused_imports = "forbid"
+
 [lib]
 name = "storyteller_client"
 path = "src/lib.rs"

crates/service/web/storyteller_web/Cargo.toml

@@ -8,6 +8,9 @@ authors = [
 ]
 publish = false
 
+#[lints.rust]
+#unused_imports = "forbid"
+
 # Main server monolith
 [[bin]]
 name = "storyteller-web"

crates/service/web/storyteller_web/src/api_doc_cli.rs

@@ -17,11 +17,9 @@
 #[macro_use] extern crate magic_crypt;
 #[macro_use] extern crate serde_derive;
 
-use std::error::Error;
 use std::fs::File;
 use std::io::Write;
 
-use r2d2_redis::redis::Commands;
 use utoipa::OpenApi;
 
 use docs::api_doc::ApiDoc;

crates/service/web/storyteller_web/src/api_doc_server.rs

@@ -20,8 +20,6 @@
 use std::error::Error;
 
 use actix_web::{App, HttpServer};
-use r2d2_redis::redis::Commands;
-use sqlx::MySqlPool;
 use utoipa::OpenApi;
 use utoipa_swagger_ui::SwaggerUi;
 
@@ -29,7 +27,6 @@ use docs::api_doc::ApiDoc;
 use errors::AnyhowResult;
 
 use crate::configs::static_api_tokens::StaticApiTokenSet;
-use crate::state::server_state::ServerState;
 
 pub mod billing;
 pub mod configs;

crates/service/web/storyteller_web/src/configs/plans/get_correct_plan_for_session.rs

@@ -1,4 +1,3 @@
-use std::ops::Deref;
 
 use chrono::Utc;
 

crates/service/web/storyteller_web/src/http_server/common_requests/media_file_token_path_info.rs

@@ -1,5 +1,5 @@
-use utoipa::ToSchema;
 use tokens::tokens::media_files::MediaFileToken;
+use utoipa::ToSchema;
 
 /// Media File Token in URL PathInfo
 #[derive(Deserialize, ToSchema)]

crates/service/web/storyteller_web/src/http_server/common_responses/common_web_error.rs

@@ -2,7 +2,6 @@ use actix_http::StatusCode;
 use actix_web::{HttpResponse, HttpResponseBuilder, ResponseError};
 use std::error::Error;
 use std::fmt::{Display, Formatter};
-use utoipa::ToSchema;
 
 #[derive(Debug)]
 pub enum CommonWebError {

crates/service/web/storyteller_web/src/http_server/common_responses/media/media_links.rs

@@ -1,10 +1,10 @@
 use url::Url;
 use utoipa::ToSchema;
 
+use crate::http_server::common_responses::media::cdn_link::{get_cdn_host, new_cdn_url};
 use crate::http_server::common_responses::media::media_domain::MediaDomain;
 use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
 use server_environment::ServerEnvironment;
-use crate::http_server::common_responses::media::cdn_link::{get_cdn_host, new_cdn_url};
 
 // TODO(bt,2024-09-05): Worth reducing the quality at all?
 const QUALITY : u8 = 95;
@@ -153,8 +153,8 @@ mod tests {
   use crate::http_server::common_responses::media::media_links::MediaLinks;
 
   mod fakeyou {
-    use server_environment::ServerEnvironment;
     use super::*;
+    use server_environment::ServerEnvironment;
 
     const DOMAIN : MediaDomain = MediaDomain::FakeYou;
 

crates/service/web/storyteller_web/src/http_server/common_responses/user_avatars/default_avatar_color_from_username.rs

@@ -29,9 +29,9 @@ pub fn default_avatar_color_from_username(username: &str) -> u8 {
 
 #[cfg(test)]
 mod tests {
-  use std::collections::HashSet;
-  use rand::distr::{Alphanumeric, SampleString};
   use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username;
+  use rand::distr::{Alphanumeric, SampleString};
+  use std::collections::HashSet;
 
   #[test]
   fn test_stability() {

crates/service/web/storyteller_web/src/http_server/common_responses/user_avatars/default_avatar_from_username.rs

@@ -28,9 +28,9 @@ pub fn default_avatar_from_username(username: &str) -> u8 {
 
 #[cfg(test)]
 mod tests {
-  use std::collections::HashSet;
-  use rand::distr::{Alphanumeric, SampleString};
   use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username;
+  use rand::distr::{Alphanumeric, SampleString};
+  use std::collections::HashSet;
 
   #[test]
   fn test_stability() {

crates/service/web/storyteller_web/src/http_server/cookies/anonymous_visitor_tracking/avt_cookie_manager.rs

@@ -1,5 +1,5 @@
-use actix_web::cookie::{Cookie, SameSite};
 use actix_web::cookie::time::OffsetDateTime;
+use actix_web::cookie::{Cookie, SameSite};
 use actix_web::HttpRequest;
 use anyhow::anyhow;
 use log::warn;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/animation/enqueue_rerender_animation.rs

@@ -5,11 +5,12 @@
 
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use log::{info, warn};
 
+use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;
 use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
 use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
 use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
@@ -23,7 +24,6 @@ use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::users::UserToken;
-use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/create_api_token.rs

@@ -1,10 +1,10 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
-use log::{log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::warn;
 
 use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/delete_api_token.rs

@@ -1,11 +1,11 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Path;
-use log::{error, log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::{error, warn};
 
 use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/edit_api_token.rs

@@ -1,10 +1,10 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
-use log::{error, log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::{error, warn};
 
 use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/api_tokens/list_api_tokens.rs

@@ -1,11 +1,11 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
-use log::{log, warn};
+use log::warn;
 
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/create_category.rs

@@ -1,9 +1,9 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use log::warn;
 
 use http_server_common::request::get_request_ip::get_request_ip;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/get_category.rs

@@ -1,12 +1,12 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Path;
+use actix_web::{web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
-use log::{log, warn};
+use log::warn;
 
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::model_categories::get_category_by_token::get_category_by_token;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/assign_tts_category.rs

@@ -1,10 +1,10 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
-use log::{error, log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::{error, warn};
 
 use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/error.rs

@@ -3,8 +3,8 @@
 #![forbid(unused_mut)]
 #![forbid(unused_variables)]
 
-use actix_web::{HttpResponse, ResponseError};
 use actix_web::http::StatusCode;
+use actix_web::{HttpResponse, ResponseError};
 
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_fully_computed_assigned_tts_categories/list_fully_computed_assigned_tts_categories.rs

@@ -10,7 +10,7 @@
 use std::collections::BTreeMap;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
+use actix_web::{web, HttpRequest, HttpResponse};
 use log::{error, info};
 
 use tokens::tokens::model_categories::ModelCategoryToken;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_categories.rs

@@ -6,9 +6,9 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
 use log::error;
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/categories/tts/list_tts_model_assigned_categories.rs

@@ -6,10 +6,10 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Path;
+use actix_web::{web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
 use log::warn;
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/control_plane/set_sora_secret_handler.rs

@@ -1,24 +1,18 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web, Either};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
-use actix_web::web::{Form, Json, Path};
-use anyhow::anyhow;
-use log::{error, log, warn};
+use actix_web::web::{Form, Json};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::error;
 use r2d2_redis::redis::Commands;
 use utoipa::ToSchema;
 
-use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
-use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
-use mysql_queries::queries::media_files::edit::update_media_file_animation_type::update_media_file_animation_type;
-use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
 use shared_service_components::sora_redis_credentials::get_sora_credentials_from_redis::get_sora_credentials_from_redis;
 use shared_service_components::sora_redis_credentials::keys::RedisSoraCredentialSubkey;
 use shared_service_components::sora_redis_credentials::set_sora_credential_field_in_redis::set_sora_credential_field_in_redis;
-use tokens::tokens::media_files::MediaFileToken;
 
 use crate::state::server_state::ServerState;
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/conversion/enqueue_fbx_to_gltf_handler.rs

@@ -30,7 +30,6 @@ use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::users::UserToken;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
-use crate::http_server::deprecated_endpoints::workflows::enqueue_comfy_ui_handler::EnqueueComfyError;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;
 use crate::util::allowed_studio_access::allowed_studio_access;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/create_scene_handler.rs

@@ -1,11 +1,9 @@
-use std::collections::HashSet;
 use std::sync::Arc;
 
 use actix_multipart::Multipart;
 use actix_web::http::StatusCode;
 use actix_web::{web, HttpRequest, HttpResponse, ResponseError};
 use log::{error, info, warn};
-use once_cell::sync::Lazy;
 use utoipa::ToSchema;
 
 use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/drain_multipart_request.rs

@@ -4,7 +4,6 @@ use futures::TryStreamExt;
 use log::warn;
 
 use errors::AnyhowResult;
-use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken;
 
 use crate::http_server::web_utils::read_multipart_field_bytes::{checked_read_multipart_bytes, read_multipart_field_as_text};
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/get_scene_handler.rs

@@ -1,25 +1,19 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpMessage, HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Path;
+use actix_web::{web, HttpMessage, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
 use log::warn;
 use utoipa::ToSchema;
 
 use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
 use enums::by_table::media_files::media_file_type::MediaFileType;
-use enums::by_table::model_weights::weights_category::WeightsCategory;
-use enums::common::visibility::Visibility;
 use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
-use mysql_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token;
 use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::model_weights::ModelWeightToken;
 
-use crate::http_server::common_responses::simple_entity_stats::SimpleEntityStats;
-use crate::http_server::common_responses::user_details_lite::UserDetailsLight;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/engine/process_upload_media_file.rs

@@ -2,7 +2,7 @@ use std::collections::HashSet;
 use std::sync::Arc;
 
 use actix_multipart::Multipart;
-use actix_web::{HttpRequest, web};
+use actix_web::{web, HttpRequest};
 use log::{error, info, warn};
 
 use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
@@ -19,8 +19,8 @@ use tokens::tokens::media_files::MediaFileToken;
 
 use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
 use crate::http_server::endpoints::media_files::upload::upload_generic::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource};
-use crate::state::server_state::ServerState;
 use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;
+use crate::state::server_state::ServerState;
 
 // TODO(bt,2023-12-20): THIS CODE NEEDS CLEANUP. This has been cargo culted three+ times.
 //  It's ridiculous and complicated.

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/events/list_events.rs

@@ -1,15 +1,15 @@
 use std::sync::Arc;
 
-use actix_web::{HttpMessage, HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpMessage, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
 use derive_more::Display;
 use log::error;
 
-use mysql_queries::queries::public_event_feed::list_public_event_feed_items::list_public_event_feed_items;
 use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username;
 use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username;
+use mysql_queries::queries::public_event_feed::list_public_event_feed_items::list_public_event_feed_items;
 
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/image_gen/enqueue_image_generation.rs

@@ -1,13 +1,13 @@
 #![forbid(unused_mut)]
 
-use std::fmt::{Display, Formatter};
 use std::fmt::Debug;
+use std::fmt::{Display, Formatter};
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Json;
+use actix_web::{web, HttpRequest, HttpResponse};
 use log::error;
 use log::warn;
 use serde::Deserialize;
@@ -38,10 +38,9 @@ use tokens::tokens::users::UserToken;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
 use crate::http_server::deprecated_endpoints::image_gen::prompt_enrichment::enrich_prompt;
+use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;
-use crate::util::allowed_studio_access::allowed_studio_access;
-use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;
 
 /// This is the number of images (batch size) to generate for each request.
 /// We should allow all users to have multiple images generated at once as this

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/leaderboard/get_leaderboard.rs

@@ -6,19 +6,19 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use log::{debug, error, warn};
 use sqlx::MySqlPool;
 
+use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username;
+use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username;
+use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight};
 use errors::AnyhowResult;
 use mysql_queries::queries::tts::stats::calculate_tts_model_leaderboard::calculate_tts_model_leaderboard;
 use mysql_queries::queries::w2l::stats::calculate_w2l_template_leaderboard::calculate_w2l_template_leaderboard;
 use tokens::tokens::users::UserToken;
-use crate::http_server::common_responses::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username;
-use crate::http_server::common_responses::user_avatars::default_avatar_from_username::default_avatar_from_username;
-use crate::http_server::common_responses::user_details_lite::{UserDefaultAvatarInfo, UserDetailsLight};
 
 use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error;
 use crate::state::server_state::ServerState;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/common/drain_multipart_request.rs

@@ -4,7 +4,6 @@ use futures::TryStreamExt;
 use log::warn;
 
 use errors::AnyhowResult;
-use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken;
 
 use crate::http_server::web_utils::read_multipart_field_bytes::{checked_read_multipart_bytes, read_multipart_field_as_text};
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/media_uploads/list_user_media_uploads_of_type.rs

@@ -1,19 +1,19 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpMessage, HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Path;
+use actix_web::{web, HttpMessage, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
-use log::{log, warn};
+use log::warn;
 
+use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;
 use enums::by_table::media_uploads::media_upload_type::MediaUploadType;
 use enums::common::visibility::Visibility;
 use mysql_queries::queries::media_uploads::reverse_list_user_media_uploads_of_type::reverse_list_user_media_uploads_of_type_with_connection;
 use tokens::tokens::media_uploads::MediaUploadToken;
 use tokens::tokens::users::UserToken;
-use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;
 
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/mocap/enqueue_mocapnet.rs

@@ -5,11 +5,12 @@
 
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use log::{error, info, warn};
 
+use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;
 use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
 use enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType;
 use enums::by_table::generic_inference_jobs::inference_model_type::InferenceModelType;
@@ -23,12 +24,11 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::users::UserToken;
-use crate::http_server::session::lookup::user_session_extended::UserSessionExtended;
 
 use crate::configs::plans::get_correct_plan_for_session::get_correct_plan_for_session;
+use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
 use crate::state::server_state::ServerState;
-use crate::http_server::validations::validate_idempotency_token_format::validate_idempotency_token_format;
 
 /// Debug requests can get routed to special "debug-only" workers, which can
 /// be used to trial new code, run debugging, etc.

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/approval/pending_w2l_templates.rs

@@ -1,11 +1,11 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
-use log::{log, warn};
+use log::warn;
 
 use mysql_queries::queries::w2l::w2l_templates::list_pending_w2l_templates::list_pending_w2l_templates;
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/delete_category.rs

@@ -1,11 +1,11 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Path;
-use log::{log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::warn;
 
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::model_categories::toggle_model_category_soft_delete::{toggle_model_category_soft_delete, ToggleSoftDeleteState};

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/edit_category.rs

@@ -1,11 +1,11 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Path;
-use log::{log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::warn;
 
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::model_categories::get_category_by_token::get_category_by_token;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/categories/list_tts_categories_for_moderation.rs

@@ -1,11 +1,11 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
-use log::{log, warn};
+use log::warn;
 
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 use mysql_queries::queries::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/stats/get_on_prem_worker_stats.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
-use actix_web::{http::StatusCode, HttpRequest, HttpResponse, ResponseError, web};
 use actix_web::web::Query;
+use actix_web::{http::StatusCode, web, HttpRequest, HttpResponse, ResponseError};
 use log::warn;
 
 use mysql_queries::queries::stats::get_on_prem_worker_stats::get_on_prem_worker_stats;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/stats/get_voice_count_stats.rs

@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
-use log::{log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::warn;
 
 use mysql_queries::queries::stats::get_voice_count_stats::get_voice_count_stats;
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/list_roles.rs

@@ -1,10 +1,10 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
-use log::{log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::warn;
 
 use mysql_queries::queries::users::user_roles::list_user_roles::{list_user_roles, UserRoleForList};
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/list_staff.rs

@@ -1,10 +1,10 @@
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use derive_more::Display;
-use log::{error, log, warn};
+use log::{error, warn};
 
 use mysql_queries::queries::users::user_roles::list_staff::list_staff;
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/user_roles/set_user_role.rs

@@ -1,11 +1,11 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Path;
-use log::{log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::warn;
 
 use mysql_queries::queries::users::user_profiles::get_user_profile_by_username::get_user_profile_by_username;
 use mysql_queries::queries::users::user_roles::list_user_roles::list_user_roles;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/moderation/users/list_users.rs

@@ -1,10 +1,10 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
-use log::{log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::warn;
 
 use mysql_queries::queries::users::user::list_users_query_builder::{ListUsersQueryBuilder, UserForList};
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_model_downloads.rs

@@ -1,9 +1,9 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
 
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_news.rs

@@ -1,9 +1,9 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
 
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/app_plans.rs

@@ -1,11 +1,11 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
+use actix_web::{web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
-use log::{log, warn};
+use log::warn;
 
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
 

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/stubs/post_app_analytics.rs

@@ -1,10 +1,10 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
-use log::{log, warn};
+use actix_web::{web, HttpRequest, HttpResponse};
+use log::warn;
 
 use http_server_common::request::get_request_ip::get_request_ip;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;

crates/service/web/storyteller_web/src/http_server/deprecated_endpoints/vocoders/get_vocoder.rs

@@ -6,10 +6,10 @@
 use std::fmt;
 use std::sync::Arc;
 
-use actix_web::{HttpRequest, HttpResponse, web};
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Path;
+use actix_web::{web, HttpRequest, HttpResponse};
 use chrono::{DateTime, Utc};
 use log::warn;