Merge pull request #16 from m5kro/Other-API-fix

Fix Custom API option and .env check in main

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')
 

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')
 

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')
 

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')
 

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')
 

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')
 

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')
 

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')
 

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!')

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')
 

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')
 

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')
 

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")
 

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')
 

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')
 

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')