run_deepmoji

.gitattributes

@@ -37,3 +37,4 @@ resources/app/python/xvapitch/text/dicts/german.txt filter=lfs diff=lfs merge=lf
 resources/app/python/xvapitch/text/dicts/arabic.txt filter=lfs diff=lfs merge=lfs -text
 resources/app/python/xvapitch/text/dicts/russian.txt filter=lfs diff=lfs merge=lfs -text
 resources/app/python/xvapitch/text/dicts/spanish.txt filter=lfs diff=lfs merge=lfs -text
+resources/app/plugins/deepmoji_plugin/DeepMoji/text_unidecode/dicts/data.bin filter=lfs diff=lfs merge=lfs -text

app.py

@@ -163,7 +163,8 @@ def predict(
 	anger,
 	happy,
 	sad,
-	surprise
+	surprise,
+	use_deepmoji
 ):
 	# grab only the first 1000 characters
 	input_text = input_text[:1000]
@@ -184,9 +185,11 @@ def predict(
 		"emAngry": (anger if anger > 0 else 0),
 		"emHappy": (happy if happy > 0 else 0),
 		"emSad": (sad if sad > 0 else 0),
-		"emSurprise": (surprise if surprise > 0 else 0)
+		"emSurprise": (surprise if surprise > 0 else 0),
+		"run_model": use_deepmoji
 	}
 
+
 	data = {
 		'pluginsContext': json.dumps(pluginsContext),
 		'modelType': model_type,
@@ -256,6 +259,7 @@ language_radio = gr.Radio(
 	info="Will be more monotone and have an English accent. Tested mostly by a native Briton."
 )
 # language_radio.change(set_default_text)
+deepmoji_checkbox = gr.Checkbox(label="Use DeepMoji", info="Auto adjust emotional values")
 
 gradio_app = gr.Interface(
 	predict,
@@ -269,7 +273,8 @@ gradio_app = gr.Interface(
 		anger_slider,
 		happy_slider,
 		sad_slider,
-		surprise_slider
+		surprise_slider,
+		deepmoji_checkbox
 	],
 	outputs=[
 		gr.Audio(label="22kHz audio output", type="filepath"),

resources/app/plugins/deepmoji_plugin/sentiment.py

@@ -36,7 +36,7 @@ last_em_surprise = float(0)
 
 def scoreText(text):
 	return text
-# from plugins.deepmoji_plugin.xvasynth_torchmoji import scoreText
+from plugins.deepmoji_plugin.xvasynth_torchmoji import scoreText
 import csv
 
 def setup(data=None):
@@ -88,6 +88,7 @@ def fetch_text(data=None):
 	if (
 		plugin_settings["load_deepmoji_model"]=="false"
 		or plugin_settings["load_deepmoji_model"]==False
+		or data["pluginsContext"]["mantella_settings"]["run_model"]==False
 	):
 		logger.log("DeepMoji model skipped")
 		return
@@ -229,17 +230,14 @@ def adjust_values(data=None):
 		pass
 	try:
 		em_happy += float(data["pluginsContext"]["mantella_settings"]["emHappy"]) * 100
-		em_emotion_max = 1
 	except:
 		pass
 	try:
 		em_sad += float(data["pluginsContext"]["mantella_settings"]["emSad"]) * 100
-		em_emotion_max = 1
 	except:
 		pass
 	try:
 		em_surprise += float(data["pluginsContext"]["mantella_settings"]["emSurprise"]) * 100
-		em_emotion_max = 1
 	except:
 		pass
 
@@ -260,6 +258,8 @@ def adjust_values(data=None):
 		ratio = float(plugin_settings['amplifier_ratio'])
 	else:
 		ratio = 1.0
+		em_emotion_max = 1
+		em_angry_max = 1
 
 	logger.log(f'Amplifier ratio: {ratio}')
 	hasExcMark = False