every_holiday/VRCT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

👍️[Update] Model : 多言語対応のkeyを数字に変更

Browse Source
This commit is contained in:
misyaguziya
2024-12-10 20:09:04 +09:00
parent b635d452b1
commit e2a30d9371
5 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src-python/config.py
View File

@@ -956,7 +956,7 @@ class Config:
self._SELECTED_YOUR_LANGUAGES = {} self._SELECTED_YOUR_LANGUAGES = {}
for tab_no in self.SELECTABLE_TAB_NO_LIST: for tab_no in self.SELECTABLE_TAB_NO_LIST:
self._SELECTED_YOUR_LANGUAGES[tab_no] = { self._SELECTED_YOUR_LANGUAGES[tab_no] = {
"primary": { "1": {
"language": "Japanese", "language": "Japanese",
"country": "Japan", "country": "Japan",
"enable": True, "enable": True,
@@ -965,17 +965,17 @@ class Config:
self._SELECTED_TARGET_LANGUAGES = {} self._SELECTED_TARGET_LANGUAGES = {}
for tab_no in self.SELECTABLE_TAB_NO_LIST: for tab_no in self.SELECTABLE_TAB_NO_LIST:
self._SELECTED_TARGET_LANGUAGES[tab_no] = { self._SELECTED_TARGET_LANGUAGES[tab_no] = {
"primary": { "1": {
"language": "English", "language": "English",
"country": "United States", "country": "United States",
"enable": True, "enable": True,
}, },
"secondary": { "2": {
"language": "English", "language": "English",
"country": "United States", "country": "United States",
"enable": False, "enable": False,
}, },
"tertiary": { "3": {
"language": "English", "language": "English",
"country": "United States", "country": "United States",
"enable": False, "enable": False,

24
src-python/model.py
View File

@@ -209,7 +209,7 @@ class Model:
def getInputTranslate(self, message): def getInputTranslate(self, message):
translator_name=config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO] translator_name=config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO]
source_language=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] source_language=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
target_languages=config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO] target_languages=config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]
translations = [] translations = []
@@ -233,9 +233,9 @@ class Model:
def getOutputTranslate(self, message): def getOutputTranslate(self, message):
translator_name=config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO] translator_name=config.SELECTED_TRANSLATION_ENGINES[config.SELECTED_TAB_NO]
source_language=config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] source_language=config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
target_language=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] target_language=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
target_country=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["country"] target_country=config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["country"]
translation, success_flag = self.getTranslate( translation, success_flag = self.getTranslate(
translator_name, translator_name,
@@ -436,8 +436,8 @@ class Model:
try: try:
res = self.mic_transcriber.transcribeAudioQueue( res = self.mic_transcriber.transcribeAudioQueue(
self.mic_audio_queue, self.mic_audio_queue,
config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"], config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"],
config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["country"], config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["country"],
config.MIC_AVG_LOGPROB, config.MIC_AVG_LOGPROB,
config.MIC_NO_SPEECH_PROB config.MIC_NO_SPEECH_PROB
) )
@@ -600,8 +600,8 @@ class Model:
try: try:
res = self.speaker_transcriber.transcribeAudioQueue( res = self.speaker_transcriber.transcribeAudioQueue(
speaker_audio_queue, speaker_audio_queue,
config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"], config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"],
config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["country"], config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["country"],
config.SPEAKER_AVG_LOGPROB, config.SPEAKER_AVG_LOGPROB,
config.SPEAKER_NO_SPEECH_PROB config.SPEAKER_NO_SPEECH_PROB
) )
@@ -685,8 +685,8 @@ class Model:
self.speaker_energy_recorder = None self.speaker_energy_recorder = None
def createOverlayImageSmallLog(self, message, translation): def createOverlayImageSmallLog(self, message, translation):
your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
return self.overlay_image.createOverlayImageSmallLog(message, your_language, translation, target_language) return self.overlay_image.createOverlayImageSmallLog(message, your_language, translation, target_language)
def createOverlayImageSystemMessage(self, message): def createOverlayImageSystemMessage(self, message):
@@ -738,8 +738,8 @@ class Model:
def createOverlayImageLargeLog(self, message_type:str, message:str, translation:str): def createOverlayImageLargeLog(self, message_type:str, message:str, translation:str):
your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] your_language = config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] target_language = config.SELECTED_YOUR_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"]
return self.overlay_image.createOverlayImageLargeLog(message_type, message, your_language, translation, target_language) return self.overlay_image.createOverlayImageLargeLog(message_type, message, your_language, translation, target_language)
def clearOverlayImageLargeLog(self): def clearOverlayImageLargeLog(self):

14
src-python/webui_controller.py
View File

