vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2026-04-28 03:30:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

refactor for clarity

Browse source
This commit is contained in:
Concedo 2026-04-16 10:53:35 +08:00
parent 9042f3fec8
commit 45737effd3
3 changed files with 35 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
embd_res/kcpp_docs.embd
View file

@ -2038,7 +2038,7 @@
"application/json": {
"example": {
"filename": "file1.kcpps",
"overrideconfig":"",
"baseconfig":"",
},
"schema": {
"properties": {
@ -2046,7 +2046,7 @@
"type": "string",
"description": "Filename of the .kcpps config to be loaded. Any associated files and models will be automatically swapped in."
},
"overrideconfig": {
"baseconfig": {
"type": "string",
"description": "If filename is a gguf, this allows other kcpps settings to be overlaid on top of that gguf."
},

20
embd_res/klite.embd
View file

@ -14503,16 +14503,16 @@ Current version indicated by LITEVER below.
let targetfile = document.getElementById("adminconfigdropdown").value;
if(targetfile)
{
let overridedropdown = document.getElementById("adminconfigoverridedropdown");
let basecfgdropdown = document.getElementById("adminbaseconfigdropdown");
var dropdown = document.getElementById("adminconfigdropdown");
for (var i = overridedropdown.options.length; i >= 0; i--) {
var option = overridedropdown.options[i];
overridedropdown.remove(option);
for (var i = basecfgdropdown.options.length; i >= 0; i--) {
var option = basecfgdropdown.options[i];
basecfgdropdown.remove(option);
}
var el = document.createElement("option");
el.textContent = "Base Config";
el.value = "";
overridedropdown.appendChild(el);
basecfgdropdown.appendChild(el);
for(var i=0;i<dropdown.options.length;++i)
{
let str = dropdown.options[i].value;
@ -14521,7 +14521,7 @@ Current version indicated by LITEVER below.
var el = document.createElement("option");
el.textContent = str;
el.value = str;
overridedropdown.appendChild(el);
basecfgdropdown.appendChild(el);
}
}
}
@ -14538,9 +14538,9 @@ Current version indicated by LITEVER below.
let header = {'Content-Type': 'application/json'};
let payload = {"filename": targetfile};
if(document.getElementById("adminconfigoverridedropdown").value && document.getElementById("adminconfigoverridedropdown").value!="")
if(document.getElementById("adminbaseconfigdropdown").value && document.getElementById("adminbaseconfigdropdown").value!="")
{
payload["overrideconfig"] = document.getElementById("adminconfigoverridedropdown").value;
payload["baseconfig"] = document.getElementById("adminbaseconfigdropdown").value;
}
if(last_admin_key!="")
@ -31493,11 +31493,11 @@ Current version indicated by LITEVER below.
<b class="color_white" style="padding: 5px;">Change Loaded Model / Config:</b><br>
<div class="color_white" style="padding: 5px;">
<div style="padding-top:3px">
Select New Model or Config: <select title="Select New Model or Config" style="padding:4px; width:100%" class="form-control" id="adminconfigdropdown">
Select Base Config (optional): <select title="Base Config" style="padding:4px; width:100%" class="form-control" id="adminbaseconfigdropdown">
</select>
</div>
<div style="padding-top:3px">
Select Base Config (optional): <select title="Base Config" style="padding:4px; width:100%" class="form-control" id="adminconfigoverridedropdown">
Select New Model or Config (required): <select title="Select New Model or Config" style="padding:4px; width:100%" class="form-control" id="adminconfigdropdown">
</select>
</div>
<div style="display:flex; padding: 5px; justify-content: center;">

46
koboldcpp.py
View file

@ -75,7 +75,7 @@ extra_images_max = 4 # for kontext/qwen img
KcppVersion = "1.112"
showdebug = True
kcpp_instance = None #global running instance
global_memory = {"tunnel_url": "", "restart_target":"", "input_to_exit":False, "load_complete":False, "restart_override_config_target":"", "last_active_timestamp":datetime.now(), "triggered_sleeping":False, "current_model":"initial_model", "current_override":"", "swapReqType": None, "autoswapmode": False}
global_memory = {"tunnel_url": "", "restart_target":"", "input_to_exit":False, "load_complete":False, "restart_override_base_config":"", "last_active_timestamp":datetime.now(), "triggered_sleeping":False, "current_model":"initial_model", "base_config":"", "swapReqType": None, "autoswapmode": False}
using_gui_launcher = False
handle = None
@ -4345,7 +4345,7 @@ class KcppProxyHandler(http.server.BaseHTTPRequestHandler):
if (global_memory["swapReqType"] is not None and swapModeChanged):
with proxy_reload_lock:
reqbody = json.dumps({"filename":global_memory["current_model"], "overrideconfig": global_memory["current_override"]})
reqbody = json.dumps({"filename":global_memory["current_model"], "baseconfig": global_memory["base_config"]})
reqheaders = {
'Content-Type': 'application/json',
'Content-Length': str(len(reqbody)),
@ -6008,19 +6008,19 @@ Change Mode<br>
resp = {"success": False}
if global_memory and args.admin and args.admindir and os.path.exists(args.admindir) and self.check_header_password(args.adminpassword):
targetfile = ""
overrideconfig = ""
baseconfig = ""
try:
tempbody = json.loads(body)
if isinstance(tempbody, dict):
targetfile = tempbody.get('filename', "")
overrideconfig = tempbody.get('overrideconfig', "")
baseconfig = tempbody.get('baseconfig', tempbody.get('overrideconfig', ""))
except Exception:
targetfile = ""
if targetfile and targetfile!="":
if targetfile=="unload_model" or targetfile=="initial_model": #special request to simply unload model or swap back top intial model
print("Admin: Received request to unload model")
global_memory["restart_target"] = targetfile
global_memory["restart_override_config_target"] = ""
global_memory["restart_override_base_config"] = ""
resp = {"success": True}
else:
dirpath = os.path.abspath(args.admindir)
@ -6029,12 +6029,12 @@ Change Mode<br>
targetfilepath = os.path.abspath(os.path.join(dirpath, targetfile))
if (targetfile in allowed_files and os.path.commonpath([dirpath, targetfilepath]) == dirpath and os.path.exists(targetfilepath)):
global_memory["restart_override_config_target"] = "" # Jail enforcement
if targetfile and overrideconfig:
overrideconfigfilepath = os.path.abspath(os.path.join(dirpath, overrideconfig))
if (overrideconfig in allowed_files and os.path.commonpath([dirpath, overrideconfigfilepath]) == dirpath and os.path.exists(overrideconfigfilepath)):
print(f"Admin: Override base config set to {overrideconfig}")
global_memory["restart_override_config_target"] = overrideconfig
global_memory["restart_override_base_config"] = "" # Jail enforcement
if targetfile and baseconfig:
baseconfigfilepath = os.path.abspath(os.path.join(dirpath, baseconfig))
if (baseconfig in allowed_files and os.path.commonpath([dirpath, baseconfigfilepath]) == dirpath and os.path.exists(baseconfigfilepath)):
print(f"Admin: Override base config set to {baseconfig}")
global_memory["restart_override_base_config"] = baseconfig
print(f"Admin: Received request to reload config to {targetfile}")
global_memory["restart_target"] = targetfile
resp = {"success": True}
@ -9867,7 +9867,7 @@ def main(launch_args, default_args):
input()
else: # manager command queue for admin mode
with multiprocessing.Manager() as mp_manager:
global_memory = mp_manager.dict({"tunnel_url": "", "restart_target":"", "input_to_exit":False, "load_complete":False, "restart_override_config_target":"", "last_active_timestamp":datetime.now(), "triggered_sleeping":False, "current_model":"initial_model", "current_override":"", "swapReqType": None, "autoswapmode": False})
global_memory = mp_manager.dict({"tunnel_url": "", "restart_target":"", "input_to_exit":False, "load_complete":False, "restart_override_base_config":"", "last_active_timestamp":datetime.now(), "triggered_sleeping":False, "current_model":"initial_model", "base_config":"", "swapReqType": None, "autoswapmode": False})
if args.remotetunnel and not args.prompt and not args.benchmark and not args.cli:
setuptunnel(global_memory, True if args.sdmodel else False)
@ -9884,7 +9884,7 @@ def main(launch_args, default_args):
while True: # keep the manager alive
try:
restart_target = ""
restart_override_config_target = ""
restart_override_base_config = ""
if not kcpp_instance or not kcpp_instance.is_alive():
if fault_recovery_mode:
#attempt to recover
@ -9899,7 +9899,7 @@ def main(launch_args, default_args):
kcpp_instance.daemon = True
kcpp_instance.start()
global_memory["restart_target"] = ""
global_memory["restart_override_config_target"] = ""
global_memory["restart_override_base_config"] = ""
global_memory["swapReqType"] = None
time.sleep(3)
else:
@ -9907,7 +9907,7 @@ def main(launch_args, default_args):
if fault_recovery_mode and global_memory["load_complete"]:
fault_recovery_mode = False
restart_target = global_memory["restart_target"]
restart_override_config_target = global_memory["restart_override_config_target"]
restart_override_base_config = global_memory["restart_override_base_config"]
last_active = global_memory["last_active_timestamp"]
if last_active and args.adminunloadtimeout>0:
curtime = datetime.now()
@ -9924,15 +9924,15 @@ def main(launch_args, default_args):
restart_target = "unload_model"
global_memory["triggered_sleeping"] = True
if restart_target!="":
overridetxt = ("" if not restart_override_config_target else f" with override config {restart_override_config_target}")
overridetxt = ("" if not restart_override_base_config else f" with override config {restart_override_base_config}")
print(f"Reloading new model/config: {restart_target}{overridetxt}")
global_memory["restart_target"] = ""
global_memory["restart_override_config_target"] = ""
global_memory["restart_override_base_config"] = ""
time.sleep(0.5) #sleep for 0.5s then restart
if args.admin and args.admindir:
dirpath = os.path.abspath(args.admindir)
targetfilepath = os.path.abspath(os.path.join(dirpath, restart_target))
targetfilepath2 = os.path.abspath(os.path.join(dirpath, restart_override_config_target)) if restart_override_config_target else ""
targetfilepath2 = os.path.abspath(os.path.join(dirpath, restart_override_base_config)) if restart_override_base_config else ""
if os.path.commonpath([dirpath, targetfilepath]) != dirpath: # Enforce admindir jail
print("Security: Invalid restart target path.")
continue
@ -9940,7 +9940,7 @@ def main(launch_args, default_args):
print("Security: Invalid override config path.")
continue
defaultargs = vars(default_args)
if (os.path.exists(targetfilepath) or restart_target=="unload_model" or restart_target=="initial_model") and (restart_override_config_target=="" or os.path.exists(targetfilepath2)):
if (os.path.exists(targetfilepath) or restart_target=="unload_model" or restart_target=="initial_model") and (restart_override_base_config=="" or os.path.exists(targetfilepath2)):
print("Terminating old process...")
global_memory["load_complete"] = False
kcpp_instance.terminate()
@ -9984,11 +9984,11 @@ def main(launch_args, default_args):
kcpp_instance.daemon = True
kcpp_instance.start()
global_memory["restart_target"] = ""
if (restart_override_config_target and restart_override_config_target!=""):
global_memory["current_override"] = restart_override_config_target
if (restart_override_base_config and restart_override_base_config!=""):
global_memory["base_config"] = restart_override_base_config
else:
global_memory["current_override"] = ""
global_memory["restart_override_config_target"] = ""
global_memory["base_config"] = ""
global_memory["restart_override_base_config"] = ""
global_memory["current_model"] = restart_target
time.sleep(3)
else: