From 2b53f08ec1eee3d7e39eb9e600edc8dd022c085d Mon Sep 17 00:00:00 2001 From: m5kro Date: Fri, 12 Apr 2024 10:52:55 -0700 Subject: [PATCH 1/2] Migrate to new base url variable --- modules/alice.py | 2 +- modules/anim.py | 2 +- modules/atelier.py | 2 +- modules/csv.py | 2 +- modules/javascript.py | 2 +- modules/json.py | 2 +- modules/kansen.py | 2 +- modules/lune.py | 2 +- modules/nscript.py | 2 +- modules/rpgmakerace.py | 2 +- modules/rpgmakermvmz.py | 2 +- modules/sakuranbo.py | 2 +- modules/tyrano.py | 2 +- modules/wolf.py | 2 +- modules/wolf2.py | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/alice.py b/modules/alice.py index edaf580..74bbf87 100644 --- a/modules/alice.py +++ b/modules/alice.py @@ -9,7 +9,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/anim.py b/modules/anim.py index 82c947b..8d8605d 100644 --- a/modules/anim.py +++ b/modules/anim.py @@ -9,7 +9,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/atelier.py b/modules/atelier.py index c52af84..30daf1b 100644 --- a/modules/atelier.py +++ b/modules/atelier.py @@ -15,7 +15,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/csv.py b/modules/csv.py index 6881fd6..b5e8b6c 100644 --- a/modules/csv.py +++ b/modules/csv.py @@ -10,7 +10,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/javascript.py b/modules/javascript.py index d2c799c..a708012 100644 --- a/modules/javascript.py +++ b/modules/javascript.py @@ -9,7 +9,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/json.py b/modules/json.py index 89b8898..717871b 100644 --- a/modules/json.py +++ b/modules/json.py @@ -9,7 +9,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/kansen.py b/modules/kansen.py index 98f31cf..7be7846 100644 --- a/modules/kansen.py +++ b/modules/kansen.py @@ -9,7 +9,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/lune.py b/modules/lune.py index 7fb6973..b7b6661 100644 --- a/modules/lune.py +++ b/modules/lune.py @@ -9,7 +9,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/nscript.py b/modules/nscript.py index 9430cf5..57b5208 100644 --- a/modules/nscript.py +++ b/modules/nscript.py @@ -9,7 +9,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/rpgmakerace.py b/modules/rpgmakerace.py index 79e5161..07f07b3 100644 --- a/modules/rpgmakerace.py +++ b/modules/rpgmakerace.py @@ -12,7 +12,7 @@ from ruamel.yaml import YAML # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/rpgmakermvmz.py b/modules/rpgmakermvmz.py index 7edd482..1d33794 100644 --- a/modules/rpgmakermvmz.py +++ b/modules/rpgmakermvmz.py @@ -10,7 +10,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/sakuranbo.py b/modules/sakuranbo.py index 99bb285..5ea2a22 100644 --- a/modules/sakuranbo.py +++ b/modules/sakuranbo.py @@ -16,7 +16,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv("api").replace(" ", "") != "": - openai.api_base = os.getenv("api") + openai.base_url = os.getenv('api') openai.organization = os.getenv("org") openai.api_key = os.getenv("key") diff --git a/modules/tyrano.py b/modules/tyrano.py index 74a67dc..988bcdf 100644 --- a/modules/tyrano.py +++ b/modules/tyrano.py @@ -9,7 +9,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/wolf.py b/modules/wolf.py index 2ad5518..cdc8777 100644 --- a/modules/wolf.py +++ b/modules/wolf.py @@ -10,7 +10,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') diff --git a/modules/wolf2.py b/modules/wolf2.py index 8ad5ad5..9989b82 100644 --- a/modules/wolf2.py +++ b/modules/wolf2.py @@ -9,7 +9,7 @@ from tqdm import tqdm # Open AI load_dotenv() if os.getenv('api').replace(' ', '') != '': - openai.api_base = os.getenv('api') + openai.base_url = os.getenv('api') openai.organization = os.getenv('org') openai.api_key = os.getenv('key') From 5e292f7eb881b33aede2423da98347fdd3ebda7d Mon Sep 17 00:00:00 2001 From: m5kro Date: Fri, 12 Apr 2024 10:54:08 -0700 Subject: [PATCH 2/2] Fix .env check --- modules/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/main.py b/modules/main.py index 3da8550..faf41bb 100644 --- a/modules/main.py +++ b/modules/main.py @@ -2,10 +2,12 @@ import sys, os, traceback from concurrent.futures import ThreadPoolExecutor, as_completed from colorama import Fore from tqdm import tqdm +from dotenv import load_dotenv # This needs to be before the module imports as some of them currently try to read and use some of these values # upon import, in which case if they are unset the script will crash before we can output these messages. envMissing = False +load_dotenv() for env in ['api','key','organization','model','language','timeout','fileThreads','threads','width','listWidth']: if os.getenv(env) is None or str(os.getenv(env))[:1] == '<': tqdm.write(Fore.RED + f'Environment variable {env} is not set!')