From 77dd5aa7259f65262f6077957b493c74d98eaa24 Mon Sep 17 00:00:00 2001
From: ebolam <ebolam@gmail.com>
Date: Thu, 11 May 2023 09:09:09 -0400
Subject: [PATCH] Minor update

---
 aiserver.py                        | 7 +++++--
 modeling/inference_models/horde.py | 2 +-
 static/koboldai.js                 | 4 +++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/aiserver.py b/aiserver.py
index e7227c81..ac90d6f4 100644
--- a/aiserver.py
+++ b/aiserver.py
@@ -6489,7 +6489,7 @@ def UI_2_select_model(data):
             if valid:
                 logger.debug("Valid Loaders: {}".format(valid_loaders))
                 emit("selected_model_info", valid_loaders)
-        if not valid:
+        if not valid and 'path' in data:
             #Get directories
             paths, breadcrumbs = get_folder_path_info(data['path'])
             output = []
@@ -6501,7 +6501,9 @@ def UI_2_select_model(data):
                         break
                 output.append({'label': path[1], 'name': path[0], 'size': "", "menu": "Custom", 'path': path[0], 'isMenu': not valid})
             emit("open_model_load_menu", {"items": output+[{'label': 'Return to Main Menu', 'name':'mainmenu', 'size': "", "menu": "Custom", 'isMenu': True}], 'breadcrumbs': breadcrumbs})
-    
+        elif not valid:
+            logger.error("Nothing can load the model: {}".format(valid_loaders))
+            
     return
     
     
@@ -6530,6 +6532,7 @@ def UI_2_select_model(data):
 def UI_2_load_model(data):
     logger.info("loading Model")
     logger.info(data)
+    model_loaders[data['plugin']].set_input_parameters(**data)
     #load_model(use_gpu=data['use_gpu'], gpu_layers=data['gpu_layers'], disk_layers=data['disk_layers'], online_model=data['online_model'], url=koboldai_vars.colaburl, use_8_bit=data['use_8_bit'])
 
 #==================================================================#
diff --git a/modeling/inference_models/horde.py b/modeling/inference_models/horde.py
index 56e88205..f02cf265 100644
--- a/modeling/inference_models/horde.py
+++ b/modeling/inference_models/horde.py
@@ -67,7 +67,7 @@ class model_loader(InferenceModel):
                                         "unit": "text",
                                         "label": "Model",
                                         "id": "model",
-                                        "default": "",
+                                        "default": model_name,
                                         "check": {"value": "", 'check': "!="},
                                         "tooltip": "Which model to use when running OpenAI/GooseAI.",
                                         "menu_path": "",
diff --git a/static/koboldai.js b/static/koboldai.js
index 0656253f..1907add8 100644
--- a/static/koboldai.js
+++ b/static/koboldai.js
@@ -1882,7 +1882,9 @@ function load_model() {
 	for (const element of settings_area.querySelectorAll(".model_settings_input:not(.hidden)")) {
 		data[element.id.split("|")[1].replace("_value", "")] = element.value;
 	}
-	data = {...data, ...selected_model_data}
+	data = {...data, ...selected_model_data};
+	
+	data['plugin'] = document.getElementById("modelplugin").value;
 	
 	socket.emit("load_model", data);
 	closePopups();