cleanup imports

crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs

@@ -1,7 +1,7 @@
 //! Audit logs are for entities that can be *edited* where we might lose the IP / edit history.
 
 use anyhow::anyhow;
-use sqlx::{Executor, MySql, Transaction};
+use sqlx::{MySql, Transaction};
 
 use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity;
 use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction;

crates/lib/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs

@@ -1,6 +1,6 @@
 use anyhow::anyhow;
 use log::error;
-use sqlx::{MySql, MySqlPool, QueryBuilder, Transaction};
+use sqlx::{MySqlPool, QueryBuilder};
 
 use composite_identifiers::by_table::batch_generations::batch_generation_entity::BatchGenerationEntity;
 use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct;

crates/lib/mysql_queries/src/queries/beta_keys/redeem_beta_key.rs

@@ -1,4 +1,4 @@
-use sqlx::{Executor, MySql, Transaction};
+use sqlx::{MySql, Transaction};
 
 use errors::AnyhowResult;
 use tokens::tokens::users::UserToken;

crates/lib/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs

@@ -186,7 +186,7 @@ fn select_result_fields() -> String {
 }
 
 fn query_builder<'a>(
-  limit: usize,
+  _limit: usize, // TODO(bt,2024-05-16): This seems wrong. Why is this unused?
   maybe_offset: Option<usize>,
   cursor_is_reversed: bool,
   sort_ascending: bool,

crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs

@@ -7,8 +7,8 @@ use sqlx::MySqlPool;
 
 use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE;
 use enums::by_table::model_weights::{
-  weights_category::WeightsCategory,
-  weights_types::WeightsType,
+    weights_category::WeightsCategory,
+    weights_types::WeightsType,
 };
 use enums::common::visibility::Visibility;
 use errors::AnyhowResult;
