run ruff formatter in pre-commit

Author: JackismyShephard

.pre-commit-config.yaml

@@ -31,8 +31,7 @@ repos:
     hooks:
       - id: ruff-check
         args: [--fix]
-        # - id: ruff-format
-        # ruff formatting currently disabled as it conflicts with Black
+      - id: ruff-format
 
   # 5) Black for experimental string processing
   - repo: https://github.com/psf/black-pre-commit-mirror

notebooks/ultimate_rvc_colab.ipynb

@@ -129,10 +129,7 @@
     "    !lt --port 6969 >> url.txt 2>&1 &\n",
     "    time.sleep(2)\n",
     "    endpoint_ip = (\n",
-    "        request.urlopen(\"https://ipv4.icanhazip.com\")\n",
-    "        .read()\n",
-    "        .decode(\"utf8\")\n",
-    "        .strip(\"\\n\")\n",
+    "        request.urlopen(\"https://ipv4.icanhazip.com\").read().decode(\"utf8\").strip(\"\\n\")\n",
     "    )\n",
     "    tunnel_url = (\n",
     "        Path(\"url.txt\").read_text(encoding=\"utf-8\").replace(\"your url is: \", \"\")\n",

src/ultimate_rvc/core/generate/common.py

@@ -185,7 +185,6 @@ def wavify(
         ]
         wav_path, wav_json_path = paths
         if not all(path.exists() for path in paths):
-
             _, stderr = (
                 ffmpeg.input(audio_path)
                 .output(filename=wav_path, f="wav")
@@ -409,7 +408,6 @@ def convert(
     converted_audio_path, converted_audio_json_path = paths
 
     if not all(path.exists() for path in paths):
-
         rvc_model_path, rvc_index_path = _get_rvc_files(model_name)
 
         voice_converter = _get_voice_converter()
@@ -601,7 +599,6 @@ def mix_audio(
     mix_path, mix_json_path = paths
 
     if not all(path.exists() for path in paths):
-
         _mix_audio(audio_path_gain_pairs, mix_path, output_sr, output_format)
         json_dump(args_dict, mix_json_path)
     return mix_path

src/ultimate_rvc/core/generate/song_cover.py

@@ -100,7 +100,6 @@ def _get_audio_separator(
     segment_size: int = SegmentSize.SEG_256,
     sample_rate: int = 44100,
 ) -> Separator:
-
     static_ffmpeg.add_paths(weak=True)
     from audio_separator.separator import Separator  # noqa: PLC0415
 

src/ultimate_rvc/core/generate/speech.py

@@ -251,7 +251,6 @@ def run_edge_tts(
     converted_audio_path, converted_audio_json_path = paths
 
     if not all(path.exists() for path in paths):
-
         pitch_shift_str = f"{pitch_shift:+}Hz"
         speed_change_str = f"{speed_change:+}%"
         volume_change_str = f"{volume_change:+}%"

src/ultimate_rvc/core/manage/common.py

@@ -12,7 +12,6 @@
 from pathlib import Path
 
 if TYPE_CHECKING:
-
     from ultimate_rvc.typing_extra import StrPath
 
 

src/ultimate_rvc/web/config/main.py

@@ -28,7 +28,6 @@
 )
 
 if TYPE_CHECKING:
-
     import gradio as gr
 
 

src/ultimate_rvc/web/tabs/generate/song_cover/multi_step_generation.py

@@ -149,13 +149,11 @@ def _render_step_0(total_config: TotalConfig, cookiefile: str | None) -> None:
                 value_indices=range(len(tab_config.song_dirs.all)),
             ),
             inputs=current_song_dir,
-            outputs=(
-                [
-                    *tab_config.song_dirs.all,
-                    tab_config.cached_song.instance,
-                    total_config.song.one_click.cached_song.instance,
-                ]
-            ),
+            outputs=[
+                *tab_config.song_dirs.all,
+                tab_config.cached_song.instance,
+                total_config.song.one_click.cached_song.instance,
+            ],
             show_progress="hidden",
         ).then(
             partial(update_dropdowns, get_named_song_dirs, 1, [], [0]),

src/ultimate_rvc/web/tabs/generate/song_cover/one_click_generation.py

@@ -31,7 +31,6 @@
 from ultimate_rvc.web.typing_extra import ConcurrencyId
 
 if TYPE_CHECKING:
-
     from ultimate_rvc.web.config.main import OneClickSongGenerationConfig, TotalConfig
 
 
@@ -228,7 +227,6 @@ def _render_main_options(tab_config: OneClickSongGenerationConfig) -> None:
 
 
 def _render_conversion_options(tab_config: OneClickSongGenerationConfig) -> None:
-
     with gr.Accordion("Vocal conversion", open=False):
         gr.Markdown("")
         with gr.Accordion("Voice synthesis", open=False):
@@ -293,7 +291,6 @@ def _render_mixing_options(tab_config: OneClickSongGenerationConfig) -> None:
 
 
 def _render_output_options(tab_config: OneClickSongGenerationConfig) -> None:
-
     with gr.Accordion("Audio output", open=False):
         with gr.Row():
             tab_config.output_name.instantiate(

src/ultimate_rvc/web/tabs/generate/speech/multi_step_generation.py

@@ -36,7 +36,6 @@
 from ultimate_rvc.web.typing_extra import ConcurrencyId, SpeechTransferOption
 
 if TYPE_CHECKING:
-
     from ultimate_rvc.web.config.main import TotalConfig
 
 
@@ -201,7 +200,6 @@ def _render_step_2(total_config: TotalConfig) -> None:
                 "Converted speech",
             )
         with gr.Row():
-
             convert_speech_reset_btn = gr.Button("Reset settings")
             convert_speech_btn = gr.Button("Convert speech", variant="primary")
         converted_speech_transfer_btn = gr.Button("Transfer converted speech")