Sourcery Starbot ⭐ refactored ikrom96git/Real-Time-Voice-Cloning #1

SourceryAI · 2024-02-29T08:51:59Z

Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨

Here's your pull request refactoring your most popular Python repo.

If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch https://github.com/sourcery-ai-bot/Real-Time-Voice-Cloning master
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI

Due to GitHub API limits, only the first 60 comments can be shown.

SourceryAI · 2024-02-29T08:52:00Z

demo_cli.py

-            print("Caught exception: %s" % repr(e))
+            print(f"Caught exception: {repr(e)}")


Lines 207-207 refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2024-02-29T08:52:00Z

encoder_preprocess.py

@@ -5,6 +5,7 @@


 if __name__ == "__main__":
+


Lines 70-70 refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2024-02-29T08:52:00Z

encoder/audio.py

-    if isinstance(fpath_or_wav, str) or isinstance(fpath_or_wav, Path):
+    if isinstance(fpath_or_wav, (str, Path)):
        wav, source_sr = librosa.load(str(fpath_or_wav), sr=None)
    else:
        wav = fpath_or_wav
-    
+
    # Resample the wav if needed
    if source_sr is not None and source_sr != sampling_rate:
        wav = librosa.resample(wav, source_sr, sampling_rate)
-        
+
    # Apply the preprocessing: normalize volume and shorten long silences 
    if normalize:
        wav = normalize_volume(wav, audio_norm_target_dBFS, increase_only=True)
    if webrtcvad and trim_silence:
        wav = trim_long_silences(wav)
-    
+


Function preprocess_wav refactored with the following changes:

Merge isinstance calls (merge-isinstance)

SourceryAI · 2024-02-29T08:52:01Z

encoder/inference.py

-    embed = _model.forward(frames).detach().cpu().numpy()
-    return embed
+    return _model.forward(frames).detach().cpu().numpy()


Function embed_frames_batch refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2024-02-29T08:52:01Z

encoder/inference.py

-        if return_partials:
-            return embed, None, None
-        return embed
-
+        return (embed, None, None) if return_partials else embed


Function embed_utterance refactored with the following changes:

Lift code into else after jump in control flow [×2] (reintroduce-else)

Replace if statement with if expression [×2] (assign-if-exp)

SourceryAI · 2024-02-29T08:52:02Z

encoder/data_objects/speaker_verification_dataset.py

-        if len(speaker_dirs) == 0:
+        if not speaker_dirs:


Function SpeakerVerificationDataset.__init__ refactored with the following changes:

Simplify sequence length comparison (simplify-len-comparison)

SourceryAI · 2024-02-29T08:52:02Z

synthesizer/audio.py

-    if preemphasize:
-        return signal.lfilter([1, -k], [1], wav)
-    return wav
+    return signal.lfilter([1, -k], [1], wav) if preemphasize else wav


Function preemphasis refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

SourceryAI · 2024-02-29T08:52:02Z

synthesizer/audio.py

-    if inv_preemphasize:
-        return signal.lfilter([1], [1, -k], wav)
-    return wav
+    return signal.lfilter([1], [1, -k], wav) if inv_preemphasize else wav


Function inv_preemphasis refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

SourceryAI · 2024-02-29T08:52:02Z

synthesizer/audio.py

-
-    if hparams.signal_normalization:
-        return _normalize(S, hparams)
-    return S
+
+    return _normalize(S, hparams) if hparams.signal_normalization else S


Function linearspectrogram refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

SourceryAI · 2024-02-29T08:52:02Z

synthesizer/audio.py

-
-    if hparams.signal_normalization:
-        return _normalize(S, hparams)
-    return S
+
+    return _normalize(S, hparams) if hparams.signal_normalization else S


Function melspectrogram refactored with the following changes:

Lift code into else after jump in control flow (reintroduce-else)

Replace if statement with if expression (assign-if-exp)

SourceryAI · 2024-02-29T08:52:04Z

synthesizer/audio.py

