Update app.py

app.py

@@ -588,7 +588,7 @@ from tqdm import tqdm
 
 # Convert chapters to audio using XTTS
 
-def convert_chapters_to_audio_custom_model(chapters_dir, output_audio_dir, target_voice_path=None, language=None, custom_model=None, temperature, length_penalty, repetition_penalty, top_k, top_p, speed, enable_text_splitting):
+def convert_chapters_to_audio_custom_model(chapters_dir, output_audio_dir, temperature, length_penalty, repetition_penalty, top_k, top_p, speed, enable_text_splitting, target_voice_path=None, language=None, custom_model=None):
 
     if target_voice_path==None:
         target_voice_path = default_target_voice_path
@@ -657,7 +657,7 @@ def convert_chapters_to_audio_custom_model(chapters_dir, output_audio_dir, targe
 
 
 
-def convert_chapters_to_audio_standard_model(chapters_dir, output_audio_dir, target_voice_path=None, language="en", temperature, length_penalty, repetition_penalty, top_k, top_p, speed, enable_text_splitting):
+def convert_chapters_to_audio_standard_model(chapters_dir, output_audio_dir, temperature, length_penalty, repetition_penalty, top_k, top_p, speed, enable_text_splitting, target_voice_path=None, language="en"):
     selected_tts_model = "tts_models/multilingual/multi-dataset/xtts_v2"
     tts = TTS(selected_tts_model, progress_bar=False).to(device)
 
@@ -708,7 +708,7 @@ def convert_chapters_to_audio_standard_model(chapters_dir, output_audio_dir, tar
 
 
 # Define the functions to be used in the Gradio interface
-def convert_ebook_to_audio(ebook_file, target_voice_file, language, use_custom_model, custom_model_file, custom_config_file, custom_vocab_file, custom_model_url=None, temperature, length_penalty, repetition_penalty, top_k, top_p, speed, enable_text_splitting, progress=gr.Progress()):
+def convert_ebook_to_audio(ebook_file, target_voice_file, language, use_custom_model, custom_model_file, custom_config_file, custom_vocab_file, temperature, length_penalty, repetition_penalty, top_k, top_p, speed, enable_text_splitting, custom_model_url=None, progress=gr.Progress()):
 
     ebook_file_path = args.ebook if args.ebook else ebook_file.name
     target_voice = args.voice if args.voice else target_voice_file.name if target_voice_file else None
@@ -780,9 +780,9 @@ def convert_ebook_to_audio(ebook_file, target_voice_file, language, use_custom_m
         print(f"Error updating progress: {e}")
     
     if use_custom_model:
-        convert_chapters_to_audio_custom_model(chapters_directory, output_audio_directory, target_voice, language, custom_model, temperature, length_penalty, repetition_penalty, top_k, top_p, speed, enable_text_splitting)
+        convert_chapters_to_audio_custom_model(chapters_directory, output_audio_directory, temperature, length_penalty, repetition_penalty, top_k, top_p, speed, enable_text_splitting, target_voice, language, custom_model)
     else:
-        convert_chapters_to_audio_standard_model(chapters_directory, output_audio_directory, target_voice, language, temperature, length_penalty, repetition_penalty, top_k, top_p, speed, enable_text_splitting)
+        convert_chapters_to_audio_standard_model(chapters_directory, output_audio_directory, temperature, length_penalty, repetition_penalty, top_k, top_p, speed, enable_text_splitting, target_voice, language)
     
     try:
         progress(0.9, desc="Creating M4B from chapters")
@@ -940,12 +940,11 @@ def run_gradio_interface():
             convert_ebook_to_audio,
             inputs=[
                 ebook_file, target_voice_file, language, use_custom_model, custom_model_file, custom_config_file, 
-                custom_vocab_file, custom_model_url, temperature, length_penalty, repetition_penalty, 
-                top_k, top_p, speed, enable_text_splitting
+                custom_vocab_file, temperature, length_penalty, repetition_penalty, 
+                top_k, top_p, speed, enable_text_splitting, custom_model_url
             ],
             outputs=[output, audio_player]
         )
-
         use_custom_model.change(
             lambda x: [gr.update(visible=x)] * 4,
             inputs=[use_custom_model],
@@ -1007,7 +1006,8 @@ if args.headless:
 
 
     # Example headless execution
-    convert_ebook_to_audio(ebook_file_path, target_voice, args.language, args.use_custom_model, args.custom_model, args.custom_config, args.custom_vocab, custom_model_url, args.temperature, args.length_penalty, args.repetition_penalty, args.top_k, args.top_p, args.speed, args.enable_text_splitting)
+    convert_ebook_to_audio(ebook_file_path, target_voice, args.language, args.use_custom_model, args.custom_model, args.custom_config, args.custom_vocab, args.temperature, args.length_penalty, args.repetition_penalty, args.top_k, args.top_p, args.speed, args.enable_text_splitting, custom_model_url)
+
 
 else:
     # Launch Gradio UI