From 1432c19d3b825e2fc8e37f380923d22d2e1d11ca Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 19 Dec 2023 01:47:36 -0500 Subject: [PATCH] fix all failing lints --- .../dev-database-seed/src/seeding/seed_model_weights.rs | 7 ++++--- ...te_model_weight_from_voice_conversion_download_job.rs | 5 +---- .../list/list_model_weights_for_voice_conversion.rs | 9 ++------- .../upsert_model_weight_from_voice_conversion_model.rs | 2 +- .../src/job/job_loop/determine_dependency_status.rs | 2 -- .../src/job/job_types/vc/process_single_vc_job.rs | 2 +- 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/crates/cli/dev-database-seed/src/seeding/seed_model_weights.rs b/crates/cli/dev-database-seed/src/seeding/seed_model_weights.rs index e479f275da..df11a86447 100644 --- a/crates/cli/dev-database-seed/src/seeding/seed_model_weights.rs +++ b/crates/cli/dev-database-seed/src/seeding/seed_model_weights.rs @@ -1,6 +1,6 @@ -use std::{path::Path, string}; -use errors::{anyhow, AnyhowResult}; -use log::{info, warn}; +use std::path::Path; + +use log::info; use rand::Rng; use sqlx::{MySql, Pool}; @@ -9,6 +9,7 @@ use enums::{ by_table::model_weights::{weights_category::WeightsCategory, weights_types::WeightsType}, common::visibility::Visibility, }; +use errors::{anyhow, AnyhowResult}; use filesys::file_read_bytes::file_read_bytes; use filesys::file_size::file_size; use filesys::path_to_string::path_to_string; diff --git a/crates/lib/mysql_queries/src/queries/model_weights/create/create_model_weight_from_voice_conversion_download_job.rs b/crates/lib/mysql_queries/src/queries/model_weights/create/create_model_weight_from_voice_conversion_download_job.rs index e066c68045..b2ed90edf5 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/create/create_model_weight_from_voice_conversion_download_job.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/create/create_model_weight_from_voice_conversion_download_job.rs @@ -1,11 +1,8 @@ -use std::path::Path; - use anyhow::anyhow; use sqlx::MySqlPool; + use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::by_table::model_weights::weights_types::WeightsType; - -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; diff --git a/crates/lib/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs b/crates/lib/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs index a902934e4f..03ce303239 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/list/list_model_weights_for_voice_conversion.rs @@ -1,18 +1,13 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use log::warn; -use sqlx::{MySql, MySqlPool}; +use sqlx::MySql; use sqlx::pool::PoolConnection; -use enums::by_table::model_weights::weights_types::WeightsType; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; +use enums::by_table::model_weights::weights_types::WeightsType; use enums::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; -use tokens::tokens::voice_conversion_models::VoiceConversionModelToken; - -use crate::helpers::boolean_converters::i8_to_bool; #[derive(Serialize, Clone)] pub struct ModelWeightForVoiceConversion { diff --git a/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs b/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs index c59b695c58..2b482dac53 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/migration/upsert_model_weight_from_voice_conversion_model.rs @@ -1,5 +1,5 @@ use anyhow::anyhow; -use sqlx::{Acquire, MySql, MySqlPool, Transaction}; +use sqlx::{MySql, MySqlPool, Transaction}; use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::by_table::model_weights::weights_types::WeightsType; diff --git a/crates/service/job/inference_job/src/job/job_loop/determine_dependency_status.rs b/crates/service/job/inference_job/src/job/job_loop/determine_dependency_status.rs index 65c67f01ca..a6490adfe4 100644 --- a/crates/service/job/inference_job/src/job/job_loop/determine_dependency_status.rs +++ b/crates/service/job/inference_job/src/job/job_loop/determine_dependency_status.rs @@ -5,12 +5,10 @@ use log::{info, warn}; use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory; use enums::by_table::tts_models::tts_model_type::TtsModelType; -use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use filesys::file_exists::file_exists; use migration::voice_conversion::query_vc_model_for_migration::{query_vc_model_for_migration, VcModel, VcModelType}; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use mysql_queries::queries::tts::tts_models::get_tts_model_for_inference_improved::{get_tts_model_for_inference_improved, TtsModelForInferenceError, TtsModelForInferenceRecord}; -use mysql_queries::queries::voice_conversion::inference::get_voice_conversion_model_for_inference::{get_voice_conversion_model_for_inference, VoiceConversionModelForInference}; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; use crate::job_dependencies::JobDependencies; 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 14c0d7078b..7523d642c5 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 @@ -25,7 +25,7 @@ pub async fn process_single_vc_job(job_dependencies: &JobDependencies, job: &Ava .await .map_err(|err| { error!("error querying vc model {model_token} : {:?}", err); - return ProcessSingleJobError::Other(anyhow!("error querying vc model {model_token} : {:?}", err)) + ProcessSingleJobError::Other(anyhow!("error querying vc model {model_token} : {:?}", err)) })?; let model = match maybe_model {