From b2a9cdc830eec108d098e0e9f0adcb71797c7e83 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 6 Aug 2024 21:41:43 -0400 Subject: [PATCH] fix gptsovits output file pathing --- .../job_types/gpt_sovits/gpt_sovits_inference_command.rs | 6 ++++-- .../tts_inference/process_single_gpt_sovits_tts_job.rs | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/crates/service/job/inference_job/src/job/job_types/gpt_sovits/gpt_sovits_inference_command.rs b/crates/service/job/inference_job/src/job/job_types/gpt_sovits/gpt_sovits_inference_command.rs index e096593712..c4c033b291 100644 --- a/crates/service/job/inference_job/src/job/job_types/gpt_sovits/gpt_sovits_inference_command.rs +++ b/crates/service/job/inference_job/src/job/job_types/gpt_sovits/gpt_sovits_inference_command.rs @@ -56,7 +56,8 @@ pub struct InferenceArgs<'s> { pub reference_transcript_path: Option<&'s Path>, pub reference_language : Option<&'s str>, - pub output_audio_directory: &'s Path, + //pub output_audio_directory: &'s Path, + pub output_file_path: &'s Path, pub maybe_reference_free: Option, pub maybe_temperature: Option, @@ -170,7 +171,8 @@ impl GptSovitsInferenceCommand { } } - command.push_str(&format!(" --output_path {}", path_to_string(args.output_audio_directory))); + //command.push_str(&format!(" --output_path {}", path_to_string(args.output_audio_directory))); + command.push_str(&format!(" --output_path {}", path_to_string(args.output_file_path))); if let Some(reference_free) = args.maybe_reference_free { command.push_str(&format!(" --ref_free {}", reference_free)); diff --git a/crates/service/job/inference_job/src/job/job_types/gpt_sovits/tts_inference/process_single_gpt_sovits_tts_job.rs b/crates/service/job/inference_job/src/job/job_types/gpt_sovits/tts_inference/process_single_gpt_sovits_tts_job.rs index fbb8c4fd34..0b26a95a9d 100644 --- a/crates/service/job/inference_job/src/job/job_types/gpt_sovits/tts_inference/process_single_gpt_sovits_tts_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/gpt_sovits/tts_inference/process_single_gpt_sovits_tts_job.rs @@ -66,6 +66,11 @@ pub async fn process_single_gpt_sovits_tts_job( .map_err(|err| ProcessSingleJobError::IoError(err))?; } + if output_file_path.exists() { + std::fs::remove_file(&output_file_path) + .map_err(|err| ProcessSingleJobError::IoError(err))?; + } + let input_text = job_args.input_text; let gpt_sovits_model = job_args.gpt_sovits_model; @@ -124,7 +129,8 @@ pub async fn process_single_gpt_sovits_tts_job( reference_audio_path: reference_audio_path.as_deref(), reference_transcript_path: reference_transcript_path.as_deref(), reference_language: Some(DEFAULT_LANGUAGE), - output_audio_directory: &output_dir, + //output_audio_directory: &output_dir, + output_file_path: &output_file_path, maybe_reference_free: None, maybe_temperature: None, maybe_target_language: Some(DEFAULT_LANGUAGE),