Accept ex02 Expresso model

app.py

@@ -9,6 +9,7 @@ import resources.app.no_server as xvaserver
 
 from gr_client import BlocksDemo
 
+# TODO: move snapshots to common folder & use an models array
 # NVIDIA NeMo models
 hf_model_name = "Pendrokar/xvapitch_nvidia"
 model_repo = HfApi()
@@ -17,6 +18,11 @@ latest_commit_sha = commits[0].commit_id
 hf_cache_models_path = f'/home/user/.cache/huggingface/hub/models--Pendrokar--xvapitch_nvidia/snapshots/{latest_commit_sha}/'
 models_path = hf_cache_models_path
 
+# Expresso models
+commits = model_repo.list_repo_commits(repo_id='Pendrokar/xvapitch_expresso')
+latest_commit_sha = commits[0].commit_id
+hf_cache_expresso_models_path = f'/home/user/.cache/huggingface/hub/models--Pendrokar--xvapitch_expresso/snapshots/{latest_commit_sha}/'
+
 # Lojban model
 commits = model_repo.list_repo_commits(repo_id='Pendrokar/xvasynth_lojban')
 latest_commit_sha = commits[0].commit_id
@@ -45,13 +51,14 @@ def load_model(voice_model_name):
 		model_path =  hf_cache_lojban_models_path + voice_model_name
 		model_type = 'FastPitch1.1'
 	else:
+        model_path =  models_path + voice_model_name
 		if voice_model_name == 'cnc_cabal':
 			model_path =  hf_cache_robotic_models_path + voice_model_name
-		else:
-			model_path =  models_path + voice_model_name
+		if voice_model_name == 'x_ex02':
+			model_path =  hf_cache_expresso_models_path + voice_model_name
 		model_type = 'xVAPitch'
 
-	language = 'en' # seems to have no effect if generated text is from a different language
+	language = 'en' # seems to have no effect if generated text is for a different language
 
 	data = {
 		'outputs': None,