From a65129cc4edc87b648ea8e139f3b77fb0fe743e3 Mon Sep 17 00:00:00 2001 From: DazedAnon Date: Tue, 8 Oct 2024 11:30:19 -0500 Subject: [PATCH] Fix pricing for estimate --- modules/csv.py | 4 ++-- modules/eushully.py | 4 ++-- modules/images.py | 6 +++--- modules/irissoft.py | 4 ++-- modules/javascript.py | 4 ++-- modules/nscript.py | 4 ++-- modules/regex.py | 4 ++-- modules/rpgmakermvmz.py | 24 +++++++++++------------- modules/rpgmakerplugin.py | 4 ++-- modules/tyrano.py | 4 ++-- modules/unity.py | 4 ++-- modules/wolf.py | 8 ++++---- modules/wolf2.py | 4 ++-- vocab.txt | 3 --- 14 files changed, 38 insertions(+), 43 deletions(-) diff --git a/modules/csv.py b/modules/csv.py index ca3f873..4ebd279 100644 --- a/modules/csv.py +++ b/modules/csv.py @@ -53,8 +53,8 @@ if "gpt-3.5" in MODEL: BATCHSIZE = 10 FREQUENCY_PENALTY = 0.2 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 20 FREQUENCY_PENALTY = 0.1 diff --git a/modules/eushully.py b/modules/eushully.py index 447fe7f..43dbfc4 100644 --- a/modules/eushully.py +++ b/modules/eushully.py @@ -55,8 +55,8 @@ if "gpt-3.5" in MODEL: OUTPUTAPICOST = 0.002 BATCHSIZE = 10 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 40 diff --git a/modules/images.py b/modules/images.py index 2fd0e2c..95a4582 100644 --- a/modules/images.py +++ b/modules/images.py @@ -48,8 +48,8 @@ if "gpt-3.5" in MODEL: BATCHSIZE = 10 FREQUENCY_PENALTY = 0.2 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 20 FREQUENCY_PENALTY = 0.1 @@ -276,7 +276,7 @@ def processImagesDir(directory_path, imageList): imageList[0].append( line ) # Using strip() to remove any extra newlines or spaces - imageList[1].append([10, 14]) + imageList[1].append([100, 22]) except FileNotFoundError: print(f"The file at {file_path} was not found.") except IOError: diff --git a/modules/irissoft.py b/modules/irissoft.py index 20759be..527c352 100644 --- a/modules/irissoft.py +++ b/modules/irissoft.py @@ -54,8 +54,8 @@ if "gpt-3.5" in MODEL: OUTPUTAPICOST = 0.002 BATCHSIZE = 10 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 40 diff --git a/modules/javascript.py b/modules/javascript.py index 89c9c3e..8338a98 100644 --- a/modules/javascript.py +++ b/modules/javascript.py @@ -54,8 +54,8 @@ if "gpt-3.5" in MODEL: OUTPUTAPICOST = 0.002 BATCHSIZE = 10 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 40 diff --git a/modules/nscript.py b/modules/nscript.py index 2643b70..fc15f20 100644 --- a/modules/nscript.py +++ b/modules/nscript.py @@ -63,8 +63,8 @@ if "gpt-3.5" in MODEL: OUTPUTAPICOST = 0.002 BATCHSIZE = 10 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 40 diff --git a/modules/regex.py b/modules/regex.py index 376f100..8ddffb2 100644 --- a/modules/regex.py +++ b/modules/regex.py @@ -54,8 +54,8 @@ if "gpt-3.5" in MODEL: OUTPUTAPICOST = 0.002 BATCHSIZE = 10 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 40 diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index cd6621e..0eebd36 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -56,8 +56,8 @@ if "gpt-3.5" in MODEL: BATCHSIZE = 10 FREQUENCY_PENALTY = 0.2 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 20 FREQUENCY_PENALTY = 0.1 @@ -66,25 +66,23 @@ BAR_FORMAT = "{l_bar}{bar:10}{r_bar}{bar:-10b}" POSITION = 0 LEAVE = False -# Dialogue / Scroll -CODE401 = True -CODE405 = True -CODE408 = False # Warning, translates comments and can inflate costs. +# Dialogue / Scroll / Choices (Main Codes) +CODE401 = False +CODE405 = False +CODE102 = False -# Choices -CODE102 = True +# Optional +CODE101 = False # Turn this one when names exist in 101 +CODE408 = False # Warning, translates comments and can inflate costs. # Variables CODE122 = False -# Names -CODE101 = False - # Other CODE355655 = False CODE357 = False CODE657 = False -CODE356 = False +CODE356 = True CODE320 = False CODE324 = False CODE111 = False @@ -1262,7 +1260,7 @@ def searchCodes(page, pbar, jobList, filename): ## Event Code: 122 [Set Variables] if "code" in codeList[i] and codeList[i]["code"] == 122 and CODE122 is True: # This is going to be the var being set. (IMPORTANT) - if codeList[i]["parameters"][0] not in list(range(0, 1000)): + if codeList[i]["parameters"][0] not in list(range(0, 100)): i += 1 continue diff --git a/modules/rpgmakerplugin.py b/modules/rpgmakerplugin.py index 3d3b493..0f70e2b 100644 --- a/modules/rpgmakerplugin.py +++ b/modules/rpgmakerplugin.py @@ -56,8 +56,8 @@ if "gpt-3.5" in MODEL: OUTPUTAPICOST = 0.002 BATCHSIZE = 10 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 40 diff --git a/modules/tyrano.py b/modules/tyrano.py index f52814f..0105d1c 100644 --- a/modules/tyrano.py +++ b/modules/tyrano.py @@ -59,8 +59,8 @@ if "gpt-3.5" in MODEL: OUTPUTAPICOST = 0.002 BATCHSIZE = 10 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 40 diff --git a/modules/unity.py b/modules/unity.py index 70844cb..3787ff9 100644 --- a/modules/unity.py +++ b/modules/unity.py @@ -63,8 +63,8 @@ if "gpt-3.5" in MODEL: OUTPUTAPICOST = 0.002 BATCHSIZE = 10 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 40 diff --git a/modules/wolf.py b/modules/wolf.py index d6f0bdd..f8a29f1 100644 --- a/modules/wolf.py +++ b/modules/wolf.py @@ -55,8 +55,8 @@ if "gpt-3.5" in MODEL: BATCHSIZE = 10 FREQUENCY_PENALTY = 0.2 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 20 FREQUENCY_PENALTY = 0.1 @@ -964,7 +964,7 @@ def searchDB(events, pbar, jobList, filename): scenarioList[2].pop(0) # Grab Items - if table["name"] == "シーン回想" and ITEMFLAG == True: + if table["name"] == "音楽鑑賞" and ITEMFLAG == True: with open("translations.txt", "a", encoding="utf-8") as file: for item in table["data"]: dataList = item["data"] @@ -972,7 +972,7 @@ def searchDB(events, pbar, jobList, filename): # Parse # for j in range(len(dataList)): # Name - if dataList[j].get("name") == "キャラ名": + if dataList[j].get("name") == "名称": # Pass 1 (Grab Data) if setData == False: if dataList[j].get("value") != "": diff --git a/modules/wolf2.py b/modules/wolf2.py index a66b7d8..f121aab 100644 --- a/modules/wolf2.py +++ b/modules/wolf2.py @@ -55,8 +55,8 @@ if "gpt-3.5" in MODEL: OUTPUTAPICOST = 0.002 BATCHSIZE = 10 elif "gpt-4" in MODEL: - INPUTAPICOST = 0.005 - OUTPUTAPICOST = 0.015 + INPUTAPICOST = 0.0025 + OUTPUTAPICOST = 0.01 BATCHSIZE = 40 diff --git a/vocab.txt b/vocab.txt index 3b0d3e6..99b0563 100644 --- a/vocab.txt +++ b/vocab.txt @@ -34,8 +34,6 @@ Here are some vocabulary and terms so that you know the proper spelling and tran 先生 (sensei) 師匠 (shishou) せんせい (sensei) -お兄ちゃん (Onii-chan) -お姉ちゃん (Onee-chan) # System 初めから (Start) @@ -81,5 +79,4 @@ ME 音量 (ME Volume) ローバー (Roper) # Locations -トリス (Tris) ``` \ No newline at end of file