From f50f5b530a6f09a744e315d29c410bb9f1309917 Mon Sep 17 00:00:00 2001 From: Henk Date: Thu, 16 Feb 2023 02:48:20 +0100 Subject: [PATCH 1/2] Move OAI to User Settings --- koboldai_settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/koboldai_settings.py b/koboldai_settings.py index 4bb758d1..77ef2eb0 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -669,8 +669,6 @@ class model_settings(settings): self.tqdm_progress = 0 # TQDP progress self.tqdm_rem_time = 0 # tqdm calculated reemaining time self.url = "https://api.inferkit.com/v1/models/standard/generate" # InferKit API URL - self.oaiurl = "" # OpenAI API URL - self.oaiengines = "https://api.openai.com/v1/engines" self.colaburl = "" # Ngrok url for Google Colab mode self.apikey = "" # API key to use for InferKit API calls self.oaiapikey = "" # API key to use for OpenAI API calls @@ -1176,6 +1174,8 @@ class user_settings(settings): self.screenshot_show_author_name = True self.screenshot_author_name = "Anonymous" self.screenshot_use_boring_colors = False + self.oaiurl = "" # OpenAI API URL + self.oaiengines = "https://api.openai.com/v1/engines" def __setattr__(self, name, value): From e905f2db2d9c9c42f8a2241b7dc26eb92f02e167 Mon Sep 17 00:00:00 2001 From: Henk Date: Thu, 16 Feb 2023 02:50:52 +0100 Subject: [PATCH 2/2] More API stuff to User --- koboldai_settings.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/koboldai_settings.py b/koboldai_settings.py index 77ef2eb0..674e00ae 100644 --- a/koboldai_settings.py +++ b/koboldai_settings.py @@ -668,10 +668,6 @@ class model_settings(settings): self._tqdm = tqdm.tqdm(total=self.genamt, file=self.ignore_tqdm()) # tqdm agent for generating tokens. This will allow us to calculate the remaining time self.tqdm_progress = 0 # TQDP progress self.tqdm_rem_time = 0 # tqdm calculated reemaining time - self.url = "https://api.inferkit.com/v1/models/standard/generate" # InferKit API URL - self.colaburl = "" # Ngrok url for Google Colab mode - self.apikey = "" # API key to use for InferKit API calls - self.oaiapikey = "" # API key to use for OpenAI API calls self.configname = None self.online_model = '' self.welcome_default = """ @@ -1176,7 +1172,10 @@ class user_settings(settings): self.screenshot_use_boring_colors = False self.oaiurl = "" # OpenAI API URL self.oaiengines = "https://api.openai.com/v1/engines" - + self.url = "https://api.inferkit.com/v1/models/standard/generate" # InferKit API URL + self.colaburl = "" # Ngrok url for Google Colab mode + self.apikey = "" # API key to use for InferKit API calls + self.oaiapikey = "" # API key to use for OpenAI API calls def __setattr__(self, name, value): new_variable = name not in self.__dict__