From 936fe0e268185b9f7e125a32b76e58aae178926d Mon Sep 17 00:00:00 2001 From: Retaliate7731 Date: Tue, 24 Dec 2024 22:42:09 +0100 Subject: [PATCH] Improve support for non-openai models. This commit prevents missing batchsize errors in scenarios where custom model names are required. --- .env.example | 14 +++++++++++++- modules/alice.py | 6 +++++- modules/anim.py | 6 +++++- modules/csv.py | 5 +++++ modules/eushully.py | 6 +++++- modules/images.py | 5 +++++ modules/irissoft.py | 6 +++++- modules/javascript.py | 6 +++++- modules/json.py | 6 +++++- modules/kansen.py | 6 +++++- modules/kirikiri.py | 6 +++++- modules/lune.py | 5 +++++ modules/nscript.py | 5 +++++ modules/regex.py | 5 +++++ modules/renpy.py | 5 +++++ modules/rpgmakerace.py | 5 +++++ modules/rpgmakermvmz.py | 5 +++++ modules/rpgmakerplugin.py | 6 +++++- modules/text.py | 6 +++++- modules/tyrano.py | 6 +++++- modules/unity.py | 6 +++++- modules/wolf.py | 5 +++++ modules/wolf2.py | 6 +++++- 23 files changed, 123 insertions(+), 14 deletions(-) diff --git a/.env.example b/.env.example index a29038e..43ebec3 100644 --- a/.env.example +++ b/.env.example @@ -30,4 +30,16 @@ width="60" listWidth="100" #The wordwap of items and help text -noteWidth="75" \ No newline at end of file +noteWidth="75" + +# Custom input API cost - default value for gpt-3.5, replace with your actual input API cost - depends on the model, see https://openai.com/pricing +input_cost= 0.002 + +# Custom output API cost - default value for gpt-3.5, replace with your actual input API cost - depends on the model, see https://openai.com/pricing +output_cost= 0.002 + +# Batch size - adjust according to your API's limitations +batchsize="10" + +# Frequency penalty - adjust according to your needs +frequency_penalty= 0.2 \ No newline at end of file diff --git a/modules/alice.py b/modules/alice.py index 5b04924..cf2c4ef 100644 --- a/modules/alice.py +++ b/modules/alice.py @@ -57,7 +57,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.01 OUTPUTAPICOST = 0.03 BATCHSIZE = 1 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleAlice(filename, estimate): global ESTIMATE diff --git a/modules/anim.py b/modules/anim.py index 2a0f646..971c5de 100644 --- a/modules/anim.py +++ b/modules/anim.py @@ -58,7 +58,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.01 OUTPUTAPICOST = 0.03 BATCHSIZE = 50 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleAnim(filename, estimate): global ESTIMATE diff --git a/modules/csv.py b/modules/csv.py index 2d25146..3287b25 100644 --- a/modules/csv.py +++ b/modules/csv.py @@ -57,6 +57,11 @@ elif "gpt-4" in MODEL: OUTPUTAPICOST = 0.01 BATCHSIZE = 20 FREQUENCY_PENALTY = 0.1 +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) # tqdm Globals BAR_FORMAT = "{l_bar}{bar:10}{r_bar}{bar:-10b}" diff --git a/modules/eushully.py b/modules/eushully.py index 14ce3c1..711d892 100644 --- a/modules/eushully.py +++ b/modules/eushully.py @@ -58,7 +58,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 40 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleEushully(filename, estimate): global ESTIMATE diff --git a/modules/images.py b/modules/images.py index 6ea1d44..987a6b0 100644 --- a/modules/images.py +++ b/modules/images.py @@ -52,6 +52,11 @@ elif "gpt-4" in MODEL: OUTPUTAPICOST = 0.01 BATCHSIZE = 20 FREQUENCY_PENALTY = 0.1 +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) # tqdm Globals BAR_FORMAT = "{l_bar}{bar:10}{r_bar}{bar:-10b}" diff --git a/modules/irissoft.py b/modules/irissoft.py index 8f5b8fc..282c9ab 100644 --- a/modules/irissoft.py +++ b/modules/irissoft.py @@ -57,7 +57,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 40 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleIris(filename, estimate): global ESTIMATE diff --git a/modules/javascript.py b/modules/javascript.py index c4cb3d9..ed3e609 100644 --- a/modules/javascript.py +++ b/modules/javascript.py @@ -57,7 +57,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 40 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleJavascript(filename, estimate): global ESTIMATE diff --git a/modules/json.py b/modules/json.py index fc44b09..3bbbc35 100644 --- a/modules/json.py +++ b/modules/json.py @@ -58,7 +58,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.01 OUTPUTAPICOST = 0.03 BATCHSIZE = 50 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleJSON(filename, estimate): global ESTIMATE, totalTokens diff --git a/modules/kansen.py b/modules/kansen.py index 3f027dd..7945e22 100644 --- a/modules/kansen.py +++ b/modules/kansen.py @@ -57,7 +57,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.01 OUTPUTAPICOST = 0.03 BATCHSIZE = 10 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleKansen(filename, estimate): global ESTIMATE diff --git a/modules/kirikiri.py b/modules/kirikiri.py index 0f18a02..7c7ff59 100644 --- a/modules/kirikiri.py +++ b/modules/kirikiri.py @@ -65,7 +65,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 40 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleKirikiri(filename, estimate): global ESTIMATE, FILENAME diff --git a/modules/lune.py b/modules/lune.py index 140bbee..8b1fcda 100644 --- a/modules/lune.py +++ b/modules/lune.py @@ -60,6 +60,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.01 OUTPUTAPICOST = 0.03 BATCHSIZE = 50 +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleLune(filename, estimate): diff --git a/modules/nscript.py b/modules/nscript.py index fef80e4..6bc7720 100644 --- a/modules/nscript.py +++ b/modules/nscript.py @@ -66,6 +66,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 40 +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleOnscripter(filename, estimate): diff --git a/modules/regex.py b/modules/regex.py index 780e486..954942e 100644 --- a/modules/regex.py +++ b/modules/regex.py @@ -60,6 +60,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 20 +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleRegex(filename, estimate): diff --git a/modules/renpy.py b/modules/renpy.py index 699a8c4..6fab545 100644 --- a/modules/renpy.py +++ b/modules/renpy.py @@ -60,6 +60,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 40 +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleRenpy(filename, estimate): diff --git a/modules/rpgmakerace.py b/modules/rpgmakerace.py index d566f93..897986d 100644 --- a/modules/rpgmakerace.py +++ b/modules/rpgmakerace.py @@ -62,6 +62,11 @@ elif "gpt-4" in MODEL: OUTPUTAPICOST = 0.01 BATCHSIZE = 20 FREQUENCY_PENALTY = 0.1 +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) # tqdm Globals BAR_FORMAT = "{l_bar}{bar:10}{r_bar}{bar:-10b}" diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index 426d154..f6ee29f 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -59,6 +59,11 @@ elif "gpt-4" in MODEL: OUTPUTAPICOST = 0.01 BATCHSIZE = 30 FREQUENCY_PENALTY = 0.1 +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) # tqdm Globals BAR_FORMAT = "{l_bar}{bar:10}{r_bar}{bar:-10b}" diff --git a/modules/rpgmakerplugin.py b/modules/rpgmakerplugin.py index 7ac94c5..b22aef9 100644 --- a/modules/rpgmakerplugin.py +++ b/modules/rpgmakerplugin.py @@ -59,7 +59,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 40 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handlePlugin(filename, estimate): global ESTIMATE, PBAR diff --git a/modules/text.py b/modules/text.py index af710df..3654b97 100644 --- a/modules/text.py +++ b/modules/text.py @@ -60,7 +60,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 30 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleText(filename, estimate): global ESTIMATE, TOKENS, FILENAME diff --git a/modules/tyrano.py b/modules/tyrano.py index 7e9ff55..b653e9c 100644 --- a/modules/tyrano.py +++ b/modules/tyrano.py @@ -60,7 +60,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 20 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleTyrano(filename, estimate): global ESTIMATE, TOKENS, FILENAME diff --git a/modules/unity.py b/modules/unity.py index 5971534..ed96e1b 100644 --- a/modules/unity.py +++ b/modules/unity.py @@ -66,7 +66,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 40 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleUnity(filename, estimate): global ESTIMATE, FILENAME diff --git a/modules/wolf.py b/modules/wolf.py index 2bd99e7..7fd7efd 100644 --- a/modules/wolf.py +++ b/modules/wolf.py @@ -59,6 +59,11 @@ elif "gpt-4" in MODEL: OUTPUTAPICOST = 0.01 BATCHSIZE = 20 FREQUENCY_PENALTY = 0.1 +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) # tqdm Globals BAR_FORMAT = "{l_bar}{bar:10}{r_bar}{bar:-10b}" diff --git a/modules/wolf2.py b/modules/wolf2.py index 114870d..f01c74d 100644 --- a/modules/wolf2.py +++ b/modules/wolf2.py @@ -58,7 +58,11 @@ elif "gpt-4" in MODEL: INPUTAPICOST = 0.0025 OUTPUTAPICOST = 0.01 BATCHSIZE = 40 - +else: + INPUTAPICOST = float(os.getenv("input_cost")) + OUTPUTAPICOST = float(os.getenv("output_cost")) + BATCHSIZE = int(os.getenv("batchsize")) + FREQUENCY_PENALTY = float(os.getenv("frequency_penalty")) def handleWOLF2(filename, estimate): global ESTIMATE