vrr/koboldcpp
2
0
Fork 0
mirror of https://github.com/LostRuins/koboldcpp.git synced 2025-09-11 09:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

disable showgui if skiplauncher is used

Browse source
This commit is contained in:
Concedo 2025-05-18 01:42:14 +08:00
parent ca4274e384
commit c546cb638e
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
koboldcpp.py
View file

@ -5019,7 +5019,7 @@ def show_gui():
def import_vars(dict): def import_vars(dict):
global importvars_in_progress global importvars_in_progress
importvars_in_progress = True importvars_in_progress = True
dict = convert_outdated_args(dict) dict = convert_invalid_args(dict)
if "threads" in dict: if "threads" in dict:
threads_var.set(dict["threads"]) threads_var.set(dict["threads"])
@ -5517,7 +5517,7 @@ def run_horde_worker(args, api_key, worker_name):
time.sleep(3) time.sleep(3)
sys.exit(2) sys.exit(2)
def convert_outdated_args(args): def convert_invalid_args(args):
dict = args dict = args
if isinstance(args, argparse.Namespace): if isinstance(args, argparse.Namespace):
dict = vars(args) dict = vars(args)
@ -5542,6 +5542,8 @@ def convert_outdated_args(args):
dict["usecpu"] = True dict["usecpu"] = True
if "failsafe" in dict and dict["failsafe"]: #failsafe implies noavx2 if "failsafe" in dict and dict["failsafe"]: #failsafe implies noavx2
dict["noavx2"] = True dict["noavx2"] = True
if "skiplauncher" in dict and dict["skiplauncher"]:
dict["showgui"] = False
if ("model_param" not in dict or not dict["model_param"]) and ("model" in dict): if ("model_param" not in dict or not dict["model_param"]) and ("model" in dict):
model_value = dict["model"] #may be null, empty/non-empty string, empty/non empty array model_value = dict["model"] #may be null, empty/non-empty string, empty/non empty array
if isinstance(model_value, str) and model_value: # Non-empty string if isinstance(model_value, str) and model_value: # Non-empty string
@ -5870,7 +5872,7 @@ def main(launch_args, default_args):
if (args.nomodel or args.benchmark or args.launch or args.admin) and args.cli: if (args.nomodel or args.benchmark or args.launch or args.admin) and args.cli:
exit_with_error(1, "Error: --cli cannot be combined with --launch, --nomodel, --admin or --benchmark") exit_with_error(1, "Error: --cli cannot be combined with --launch, --nomodel, --admin or --benchmark")
args = convert_outdated_args(args) args = convert_invalid_args(args)
temp_hide_print = (args.model_param and (args.prompt and not args.cli) and not args.benchmark and not (args.debugmode >= 1)) temp_hide_print = (args.model_param and (args.prompt and not args.cli) and not args.benchmark and not (args.debugmode >= 1))
@ -5915,7 +5917,7 @@ def main(launch_args, default_args):
else: else:
exitcounter = 999 exitcounter = 999
exit_with_error(2,"Specified kcpp config file invalid or not found.") exit_with_error(2,"Specified kcpp config file invalid or not found.")
args = convert_outdated_args(args) args = convert_invalid_args(args)
#positional handling for kcpps files (drag and drop) #positional handling for kcpps files (drag and drop)
if args.model_param and args.model_param!="" and (args.model_param.lower().endswith('.kcpps') or args.model_param.lower().endswith('.kcppt') or args.model_param.lower().endswith('.kcpps?download=true') or args.model_param.lower().endswith('.kcppt?download=true')): if args.model_param and args.model_param!="" and (args.model_param.lower().endswith('.kcpps') or args.model_param.lower().endswith('.kcppt') or args.model_param.lower().endswith('.kcpps?download=true') or args.model_param.lower().endswith('.kcppt?download=true')):
@ -6829,7 +6831,7 @@ if __name__ == '__main__':
advparser.add_argument("--overridetensors", metavar=('[tensor name pattern=buffer type]'), help="Advanced option to override tensor backend selection, same as in llama.cpp.", default="") advparser.add_argument("--overridetensors", metavar=('[tensor name pattern=buffer type]'), help="Advanced option to override tensor backend selection, same as in llama.cpp.", default="")
compatgroup2 = parser.add_mutually_exclusive_group() compatgroup2 = parser.add_mutually_exclusive_group()
compatgroup2.add_argument("--showgui", help="Always show the GUI instead of launching the model right away when loading settings from a .kcpps file.", action='store_true') compatgroup2.add_argument("--showgui", help="Always show the GUI instead of launching the model right away when loading settings from a .kcpps file.", action='store_true')
compatgroup2.add_argument("--skiplauncher", help="Doesn't display or use the GUI launcher.", action='store_true') compatgroup2.add_argument("--skiplauncher", help="Doesn't display or use the GUI launcher. Overrides showgui.", action='store_true')
hordeparsergroup = parser.add_argument_group('Horde Worker Commands') hordeparsergroup = parser.add_argument_group('Horde Worker Commands')
hordeparsergroup.add_argument("--hordemodelname", metavar=('[name]'), help="Sets your AI Horde display model name.", default="") hordeparsergroup.add_argument("--hordemodelname", metavar=('[name]'), help="Sets your AI Horde display model name.", default="")