mirror of
https://github.com/KoboldAI/KoboldAI-Client.git
synced 2025-02-17 12:10:49 +01:00
Universal Model Settings
No longer depends on a local config file enabling the configuration to work in --colab mode.
This commit is contained in:
parent
c25e2a33f1
commit
9532b56cb8
@ -2259,9 +2259,8 @@ def loadsettings():
|
||||
# Allow the models to override some settings
|
||||
#==================================================================#
|
||||
def loadmodelsettings():
|
||||
if(path.exists(vars.custmodpth.replace('/', '_') + "/config.json")):
|
||||
model_config = open(vars.custmodpth.replace('/', '_') + "/config.json", "r")
|
||||
js = json.load(model_config)
|
||||
model_js_config = str(model_config).partition(' ')[2]
|
||||
js = json.loads(model_js_config)
|
||||
if("badwordsids" in js):
|
||||
vars.badwordsids = js["badwordsids"]
|
||||
if("temp" in js):
|
||||
@ -2286,7 +2285,6 @@ def loadmodelsettings():
|
||||
vars.setauthornotetemplate = js["antemplate"]
|
||||
if(not vars.gamestarted):
|
||||
vars.authornotetemplate = vars.setauthornotetemplate
|
||||
model_config.close()
|
||||
|
||||
#==================================================================#
|
||||
# Don't save settings unless 2 seconds have passed without modification
|
||||
@ -4552,7 +4550,8 @@ def randomGameRequest(topic, memory=""):
|
||||
actionsubmit("", force_submit=True, force_prompt_gen=True)
|
||||
vars.memory = memory
|
||||
|
||||
# Load settings from client.settings
|
||||
# Load desired settings from both the model and the users config file
|
||||
if(not vars.model in ["InferKit", "Colab", "OAI", "ReadOnly", "TPUMeshTransformerGPTJ"]):
|
||||
loadmodelsettings()
|
||||
loadsettings()
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user