From 1c81874b288c1af4d00a374b76b917fb2ec6b4b3 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Mon, 9 Oct 2023 21:55:48 -0400 Subject: [PATCH] fix tests and lints --- .../src/by_table/generic_synthetic_ids/id_category.rs | 2 +- crates/cli/dev_database_seed/src/main.rs | 2 +- .../generic_inference_args/generic_inference_args.rs | 10 +++++++--- .../src/queries/voice_designer/voices/get_voice.rs | 2 -- .../src/job/job_types/tts/process_single_tts_job.rs | 1 - 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/crates/_types/enums/src/by_table/generic_synthetic_ids/id_category.rs b/crates/_types/enums/src/by_table/generic_synthetic_ids/id_category.rs index 25200e98df..2611d797ff 100644 --- a/crates/_types/enums/src/by_table/generic_synthetic_ids/id_category.rs +++ b/crates/_types/enums/src/by_table/generic_synthetic_ids/id_category.rs @@ -98,7 +98,7 @@ mod tests { fn all_variants() { // Static check let mut variants = IdCategory::all_variants(); - assert_eq!(variants.len(), 3); + assert_eq!(variants.len(), 4); assert_eq!(variants.pop_first(), Some(IdCategory::MediaFile)); assert_eq!(variants.pop_first(), Some(IdCategory::LipsyncAnimation)); assert_eq!(variants.pop_first(), Some(IdCategory::ZsDataset)); diff --git a/crates/cli/dev_database_seed/src/main.rs b/crates/cli/dev_database_seed/src/main.rs index e57749f744..e73fbea181 100644 --- a/crates/cli/dev_database_seed/src/main.rs +++ b/crates/cli/dev_database_seed/src/main.rs @@ -1,4 +1,4 @@ -use log::{info, log}; +use log::info; use sqlx::mysql::MySqlPoolOptions; use config::shared_constants::{DEFAULT_MYSQL_CONNECTION_STRING, DEFAULT_RUST_LOG}; diff --git a/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs b/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs index ead5855878..7e7f96dfb2 100644 --- a/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs +++ b/crates/lib/mysql_queries/src/payloads/generic_inference_args/generic_inference_args.rs @@ -116,6 +116,7 @@ impl InferenceCategoryAbbreviated { mod tests { use crate::payloads::generic_inference_args::generic_inference_args::{FundamentalFrequencyMethodForJob, GenericInferenceArgs, InferenceCategoryAbbreviated, PolymorphicInferenceArgs}; use crate::payloads::generic_inference_args::lipsync_payload::{LipsyncAnimationAudioSource, LipsyncAnimationImageSource, LipsyncArgs}; + use crate::payloads::generic_inference_args::tts_payload::TTSArgs; #[test] fn typical_lipsync_animation_args_serialize() { @@ -148,14 +149,17 @@ mod tests { #[test] fn typical_tts_args_serialize() { let args = GenericInferenceArgs { - inference_category: Some(InferenceCategoryAbbreviated::VoiceConversion), - args: Some(PolymorphicInferenceArgs::Tts()), + inference_category: Some(InferenceCategoryAbbreviated::TextToSpeech), + args: Some(PolymorphicInferenceArgs::Tts(TTSArgs { + text: "hello world".to_string(), + voice_token: "token".to_string(), + })), }; let json = serde_json::ser::to_string(&args).unwrap(); // NB: Assert the serialized form. If this changes and the test breaks, be careful about migrating. - assert_eq!(json, r#"{"cat":"vc","args":{"Tts":{}}}"#.to_string()); + assert_eq!(json, r#"{"cat":"tts","args":{"Tts":{"t":"hello world","e":"token"}}}"#.to_string()); // NB: Make sure we don't overflow the DB field capacity (TEXT column). assert!(json.len() < 1000); diff --git a/crates/lib/mysql_queries/src/queries/voice_designer/voices/get_voice.rs b/crates/lib/mysql_queries/src/queries/voice_designer/voices/get_voice.rs index e7b193ec62..5f6c0dce7d 100644 --- a/crates/lib/mysql_queries/src/queries/voice_designer/voices/get_voice.rs +++ b/crates/lib/mysql_queries/src/queries/voice_designer/voices/get_voice.rs @@ -1,5 +1,4 @@ use anyhow::anyhow; -use chrono::{DateTime, Utc}; use log::error; use sqlx::{MySql, MySqlPool}; use sqlx::pool::PoolConnection; @@ -8,7 +7,6 @@ use enums::common::visibility::Visibility; use errors::AnyhowResult; use tokens::tokens::zs_voice::ZsVoiceToken; - pub struct ZsVoice { pub token: ZsVoiceToken, pub title: String, diff --git a/crates/service/job/inference_job/src/job/job_types/tts/process_single_tts_job.rs b/crates/service/job/inference_job/src/job/job_types/tts/process_single_tts_job.rs index 3f0fb5c096..b0589183d3 100644 --- a/crates/service/job/inference_job/src/job/job_types/tts/process_single_tts_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/tts/process_single_tts_job.rs @@ -4,7 +4,6 @@ use enums::by_table::generic_inference_jobs::inference_model_type::InferenceMode use enums::by_table::tts_models::tts_model_type::TtsModelType; 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; -use tokens::tokens::tts_models::TtsModelToken; use crate::job::job_loop::job_success_result::JobSuccessResult; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;