From 9f7fc09e9fca599feda11f20bdbcd2809bbf22a2 Mon Sep 17 00:00:00 2001 From: Michael Chung Date: Sat, 21 Oct 2023 01:13:39 -0400 Subject: [PATCH] Builds testing. --- .../job/job_types/tts/process_single_tts_job.rs | 17 +++++------------ .../job/job_types/tts/vall_e_x/process_job.rs | 4 ++-- 2 files changed, 7 insertions(+), 14 deletions(-) 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 815610770f..95c492d95b 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 @@ -21,21 +21,21 @@ pub async fn process_single_tts_job( ) -> Result { // TODO: Move common checks for slurs, etc. here. - let raw_inference_text = job.maybe_raw_inference_text - .as_deref() - .ok_or(ProcessSingleJobError::Other(anyhow!("no inference text")))?; match job.maybe_model_type { Some(InferenceModelType::VallEX) => { // Zero-shot TTS does not need a fine-tuned model token. dispatch_zero_shot_model( job_dependencies, - job, - &raw_inference_text + job ).await }, Some(InferenceModelType::Tacotron2 | InferenceModelType::Vits) => { // All other TTS types require a fine-tuned TTS database record. + let raw_inference_text = job.maybe_raw_inference_text + .as_deref() + .ok_or(ProcessSingleJobError::Other(anyhow!("no inference text")))?; + dispatch_fine_tuned_weights_model( job_dependencies, job, @@ -54,21 +54,14 @@ pub async fn process_single_tts_job( async fn dispatch_zero_shot_model( job_dependencies: &JobDependencies, job: &AvailableInferenceJob, - raw_inference_text: &str, ) -> Result { - - - match job.maybe_model_type { Some(InferenceModelType::VallEX) => { - vall_e_x::process_job::process_job(VALLEXProcessJobArgs { job_dependencies, job, }).await - - } _ => { Err(ProcessSingleJobError::Other(anyhow!("not a zero-shot model"))) diff --git a/crates/service/job/inference_job/src/job/job_types/tts/vall_e_x/process_job.rs b/crates/service/job/inference_job/src/job/job_types/tts/vall_e_x/process_job.rs index 52c9728a1c..f84926e4b7 100644 --- a/crates/service/job/inference_job/src/job/job_types/tts/vall_e_x/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/tts/vall_e_x/process_job.rs @@ -121,7 +121,7 @@ pub async fn process_create_voice( let mut job_progress_reporter = deps.job_progress_reporter .new_generic_inference(job.inference_job_token.as_str()) .map_err(|e| ProcessSingleJobError::Other(anyhow!(e)))?; - + println!("token! {}",dataset_token); let voice_dataset_token = tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken(dataset_token); // download data set files into a temp directory @@ -143,7 +143,7 @@ pub async fn process_create_voice( single_dataset = val; }, None => { - return Err(ProcessSingleJobError::InvalidJob(anyhow!("Missing Text for Inference"))); + return Err(ProcessSingleJobError::InvalidJob(anyhow!("Missing Dataset"))); } }