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

Merge pull request #81 from VE-FORBRYDERNE/patch 

Replace slashes in model name with underscores
This commit is contained in:
henk717 2021-11-18 06:51:21 +01:00 committed by GitHub
parent 7b47a8457a 98a72e34a4
commit 9b73d6a913
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
aiserver.py
View File

@ -272,13 +272,13 @@ if(not vars.model in ["InferKit", "Colab", "OAI", "ReadOnly"]):
# Ask for API key if InferKit was selected # Ask for API key if InferKit was selected
if(vars.model == "InferKit"): if(vars.model == "InferKit"):
if(not path.exists("settings/" + getmodelname() + ".settings")): if(not path.exists("settings/" + getmodelname().replace('/', '_') + ".settings")):
# If the client settings file doesn't exist, create it # If the client settings file doesn't exist, create it
print("{0}Please enter your InferKit API key:{1}\n".format(colors.CYAN, colors.END)) print("{0}Please enter your InferKit API key:{1}\n".format(colors.CYAN, colors.END))
vars.apikey = input("Key> ") vars.apikey = input("Key> ")
# Write API key to file # Write API key to file
os.makedirs('settings', exist_ok=True) os.makedirs('settings', exist_ok=True)
file = open("settings/" + getmodelname() + ".settings", "w") file = open("settings/" + getmodelname().replace('/', '_') + ".settings", "w")
try: try:
js = {"apikey": vars.apikey} js = {"apikey": vars.apikey}
file.write(json.dumps(js, indent=3)) file.write(json.dumps(js, indent=3))
@ -286,7 +286,7 @@ if(vars.model == "InferKit"):
file.close() file.close()
else: else:
# Otherwise open it up # Otherwise open it up
file = open("settings/" + getmodelname() + ".settings", "r") file = open("settings/" + getmodelname().replace('/', '_') + ".settings", "r")
# Check if API key exists # Check if API key exists
js = json.load(file) js = json.load(file)
if("apikey" in js and js["apikey"] != ""): if("apikey" in js and js["apikey"] != ""):
@ -299,7 +299,7 @@ if(vars.model == "InferKit"):
vars.apikey = input("Key> ") vars.apikey = input("Key> ")
js["apikey"] = vars.apikey js["apikey"] = vars.apikey
# Write API key to file # Write API key to file
file = open("settings/" + getmodelname() + ".settings", "w") file = open("settings/" + getmodelname().replace('/', '_') + ".settings", "w")
try: try:
file.write(json.dumps(js, indent=3)) file.write(json.dumps(js, indent=3))
finally: finally:
@ -307,13 +307,13 @@ if(vars.model == "InferKit"):
# Ask for API key if OpenAI was selected # Ask for API key if OpenAI was selected
if(vars.model == "OAI"): if(vars.model == "OAI"):
if(not path.exists("settings/" + getmodelname() + ".settings")): if(not path.exists("settings/" + getmodelname().replace('/', '_') + ".settings")):
# If the client settings file doesn't exist, create it # If the client settings file doesn't exist, create it
print("{0}Please enter your OpenAI API key:{1}\n".format(colors.CYAN, colors.END)) print("{0}Please enter your OpenAI API key:{1}\n".format(colors.CYAN, colors.END))
vars.oaiapikey = input("Key> ") vars.oaiapikey = input("Key> ")
# Write API key to file # Write API key to file
os.makedirs('settings', exist_ok=True) os.makedirs('settings', exist_ok=True)
file = open("settings/" + getmodelname() + ".settings", "w") file = open("settings/" + getmodelname().replace('/', '_') + ".settings", "w")
try: try:
js = {"oaiapikey": vars.oaiapikey} js = {"oaiapikey": vars.oaiapikey}
file.write(json.dumps(js, indent=3)) file.write(json.dumps(js, indent=3))
@ -321,7 +321,7 @@ if(vars.model == "OAI"):
file.close() file.close()
else: else:
# Otherwise open it up # Otherwise open it up
file = open("settings/" + getmodelname() + ".settings", "r") file = open("settings/" + getmodelname().replace('/', '_') + ".settings", "r")
# Check if API key exists # Check if API key exists
js = json.load(file) js = json.load(file)
if("oaiapikey" in js and js["oaiapikey"] != ""): if("oaiapikey" in js and js["oaiapikey"] != ""):
@ -334,7 +334,7 @@ if(vars.model == "OAI"):
vars.oaiapikey = input("Key> ") vars.oaiapikey = input("Key> ")
js["oaiapikey"] = vars.oaiapikey js["oaiapikey"] = vars.oaiapikey
# Write API key to file # Write API key to file
file = open("settings/" + getmodelname() + ".settings", "w") file = open("settings/" + getmodelname().replace('/', '_') + ".settings", "w")
try: try:
file.write(json.dumps(js, indent=3)) file.write(json.dumps(js, indent=3))
finally: finally:
@ -850,7 +850,7 @@ def savesettings():
# Write it # Write it
if not os.path.exists('settings'): if not os.path.exists('settings'):
os.mkdir('settings') os.mkdir('settings')
file = open("settings/" + getmodelname() + ".settings", "w") file = open("settings/" + getmodelname().replace('/', '_') + ".settings", "w")
try: try:
file.write(json.dumps(js, indent=3)) file.write(json.dumps(js, indent=3))
finally: finally:
@ -860,9 +860,9 @@ def savesettings():
# Read settings from client file JSON and send to vars # Read settings from client file JSON and send to vars
#==================================================================# #==================================================================#
def loadsettings(): def loadsettings():
if(path.exists("settings/" + getmodelname() + ".settings")): if(path.exists("settings/" + getmodelname().replace('/', '_') + ".settings")):
# Read file contents into JSON object # Read file contents into JSON object
file = open("settings/" + getmodelname() + ".settings", "r") file = open("settings/" + getmodelname().replace('/', '_') + ".settings", "r")
js = json.load(file) js = json.load(file)
# Copy file contents to vars # Copy file contents to vars