naming refactor

.gitignore

@@ -0,0 +1,7 @@
+# testing files
+*.sh
+*.db
+test.py
+
+# cache
+/__pycache__

LICENSE

@@ -1,6 +1,6 @@
 ZLIB/LIBPNG LICENSE
 
-Copyright (c) 2024 TTS-AGI Contributors
+Copyright (c) 2024 Kotoba Technologies Contributors
 
 This software is provided ‘as-is’, without any express or implied
 warranty. In no event will the authors be held liable for any damages

app.py

@@ -388,16 +388,16 @@ model_names = {
     # 'pheme': 'PolyAI Pheme',
     # 'speecht5': 'SpeechT5',
     # 'metavoice': 'MetaVoice-1B',
-    'bark': 'BARK',
-    'moe-vits': 'MOE-VITS',
-    'kotoba-speech-ava': 'KOTOBA-SPEECH-v0.1-AVA',
-    'kotoba-speech-bria': 'KOTOBA-SPEECH-v0.1-BRIA',
-    'kotoba-speech-alex': 'KOTOBA-SPEECH-v0.1-ALEX',
-    'kotoba-speech-jacob': 'KOTOBA-SPEECH-v0.1-JACOB',
-    'blane-tts': 'BLANE-TTS',
-    'amitaro-vits': 'AMITARO-VITS',
-    'google-tts': 'google-tts',
-    'openai-tts': 'openai-tts'
+    'BARK': 'BARK',
+    'MOE-VITS': 'MOE-VITS',
+    'KOTOBA-SPEECH-AVA': 'KOTOBA-SPEECH-v0.1-SPK1',
+    'KOTOBA-SPEECH-BRIA': 'KOTOBA-SPEECH-v0.1-SPK2',
+    'KOTOBA-SPEECH-ALEX': 'KOTOBA-SPEECH-v0.1-SPK3',
+    'KOTOBA-SPEECH-JACOB': 'KOTOBA-SPEECH-v0.1-SPK4',
+    'BLANE-TTS': 'BLANE-TTS',
+    'AMITARO-VITS': 'AMITARO-VITS',
+    'GOOGLE-TTS': 'GOOGLE-TTS',
+    'OPENAI-TTS': 'OPENAI-TTS'
     # 'styletts2': 'StyleTTS 2',
 }
 model_licenses = {
@@ -620,11 +620,11 @@ def reload(chosenmodel1=None, chosenmodel2=None, userid=None, chose_a=False, cho
         gr.update(interactive=False, visible=False)
     ]
     if chose_a == True:
-        out.append(gr.update(value=f'Your vote: {chosenmodel1}', interactive=False, visible=True))
-        out.append(gr.update(value=f'{chosenmodel2}', interactive=False, visible=True))
+        out.append(gr.update(value=f'Your vote: {model_names[chosenmodel1]}', interactive=False, visible=True))
+        out.append(gr.update(value=f'{model_names[chosenmodel2]}', interactive=False, visible=True))
     else:
-        out.append(gr.update(value=f'{chosenmodel1}', interactive=False, visible=True))
-        out.append(gr.update(value=f'Your vote: {chosenmodel2}', interactive=False, visible=True))
+        out.append(gr.update(value=f'{model_names[chosenmodel1]}', interactive=False, visible=True))
+        out.append(gr.update(value=f'Your vote: {model_names[chosenmodel2]}', interactive=False, visible=True))
     out.append(gr.update(visible=True))
     return out
 
@@ -726,7 +726,7 @@ def synthandreturn(text):
     def predict_and_update_result(text, model, result_storage):
         try:
             # if model in AVAILABLE_MODELS:
-            if model in model_names:
+            if model in AVAILABLE_MODELS.values():
                 model_args = {
                     'moe-vits': (
                         text, 
@@ -819,7 +819,7 @@ def synthandreturn(text):
     if mdl1 in AVAILABLE_MODELS.keys(): mdl1k=AVAILABLE_MODELS[mdl1]
     if mdl2 in AVAILABLE_MODELS.keys(): mdl2k=AVAILABLE_MODELS[mdl2]
     results = {}
-    print(f"Sending models {mdl1k} and {mdl2k} to API")
+    print(f"[debug] Sending models {mdl1k} and {mdl2k} to API")
     thread1 = threading.Thread(target=predict_and_update_result, args=(text, mdl1k, results))
     thread2 = threading.Thread(target=predict_and_update_result, args=(text, mdl2k, results))