From a0b884980682464cdaeb4aa5ec4b92af2e3ed6bb Mon Sep 17 00:00:00 2001 From: Michael Chung Date: Thu, 12 Oct 2023 00:56:50 -0400 Subject: [PATCH] Trying to build again. --- .../job/job_types/tts/vall_e_x/process_job.rs | 34 ++++++++++++------- .../job_types/tts/vall_e_x/validate_job.rs | 7 ++-- 2 files changed, 25 insertions(+), 16 deletions(-) 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 f870b50730..ccf5026336 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 @@ -8,6 +8,9 @@ use mysql_queries::queries::generic_inference::job::list_available_generic_infer use crate::job::job_loop::job_success_result::JobSuccessResult; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; +use crate::job::job_types::tts::vall_e_x::validate_job::validate_job; +use crate::job::job_types::tts::vall_e_x::validate_job::JobArgs; + use crate::job_dependencies::JobDependencies; use crate::job::job_types::tts::vall_e_x::vall_e_x_inference_command::InferenceArgs; use cloud_storage::bucket_path_unifier::BucketPathUnifier; @@ -46,18 +49,32 @@ pub async fn process_job( let job = args.job; let deps = args.job_dependencies; let mysql_pool = deps.mysql_pool; + + // get some globals + let job_progress_reporter = deps.job_progress_reporter + .new_generic_inference(job.inference_job_token.as_str()) + .map_err(|e| ProcessSingleJobError::Other(anyhow!(e)))?; + + // get job args let text = match job.maybe_raw_inference_text { - Some(value) => value, - None => { Err(ProcessSingleJobError::InvalidJob(anyhow!("Missing Text for Inference"))) } + Some(value) => { value }, + None => { return Err(ProcessSingleJobError::InvalidJob(anyhow!("Missing Text for Inference"))) } }; - // get voice token - + // get args token + let jobArgs = validate_job(&job); + let args = match jobArgs { + Ok(args) => { args }, + Err(error) => { error } + }; + + let voice_token = tokens::tokens::zs_voices::ZsVoiceToken(args.voice_token.clone()); + // Get voice bucket hash - from voice token - let voice_lookup_result = get_voice_by_token(voice_token, false, &mysql_pool).await; + let voice_lookup_result = get_voice_by_token(&voice_token, false, &mysql_pool).await; let voice = match voice_lookup_result { Ok(Some(voice)) => voice, @@ -71,13 +88,6 @@ pub async fn process_job( } }; - // get some globals - let job_progress_reporter = deps.job_progress_reporter - .new_generic_inference(job.inference_job_token.as_str()) - .map_err(|e| ProcessSingleJobError::Other(anyhow!(e)))?; - - // validate the inputs - // let job_args = validate_job(job)?; // Need to download the models info!("Download models (if not present)..."); diff --git a/crates/service/job/inference_job/src/job/job_types/tts/vall_e_x/validate_job.rs b/crates/service/job/inference_job/src/job/job_types/tts/vall_e_x/validate_job.rs index d18f22d577..e97d198e75 100644 --- a/crates/service/job/inference_job/src/job/job_types/tts/vall_e_x/validate_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/tts/vall_e_x/validate_job.rs @@ -3,9 +3,8 @@ use mysql_queries::payloads::generic_inference_args::generic_inference_args::{In use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; - pub struct JobArgs { - voice_token: &String + pub voice_token: String } pub fn validate_job(job: &AvailableInferenceJob) -> Result { @@ -43,7 +42,7 @@ pub fn validate_job(job: &AvailableInferenceJob) -> Result