From 88610b2c586da0f5bfd49582b360420845aeeb2f Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 30 Dec 2023 23:19:44 -0500 Subject: [PATCH] unused variables lint --- Cranky.toml | 1 + crates/cli/dev-database-seed/src/main.rs | 10 +++++----- .../src/seeding/model_weights.rs | 10 +++++----- .../src/seeding/seed_model_weights.rs | 8 ++++---- .../src/plans/create_all_tts_documents.rs | 2 +- .../cloud_storage/src/bucket_path_unifier.rs | 2 +- .../noop_job_progress_reporter.rs | 14 +++++++------- .../mysql_queries/src/mediators/badge_granter.rs | 2 +- .../src/mediators/firehose_publisher.rs | 2 +- .../insert_media_file_from_face_animation.rs | 4 ---- .../create/insert_media_file_from_rerender.rs | 3 --- .../create/insert_media_file_from_tacotron2.rs | 4 ---- .../insert_media_file_from_voice_conversion.rs | 4 ---- .../edit/set_model_weight_cover_image.rs | 4 ++-- .../tts_download_job_queries.rs | 2 +- .../queries/tts/tts_models/list_tts_models.rs | 14 +++++++------- .../list_whole_tts_models_using_cursor.rs | 12 ++++++------ .../list_tts_results_query_builder.rs | 2 +- .../reorder_twitch_event_rules.rs | 2 +- ...whole_voice_conversion_models_using_cursor.rs | 12 ++++++------ .../models/list_voice_conversion_models.rs | 14 +++++++------- .../datasets/list_datasets_by_username.rs | 12 ++++++------ .../insert_dataset_sample_and_media_file.rs | 2 +- .../list_dataset_samples_for_dataset_token.rs | 14 ++++++-------- .../voices/list_voices_by_username.rs | 12 ++++++------ .../w2l/w2l_templates/list_w2l_templates.rs | 14 +++++++------- .../download_job/src/util/scoped_downloads.rs | 2 +- .../endpoints/health_check_handler.rs | 2 +- .../src/http_server/run_http_server.rs | 2 +- .../src/job/job_loop/process_single_job.rs | 4 ++-- crates/service/job/email_sender_job/src/main.rs | 4 ++-- .../endpoints/health_check_handler.rs | 2 +- .../src/http_server/run_http_server.rs | 2 +- .../job_types/lipsync/sad_talker/process_job.rs | 2 +- .../tts/vall_e_x/process_job_create_voice.rs | 16 ++++++++-------- .../rerender_a_video/categorize_error.rs | 2 +- crates/service/job/inference_job/src/main.rs | 4 ++-- .../src/util/common_commands/audiowmark.rs | 4 ++-- .../inference_job/src/util/scoped_execution.rs | 2 +- 39 files changed, 107 insertions(+), 123 deletions(-) diff --git a/Cranky.toml b/Cranky.toml index 118c6bd9d3..651e6631a3 100644 --- a/Cranky.toml +++ b/Cranky.toml @@ -42,6 +42,7 @@ deny = [ # Rust "unused_parens", # Unused parens are ugly "unused_imports", # These are easy to automatically cull + "unused_variables", # Don't leave cruft # Possible: # "clippy::ptr_arg", diff --git a/crates/cli/dev-database-seed/src/main.rs b/crates/cli/dev-database-seed/src/main.rs index 6a2290bea5..c4e3f6b459 100644 --- a/crates/cli/dev-database-seed/src/main.rs +++ b/crates/cli/dev-database-seed/src/main.rs @@ -47,11 +47,11 @@ pub async fn main() -> AnyhowResult<()> { maybe_bucket_clients = Some(get_bucket_clients()?); } - let mut maybe_elasticsearch = None; - - if args.seed_elasticsearch { - maybe_elasticsearch = Some(get_elasticsearch_client()); - } +// let mut maybe_elasticsearch = None; +// +// if args.seed_elasticsearch { +// maybe_elasticsearch = Some(get_elasticsearch_client()); +// } seed_user_accounts(&pool).await?; seed_media_files(&pool, maybe_bucket_clients.as_ref()).await?; diff --git a/crates/cli/dev-database-seed/src/seeding/model_weights.rs b/crates/cli/dev-database-seed/src/seeding/model_weights.rs index 3f3e704136..c7b9704bb4 100644 --- a/crates/cli/dev-database-seed/src/seeding/model_weights.rs +++ b/crates/cli/dev-database-seed/src/seeding/model_weights.rs @@ -81,7 +81,7 @@ pub async fn seed_weights_for_paging(mysql_pool: &Pool, user_token: UserT *Thank you for your continued support and feedback!* "#; - let sd1_5_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be706282-2978-42a0-aaa2-73881aad94e9/width=1024/00049-2287632957-1girl,face,curly%20hair,red%20hair,white%20background,.jpeg"; + let _sd1_5_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be706282-2978-42a0-aaa2-73881aad94e9/width=1024/00049-2287632957-1girl,face,curly%20hair,red%20hair,white%20background,.jpeg"; // create a loop that loops from 1 to 100 for i in 1..=100 { @@ -112,7 +112,7 @@ pub async fn seed_weights_for_paging(mysql_pool: &Pool, user_token: UserT let mut original_filename; let mut original_download_url; - let mut private_bucket_hash:String = "".to_string(); + let mut _private_bucket_hash:String = "".to_string(); let mut private_bucket_prefix; let mut private_bucket_extension; @@ -220,7 +220,7 @@ pub async fn seed_weights_for_paging(mysql_pool: &Pool, user_token: UserT Have fun! 😊 "#; - let sdxl_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be706282-2978-42a0-aaa2-73881aad94e9/width=1024/00049-2287632957-1girl,face,curly%20hair,red%20hair,white%20background,.jpeg"; + let _sdxl_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be706282-2978-42a0-aaa2-73881aad94e9/width=1024/00049-2287632957-1girl,face,curly%20hair,red%20hair,white%20background,.jpeg"; model_weight_token = ModelWeightToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously(); title = format!("SDXL_Niji_Special Edition: {}", i); @@ -249,7 +249,7 @@ pub async fn seed_weights_for_paging(mysql_pool: &Pool, user_token: UserT - LoRA Gawr Gura "#; - let lora_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/123645df-dee2-4239-863a-76a150b09c32/width=1024/00000-2171948503.jpeg"; + let _lora_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/123645df-dee2-4239-863a-76a150b09c32/width=1024/00000-2171948503.jpeg"; model_weight_token = ModelWeightToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously(); title = format!("Gawr Gura LoRA: {}", i); @@ -479,7 +479,7 @@ pub async fn seed_weights_for_user_token( } -pub async fn original_seed_weights(mysql_pool: &Pool,user_token: UserToken) -> AnyhowResult<()> { +pub async fn original_seed_weights(mysql_pool: &Pool, _user_token: UserToken) -> AnyhowResult<()> { let model_weight_token1 = ModelWeightToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously(); let creator_token1 = UserToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously(); 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 0660b063c1..0704288417 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 @@ -74,7 +74,7 @@ pub async fn seed_weights_files( for ( user_token, - weights_file_token, + _weights_file_token, weights_type, weights_category, model_name, @@ -168,9 +168,9 @@ struct BucketDetails { } async fn seed_model( - mysql_pool: &Pool, - model_weight_token: &ModelWeightToken, - user_token: &UserToken, + _mysql_pool: &Pool, + _model_weight_token: &ModelWeightToken, + _user_token: &UserToken, weight_type: WeightsType, weight_file_path: &Path, maybe_bucket_clients: Option<&BucketClients> diff --git a/crates/cli/elasticsearch-cli/src/plans/create_all_tts_documents.rs b/crates/cli/elasticsearch-cli/src/plans/create_all_tts_documents.rs index ff46f4a402..5ac7ee12b1 100644 --- a/crates/cli/elasticsearch-cli/src/plans/create_all_tts_documents.rs +++ b/crates/cli/elasticsearch-cli/src/plans/create_all_tts_documents.rs @@ -81,7 +81,7 @@ async fn create_document_from_record(elasticsearch: &Elasticsearch, record: &Tts } // NB: Adapted from elasticsearch crate examples source -async fn create_tts_model_index(client: &Elasticsearch, delete: bool) -> AnyhowResult<()> { +async fn create_tts_model_index(client: &Elasticsearch, _delete: bool) -> AnyhowResult<()> { info!("Creating TTS model index..."); diff --git a/crates/lib/api_clients/cloud_storage/src/bucket_path_unifier.rs b/crates/lib/api_clients/cloud_storage/src/bucket_path_unifier.rs index f7a113bb34..bb9bf4d1ca 100644 --- a/crates/lib/api_clients/cloud_storage/src/bucket_path_unifier.rs +++ b/crates/lib/api_clients/cloud_storage/src/bucket_path_unifier.rs @@ -192,7 +192,7 @@ impl BucketPathUnifier { pub fn w2l_inference_video_output_path(&self, w2l_inference_job_token: &str) -> PathBuf { // NB: We don't want colons from the token in the filename. if w2l_inference_job_token.contains(":") { - if let Some((token_type, token)) = w2l_inference_job_token.split_once(":") { + if let Some((_token_type, token)) = w2l_inference_job_token.split_once(":") { let video_filename = w2l_inference_job_token.replace(":", ""); let video_filename = format!("vocodes_video_{}.mp4", video_filename); diff --git a/crates/lib/jobs_common/src/job_progress_reporter/noop_job_progress_reporter.rs b/crates/lib/jobs_common/src/job_progress_reporter/noop_job_progress_reporter.rs index 68c29edfa1..c00ffaca1c 100644 --- a/crates/lib/jobs_common/src/job_progress_reporter/noop_job_progress_reporter.rs +++ b/crates/lib/jobs_common/src/job_progress_reporter/noop_job_progress_reporter.rs @@ -15,33 +15,33 @@ impl NoOpJobProgressReporterBuilder { } impl JobProgressReporterBuilder for NoOpJobProgressReporterBuilder { - fn new_generic_download(&self, job_token: &str) -> AnyhowResult> { + fn new_generic_download(&self, _job_token: &str) -> AnyhowResult> { NoOpJobProgressReporterBuilder::create_instance() } - fn new_generic_inference(&self, job_token: &str) -> AnyhowResult> { + fn new_generic_inference(&self, _job_token: &str) -> AnyhowResult> { NoOpJobProgressReporterBuilder::create_instance() } - fn new_tts_download(&self, tts_job_token: &str) -> AnyhowResult> { + fn new_tts_download(&self, _tts_job_token: &str) -> AnyhowResult> { NoOpJobProgressReporterBuilder::create_instance() } - fn new_tts_inference(&self, tts_job_token: &str) -> AnyhowResult> { + fn new_tts_inference(&self, _tts_job_token: &str) -> AnyhowResult> { NoOpJobProgressReporterBuilder::create_instance() } - fn new_w2l_download(&self, w2l_job_token: &str) -> AnyhowResult> { + fn new_w2l_download(&self, _w2l_job_token: &str) -> AnyhowResult> { NoOpJobProgressReporterBuilder::create_instance() } - fn new_w2l_inference(&self, w2l_job_token: &str) -> AnyhowResult> { + fn new_w2l_inference(&self, _w2l_job_token: &str) -> AnyhowResult> { NoOpJobProgressReporterBuilder::create_instance() } } impl JobProgressReporter for NoOpJobProgressReporter { - fn log_status(&mut self, logging_details: &str) -> AnyhowResult<()> { + fn log_status(&mut self, _logging_details: &str) -> AnyhowResult<()> { Ok(()) // No-op } } diff --git a/crates/lib/mysql_queries/src/mediators/badge_granter.rs b/crates/lib/mysql_queries/src/mediators/badge_granter.rs index f288a84d2f..c16af2e300 100644 --- a/crates/lib/mysql_queries/src/mediators/badge_granter.rs +++ b/crates/lib/mysql_queries/src/mediators/badge_granter.rs @@ -468,7 +468,7 @@ SET // NB: MySQL Error Code 1062: Duplicate key insertion (this is harder to access) match err { Database(err) => { - let maybe_code = err.code().map(|c| c.into_owned()); + let _maybe_code = err.code().map(|c| c.into_owned()); /*match maybe_code.as_deref() { Some("23000") => { if err.message().contains("username") { diff --git a/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs b/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs index 8d70586bd0..45658bdf4d 100644 --- a/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs +++ b/crates/lib/mysql_queries/src/mediators/firehose_publisher.rs @@ -346,7 +346,7 @@ SET // NB: MySQL Error Code 1062: Duplicate key insertion (this is harder to access) match err { Database(err) => { - let maybe_code = err.code().map(|c| c.into_owned()); + let _maybe_code = err.code().map(|c| c.into_owned()); /*match maybe_code.as_deref() { Some("23000") => { if err.message().contains("username") { diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_animation.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_animation.rs index be24e08581..12a302e2f6 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_animation.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_face_animation.rs @@ -63,10 +63,6 @@ pub async fn insert_media_file_from_face_animation( maybe_creator_category_synthetic_id = Some(next_lipsync_id); } - let vc_model_token = args.job.maybe_model_token.as_deref(); - let creator_ip_address = args.job.creator_ip_address.as_str(); - let creator_set_visibility = args.job.creator_set_visibility.clone(); - const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference; const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::FaceAnimator; const ORIGIN_MODEL_TYPE : MediaFileOriginModelType = MediaFileOriginModelType::SadTalker; diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_rerender.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_rerender.rs index b1adc3d6c3..901e4389a1 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_rerender.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_rerender.rs @@ -63,9 +63,6 @@ pub async fn insert_media_file_from_rerender( maybe_creator_category_synthetic_id = Some(next_rerender_id); } - let creator_ip_address = args.job.creator_ip_address.as_str(); - let creator_set_visibility = args.job.creator_set_visibility.clone(); - const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference; const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::VideoFilter; const ORIGIN_MODEL_TYPE : MediaFileOriginModelType = MediaFileOriginModelType::Rerender; diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_tacotron2.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_tacotron2.rs index bc3010c1f8..85ce975108 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_tacotron2.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_tacotron2.rs @@ -67,10 +67,6 @@ pub async fn insert_media_file_from_tacotron2( maybe_creator_category_synthetic_id = Some(next_voice_conversion_id); } - let vc_model_token = args.job.maybe_model_token.as_deref(); - let creator_ip_address = args.job.creator_ip_address.as_str(); - let creator_set_visibility = args.job.creator_set_visibility.clone(); - const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference; const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::TextToSpeech; const MEDIA_TYPE : MediaFileType = MediaFileType::Audio; diff --git a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_voice_conversion.rs b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_voice_conversion.rs index 88349d9441..78f36d2713 100644 --- a/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_voice_conversion.rs +++ b/crates/lib/mysql_queries/src/queries/media_files/create/insert_media_file_from_voice_conversion.rs @@ -76,10 +76,6 @@ pub async fn insert_media_file_from_voice_conversion( maybe_creator_category_synthetic_id = Some(next_voice_conversion_id); } - let vc_model_token = args.job.maybe_model_token.as_deref(); - let creator_ip_address = args.job.creator_ip_address.as_str(); - let creator_set_visibility = args.job.creator_set_visibility.clone(); - const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference; const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::VoiceConversion; const MEDIA_TYPE : MediaFileType = MediaFileType::Audio; diff --git a/crates/lib/mysql_queries/src/queries/model_weights/edit/set_model_weight_cover_image.rs b/crates/lib/mysql_queries/src/queries/model_weights/edit/set_model_weight_cover_image.rs index 6bfc8572f6..7deeb31bfc 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/edit/set_model_weight_cover_image.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/edit/set_model_weight_cover_image.rs @@ -14,7 +14,7 @@ pub struct UpdateArgs<'a> { pub async fn set_model_weight_cover_image(args: UpdateArgs<'_>) -> AnyhowResult<()>{ let transaction = args.mysql_pool.begin().await?; - let query_result = sqlx::query!( + let _query_result = sqlx::query!( r#" UPDATE model_weights SET @@ -24,7 +24,7 @@ pub async fn set_model_weight_cover_image(args: UpdateArgs<'_>) -> AnyhowResult< "#, args.maybe_cover_image_media_file_token, args.model_weight_token, - ).execute(args.mysql_pool).await; + ).execute(args.mysql_pool).await?; transaction.commit().await?; diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs b/crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs index 0a97d15436..001f424297 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_download_jobs/tts_download_job_queries.rs @@ -164,7 +164,7 @@ pub async fn mark_tts_upload_job_failure( next_status = "dead"; } - let query_result = sqlx::query!( + let _query_result = sqlx::query!( r#" UPDATE tts_model_upload_jobs SET diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs index c63a9b3276..3c0c393b82 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/list_tts_models.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use log::{info, warn}; -use sqlx::{MySql, MySqlPool}; +use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; use enums::common::visibility::Visibility; @@ -75,13 +75,13 @@ pub async fn list_tts_models_with_connection( let models : Vec = match maybe_models { Ok(models) => models, Err(err) => { - match err { - RowNotFound => { - return Ok(Vec::new()); + return match err { + Error::RowNotFound => { + Ok(Vec::new()) }, _ => { warn!("tts model list query error: {:?}", err); - return Err(anyhow!("tts model list query error")); + Err(anyhow!("tts model list query error")) } } } @@ -117,7 +117,7 @@ pub async fn list_tts_models_with_connection( async fn list_tts_models_for_all_creators( mysql_connection: &mut PoolConnection, allow_mod_disabled: bool -) -> AnyhowResult> { +) -> Result, Error> { // TODO: There has to be a better way. // Sqlx doesn't like anything except string literals. let maybe_models = if !allow_mod_disabled { @@ -198,7 +198,7 @@ async fn list_tts_models_creator_scoped( mysql_connection: &mut PoolConnection, scope_creator_username: &str, allow_mod_disabled: bool -) -> AnyhowResult> { +) -> Result, Error> { // TODO: There has to be a better way. // Sqlx doesn't like anything except string literals. let maybe_models = if !allow_mod_disabled { diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs b/crates/lib/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs index af25d2adc2..051e35416c 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_models/migration/list_whole_tts_models_using_cursor.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use log::warn; -use sqlx::{MySql, MySqlPool}; +use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; use enums::by_table::tts_models::tts_model_type::TtsModelType; @@ -104,13 +104,13 @@ pub async fn list_whole_tts_models_using_cursor( let models : Vec = match maybe_models { Ok(models) => models, Err(err) => { - match err { - RowNotFound => { - return Ok(Vec::new()); + return match err { + Error::RowNotFound => { + Ok(Vec::new()) }, _ => { warn!("vc model list query error: {:?}", err); - return Err(anyhow!("vc model list query error")); + Err(anyhow!("vc model list query error")) } } } @@ -176,7 +176,7 @@ async fn list_whole_voice_conversion_models( mysql_connection: &mut PoolConnection, page_size: u64, cursor: u64, -) -> AnyhowResult> { +) -> Result, Error> { Ok(sqlx::query_as!( RawRecord, r#" diff --git a/crates/lib/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs b/crates/lib/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs index 0ed9b446a7..ffb4c4c92f 100644 --- a/crates/lib/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs +++ b/crates/lib/mysql_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs @@ -241,7 +241,7 @@ LEFT OUTER JOIN users let mut query = "".to_string(); - if let Some(offset) = self.offset { + if let Some(_offset) = self.offset { if !first_predicate_added { query.push_str(" WHERE"); first_predicate_added = true; diff --git a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs index f2cafbbef1..74c169cffa 100644 --- a/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs +++ b/crates/lib/mysql_queries/src/queries/twitch/twitch_event_rules/reorder_twitch_event_rules.rs @@ -72,7 +72,7 @@ pub async fn reorder_twitch_event_rules( .join("\n"); let query_inner_ip_addresses = rule_token_to_order_map.iter() - .map(|(token, position)| { + .map(|(token, _position)| { format!("when token = '{}' then '{}'", token.as_str(), ip_address_update) }) .collect::>() diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/migration/list_whole_voice_conversion_models_using_cursor.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/migration/list_whole_voice_conversion_models_using_cursor.rs index 33335c5628..f690ecc34d 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/migration/list_whole_voice_conversion_models_using_cursor.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/migration/list_whole_voice_conversion_models_using_cursor.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use log::warn; -use sqlx::{MySql, MySqlPool}; +use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; @@ -80,13 +80,13 @@ pub async fn list_whole_voice_conversion_models_using_cursor( let models : Vec = match maybe_models { Ok(models) => models, Err(err) => { - match err { - RowNotFound => { - return Ok(Vec::new()); + return match err { + Error::RowNotFound => { + Ok(Vec::new()) }, _ => { warn!("vc model list query error: {:?}", err); - return Err(anyhow!("vc model list query error")); + Err(anyhow!("vc model list query error")) } } } @@ -134,7 +134,7 @@ async fn list_whole_voice_conversion_models( mysql_connection: &mut PoolConnection, page_size: u64, cursor: u64, -) -> AnyhowResult> { +) -> Result, Error> { Ok(sqlx::query_as!( RawRecord, r#" diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs index 5476272290..491833f9fd 100644 --- a/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs +++ b/crates/lib/mysql_queries/src/queries/voice_conversion/models/list_voice_conversion_models.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use log::warn; -use sqlx::{MySql, MySqlPool}; +use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; @@ -64,13 +64,13 @@ pub async fn list_voice_conversion_models_with_connection( let models : Vec = match maybe_models { Ok(models) => models, Err(err) => { - match err { - RowNotFound => { - return Ok(Vec::new()); + return match err { + Error::RowNotFound => { + Ok(Vec::new()) }, _ => { warn!("vc model list query error: {:?}", err); - return Err(anyhow!("vc model list query error")); + Err(anyhow!("vc model list query error")) } } } @@ -99,7 +99,7 @@ pub async fn list_voice_conversion_models_with_connection( async fn list_voice_conversion_models_for_all_creators( mysql_connection: &mut PoolConnection, -) -> AnyhowResult> { +) -> Result, Error> { Ok(sqlx::query_as!( RawVoiceConversionModelRecord, r#" @@ -131,7 +131,7 @@ WHERE async fn list_voice_conversion_models_creator_scoped( mysql_connection: &mut PoolConnection, scope_creator_username: &str, -) -> AnyhowResult> { +) -> Result, Error> { Ok(sqlx::query_as!( RawVoiceConversionModelRecord, r#" diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/datasets/list_datasets_by_username.rs b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/list_datasets_by_username.rs index bf91881380..6d4d85f0d5 100644 --- a/crates/lib/mysql_queries/src/queries/voice_designer/datasets/list_datasets_by_username.rs +++ b/crates/lib/mysql_queries/src/queries/voice_designer/datasets/list_datasets_by_username.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use log::{info, warn}; -use sqlx::{MySql, MySqlPool}; +use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; use enums::common::visibility::Visibility; @@ -51,13 +51,13 @@ pub async fn list_datasets_by_username_with_connection( let datasets : Vec = match datasets { Ok(datasets) => datasets, Err(err) => { - match err { - RowNotFound => { - return Ok(Vec::new()); + return match err { + Error::RowNotFound => { + Ok(Vec::new()) }, _ => { warn!("dataset list query error: {:?}", err); - return Err(anyhow!("dataset list query error")); + Err(anyhow!("dataset list query error")) } } } @@ -90,7 +90,7 @@ async fn list_datasets_by_creator_username( mysql_connection: &mut PoolConnection, creator_username: &str, can_see_deleted: bool, -) -> AnyhowResult> { +) -> Result, Error> { // TODO: There has to be a better way. // Sqlx doesn't like anything except string literals. let maybe_datasets = if !can_see_deleted { diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/voice_samples/insert_dataset_sample_and_media_file.rs b/crates/lib/mysql_queries/src/queries/voice_designer/voice_samples/insert_dataset_sample_and_media_file.rs index 0abda7cd4b..07bb25f5b6 100644 --- a/crates/lib/mysql_queries/src/queries/voice_designer/voice_samples/insert_dataset_sample_and_media_file.rs +++ b/crates/lib/mysql_queries/src/queries/voice_designer/voice_samples/insert_dataset_sample_and_media_file.rs @@ -53,7 +53,7 @@ const ORIGIN_PRODUCT : MediaFileOriginProductCategory = MediaFileOriginProductCa pub async fn insert_dataset_sample_and_media_file(args: InsertDatasetSampleAndMediaFileArgs<'_>) -> AnyhowResult<(ZsVoiceDatasetSampleToken, MediaFileToken, u64)> { - let maybe_creator_synthetic_id : Option = None; + let _maybe_creator_synthetic_id : Option = None; let mut transaction = args.mysql_pool.begin().await?; diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/voice_samples/list_dataset_samples_for_dataset_token.rs b/crates/lib/mysql_queries/src/queries/voice_designer/voice_samples/list_dataset_samples_for_dataset_token.rs index 86ef7ea8dd..0fa541eb79 100644 --- a/crates/lib/mysql_queries/src/queries/voice_designer/voice_samples/list_dataset_samples_for_dataset_token.rs +++ b/crates/lib/mysql_queries/src/queries/voice_designer/voice_samples/list_dataset_samples_for_dataset_token.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use log::warn; -use sqlx::{MySql, MySqlPool}; +use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; use enums::by_table::media_files::media_file_type::MediaFileType; @@ -11,8 +11,6 @@ use tokens::tokens::users::UserToken; use tokens::tokens::zs_voice_dataset_samples::ZsVoiceDatasetSampleToken; use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken; - - pub struct DatasetSampleRecordForList { pub sample_token: ZsVoiceDatasetSampleToken, @@ -62,13 +60,13 @@ pub async fn list_samples_by_dataset_token_with_connection( let records = match maybe_samples { Ok(records) => records, Err(err) => { - match err { - RowNotFound => { - return Ok(Vec::new()); + return match err { + Error::RowNotFound => { + Ok(Vec::new()) }, _ => { warn!("dataset sample list query error: {:?}", err); - return Err(anyhow!("Error fetching dataset samples by dataset token: {:?}", err)); + Err(anyhow!("Error fetching dataset samples by dataset token: {:?}", err)) } } } @@ -96,7 +94,7 @@ async fn list_samples_by_dataset_token( mysql_connection: &mut PoolConnection, dataset_token: &ZsVoiceDatasetToken, can_see_deleted: bool, -) -> AnyhowResult> { +) -> Result, Error> { let maybe_samples = if !can_see_deleted { sqlx::query_as!( InternalRawDatasetSampleRecordForList, diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_by_username.rs b/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_by_username.rs index eb6a4bd0f8..970e5e2124 100644 --- a/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_by_username.rs +++ b/crates/lib/mysql_queries/src/queries/voice_designer/voices/list_voices_by_username.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use log::{info, warn}; -use sqlx::{MySql, MySqlPool}; +use sqlx::{Error, MySql, MySqlPool}; use sqlx::pool::PoolConnection; use enums::common::visibility::Visibility; @@ -50,13 +50,13 @@ pub async fn list_zs_voices_by_username_with_connection( let voices : Vec = match maybe_voices { Ok(voices) => voices, Err(err) => { - match err { - RowNotFound => { - return Ok(Vec::new()); + return match err { + Error::RowNotFound => { + Ok(Vec::new()) }, _ => { warn!("voice list query error: {:?}", err); - return Err(anyhow!("voice list query error")); + Err(anyhow!("voice list query error")) } } } @@ -89,7 +89,7 @@ async fn list_voices_by_creator_username( mysql_connection: &mut PoolConnection, creator_username: &str, can_see_deleted: bool, -) -> AnyhowResult> { +) -> Result, Error> { // TODO: There has to be a better way. // Sqlx doesn't like anything except string literals. let maybe_voices = if !can_see_deleted { diff --git a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs index d1424c8350..f022767ddb 100644 --- a/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs +++ b/crates/lib/mysql_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use log::{info, warn}; -use sqlx::MySqlPool; +use sqlx::{Error, MySqlPool}; use errors::AnyhowResult; @@ -69,13 +69,13 @@ pub async fn list_w2l_templates( Err(err) => { warn!("Error: {:?}", err); - match err { - RowNotFound => { - return Ok(Vec::new()); + return match err { + Error::RowNotFound => { + Ok(Vec::new()) }, _ => { warn!("w2l template list query error: {:?}", err); - return Err(anyhow!("w2l template list query error")); + Err(anyhow!("w2l template list query error")) } } } @@ -106,7 +106,7 @@ pub async fn list_w2l_templates( async fn list_w2l_templates_for_all_creators( mysql_pool: &MySqlPool, require_mod_approved: bool -) -> AnyhowResult> { +) -> Result, Error> { // TODO: There has to be a better way. // Sqlx doesn't like anything except string literals. let maybe_templates = if require_mod_approved { @@ -177,7 +177,7 @@ async fn list_w2l_templates_creator_scoped( mysql_pool: &MySqlPool, scope_creator_username: &str, require_mod_approved: bool -) -> AnyhowResult> { +) -> Result, Error> { // TODO: There has to be a better way. // Sqlx doesn't like anything except string literals. let maybe_templates = if require_mod_approved { diff --git a/crates/service/job/download_job/src/util/scoped_downloads.rs b/crates/service/job/download_job/src/util/scoped_downloads.rs index bb8fd3e439..90134a603f 100644 --- a/crates/service/job/download_job/src/util/scoped_downloads.rs +++ b/crates/service/job/download_job/src/util/scoped_downloads.rs @@ -60,7 +60,7 @@ pub fn parse_download_types(comma_separated_types: &str) -> AnyhowResult AnyhowResult // HTTP server args let bind_address = easyenv::get_env_string_or_default("HTTP_BIND_ADDRESS", DEFAULT_BIND_ADDRESS); let num_workers = easyenv::get_env_num("HTTP_NUM_WORKERS", DEFAULT_NUM_WORKERS)?; - let hostname = args.container_environment.hostname.clone(); + let _hostname = args.container_environment.hostname.clone(); let server_state = HttpServerSharedState { job_stats: args.job_stats.clone(), diff --git a/crates/service/job/email_sender_job/src/job/job_loop/process_single_job.rs b/crates/service/job/email_sender_job/src/job/job_loop/process_single_job.rs index 3579ceba81..b03fc4953a 100644 --- a/crates/service/job/email_sender_job/src/job/job_loop/process_single_job.rs +++ b/crates/service/job/email_sender_job/src/job/job_loop/process_single_job.rs @@ -17,7 +17,7 @@ pub async fn process_single_job( job_dependencies: &JobDependencies, job: &AvailableEmailSenderJob, ) -> Result { - let mut force_execution = false; + //let mut force_execution = false; // Some jobs have "routing tags". These ensure that jobs only execute on certain hosts. // This is typically for debugging or development. @@ -27,7 +27,7 @@ pub async fn process_single_job( if hostname.starts_with(&routing_tag) { info!("Job has routing tag ({}) for execution on this host ({})", routing_tag, hostname); - force_execution = true; + //force_execution = true; } else { info!("Job routing tag ({}) doesn't match hostname ({}); skipping...", routing_tag, hostname); return Ok(ProcessSingleJobSuccessCase::JobSkippedForRoutingTagMismatch); diff --git a/crates/service/job/email_sender_job/src/main.rs b/crates/service/job/email_sender_job/src/main.rs index e1332cbccf..4a76a5134f 100644 --- a/crates/service/job/email_sender_job/src/main.rs +++ b/crates/service/job/email_sender_job/src/main.rs @@ -70,8 +70,8 @@ async fn main() -> AnyhowResult<()> { info!("Hostname: {}", &container_environment.hostname); // NB: These are non-standard env vars we're injecting ourselves. - let k8s_node_name = easyenv::get_env_string_optional("K8S_NODE_NAME"); - let k8s_pod_name = easyenv::get_env_string_optional("K8S_POD_NAME"); + let _k8s_node_name = easyenv::get_env_string_optional("K8S_NODE_NAME"); + let _k8s_pod_name = easyenv::get_env_string_optional("K8S_POD_NAME"); let db_connection_string = easyenv::get_env_string_or_default( diff --git a/crates/service/job/inference_job/src/http_server/endpoints/health_check_handler.rs b/crates/service/job/inference_job/src/http_server/endpoints/health_check_handler.rs index a77d9b1061..44334d4ce2 100644 --- a/crates/service/job/inference_job/src/http_server/endpoints/health_check_handler.rs +++ b/crates/service/job/inference_job/src/http_server/endpoints/health_check_handler.rs @@ -95,7 +95,7 @@ pub async fn get_health_check_handler( }; let body = serde_json::to_string(&response) - .map_err(|e| HealthCheckError::ServerError)?; + .map_err(|_e| HealthCheckError::ServerError)?; if is_healthy { Ok(HttpResponse::Ok() diff --git a/crates/service/job/inference_job/src/http_server/run_http_server.rs b/crates/service/job/inference_job/src/http_server/run_http_server.rs index 6114dc6802..40757da4f2 100644 --- a/crates/service/job/inference_job/src/http_server/run_http_server.rs +++ b/crates/service/job/inference_job/src/http_server/run_http_server.rs @@ -25,7 +25,7 @@ pub fn run_http_server(args: CreateServerArgs) -> AnyhowResult // HTTP server args let bind_address = easyenv::get_env_string_or_default("HTTP_BIND_ADDRESS", DEFAULT_BIND_ADDRESS); let num_workers = easyenv::get_env_num("HTTP_NUM_WORKERS", DEFAULT_NUM_WORKERS)?; - let hostname = args.container_environment.hostname.clone(); + let _hostname = args.container_environment.hostname.clone(); let server_state = HttpServerSharedState { job_stats: args.job_stats.clone(), diff --git a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs index fdeb1ba53e..6af98d3035 100644 --- a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs @@ -180,7 +180,7 @@ pub async fn process_job(args: SadTalkerProcessJobArgs<'_>) -> Result = Vec::new(); diff --git a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/categorize_error.rs b/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/categorize_error.rs index a1effe90c7..8fbbc5ff6e 100644 --- a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/categorize_error.rs +++ b/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/categorize_error.rs @@ -1,5 +1,5 @@ use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; -pub fn categorize_error(stderr_contents: &str) -> Option { +pub fn categorize_error(_stderr_contents: &str) -> Option { None } diff --git a/crates/service/job/inference_job/src/main.rs b/crates/service/job/inference_job/src/main.rs index 186e87c9f4..3fdf49fef5 100644 --- a/crates/service/job/inference_job/src/main.rs +++ b/crates/service/job/inference_job/src/main.rs @@ -84,8 +84,8 @@ async fn main() -> AnyhowResult<()> { info!("Hostname: {}", &container_environment.hostname); // NB: These are non-standard env vars we're injecting ourselves. - let k8s_node_name = easyenv::get_env_string_optional("K8S_NODE_NAME"); - let k8s_pod_name = easyenv::get_env_string_optional("K8S_POD_NAME"); + let _k8s_node_name = easyenv::get_env_string_optional("K8S_NODE_NAME"); + let _k8s_pod_name = easyenv::get_env_string_optional("K8S_POD_NAME"); // Bucket stuff (shared) let access_key = easyenv::get_env_string_required(ENV_ACCESS_KEY)?; diff --git a/crates/service/job/inference_job/src/util/common_commands/audiowmark.rs b/crates/service/job/inference_job/src/util/common_commands/audiowmark.rs index e60e2587f9..25a8e5fa0b 100644 --- a/crates/service/job/inference_job/src/util/common_commands/audiowmark.rs +++ b/crates/service/job/inference_job/src/util/common_commands/audiowmark.rs @@ -43,11 +43,11 @@ where P: AsRef { if out.status.success() { Ok( u128::from_str_radix(String::from_utf8(out.stdout) - .map_err(|e| io::Error::new(io::ErrorKind::Other, "audiowmark output parse failed"))? + .map_err(|_e| io::Error::new(io::ErrorKind::Other, "audiowmark output parse failed"))? .split_whitespace().take(3).collect::>().get(2) .ok_or(io::Error::new(io::ErrorKind::Other, "audiowmark output didn't match expected format"))? , 16) - .map_err(|e| io::Error::new(io::ErrorKind::Other, "audiowmark output parse failed"))? + .map_err(|_e| io::Error::new(io::ErrorKind::Other, "audiowmark output parse failed"))? .to_be_bytes() ) } diff --git a/crates/service/job/inference_job/src/util/scoped_execution.rs b/crates/service/job/inference_job/src/util/scoped_execution.rs index 7705f00fdf..4e0546883e 100644 --- a/crates/service/job/inference_job/src/util/scoped_execution.rs +++ b/crates/service/job/inference_job/src/util/scoped_execution.rs @@ -60,7 +60,7 @@ pub fn parse_model_types(comma_separated_types: &str) -> AnyhowResult