Fix API and CI

This commit is contained in:
WeberJulian 2023-12-11 20:21:53 +01:00
parent e3c9dab7a3
commit 5cd750ac7e
2 changed files with 21 additions and 1 deletions

View File

@ -8,6 +8,14 @@ class SpeakerManager():
def name_to_id(self): def name_to_id(self):
return self.speakers.keys() return self.speakers.keys()
@property
def num_speakers(self):
return len(self.name_to_id)
@property
def speaker_names(self):
return list(self.name_to_id.keys())
class LanguageManager(): class LanguageManager():
def __init__(self, config): def __init__(self, config):
@ -16,3 +24,11 @@ class LanguageManager():
@property @property
def name_to_id(self): def name_to_id(self):
return self.langs return self.langs
@property
def num_languages(self):
return len(self.name_to_id)
@property
def language_names(self):
return list(self.name_to_id)

View File

@ -379,7 +379,7 @@ class Xtts(BaseTTS):
return gpt_cond_latents, speaker_embedding return gpt_cond_latents, speaker_embedding
def synthesize(self, text, config, speaker_wav, language, speaker_id, **kwargs): def synthesize(self, text, config, speaker_wav, language, speaker_id=None, **kwargs):
"""Synthesize speech with the given input text. """Synthesize speech with the given input text.
Args: Args:
@ -520,6 +520,8 @@ class Xtts(BaseTTS):
): ):
language = language.split("-")[0] # remove the country code language = language.split("-")[0] # remove the country code
length_scale = 1.0 / max(speed, 0.05) length_scale = 1.0 / max(speed, 0.05)
gpt_cond_latent = gpt_cond_latent.to(self.device)
speaker_embedding = speaker_embedding.to(self.device)
if enable_text_splitting: if enable_text_splitting:
text = split_sentence(text, language, self.tokenizer.char_limits[language]) text = split_sentence(text, language, self.tokenizer.char_limits[language])
else: else:
@ -628,6 +630,8 @@ class Xtts(BaseTTS):
): ):
language = language.split("-")[0] # remove the country code language = language.split("-")[0] # remove the country code
length_scale = 1.0 / max(speed, 0.05) length_scale = 1.0 / max(speed, 0.05)
gpt_cond_latent = gpt_cond_latent.to(self.device)
speaker_embedding = speaker_embedding.to(self.device)
if enable_text_splitting: if enable_text_splitting:
text = split_sentence(text, language, self.tokenizer.char_limits[language]) text = split_sentence(text, language, self.tokenizer.char_limits[language])
else: else: