diff --git a/modules/alice.py b/modules/alice.py index 602f523..657e63f 100644 --- a/modules/alice.py +++ b/modules/alice.py @@ -444,8 +444,7 @@ def translateText(characters, system, user, history): msg.append({"role": "user", "content": f'{user}'}) response = openai.chat.completions.create( temperature=0.1, - frequency_penalty=0, - presence_penalty=0, + frequency_penalty=0.1, model=MODEL, messages=msg, ) @@ -467,7 +466,10 @@ def cleanTranslatedText(translatedText, varResponse): translatedText = translatedText.replace(target, replacement) translatedText = resubVars(translatedText, varResponse[1]) - return [line for line in translatedText.split('\\n') if line] + if '\n' in translatedText: + return [line for line in translatedText.split('\n') if line] + else: + return [line for line in translatedText.split('\\n') if line] def extractTranslation(translatedTextList, is_list): pattern = r'[\\]*`?(.*?)[\\]*?`?' @@ -514,7 +516,7 @@ def translateGPT(text, history, fullPromptFlag): for index, tItem in enumerate(tList): # Before sending to translation, if we have a list of items, add the formatting if isinstance(tItem, list): - payload = '\\n'.join([f'`{item}`' for i, item in enumerate(tItem)]) + payload = '\n'.join([f'`{item}`' for i, item in enumerate(tItem)]) payload = payload.replace('``', '`Placeholder Text`') varResponse = subVars(payload) subbedT = varResponse[0] @@ -552,8 +554,8 @@ def translateGPT(text, history, fullPromptFlag): history = extractedTranslations[-10:] # Update history if we have a list else: # Ensure we're passing a single string to extractTranslation - extractedTranslations = extractTranslation('\\n'.join(translatedTextList), False) + extractedTranslations = extractTranslation('\n'.join(translatedTextList), False) tList[index] = extractedTranslations finalList = combineList(tList, text) - return [finalList, totalTokens] \ No newline at end of file + return [finalList, totalTokens] diff --git a/modules/json.py b/modules/json.py index c6c2cf3..d1615b8 100644 --- a/modules/json.py +++ b/modules/json.py @@ -417,8 +417,7 @@ def translateText(characters, system, user, history): msg.append({"role": "user", "content": f'{user}'}) response = openai.chat.completions.create( temperature=0.1, - frequency_penalty=0, - presence_penalty=0, + frequency_penalty=0.1, model=MODEL, messages=msg, ) @@ -440,7 +439,10 @@ def cleanTranslatedText(translatedText, varResponse): translatedText = translatedText.replace(target, replacement) translatedText = resubVars(translatedText, varResponse[1]) - return [line for line in translatedText.split('\\n') if line] + if '\n' in translatedText: + return [line for line in translatedText.split('\n') if line] + else: + return [line for line in translatedText.split('\\n') if line] def extractTranslation(translatedTextList, is_list): pattern = r'[\\]*`?(.*?)[\\]*?`?' @@ -487,7 +489,7 @@ def translateGPT(text, history, fullPromptFlag): for index, tItem in enumerate(tList): # Before sending to translation, if we have a list of items, add the formatting if isinstance(tItem, list): - payload = '\\n'.join([f'`{item}`' for i, item in enumerate(tItem)]) + payload = '\n'.join([f'`{item}`' for i, item in enumerate(tItem)]) payload = payload.replace('``', '`Placeholder Text`') varResponse = subVars(payload) subbedT = varResponse[0] @@ -525,7 +527,7 @@ def translateGPT(text, history, fullPromptFlag): history = extractedTranslations[-10:] # Update history if we have a list else: # Ensure we're passing a single string to extractTranslation - extractedTranslations = extractTranslation('\\n'.join(translatedTextList), False) + extractedTranslations = extractTranslation('\n'.join(translatedTextList), False) tList[index] = extractedTranslations finalList = combineList(tList, text) diff --git a/modules/kansen.py b/modules/kansen.py index 029aff1..23aea67 100644 --- a/modules/kansen.py +++ b/modules/kansen.py @@ -548,8 +548,7 @@ def translateText(characters, system, user, history): msg.append({"role": "user", "content": f'{user}'}) response = openai.chat.completions.create( temperature=0.1, - frequency_penalty=0, - presence_penalty=0, + frequency_penalty=0.1, model=MODEL, messages=msg, ) @@ -571,7 +570,10 @@ def cleanTranslatedText(translatedText, varResponse): translatedText = translatedText.replace(target, replacement) translatedText = resubVars(translatedText, varResponse[1]) - return [line for line in translatedText.split('\\n') if line] + if '\n' in translatedText: + return [line for line in translatedText.split('\n') if line] + else: + return [line for line in translatedText.split('\\n') if line] def extractTranslation(translatedTextList, is_list): pattern = r'[\\]*`?(.*?)[\\]*?`?' @@ -618,7 +620,7 @@ def translateGPT(text, history, fullPromptFlag): for index, tItem in enumerate(tList): # Before sending to translation, if we have a list of items, add the formatting if isinstance(tItem, list): - payload = '\\n'.join([f'`{item}`' for i, item in enumerate(tItem)]) + payload = '\n'.join([f'`{item}`' for i, item in enumerate(tItem)]) payload = payload.replace('``', '`Placeholder Text`') varResponse = subVars(payload) subbedT = varResponse[0] @@ -656,8 +658,8 @@ def translateGPT(text, history, fullPromptFlag): history = extractedTranslations[-10:] # Update history if we have a list else: # Ensure we're passing a single string to extractTranslation - extractedTranslations = extractTranslation('\\n'.join(translatedTextList), False) + extractedTranslations = extractTranslation('\n'.join(translatedTextList), False) tList[index] = extractedTranslations finalList = combineList(tList, text) - return [finalList, totalTokens] \ No newline at end of file + return [finalList, totalTokens] diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index a9dd5da..53a94df 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -1911,8 +1911,7 @@ def translateText(characters, system, user, history): msg.append({"role": "user", "content": f'{user}'}) response = openai.chat.completions.create( temperature=0.1, - frequency_penalty=0, - presence_penalty=0, + frequency_penalty=0.1, model=MODEL, messages=msg, ) @@ -1934,7 +1933,10 @@ def cleanTranslatedText(translatedText, varResponse): translatedText = translatedText.replace(target, replacement) translatedText = resubVars(translatedText, varResponse[1]) - return [line for line in translatedText.split('\\n') if line] + if '\n' in translatedText: + return [line for line in translatedText.split('\n') if line] + else: + return [line for line in translatedText.split('\\n') if line] def extractTranslation(translatedTextList, is_list): pattern = r'[\\]*`?(.*?)[\\]*?`?' @@ -1981,7 +1983,7 @@ def translateGPT(text, history, fullPromptFlag): for index, tItem in enumerate(tList): # Before sending to translation, if we have a list of items, add the formatting if isinstance(tItem, list): - payload = '\\n'.join([f'`{item}`' for i, item in enumerate(tItem)]) + payload = '\n'.join([f'`{item}`' for i, item in enumerate(tItem)]) payload = payload.replace('``', '`Placeholder Text`') varResponse = subVars(payload) subbedT = varResponse[0] @@ -2019,8 +2021,8 @@ def translateGPT(text, history, fullPromptFlag): history = extractedTranslations[-10:] # Update history if we have a list else: # Ensure we're passing a single string to extractTranslation - extractedTranslations = extractTranslation('\\n'.join(translatedTextList), False) + extractedTranslations = extractTranslation('\n'.join(translatedTextList), False) tList[index] = extractedTranslations finalList = combineList(tList, text) - return [finalList, totalTokens] \ No newline at end of file + return [finalList, totalTokens]