more langs, voices option functionality

gr_client.py

@@ -161,14 +161,14 @@ input_textbox_init = {
 	'info': "Also accepts ARPAbet symbols placed within {} brackets.",
 	'lines': 1,
 	'max_lines': 5,
-	'autofocus': True
+	'autofocus': True,
 }
 pacing_slider_init = {
 	'value': 1.0,
 	'minimum': 0.5,
 	'maximum': 2.0,
 	'step': 0.1,
-	'label': "Duration"
+	'label': "Duration",
 }
 pitch_slider_init = {
 	'minimum': 0,
@@ -176,7 +176,7 @@ pitch_slider_init = {
 	'value': 0.5,
 	'step': 0.05,
 	'label': "Pitch",
-	'visible': False
+	'visible': False,
 }
 energy_slider_init = {
 	'minimum': 0.1,
@@ -184,7 +184,7 @@ energy_slider_init = {
 	'value': 1.0,
 	'step': 0.05,
 	'label': "Energy",
-	'visible': False
+	'visible': False,
 }
 anger_slider_init = {
 	'minimum': 0,
@@ -192,7 +192,7 @@ anger_slider_init = {
 	'value': 0,
 	'step': 0.05,
 	'label': "😠 Anger",
-	'info': "Tread lightly beyond 0.9"
+	'info': "Tread lightly beyond 0.9",
 }
 happy_slider_init = {
 	'minimum': 0,
@@ -200,7 +200,7 @@ happy_slider_init = {
 	'value': 0,
 	'step': 0.05,
 	'label': "😃 Happiness",
-	'info': "Tread lightly beyond 0.7"
+	'info': "Tread lightly beyond 0.7",
 }
 sad_slider_init = {
 	'minimum': 0,
@@ -208,7 +208,7 @@ sad_slider_init = {
 	'value': 0,
 	'step': 0.05,
 	'label': "😭 Sadness",
-	'info': "Duration increased when beyond 0.2"
+	'info': "Duration increased when beyond 0.2",
 }
 surprise_slider_init = {
 	'minimum': 0,
@@ -216,7 +216,7 @@ surprise_slider_init = {
 	'value': 0,
 	'step': 0.05,
 	'label': "😮 Surprise",
-	'info': "Does not play well with Happiness with either being beyond 0.3"
+	'info': "Does not play well with Happiness with either being beyond 0.3",
 }
 voice_radio_init = {
 	'choices': [*voice_models, (f'+{len(voice_models_more)}', 'more')],
@@ -226,24 +226,40 @@ voice_radio_init = {
 }
 deepmoji_checkbox_init = {
 	'label': "Use DeepMoji",
-	'info': "Auto adjust emotional values",
+	'info': "Auto adjust emotional values for English",
 	'value': True,
 	'interactive': True
 }
 
+def more_lang_options(lang):
+	print('more_lang_options')
+	if lang != 'more':
+		return lang
+
+	radio_init = {**language_radio_init}
+	radio_init['choices'] = [*languages, *languages_more]
+	return gr.Radio(**radio_init)
+
 def set_default_text(lang, deepmoji_checked):
+	print('set_default_text')
+	if lang == 'more':
+		return default_text['en'], deepmoji_checked
+		# return gr.Textbox(**input_textbox_init), deepmoji_checked
+
 	# DeepMoji only works on English Text
 	checkbox_init = {**deepmoji_checkbox_init}
 	if lang == 'en':
 		checkbox_init['value'] = deepmoji_checked,
-		checkbox_init['interactive'] = True
+		# checkbox_init['interactive'] = True
 	else:
-		checkbox_init['info'] = "Works only with English!",
-		checkbox_init['value'] = False,
-		checkbox_init['interactive'] = False
+		deepmoji_checked = False
+		# FIXME: event listener conflict with toggle_deepmoji
+		# checkbox_init['info'] = "Works only with English!",
+		# checkbox_init['value'] = False,
+		# checkbox_init['interactive'] = False
 
-	checkbox_enabled = gr.Checkbox(**checkbox_init)
-	return default_text[lang], checkbox_enabled  # Return the modified textbox (important for Blocks)
+	# checkbox_enabled = gr.Checkbox(**checkbox_init)
+	return default_text[lang], deepmoji_checked
 
 # examples component
 en_examples = [
@@ -269,9 +285,11 @@ en_examples_dropdown_init = {
 }
 
 def set_example_as_input(example_text):
+	print('set_example_as_input')
 	return example_text
 
 def toggle_example_dropdown(lang):
+	print('toggle_example_dropdown')
 	dropdown_init = {**en_examples_dropdown_init}
 	if lang == 'en':
 		dropdown_init['visible'] = True
@@ -280,6 +298,15 @@ def toggle_example_dropdown(lang):
 
 	return gr.Dropdown(**dropdown_init)
 
+def more_voice_options(voice):
+	print('more_voice_options')
+	if voice != 'more':
+		return voice
+
+	radio_init = {**voice_radio_init}
+	radio_init['choices'] = [*voice_models, *voice_models_more]
+	return gr.Radio(**radio_init)
+
 def reset_em_sliders(
 	deepmoji_enabled,
 	anger,
@@ -287,6 +314,7 @@ def reset_em_sliders(
 	sad,
 	surprise
 ):
+	print('reset_em_sliders')
 	if (deepmoji_enabled):
 		return (0, 0, 0, 0)
 	else:
@@ -304,6 +332,7 @@ def toggle_deepmoji(
 	sad,
 	surprise
 ):
+	print('toggle_deepmoji')
 	if checked:
 		return (0, 0, 0, 0)
 	else:
@@ -325,8 +354,9 @@ language_radio_init = {
 _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.3k-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</span>
+<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>
 '''
 
@@ -397,22 +427,49 @@ with gr.Blocks(css=".arpabet {background-color: gray; border-radius: 5px; font-s
 		]
 	)
 
+	# more languages option
 	language_radio.change(
-		set_default_text,
-		inputs=[language_radio, deepmoji_checkbox],
-		outputs=[input_textbox, deepmoji_checkbox]
+		more_lang_options,
+		inputs=language_radio,
+		outputs=language_radio,
+		trigger_mode='once',
+		show_progress='hidden',
 	)
 
-	en_examples_dropdown.change(
-		set_example_as_input,
-		inputs=[en_examples_dropdown],
-		outputs=[input_textbox]
+	# more voices option
+	voice_radio.change(
+		more_voice_options,
+		inputs=voice_radio,
+		outputs=voice_radio,
+		trigger_mode='once',
+		show_progress='hidden',
+		queue=False,
+	)
+
+	# set default text
+	language_radio.change(
+		set_default_text,
+		inputs=[language_radio, deepmoji_checkbox],
+		outputs=[input_textbox, deepmoji_checkbox],
+		show_progress='hidden',
+		queue=False,
 	)
 
+	# toggle en examples
 	language_radio.change(
 		toggle_example_dropdown,
 		inputs=language_radio,
-		outputs=en_examples_dropdown
+		outputs=en_examples_dropdown,
+		show_progress='hidden',
+		queue=False,
+	)
+
+	en_examples_dropdown.change(
+		set_example_as_input,
+		inputs=[en_examples_dropdown],
+		outputs=[input_textbox],
+		show_progress='hidden',
+		queue=False,
 	)
 
 	deepmoji_checkbox.change(
@@ -429,7 +486,9 @@ with gr.Blocks(css=".arpabet {background-color: gray; border-radius: 5px; font-s
 			happy_slider,
 			sad_slider,
 			surprise_slider
-		]
+		],
+		show_progress='hidden',
+		queue=False,
 	)
 
 	input_textbox.change(
@@ -446,7 +505,9 @@ with gr.Blocks(css=".arpabet {background-color: gray; border-radius: 5px; font-s
 			happy_slider,
 			sad_slider,
 			surprise_slider
-		]
+		],
+		show_progress='hidden',
+		queue=False,
 	)
 
 	voice_radio.change(
@@ -463,12 +524,14 @@ with gr.Blocks(css=".arpabet {background-color: gray; border-radius: 5px; font-s
 			happy_slider,
 			sad_slider,
 			surprise_slider
-		]
+		],
+		show_progress='hidden',
+		queue=False,
 	)
 
 if __name__ == "__main__":
 	print('running Gradio interface')
 	# gradio_app.launch()
-	# client = Client("Pendrokar/xVASynth")
+	client = Client("Pendrokar/xVASynth")
 
 	demo.launch()