-    
+
    S = _db_to_amp(D + hparams.ref_level_db) #Convert back to linear
-
-    if hparams.use_lws:
-        processor = _lws_processor(hparams)
-        D = processor.run_lws(S.astype(np.float64).T ** hparams.power)
-        y = processor.istft(D).astype(np.float32)
-        return inv_preemphasis(y, hparams.preemphasis, hparams.preemphasize)
-    else:
+
+    if not hparams.use_lws:
        return inv_preemphasis(_griffin_lim(S ** hparams.power, hparams), hparams.preemphasis, hparams.preemphasize)
+    processor = _lws_processor(hparams)
+    D = processor.run_lws(S.astype(np.float64).T ** hparams.power)
+    y = processor.istft(D).astype(np.float32)
+    return inv_preemphasis(y, hparams.preemphasis, hparams.preemphasize)


Function inv_linear_spectrogram refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

SourceryAI · 2024-02-29T08:52:04Z

synthesizer/audio.py

-    
+
    S = _mel_to_linear(_db_to_amp(D + hparams.ref_level_db), hparams)  # Convert back to linear
-
-    if hparams.use_lws:
-        processor = _lws_processor(hparams)
-        D = processor.run_lws(S.astype(np.float64).T ** hparams.power)
-        y = processor.istft(D).astype(np.float32)
-        return inv_preemphasis(y, hparams.preemphasis, hparams.preemphasize)
-    else:
+
+    if not hparams.use_lws:
        return inv_preemphasis(_griffin_lim(S ** hparams.power, hparams), hparams.preemphasis, hparams.preemphasize)
+    processor = _lws_processor(hparams)
+    D = processor.run_lws(S.astype(np.float64).T ** hparams.power)
+    y = processor.istft(D).astype(np.float32)
+    return inv_preemphasis(y, hparams.preemphasis, hparams.preemphasize)


Function inv_mel_spectrogram refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

SourceryAI · 2024-02-29T08:52:04Z

synthesizer/audio.py

-    for i in range(hparams.griffin_lim_iters):
+    for _ in range(hparams.griffin_lim_iters):


Function _griffin_lim refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

SourceryAI · 2024-02-29T08:52:04Z

synthesizer/audio.py

-    if length % fshift == 0:
-        M = (length + pad * 2 - fsize) // fshift + 1
-    else:
-        M = (length + pad * 2 - fsize) // fshift + 2
-    return M
+    return (
+        (length + pad * 2 - fsize) // fshift + 1
+        if length % fshift == 0
+        else (length + pad * 2 - fsize) // fshift + 2
+    )


Function num_frames refactored with the following changes:

Replace if statement with if expression (assign-if-exp)

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2024-02-29T08:52:05Z

synthesizer/inference.py

-        if isinstance(fpath_or_wav, str) or isinstance(fpath_or_wav, Path):
+        if isinstance(fpath_or_wav, (str, Path)):
            wav = Synthesizer.load_preprocess_wav(fpath_or_wav)
        else:
            wav = fpath_or_wav

-        mel_spectrogram = audio.melspectrogram(wav, hparams).astype(np.float32)
-        return mel_spectrogram
+        return audio.melspectrogram(wav, hparams).astype(np.float32)


Function Synthesizer.make_spectrogram refactored with the following changes:

Merge isinstance calls (merge-isinstance)

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2024-02-29T08:52:05Z

synthesizer/utils/_cmudict.py

-      pronunciation = _get_pronunciation(parts[1])
-      if pronunciation:
+      if pronunciation := _get_pronunciation(parts[1]):


Function _parse_cmudict refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

SourceryAI · 2024-02-29T08:52:05Z

synthesizer/utils/numbers.py

-        return match + " dollars"  # Unexpected format
+        return f"{match} dollars"
    dollars = int(parts[0]) if parts[0] else 0
    cents = int(parts[1]) if len(parts) > 1 and parts[1] else 0
    if dollars and cents:
        dollar_unit = "dollar" if dollars == 1 else "dollars"
        cent_unit = "cent" if cents == 1 else "cents"
