rixty
/
KoboldAI-Client
mirror of https://github.com/KoboldAI/KoboldAI-Client.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge artifacts

This commit is contained in:
Henk 2022-09-06 01:54:18 +02:00
parent 8ed731daff
commit cf3f38b90d
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aiserver.py
View File

@ -2131,7 +2131,7 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
if changed: if changed:
with open(get_config_filename(), "w") as file: with open(get_config_filename(), "w") as file:
file.write(json.dumps(js, indent=3)) file.write(json.dumps(js, indent=3))
<<<<<<< HEAD
# Swap OAI Server if GooseAI was selected # Swap OAI Server if GooseAI was selected
if(vars.model == "GooseAI"): if(vars.model == "GooseAI"):
vars.oaiengines = "https://api.goose.ai/v1/engines" vars.oaiengines = "https://api.goose.ai/v1/engines"
@ -2139,8 +2139,6 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
args.configname = "GooseAI" + "/" + online_model args.configname = "GooseAI" + "/" + online_model
elif vars.model != "CLUSTER": elif vars.model != "CLUSTER":
args.configname = vars.model + "/" + online_model args.configname = vars.model + "/" + online_model
=======
>>>>>>> 296481f4aae46ce3d665537744460f1d3c0947a2
vars.oaiurl = vars.oaiengines + "/{0}/completions".format(online_model) vars.oaiurl = vars.oaiengines + "/{0}/completions".format(online_model)