From a05c42270270852cd080c57d84bc91bae8139f9e Mon Sep 17 00:00:00 2001 From: DazedAnon Date: Thu, 6 Jun 2024 15:20:20 -0500 Subject: [PATCH] Adjust if for gpt4 --- modules/rpgmakerace.py | 2 +- modules/rpgmakermvmz.py | 2 +- modules/rpgmakerplugin.py | 14 ++++++++------ 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/rpgmakerace.py b/modules/rpgmakerace.py index 169029a..6f56edb 100644 --- a/modules/rpgmakerace.py +++ b/modules/rpgmakerace.py @@ -47,7 +47,7 @@ if 'gpt-3.5' in MODEL: OUTPUTAPICOST = .002 BATCHSIZE = 10 FREQUENCY_PENALTY = 0.2 -elif 'gpt-4o' in MODEL: +elif 'gpt-4' in MODEL: INPUTAPICOST = .005 OUTPUTAPICOST = .015 BATCHSIZE = 20 diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index 33daf4f..46ca601 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -46,7 +46,7 @@ if 'gpt-3.5' in MODEL: OUTPUTAPICOST = .002 BATCHSIZE = 10 FREQUENCY_PENALTY = 0.2 -elif 'gpt-4o' in MODEL: +elif 'gpt-4' in MODEL: INPUTAPICOST = .005 OUTPUTAPICOST = .015 BATCHSIZE = 50 diff --git a/modules/rpgmakerplugin.py b/modules/rpgmakerplugin.py index f950de5..f6bf713 100644 --- a/modules/rpgmakerplugin.py +++ b/modules/rpgmakerplugin.py @@ -162,6 +162,7 @@ def translatePlugin(data, pbar, filename, translatedList): while i < len(data): voice = False speaker = '' + newline = r'\\\\n' """ Plugin List @@ -176,14 +177,14 @@ def translatePlugin(data, pbar, filename, translatedList): TODO TL all of the above in one call instead of multiple """ # Lines - matchList = re.findall(r'[\\]+"PlaceInformation[\\]+":[\\]+"(.*?)[\\]+"', data[i]) + matchList = re.findall(r'Latest Title:.*?\].*?[\\]+C.*?[\\]+n(.*?)[\\]+n?[\\]+n[\\]+C', data[i]) if len(matchList) > 0: for match in matchList: # Save Original String originalString = match # Remove any textwrap - match = match.replace(r'\\\\\\\\n', ' ') + match = match.replace(newline, ' ') # Pass 1 if translatedList == []: @@ -204,10 +205,11 @@ def translatePlugin(data, pbar, filename, translatedList): # Textwrap translatedText = textwrap.fill(translatedText, width=WIDTH) - translatedText = translatedText.replace('\n', r'\\\\\\\\n') + translatedText = translatedText.replace('\n', newline) # Replace Single Quotes - translatedText = translatedText.replace("'", "\\'") + translatedText = translatedText.replace("'", "\'") + translatedText = translatedText.replace('"', "\'") # Set Data data[i] = data[i].replace(originalString, translatedText) @@ -221,7 +223,7 @@ def translatePlugin(data, pbar, filename, translatedList): pbar.refresh() # Translate - response = translateGPT(stringList, 'The following lines are quest locations', True, pbar, filename) + response = translateGPT(stringList, '', True, pbar, filename) tokens[0] += response[1][0] tokens[1] += response[1][1] translatedList = response[0] @@ -382,7 +384,7 @@ def batchList(input_list, batch_size): def createContext(fullPromptFlag, subbedT): characters = 'Game Characters:\n\ -ティアナ (Tiana) - Female\n\ +ティアナ (Teana) - Female\n\ キャサリン (Catherine) - Female\n\ '