diff --git a/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs b/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs index 0d4918457d..1d0c8fb282 100644 --- a/crates/lib/mysql_queries/src/queries/audit_logs/insert_audit_log_transactional.rs +++ b/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; diff --git a/crates/lib/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs b/crates/lib/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs index ed3aaef8c4..cc0d2137ff 100644 --- a/crates/lib/mysql_queries/src/queries/beta_keys/insert_batch_beta_keys.rs +++ b/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; diff --git a/crates/lib/mysql_queries/src/queries/beta_keys/redeem_beta_key.rs b/crates/lib/mysql_queries/src/queries/beta_keys/redeem_beta_key.rs index e996428dc2..8ac60bf15f 100644 --- a/crates/lib/mysql_queries/src/queries/beta_keys/redeem_beta_key.rs +++ b/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; diff --git a/crates/lib/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs b/crates/lib/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs index 80817639f6..74769fd4f1 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/list/list_featured_weights.rs +++ b/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, cursor_is_reversed: bool, sort_ascending: bool, diff --git a/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs b/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs index 3f24644c43..25a2695900 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/list/list_weights_query_builder.rs +++ b/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(); diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs b/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs index cd60b8d61d..8b27d72aab 100644 --- a/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_query_builder.rs +++ b/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(); diff --git a/crates/service/job/inference_job/src/job/job_loop/main_loop.rs b/crates/service/job/inference_job/src/job/job_loop/main_loop.rs index 3812f276cc..5341626abc 100644 --- a/crates/service/job/inference_job/src/job/job_loop/main_loop.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/stable_diffusion_dependencies.rs b/crates/service/job/inference_job/src/job/job_types/image_generation/sd/stable_diffusion_dependencies.rs index 4bcb787017..2b8516bb2f 100644 --- a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/stable_diffusion_dependencies.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/validate_inputs.rs b/crates/service/job/inference_job/src/job/job_types/image_generation/sd/validate_inputs.rs index 75cf105f6f..23539b65bf 100644 --- a/crates/service/job/inference_job/src/job/job_types/image_generation/sd/validate_inputs.rs +++ b/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 diff --git a/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/download_video_file.rs b/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/download_video_file.rs index b545a35452..d6f448d8bd 100644 --- a/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/download_video_file.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/validate_job.rs b/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/validate_job.rs index 5499bb9dad..098361d655 100644 --- a/crates/service/job/inference_job/src/job/job_types/mocap/mocap_net/validate_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/mocap/process_single_mc_job.rs b/crates/service/job/inference_job/src/job/job_types/mocap/process_single_mc_job.rs index b755586697..56cb88e478 100644 --- a/crates/service/job/inference_job/src/job/job_types/mocap/process_single_mc_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/vc/media_for_inference.rs b/crates/service/job/inference_job/src/job/job_types/vc/media_for_inference.rs index c2e7a72776..33ba9e0384 100644 --- a/crates/service/job/inference_job/src/job/job_types/vc/media_for_inference.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/vc/process_single_vc_job.rs b/crates/service/job/inference_job/src/job/job_types/vc/process_single_vc_job.rs index d121ff74d3..563ffc7fd7 100644 --- a/crates/service/job/inference_job/src/job/job_types/vc/process_single_vc_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/rvc_v2_dependencies.rs b/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/rvc_v2_dependencies.rs index 77abf91b3d..9511f53f05 100644 --- a/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/rvc_v2_dependencies.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/svc_dependencies.rs b/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/svc_dependencies.rs index b8479a69cc..013fb69cee 100644 --- a/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/svc_dependencies.rs +++ b/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 { diff --git a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_video_file.rs b/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_video_file.rs index 83188818cd..563e004c79 100644 --- a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_video_file.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/validate_job.rs b/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/validate_job.rs index 6a1856899c..1ac2b22bca 100644 --- a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/validate_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_dependencies.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_dependencies.rs index d5c02792b3..1467711741 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_dependencies.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_inference_command.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_inference_command.rs index 6df1560d91..f08ea09439 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/comfy_ui_inference_command.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/download_input_video.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/download_input_video.rs index cf32fc4a05..7fe7c05f89 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/download_input_video.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/validate_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/validate_job.rs index cba7baeb9d..08031a4aa8 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/validate_job.rs +++ b/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; diff --git a/crates/service/job/inference_job/src/job_dependencies.rs b/crates/service/job/inference_job/src/job_dependencies.rs index 09242faf96..30d31e2058 100644 --- a/crates/service/job/inference_job/src/job_dependencies.rs +++ b/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, diff --git a/crates/service/job/inference_job/src/util/comfy_workflows/load_json.rs b/crates/service/job/inference_job/src/util/comfy_workflows/load_json.rs index b1275a47d6..22ec1556d4 100644 --- a/crates/service/job/inference_job/src/util/comfy_workflows/load_json.rs +++ b/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>(filename: P) -> AnyhowResult { @@ -12,6 +14,7 @@ pub fn load_json>(filename: P) -> AnyhowResult { #[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 { diff --git a/crates/service/job/inference_job/src/util/instrumentation.rs b/crates/service/job/inference_job/src/util/instrumentation.rs index ee91e1b16a..6f83e48ce7 100644 --- a/crates/service/job/inference_job/src/util/instrumentation.rs +++ b/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, diff --git a/crates/service/job/inference_job/src/util/model_weights_cache/model_weights_cache_filename.rs b/crates/service/job/inference_job/src/util/model_weights_cache/model_weights_cache_filename.rs index af49a732cc..92bb74621d 100644 --- a/crates/service/job/inference_job/src/util/model_weights_cache/model_weights_cache_filename.rs +++ b/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]