diff --git a/src/UltraSinger.py b/src/UltraSinger.py index ed183b4..48e88d0 100644 --- a/src/UltraSinger.py +++ b/src/UltraSinger.py @@ -17,7 +17,6 @@ from modules.Audio.vocal_chunks import ( create_audio_chunks_from_ultrastar_data, ) from modules.Audio.silence_processing import remove_silence_from_transcription_data, mute_no_singing_parts -from modules.Speech_Recognition.Whisper import WhisperModel from modules.Audio.separation import DemucsModel from modules.Audio.convert_audio import convert_audio_to_mono_wav, convert_wav_to_mp3 from modules.Audio.youtube import ( diff --git a/src/modules/Audio/separation.py b/src/modules/Audio/separation.py index f463aed..4185f5a 100644 --- a/src/modules/Audio/separation.py +++ b/src/modules/Audio/separation.py @@ -4,8 +4,6 @@ from enum import Enum import demucs.separate -from modules.Audio.convert_audio import convert_audio_to_mono_wav - from modules.console_colors import ( ULTRASINGER_HEAD, blue_highlighted, diff --git a/src/modules/init_interactive_mode.py b/src/modules/init_interactive_mode.py index 82129b2..62bfec2 100644 --- a/src/modules/init_interactive_mode.py +++ b/src/modules/init_interactive_mode.py @@ -58,7 +58,7 @@ def configure_additional_options(console, settings, header): if additional_options_input == 'y': console.print(f"\n{header} [bold underline]Additional options:[/bold underline]\n") - + # Whisper Batch Size whipser_batch_size_response = console.input( f"{header} Enter the [green]Whisper batch size[/green] (default [cyan]16[/cyan]): " @@ -66,7 +66,7 @@ def configure_additional_options(console, settings, header): settings.whisper_batch_size = int(whipser_batch_size_response) if whipser_batch_size_response.isdigit() else 16 # Whisper Compute Type - whisper_compute_choice = console.input( + whisper_compute_choice = console.input( f"{header} Enter the [green]Whisper compute type[/green] (default '[cyan]float16[/cyan]' for CUDA and '[cyan]int8[/cyan]' for CPU): " ).strip() if whisper_compute_choice: @@ -158,7 +158,14 @@ def configure_additional_options(console, settings, header): f"\n{header} Enter the path to [green]cookies.txt[/green] file (if required for YouTube downloads, leave empty otherwise): " ).strip() if cookie_file: - settings.cookiefile = cookie_file + settings.cookiefile = cookie_file + + # FFmpeg executable path + ffmpeg_path = console.input( + f"\n{header} Enter the path to [green]ffmpeg[/green] executable folder (leave empty for default): " + ).strip() + if ffmpeg_path: + settings.ffmpeg_path = ffmpeg_path def init_settings_interactive(settings: Settings) -> Settings: ULTRASINGER_HEAD = "[bold green][UltraSinger][/bold green]"