added Expresso voice models

app.py

@@ -54,7 +54,7 @@ def load_model(voice_model_name):
 		model_path =  models_path + voice_model_name
 		if voice_model_name == 'cnc_cabal':
 			model_path =  hf_cache_robotic_models_path + voice_model_name
-		if voice_model_name == 'x_ex02':
+		if voice_model_name[:5] == 'x_ex0':
 			model_path =  hf_cache_expresso_models_path + voice_model_name
 		model_type = 'xVAPitch'
 
@@ -221,5 +221,5 @@ class LocalBlocksDemo(BlocksDemo):
 
 if __name__ == "__main__":
 	print('running custom Gradio interface')
-	demo = LocalBlocksDemo(models_path, hf_cache_lojban_models_path, hf_cache_robotic_models_path)
+	demo = LocalBlocksDemo(models_path, hf_cache_lojban_models_path, hf_cache_robotic_models_path, hf_cache_expresso_models_path)
 	demo.block.launch()

gr_client.py

@@ -4,10 +4,14 @@ import gradio as gr
 from gradio_client import Client
 
 voice_models = [
-	("👨‍🦳 #6671", "ccby_nvidia_hifi_6671_M"),
+	("👩 #ex04", "x_ex04"),
+	("🧑 #ex01", "x_ex01"),
 	("👱‍♀️ 🇬🇧 #92", "ccby_nvidia_hifi_92_F"),
+	("👨‍🦳 #6671", "ccby_nvidia_hifi_6671_M"),
 ]
 voice_models_more = [
+	("👸 #ex02", "x_ex02"),
+	("👨‍🦱 #ex03", "x_ex03"),
 	("🧔 #6670", "ccby_nvidia_hifi_6670_M"),
 	("👨‍🦲 #9017", "ccby_nvidia_hifi_9017_M"),
 	("🧑 #6097", "ccby_nvidia_hifi_6097_M"),
@@ -16,7 +20,7 @@ voice_models_more = [
 	("👩‍🦰 #8051", "ccby_nvidia_hifi_8051_F"),
 	("👩‍🦳 #11697", "ccby_nvidia_hifi_11697_F"),
 	("👩‍🦲 #9136", "ccby_nvidia_hifi_9136_F"),
-	("♟ Lojban", "x_selpahi"), # v2 model for Lojban, pre-multilingual capabilities of xVASynth
+	("♟ Lojban", "x_selpahi"), # v2 model for Lojban, pre- the multilingual capabilities of xVASynth v3
 ]
 
 # order ranked by similarity to English due to the xVASynth's use of ARPAbet instead of IPA
@@ -153,7 +157,7 @@ surprise_slider_init = {
 	'value': 0,
 	'step': 0.05,
 	'label': "😮 Surprise",
-	'info': "Can oversaturate Happiness with either being beyond 0.3",
+	'info': "Oversaturates Happiness when beyond 0.3",
 }
 voice_radio_init = {
 	'choices': [*voice_models, (f'+{len(voice_models_more)}', 'more')],
@@ -306,7 +310,7 @@ def set_lojban_language(voice, lang):
 _DESCRIPTION = '''
 <div>
 <a style="display:inline-block;" href="https://github.com/DanRuta/xVA-Synth"><img src='https://img.shields.io/github/stars/DanRuta/xVA-Synth?style=social'/></a>
-<a style="display:inline-block;" href="https://www.nexusmods.com/skyrimspecialedition/mods/44184"><img src='https://img.shields.io/badge/Endorsements-3.4k-blue?logo=nexusmods'/></a>
+<a style="display:inline-block;" href="https://www.nexusmods.com/skyrimspecialedition/mods/44184"><img src='https://img.shields.io/badge/Endorsements-3.9k-blue?logo=nexusmods'/></a>
 <a style="display:inline-block; margin-left: .5em" href="https://discord.gg/nv7c6E2TzV"><img src='https://img.shields.io/discord/794590496202293278.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2'/></a>
 <span style="display: inline-block;margin-left: .5em;vertical-align: top;"><a href="https://huggingface.co/spaces/Pendrokar/xVASynth?duplicate=true" style="" target="_blank"><img style="margin-bottom: 0em;display: inline;" src="https://bit.ly/3gLdBN6" alt="Duplicate Space"></a> for a personal CPU-run one</span>
 </div>
@@ -314,10 +318,11 @@ _DESCRIPTION = '''
 
 
 class BlocksDemo:
-	def __init__(self, models_path, lojban_models_path, robotic_models_path):
+	def __init__(self, models_path, lojban_models_path, robotic_models_path, expresso_models_path):
 		self.models_path = models_path
 		self.lojban_models_path = lojban_models_path
 		self.robotic_models_path = robotic_models_path
+		self.expresso_models_path = expresso_models_path
 
 		if robotic_models_path != '':
 			# insert robotic voice as the third option
@@ -612,6 +617,8 @@ class BlocksDemo:
 			sample_path = self.lojban_models_path
 		elif voice_id == 'cnc_cabal':
 			sample_path = self.robotic_models_path
+		elif voice_id[:5] == 'x_ex0':
+			model_path =  self.expresso_models_path
 		else:
 			sample_path = self.models_path
 
@@ -627,5 +634,5 @@ if __name__ == "__main__":
 	print('running Gradio interface')
 	client = Client("Pendrokar/xVASynth")
 
-	demo = BlocksDemo('', '', '')
+	demo = BlocksDemo('', '', '', '')
 	demo.block.launch()