-        return "%s %s, %s %s" % (dollars, dollar_unit, cents, cent_unit)
+        return f"{dollars} {dollar_unit}, {cents} {cent_unit}"
    elif dollars:
        dollar_unit = "dollar" if dollars == 1 else "dollars"
-        return "%s %s" % (dollars, dollar_unit)
+        return f"{dollars} {dollar_unit}"
    elif cents:
        cent_unit = "cent" if cents == 1 else "cents"
-        return "%s %s" % (cents, cent_unit)
+        return f"{cents} {cent_unit}"


Function _expand_dollars refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

Replace interpolated string formatting with f-string [×3] (replace-interpolation-with-fstring)

This removes the following comments ( why? ):

# Unexpected format

SourceryAI · 2024-02-29T08:52:06Z

synthesizer/utils/numbers.py

-    if num > 1000 and num < 3000:
-        if num == 2000:
-            return "two thousand"
-        elif num > 2000 and num < 2010:
-            return "two thousand " + _inflect.number_to_words(num % 100)
-        elif num % 100 == 0:
-            return _inflect.number_to_words(num // 100) + " hundred"
-        else:
-            return _inflect.number_to_words(num, andword="", zero="oh", group=2).replace(", ", " ")
-    else:
+    if num <= 1000 or num >= 3000:
        return _inflect.number_to_words(num, andword="")
+    if num == 2000:
+        return "two thousand"
+    elif num > 2000 and num < 2010:
+        return f"two thousand {_inflect.number_to_words(num % 100)}"
+    elif num % 100 == 0:
+        return f"{_inflect.number_to_words(num // 100)} hundred"
+    else:
+        return _inflect.number_to_words(num, andword="", zero="oh", group=2).replace(", ", " ")


Function _expand_number refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

SourceryAI · 2024-02-29T08:52:06Z

synthesizer/utils/text.py

-_id_to_symbol = {i: s for i, s in enumerate(symbols)}
+_id_to_symbol = dict(enumerate(symbols))


Lines 8-8 refactored with the following changes:

Replace identity comprehension with call to collection constructor (identity-comprehension)

SourceryAI · 2024-02-29T08:52:06Z

synthesizer/utils/text.py

-        cleaner = getattr(cleaners, name)
-        if not cleaner:
-            raise Exception("Unknown cleaner: %s" % name)
-        text = cleaner(text)
+        if cleaner := getattr(cleaners, name):
+            text = cleaner(text)
+        else:
+            raise Exception(f"Unknown cleaner: {name}")


Function _clean_text refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Lift code into else after jump in control flow (reintroduce-else)

Swap if/else branches (swap-if-else-branches)

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2024-02-29T08:52:08Z

synthesizer/utils/text.py

-    return _symbols_to_sequence(["@" + s for s in text.split()])
+    return _symbols_to_sequence([f"@{s}" for s in text.split()])


Function _arpabet_to_sequence refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

SourceryAI · 2024-02-29T08:52:08Z

toolbox/__init__.py

-        self.ui.log("Exception: %s" % exc_value)
+        self.ui.log(f"Exception: {exc_value}")


Function Toolbox.excepthook refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2024-02-29T08:52:08Z

toolbox/__init__.py

-            speaker_name = self.ui.current_dataset_name + '_' + self.ui.current_speaker_name
+            speaker_name = f'{self.ui.current_dataset_name}_{self.ui.current_speaker_name}'


Function Toolbox.load_from_browser refactored with the following changes:

Use f-string instead of string concatenation [×2] (use-fstring-for-concatenation)

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2024-02-29T08:52:08Z

toolbox/__init__.py

-        self.ui.log("Loading the encoder %s... " % model_fpath)
+        self.ui.log(f"Loading the encoder {model_fpath}... ")


Function Toolbox.init_encoder refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2024-02-29T08:52:08Z

toolbox/__init__.py

-        self.ui.log("Loading the synthesizer %s... " % model_fpath)
+        self.ui.log(f"Loading the synthesizer {model_fpath}... ")


Function Toolbox.init_synthesizer refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2024-02-29T08:52:09Z

vocoder/display.py

-def time_since(started) :
+def time_since(started):
    elapsed = time.time() - started
    m = int(elapsed // 60)
    s = int(elapsed % 60)
-    if m >= 60 :
-        h = int(m // 60)
-        m = m % 60
-        return f'{h}h {m}m {s}s'
-    else :
+    if m < 60:
        return f'{m}m {s}s'
+    h = int(m // 60)
+    m %= 60
+    return f'{h}h {m}m {s}s'


Function time_since refactored with the following changes:

Swap if/else branches (swap-if-else-branches)

Remove unnecessary else after guard condition (remove-unnecessary-else)

Replace assignment with augmented assignment (aug-assign)

SourceryAI · 2024-02-29T08:52:09Z

vocoder/inference.py

-    
+


Function load_model refactored with the following changes:

Replace interpolated string formatting with f-string (replace-interpolation-with-fstring)

SourceryAI · 2024-02-29T08:52:09Z

vocoder/inference.py

-    
+
    if normalize:
        mel = mel / hp.mel_max_abs_value
    mel = torch.from_numpy(mel[None, ...])
-    wav = _model.generate(mel, batched, target, overlap, hp.mu_law, progress_callback)
-    return wav
+    return _model.generate(
+        mel, batched, target, overlap, hp.mu_law, progress_callback
+    )


Function infer_waveform refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

SourceryAI · 2024-02-29T08:52:09Z

vocoder/models/deepmind_version.py

-    def num_params(self) :
+    def num_params(self):
        parameters = filter(lambda p: p.requires_grad, self.parameters())
-        parameters = sum([np.prod(p.size()) for p in parameters]) / 1_000_000
+        parameters = sum(np.prod(p.size()) for p in parameters) / 1_000_000


Function WaveRNN.num_params refactored with the following changes:

Replace unneeded comprehension with generator (comprehension-to-generator)

SourceryAI · 2024-02-29T08:52:10Z

vocoder/models/fatchord_version.py

-        for i in range(res_blocks):
+        for _ in range(res_blocks):


Function MelResNet.__init__ refactored with the following changes:

Replace unused for index with underscore (for-index-underscore)

'Refactored by Sourcery'

a88a746

SourceryAI commented Feb 29, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery Starbot ⭐ refactored ikrom96git/Real-Time-Voice-Cloning #1

Sourcery Starbot ⭐ refactored ikrom96git/Real-Time-Voice-Cloning #1

SourceryAI commented Feb 29, 2024

SourceryAI left a comment

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

SourceryAI Feb 29, 2024

		print("Caught exception: %s" % repr(e))
		print(f"Caught exception: {repr(e)}")

		for i in range(hparams.griffin_lim_iters):
		for _ in range(hparams.griffin_lim_iters):

		_id_to_symbol = {i: s for i, s in enumerate(symbols)}
		_id_to_symbol = dict(enumerate(symbols))

		return _symbols_to_sequence(["@" + s for s in text.split()])
		return _symbols_to_sequence([f"@{s}" for s in text.split()])

		self.ui.log("Exception: %s" % exc_value)
		self.ui.log(f"Exception: {exc_value}")

		speaker_name = self.ui.current_dataset_name + '_' + self.ui.current_speaker_name
		speaker_name = f'{self.ui.current_dataset_name}_{self.ui.current_speaker_name}'

		self.ui.log("Loading the encoder %s... " % model_fpath)
		self.ui.log(f"Loading the encoder {model_fpath}... ")

		self.ui.log("Loading the synthesizer %s... " % model_fpath)
		self.ui.log(f"Loading the synthesizer {model_fpath}... ")

Sourcery Starbot ⭐ refactored ikrom96git/Real-Time-Voice-Cloning #1

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored ikrom96git/Real-Time-Voice-Cloning #1

Conversation

SourceryAI commented Feb 29, 2024

SourceryAI left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment