diff --git a/modules/alice.py b/modules/alice.py index 74bbf87..92515c7 100644 --- a/modules/alice.py +++ b/modules/alice.py @@ -497,7 +497,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/modules/csv.py b/modules/csv.py index b5e8b6c..99b97a5 100644 --- a/modules/csv.py +++ b/modules/csv.py @@ -538,7 +538,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/modules/javascript.py b/modules/javascript.py index a708012..f167580 100644 --- a/modules/javascript.py +++ b/modules/javascript.py @@ -415,7 +415,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/modules/json.py b/modules/json.py index 717871b..d0a136c 100644 --- a/modules/json.py +++ b/modules/json.py @@ -501,7 +501,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/modules/kansen.py b/modules/kansen.py index 7be7846..0f31ecf 100644 --- a/modules/kansen.py +++ b/modules/kansen.py @@ -594,7 +594,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/modules/lune.py b/modules/lune.py index b7b6661..d2cf21d 100644 --- a/modules/lune.py +++ b/modules/lune.py @@ -481,7 +481,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/modules/nscript.py b/modules/nscript.py index 57b5208..c3ec2f4 100644 --- a/modules/nscript.py +++ b/modules/nscript.py @@ -600,7 +600,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/modules/rpgmakerace.py b/modules/rpgmakerace.py index 07f07b3..23ea656 100644 --- a/modules/rpgmakerace.py +++ b/modules/rpgmakerace.py @@ -2254,7 +2254,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index 85271be..d375bd3 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -57,7 +57,7 @@ LEAVE = False # Dialogue / Scroll CODE401 = True -CODE405 = False +CODE405 = True CODE408 = False # Choices @@ -67,7 +67,7 @@ CODE102 = True CODE122 = False # Names -CODE101 = False +CODE101 = True # Other CODE355655 = False @@ -843,10 +843,10 @@ def searchCodes(page, pbar, jobList, filename): ### \\n nCase = None if finalJAString[0] != '\\': - regex = r'(.*?)([\\]+[kKnN][wWcC]?[<\[](.*?)[>\]].*)' + regex = r'(.*?)([\\]+[kKnN][wWcC]?[<](.*?)[>].*)' nCase = 0 else: - regex = r'(.*[\\]+[kKnN][wWcC]?[<\[](.*?)[\]>])(.*)' + regex = r'(.*[\\]+[kKnN][wWcC]?[<](.*?)[>])(.*)' nCase = 1 matchList = re.findall(regex, finalJAString) if len(matchList) > 0: @@ -971,7 +971,7 @@ def searchCodes(page, pbar, jobList, filename): if speaker == '' and finalJAString != '': docList.append(finalJAString) elif finalJAString != '': - docList.append(f'{speaker}: {finalJAString}') + docList.append(f'[{speaker}]: {finalJAString}') else: docList.append(speaker) speaker = '' @@ -1946,11 +1946,12 @@ def batchList(input_list, batch_size): def createContext(fullPromptFlag, subbedT): characters = 'Game Characters:\n\ -リゼ (Rize) - Female\n\ -ティア (Tia) - Female\n\ -リィナ (Riina) - Female\n\ -クェス (Ques) - Female\n\ -たこ (Tako) - Female\n\ +皆月 (Minazuki)\n\ +さやか (Sayaka)\n\ +皆月 さやか (Minazuki Sayaka) - Female\n\ +広瀬 (Hirose)\n\ +智恵 (Chie) - Female\n\ +広瀬 智恵 (Hirose Chie) - Femal\n\ ' system = PROMPT + VOCAB if fullPromptFlag else \ @@ -2051,7 +2052,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] @@ -2095,7 +2096,7 @@ def translateGPT(text, history, fullPromptFlag): continue # Translating - response = translateText(characters, system, user, history, 0) + response = translateText(characters, system, user, history, 0.02) translatedText = response.choices[0].message.content totalTokens[0] += response.usage.prompt_tokens totalTokens[1] += response.usage.completion_tokens @@ -2107,7 +2108,7 @@ def translateGPT(text, history, fullPromptFlag): tList[index] = extractedTranslations if len(tItem) != len(extractedTranslations): # Mismatch. Try Again - response = translateText(characters, system, user, history, 0.05) + response = translateText(characters, system, user, history, 0.1) translatedText = response.choices[0].message.content totalTokens[0] += response.usage.prompt_tokens totalTokens[1] += response.usage.completion_tokens diff --git a/modules/tyrano.py b/modules/tyrano.py index 988bcdf..227ea19 100644 --- a/modules/tyrano.py +++ b/modules/tyrano.py @@ -593,7 +593,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/modules/wolf.py b/modules/wolf.py index cdc8777..e46f583 100644 --- a/modules/wolf.py +++ b/modules/wolf.py @@ -1215,7 +1215,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/modules/wolf2.py b/modules/wolf2.py index 9989b82..a5957a9 100644 --- a/modules/wolf2.py +++ b/modules/wolf2.py @@ -499,7 +499,7 @@ def countTokens(characters, system, user, history): inputTotalTokens += len(enc.encode(user)) # Output - outputTotalTokens += round(len(enc.encode(user))/1.5) + outputTotalTokens += round(len(enc.encode(user))*3) return [inputTotalTokens, outputTotalTokens] diff --git a/vocab.txt b/vocab.txt index eb38f72..47918f7 100644 --- a/vocab.txt +++ b/vocab.txt @@ -40,5 +40,5 @@ ME 音量 (ME Volume) 回想する (Recollection) # Other -ジュピターノ (Jupiterino) +パパ (papa) ``` \ No newline at end of file