Update app.py

app.py

@@ -621,29 +621,28 @@ def convert_chapters_to_audio_standard_model(chapters_dir, output_audio_dir, tar
             print(f"Converted chapter {chapter_num} to audio.")
 
 
+
+# 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, progress=gr.Progress()):
-    # Handle ebook file and target voice file
     ebook_file_path = ebook_file if isinstance(ebook_file, str) else ebook_file.name
     target_voice = target_voice_file if isinstance(target_voice_file, str) else target_voice_file.name if target_voice_file else None
-    
-    custom_model = None  # Initialize custom_model as None
+    custom_model = None
+
+
 
-    # Setup working directories
     working_files = os.path.join(".", "Working_files", "temp_ebook")
     full_folder_working_files = os.path.join(".", "Working_files")
     chapters_directory = os.path.join(".", "Working_files", "temp_ebook")
     output_audio_directory = os.path.join(".", 'Chapter_wav_files')
-
-    # Clean up previous working files
     remove_folder_with_contents(full_folder_working_files)
     remove_folder_with_contents(output_audio_directory)
 
-    # Handle custom model files (if provided)
-    custom_model_path = custom_model_file if isinstance(custom_model_file, str) else custom_model_file.name if custom_model_file else None
-    custom_config_path = custom_config_file if isinstance(custom_config_file, str) else custom_config_file.name if custom_config_file else None
-    custom_vocab_path = custom_vocab_file if isinstance(custom_vocab_file, str) else custom_vocab_file.name if custom_vocab_file else None
-
-    # Handle the download of custom model via URL (if provided)
+    if use_custom_model and custom_model_file and custom_config_file and custom_vocab_file:
+        custom_model = {
+            'model': custom_model_file.name,
+            'config': custom_config_file.name,
+            'vocab': custom_vocab_file.name
+        }
     if use_custom_model and custom_model_url:
         print(f"Received custom model URL: {custom_model_url}")
         download_dir = os.path.join(".", "Working_files", "custom_model")
@@ -653,16 +652,10 @@ def convert_ebook_to_audio(ebook_file, target_voice_file, language, use_custom_m
         if rename_vocab_file_if_exists(download_dir):
             print("vocab.json file was found and renamed.")
         
-        custom_model_path = os.path.join(download_dir, 'model.pth')
-        custom_config_path = os.path.join(download_dir, 'config.json')
-        custom_vocab_path = os.path.join(download_dir, 'vocab.json_')
-
-    # Set the custom model if all the paths are available
-    if use_custom_model and custom_model_path and custom_config_path and custom_vocab_path:
         custom_model = {
-            'model': custom_model_path,
-            'config': custom_config_path,
-            'vocab': custom_vocab_path
+            'model': os.path.join(download_dir, 'model.pth'),
+            'config': os.path.join(download_dir, 'config.json'),
+            'vocab': os.path.join(download_dir, 'vocab.json_')
         }
     
     try:
@@ -670,16 +663,15 @@ def convert_ebook_to_audio(ebook_file, target_voice_file, language, use_custom_m
     except Exception as e:
         print(f"Error updating progress: {e}")
     
-    # Ensure Calibre is installed
     if not calibre_installed():
         return "Calibre is not installed."
     
+    
     try:
         progress(0.1, desc="Creating chapter-labeled book")
     except Exception as e:
         print(f"Error updating progress: {e}")
     
-    # Create a chapter-labeled book
     create_chapter_labeled_book(ebook_file_path)
     audiobook_output_path = os.path.join(".", "Audiobooks")
     
@@ -688,7 +680,6 @@ def convert_ebook_to_audio(ebook_file, target_voice_file, language, use_custom_m
     except Exception as e:
         print(f"Error updating progress: {e}")
     
-    # Convert chapters to audio (custom or standard model)
     if use_custom_model:
         convert_chapters_to_audio_custom_model(chapters_directory, output_audio_directory, target_voice, language, custom_model)
     else:
@@ -699,7 +690,6 @@ def convert_ebook_to_audio(ebook_file, target_voice_file, language, use_custom_m
     except Exception as e:
         print(f"Error updating progress: {e}")
     
-    # Create an M4B from the chapters
     create_m4b_from_chapters(output_audio_directory, ebook_file_path, audiobook_output_path)
     
     # Get the name of the created M4B file
@@ -710,12 +700,10 @@ def convert_ebook_to_audio(ebook_file, target_voice_file, language, use_custom_m
         progress(1.0, desc="Conversion complete")
     except Exception as e:
         print(f"Error updating progress: {e}")
-
     print(f"Audiobook created at {m4b_filepath}")
     return f"Audiobook created at {m4b_filepath}", m4b_filepath
 
 
-
 def list_audiobook_files(audiobook_folder):
     # List all files in the audiobook folder
     files = []