@@ -463,14 +463,14 @@ struct RawWeightJoinUser {
 
 #[cfg(test)]
 mod tests {
-  use enums::by_table::model_weights::{
-    weights_category::WeightsCategory,
-    weights_types::WeightsType,
-  };
+    use enums::by_table::model_weights::{
+        weights_category::WeightsCategory,
+        weights_types::WeightsType,
+    };
 
-  use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder;
+    use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder;
 
-  #[test]
+    #[test]
     fn predicates_without_scoping() {
         let query_builder = ListWeightsQueryBuilder::new();
 

crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs

@@ -301,9 +301,9 @@ struct RawInternalVoiceRecordForList {
 
 #[cfg(test)]
 mod tests {
-  use crate::queries::voice_designer::voices::list_voices_query_builder::ListVoicesQueryBuilder;
+    use crate::queries::voice_designer::voices::list_voices_query_builder::ListVoicesQueryBuilder;
 
-  #[test]
+    #[test]
     fn predicates_without_scoping() {
         let query_builder = ListVoicesQueryBuilder::new();
 

crates/service/job/inference_job/src/job/job_loop/main_loop.rs

@@ -1,7 +1,7 @@
 use std::time::{Duration, Instant};
 
-use opentelemetry::KeyValue as OtelAttribute;
 use log::{error, info, warn};
+use opentelemetry::KeyValue as OtelAttribute;
 
 use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
 use errors::AnyhowResult;

crates/service/job/inference_job/src/job/job_types/image_generation/sd/stable_diffusion_dependencies.rs

@@ -1,4 +1,5 @@
-use anyhow::{Ok};
+use anyhow::Ok;
+
 use errors::AnyhowResult;
 
 use crate::job::job_types::image_generation::sd::model_downloaders::StableDiffusionDownloaders;

crates/service/job/inference_job/src/job/job_types/image_generation/sd/validate_inputs.rs

@@ -1,9 +1,10 @@
-use mysql_queries::payloads::generic_inference_args::image_generation_payload::StableDiffusionArgs;
-use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
 use anyhow::anyhow;
-use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs;
-use crate::job::job_types::image_generation::sd::process_job::StableDiffusionProcessArgs;
 
+use mysql_queries::payloads::generic_inference_args::generic_inference_args::PolymorphicInferenceArgs;
+use mysql_queries::payloads::generic_inference_args::image_generation_payload::StableDiffusionArgs;
+
+use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
+use crate::job::job_types::image_generation::sd::process_job::StableDiffusionProcessArgs;
 
 pub async fn validate_inputs(args: StableDiffusionProcessArgs<'_>) -> Result<(), ProcessSingleJobError> {
     let inference_args = args.job.maybe_inference_args

crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/download_video_file.rs

@@ -4,6 +4,7 @@ use anyhow::anyhow;
 use log::{error, warn};
 use sqlx::MySqlPool;
 use tempdir::TempDir;
+
 use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use buckets::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePath;
 use cloud_storage::bucket_client::BucketClient;

crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/validate_job.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::mocap_payload::{MocapVideoSource};
+use mysql_queries::payloads::generic_inference_args::mocap_payload::MocapVideoSource;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;

crates/service/job/inference_job/src/job/job_types/mocap/process_single_mc_job.rs

@@ -1,4 +1,5 @@
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
+
 use crate::job::job_loop::job_success_result::JobSuccessResult;
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
 use crate::job::job_types::mocap::mocap_net;

crates/service/job/inference_job/src/job/job_types/vc/media_for_inference.rs

@@ -1,4 +1,5 @@
 use std::path::PathBuf;
+
 use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use buckets::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePath;
 use mysql_queries::queries::media_files::get_media_file_for_inference::MediaFileForInference;

crates/service/job/inference_job/src/job/job_types/vc/process_single_vc_job.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 use log::{error, info};
-use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType;
 
+use enums::by_table::generic_inference_jobs::inference_input_source_token_type::InferenceInputSourceTokenType;
 use migration::voice_conversion::query_vc_model_for_migration::{query_vc_model_for_migration, VcModelType};
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use mysql_queries::queries::media_files::get_media_file_for_inference::get_media_file_for_inference;

crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/rvc_v2_dependencies.rs

@@ -1,4 +1,5 @@
 use errors::AnyhowResult;
+
 use crate::job::job_types::vc::rvc_v2::model_downloaders::RvcV2Downloaders;
 use crate::job::job_types::vc::rvc_v2::pretrained_hubert_model::PretrainedHubertModel;
 use crate::job::job_types::vc::rvc_v2::rvc_v2_inference_command::RvcV2InferenceCommand;

crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/svc_dependencies.rs

@@ -1,4 +1,5 @@
 use errors::AnyhowResult;
+
 use crate::job::job_types::vc::so_vits_svc::so_vits_svc_inference_command::SoVitsSvcInferenceCommand;
 
 pub struct SvcDependencies {

crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_video_file.rs

@@ -4,6 +4,7 @@ use anyhow::anyhow;
 use log::{error, warn};
 use sqlx::MySqlPool;
 use tempdir::TempDir;
+
 use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use buckets::public::media_uploads::bucket_file_path::MediaUploadOriginalFilePath;
 use cloud_storage::bucket_client::BucketClient;

crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/validate_job.rs

@@ -1,7 +1,7 @@
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::videofilter_payload::{VideofilterVideoSource};
+use mysql_queries::payloads::generic_inference_args::videofilter_payload::VideofilterVideoSource;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use tokens::tokens::model_weights::ModelWeightToken;
 

crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_dependencies.rs

@@ -1,10 +1,12 @@
 use std::path::PathBuf;
-use tokio::process::Command;
 use std::time::{Duration, Instant};
+
 use actix_web::http::StatusCode;
-use errors::AnyhowResult;
+use tokio::process::Command;
 use tokio::time::sleep;
 
+use errors::AnyhowResult;
+
 use crate::job::job_types::workflow::comfy_ui::comfy_ui_inference_command::ComfyInferenceCommand;
 use crate::util::common_commands::ffmpeg_command_runner::FfmpegCommandRunner;
 use crate::util::common_commands::ffmpeg_logo_watermark_command::FfmpegLogoWatermarkCommand;

crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_inference_command.rs

@@ -9,8 +9,8 @@ use anyhow::anyhow;
 use log::info;
 use once_cell::sync::Lazy;
 use subprocess::{Popen, PopenConfig};
-use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 
+use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use errors::AnyhowResult;
 use filesys::path_to_string::path_to_string;
 use subprocess_common::command_exit_status::CommandExitStatus;

crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/download_input_video.rs

@@ -1,10 +1,12 @@
 use anyhow::anyhow;
 use log::{error, info};
 use sqlx::MySqlPool;
+
 use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
 use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient;
 use filesys::path_to_string::path_to_string;
 use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, MediaFile};
+
 use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
 use crate::job::job_types::workflow::comfy_ui::job_outputs::JobOutputs;
 use crate::job::job_types::workflow::comfy_ui::validate_job::JobArgs;

crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/validate_job.rs

@@ -1,8 +1,9 @@
 use std::collections::HashMap;
+
 use anyhow::anyhow;
 
 use mysql_queries::payloads::generic_inference_args::generic_inference_args::{InferenceCategoryAbbreviated, PolymorphicInferenceArgs};
-use mysql_queries::payloads::generic_inference_args::workflow_payload::{NewValue};
+use mysql_queries::payloads::generic_inference_args::workflow_payload::NewValue;
 use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::model_weights::ModelWeightToken;

crates/service/job/inference_job/src/job_dependencies.rs

@@ -29,7 +29,6 @@ use crate::util::model_weights_cache::model_weights_cache_directory::ModelWeight
 use crate::util::scoped_execution::ScopedExecution;
 use crate::util::scoped_temp_dir_creator::ScopedTempDirCreator;
 
-
 pub struct JobDependencies {
   /// Database dependencies.
   pub db: DatabaseDependencies,

crates/service/job/inference_job/src/util/comfy_workflows/load_json.rs

@@ -1,6 +1,8 @@
 use std::fs::File;
 use std::path::Path;
+
 use serde_json::Value;
+
 use errors::AnyhowResult;
 
 pub fn load_json<P: AsRef<Path>>(filename: P) -> AnyhowResult<Value> {
@@ -12,6 +14,7 @@ pub fn load_json<P: AsRef<Path>>(filename: P) -> AnyhowResult<Value> {
 #[cfg(test)]
 mod tests {
   use std::path::PathBuf;
+
   use crate::util::comfy_workflows::load_json::load_json;
 
   fn test_file(path_from_repo_root: &str) -> PathBuf {

crates/service/job/inference_job/src/util/instrumentation.rs

@@ -1,4 +1,5 @@
 use std::time::Duration;
+
 use log::{info, warn};
 use opentelemetry::KeyValue;
 use opentelemetry::metrics::{Counter, Histogram, Meter, Unit};
@@ -6,7 +7,6 @@ use opentelemetry_otlp::WithExportConfig;
 use opentelemetry_sdk::metrics::reader::{DefaultAggregationSelector, DefaultTemporalitySelector};
 use opentelemetry_sdk::Resource;
 
-
 pub struct JobInstrumentLabels {
     pub service_name: String,
     pub service_namespace: String,

crates/service/job/inference_job/src/util/model_weights_cache/model_weights_cache_filename.rs

@@ -1,4 +1,5 @@
 use std::path::PathBuf;
+
 use enums::by_table::model_weights::weights_types::WeightsType;
 use mysql_queries::queries::model_weights::get::get_weight::RetrievedModelWeight;
 use tokens::tokens::model_weights::ModelWeightToken;
@@ -50,8 +51,10 @@ impl ModelWeightsCacheMapping {
 #[cfg(test)]
 mod tests {
   use std::path::PathBuf;
+
   use enums::by_table::model_weights::weights_types::WeightsType;
   use tokens::tokens::model_weights::ModelWeightToken;
+
   use crate::util::model_weights_cache::model_weights_cache_filename::ModelWeightsCacheMapping;
 
   #[test]