DeepMoji plugin: per-model amplifiers; decreased sadness pacing adjustment

resources/app/plugins/deepmoji_plugin/ccby_amplifiers.csv

@@ -0,0 +1,2 @@
+model,amplifier_value
+ccby_nvidia_hifi_92_F,1.0

resources/app/plugins/deepmoji_plugin/other_amplifiers.csv

@@ -0,0 +1,3 @@
+model,amplifier_value
+x_ex02,1.0
+x_ex04,1.0

resources/app/plugins/deepmoji_plugin/sentiment.py

@@ -34,12 +34,23 @@ last_em_happy = float(0)
 last_em_sad = float(0)
 last_em_surprise = float(0)
 
-def scoreText(text):
-	return text
 from plugins.deepmoji_plugin.xvasynth_torchmoji import scoreText
 import csv
 
+game_list = [
+	'skyrim',
+	'fallout4',
+	'other',
+	'ccby',
+]
+# amplifier values for certain models
+model_amplifiers = {
+}
+amplifier_value = None
+
 def setup(data=None):
+	global game_list, model_amplifiers
+
 	logger.log(f'Setting up plugin. App version: {data["appVersion"]} | CPU only: {data["isCPUonly"]} | Development mode: {data["isDev"]}')
 	# Show test emoji in console; can crash due to encoding issues
 	try:
@@ -47,11 +58,20 @@ def setup(data=None):
 	except:
 		pass
 
+	# for game in game_list:
+	# 	with open(f'{root_path}/plugins/deepmoji_plugin/{game}_amplifiers.csv', encoding='utf-8') as csvfile:
+	# 		reader = csv.DictReader(csvfile)
+	# 		for row in reader:
+	# 			model_amplifiers[row['model']] = float(row['amplifier_value'])
+	# print(model_amplifiers)
+	# forgotten right after
+
 def pre_load_model(data=None):
 	# reset last em values
 	global last_em_angry, last_em_happy, last_em_sad, last_em_surprise,\
 		isBatch, isXVAPitch, isEnglish, prev_sentence,\
-		plugin_settings, configparser, emoji_count
+		plugin_settings, configparser, emoji_count,\
+		model_amplifiers, amplifier_value
 
 	# reload settings from INI
 	config = configparser.ConfigParser()
@@ -71,6 +91,19 @@ def pre_load_model(data=None):
 	last_em_sad = float(0)
 	last_em_surprise = float(0)
 	logger.log("last_em reset")
+	amplifier_value = None
+	try:
+		for game in game_list:
+			with open(f'{root_path}/plugins/deepmoji_plugin/{game}_amplifiers.csv', encoding='utf-8') as csvfile:
+				reader = csv.DictReader(csvfile)
+				for row in reader:
+					model_amplifiers[row['model']] = float(row['amplifier_value'])
+
+		model_name = data['model'][(data['model'].rindex('/') + 1):]
+		amplifier_value = model_amplifiers[model_name]
+		logger.log(f"Voice model amplifier value: {amplifier_value}")
+	except:
+		pass
 
 def fetch_text(data=None):
 	global plugin_settings, emoji_count, text_scores, scoreText, isXVAPitch, isEnglish, prev_sentence
@@ -86,11 +119,8 @@ def fetch_text(data=None):
 		pass
 
 	if (
-		(
-			plugin_settings["load_deepmoji_model"]=="false"
-			or plugin_settings["load_deepmoji_model"]==False
-		)
-		and data["pluginsContext"]["mantella_settings"]["run_model"]==False
+		plugin_settings["load_deepmoji_model"]=="false"
+		or plugin_settings["load_deepmoji_model"]==False
 	):
 		logger.log("DeepMoji model skipped")
 		return
@@ -171,7 +201,8 @@ def fetch_text_batch(data=None):
 def adjust_values(data=None):
 	global root_path, os, csv, example_helper,\
 		isBatch, isXVAPitch, isEnglish, logger, emoji_count, text_scores, plugin_settings,\
-		prev_sentence, last_em_angry, last_em_happy, last_em_sad, last_em_surprise
+		prev_sentence, last_em_angry, last_em_happy, last_em_sad, last_em_surprise,\
+		amplifier_value
 
 	if (
 		isBatch
@@ -227,7 +258,6 @@ def adjust_values(data=None):
 	em_angry_max = 0.6
 	try:
 		em_angry += float(data["pluginsContext"]["mantella_settings"]["emAngry"]) * 100
-		em_angry_max = 1
 	except:
 		pass
 	try:
@@ -243,26 +273,19 @@ def adjust_values(data=None):
 	except:
 		pass
 
-	# HF
-	if (len(text_scores) > 1):
-		# top_em highest wins all
-		top_em = max(
-			em_angry,
-			em_happy,
-			em_sad
-		)
-		em_angry = em_angry if (em_angry == top_em) else 0
-		em_happy = em_happy if (em_happy == top_em) else 0
-		# amplified sadness ratio
-		em_sad = (em_sad * 3) if (em_sad == top_em) else 0
-
-		# amplifier
-		ratio = float(plugin_settings['amplifier_ratio'])
-	else:
-		ratio = 1.0
-		em_emotion_max = 1
-		em_angry_max = 1
-
+	# top_em highest wins all
+	top_em = max(
+		em_angry,
+		em_happy,
+		em_sad
+	)
+	em_angry = em_angry if (em_angry == top_em) else 0
+	em_happy = em_happy if (em_happy == top_em) else 0
+	# amplified sadness ratio
+	em_sad = (em_sad * 3) if (em_sad == top_em) else 0
+
+	# amplifier
+	ratio = float(plugin_settings['amplifier_ratio']) if not amplifier_value else amplifier_value
 	logger.log(f'Amplifier ratio: {ratio}')
 	hasExcMark = False
 	if ('!!!' in text_scores[0]):
@@ -287,11 +310,6 @@ def adjust_values(data=None):
 		logger.log(f'! Ratio: {ratio}')
 		hasExcMark = True
 
-	# HF
-	if (len(text_scores) <= 1):
-		em_angry_max = 1
-		ratio = 1
-
 	# final values
 	em_angry = min(em_angry_max, em_angry / 100 * ratio) if em_angry > 0 else 0
 	em_happy = min(em_emotion_max, em_happy / 100 * ratio) if em_happy > 0 else 0
@@ -370,10 +388,10 @@ def adjust_values(data=None):
 				data["hasDataChanged"] = True
 
 		# slower the speech if above threshold
-		if (em_sad > 0.2):
+		if (em_sad > 0.25):
 			try:
-				data["pace"] *= (1 + em_sad / 3)
-				logger.log(f"Adjusting pacing: {1 + em_sad / 3}")
+				data["pace"] *= (1 + em_sad / 4)
+				logger.log(f"Adjusting pacing: {1 + em_sad / 4}")
 			except:
 				pass