From a1ee6849dc1d98c287561d5bdb6aff225c0322a5 Mon Sep 17 00:00:00 2001 From: ebolam Date: Fri, 19 May 2023 18:28:47 -0400 Subject: [PATCH] Custom Paths from Menu structure fixed --- aiserver.py | 3 ++- modeling/inference_models/gooseai/class.py | 2 +- modeling/inference_models/openai/class.py | 2 +- modeling/inference_models/openai_gooseai.py | 5 ----- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/aiserver.py b/aiserver.py index 14d268be..d4a127f0 100644 --- a/aiserver.py +++ b/aiserver.py @@ -6152,7 +6152,8 @@ def UI_2_select_model(data): #Here we have a model that's not in our menu structure (either a custom model or a custom path #so we'll just go through all the possible loaders for model_backend in model_backends: - valid_loaders[model_backend] = model_backends[model_backend].get_requested_parameters(data["name"], data["path"] if 'path' in data else None, data["menu"]) + if model_backends[model_backend].is_valid(data["name"], data["path"] if 'path' in data else None, data["menu"]): + valid_loaders[model_backend] = model_backends[model_backend].get_requested_parameters(data["name"], data["path"] if 'path' in data else None, data["menu"]) emit("selected_model_info", {"model_backends": valid_loaders}) else: #Get directories diff --git a/modeling/inference_models/gooseai/class.py b/modeling/inference_models/gooseai/class.py index 1073f45f..934f15dd 100644 --- a/modeling/inference_models/gooseai/class.py +++ b/modeling/inference_models/gooseai/class.py @@ -19,7 +19,6 @@ model_backend_name = "GooseAI" class OpenAIAPIError(Exception): def __init__(self, error_type: str, error_message) -> None: super().__init__(f"{error_type}: {error_message}") - self.source = "GooseAI" class model_backend(openai_gooseai_model_backend): @@ -28,6 +27,7 @@ class model_backend(openai_gooseai_model_backend): def __init__(self): super().__init__() self.url = "https://api.goose.ai/v1/engines" + self.source = "GooseAI" def is_valid(self, model_name, model_path, menu_path): return model_name == "GooseAI" \ No newline at end of file diff --git a/modeling/inference_models/openai/class.py b/modeling/inference_models/openai/class.py index 492a3fdb..cea644ea 100644 --- a/modeling/inference_models/openai/class.py +++ b/modeling/inference_models/openai/class.py @@ -19,7 +19,6 @@ model_backend_name = "OpenAI" class OpenAIAPIError(Exception): def __init__(self, error_type: str, error_message) -> None: super().__init__(f"{error_type}: {error_message}") - self.source = "OpenAI" class model_backend(openai_gooseai_model_backend): @@ -28,6 +27,7 @@ class model_backend(openai_gooseai_model_backend): def __init__(self): super().__init__() self.url = "https://api.openai.com/v1/engines" + self.source = "OpenAI" def is_valid(self, model_name, model_path, menu_path): return model_name == "OAI" \ No newline at end of file diff --git a/modeling/inference_models/openai_gooseai.py b/modeling/inference_models/openai_gooseai.py index e4a027db..e4b9dfb8 100644 --- a/modeling/inference_models/openai_gooseai.py +++ b/modeling/inference_models/openai_gooseai.py @@ -31,11 +31,6 @@ class model_backend(InferenceModel): return model_name == "OAI" or model_name == "GooseAI" def get_requested_parameters(self, model_name, model_path, menu_path): - try: - print(self.source) - except: - print(vars(self)) - raise if os.path.exists("settings/{}.model_backend.settings".format(self.source)) and 'colaburl' not in vars(self): with open("settings/{}.model_backend.settings".format(self.source), "r") as f: self.key = json.load(f)['key']