@@ -222,7 +222,7 @@ class Controller:
) )
if config.CONVERT_MESSAGE_TO_ROMAJI is True or config.CONVERT_MESSAGE_TO_HIRAGANA is True: if config.CONVERT_MESSAGE_TO_ROMAJI is True or config.CONVERT_MESSAGE_TO_HIRAGANA is True:
if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] == "Japanese": if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese":
transliteration = model.convertMessageToTransliteration(translation[0]) transliteration = model.convertMessageToTransliteration(translation[0])
if config.ENABLE_TRANSCRIPTION_SEND is True: if config.ENABLE_TRANSCRIPTION_SEND is True:
@@ -287,7 +287,7 @@ class Controller:
) )
if config.CONVERT_MESSAGE_TO_ROMAJI is True or config.CONVERT_MESSAGE_TO_HIRAGANA is True: if config.CONVERT_MESSAGE_TO_ROMAJI is True or config.CONVERT_MESSAGE_TO_HIRAGANA is True:
if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] == "Japanese": if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese":
transliteration = model.convertMessageToTransliteration(message) transliteration = model.convertMessageToTransliteration(message)
if config.ENABLE_TRANSCRIPTION_RECEIVE is True: if config.ENABLE_TRANSCRIPTION_RECEIVE is True:
@@ -354,7 +354,7 @@ class Controller:
) )
if config.CONVERT_MESSAGE_TO_ROMAJI is True or config.CONVERT_MESSAGE_TO_HIRAGANA is True: if config.CONVERT_MESSAGE_TO_ROMAJI is True or config.CONVERT_MESSAGE_TO_HIRAGANA is True:
if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["primary"]["language"] == "Japanese": if config.SELECTED_TARGET_LANGUAGES[config.SELECTED_TAB_NO]["1"]["language"] == "Japanese":
transliteration = model.convertMessageToTransliteration(translation[0]) transliteration = model.convertMessageToTransliteration(translation[0])
# send OSC message # send OSC message
@@ -1337,13 +1337,13 @@ class Controller:
def swapYourLanguageAndTargetLanguage(self, *args, **kwargs) -> dict: def swapYourLanguageAndTargetLanguage(self, *args, **kwargs) -> dict:
your_languages = config.SELECTED_YOUR_LANGUAGES your_languages = config.SELECTED_YOUR_LANGUAGES
your_language_primary = your_languages[config.SELECTED_TAB_NO]["primary"] your_language_temp = your_languages[config.SELECTED_TAB_NO]["1"]
target_languages = config.SELECTED_TARGET_LANGUAGES target_languages = config.SELECTED_TARGET_LANGUAGES
target_language_primary = target_languages[config.SELECTED_TAB_NO]["primary"] target_language_temp = target_languages[config.SELECTED_TAB_NO]["1"]
your_languages[config.SELECTED_TAB_NO]["primary"] = target_language_primary your_languages[config.SELECTED_TAB_NO]["1"] = target_language_temp
target_languages[config.SELECTED_TAB_NO]["primary"] = your_language_primary target_languages[config.SELECTED_TAB_NO]["1"] = your_language_temp
self.setSelectedYourLanguages(your_languages) self.setSelectedYourLanguages(your_languages)
self.setSelectedTargetLanguages(target_languages) self.setSelectedTargetLanguages(target_languages)

12
src-python/webui_mainloop.py
View File

@@ -413,19 +413,19 @@ if __name__ == "__main__":
case "/set/data/selected_your_languages": case "/set/data/selected_your_languages":
data = { data = {
"1":{ "1":{
"primary":{ "1":{
"language": "English", "language": "English",
"country": "Hong Kong" "country": "Hong Kong"
}, },
}, },
"2":{ "2":{
"primary":{ "1":{
"language":"Japanese", "language":"Japanese",
"country":"Japan" "country":"Japan"
}, },
}, },
"3":{ "3":{
"primary":{ "1":{
"language":"Japanese", "language":"Japanese",
"country":"Japan" "country":"Japan"
}, },
@@ -434,7 +434,7 @@ if __name__ == "__main__":
case "/set/data/selected_target_languages": case "/set/data/selected_target_languages":
data ={ data ={
"1":{ "1":{
"primary": { "1": {
"language": "Japanese", "language": "Japanese",
"country": "Japan", "country": "Japan",
"enabled": True, "enabled": True,
@@ -451,7 +451,7 @@ if __name__ == "__main__":
} }
}, },
"2":{ "2":{
"primary":{ "1":{
"language":"English", "language":"English",
"country":"United States", "country":"United States",
"enabled": True, "enabled": True,
@@ -468,7 +468,7 @@ if __name__ == "__main__":
}, },
}, },
"3":{ "3":{
"primary":{ "1":{
"language":"English", "language":"English",
"country":"United States", "country":"United States",
"enabled": True, "enabled": True,

8
src-ui/logics/main/useLanguageSettings.js
View File

@@ -61,9 +61,10 @@ export const useLanguageSettings = () => {
const send_obj = { const send_obj = {
...currentSelectedYourLanguages.data, ...currentSelectedYourLanguages.data,
[currentSelectedPresetTabNumber.data]: { [currentSelectedPresetTabNumber.data]: {
primary: { 1: {
language: selected_language_data.language, language: selected_language_data.language,
country: selected_language_data.country, country: selected_language_data.country,
enable: selected_language_data.enable,
} }
} }
}; };
@@ -80,8 +81,9 @@ export const useLanguageSettings = () => {
pendingSelectedTargetLanguages(); pendingSelectedTargetLanguages();
let send_obj = currentSelectedTargetLanguages.data; let send_obj = currentSelectedTargetLanguages.data;
send_obj[currentSelectedPresetTabNumber.data].primary.language = selected_language_data.language, send_obj[currentSelectedPresetTabNumber.data][1].language = selected_language_data.language,
send_obj[currentSelectedPresetTabNumber.data].primary.country = selected_language_data.country, send_obj[currentSelectedPresetTabNumber.data][1].country = selected_language_data.country,
send_obj[currentSelectedPresetTabNumber.data][1].enable = selected_language_data.enable,
asyncStdoutToPython("/set/data/selected_target_languages", send_obj); asyncStdoutToPython("/set/data/selected_target_languages", send_obj);
}; };