From 98a72e34a4dd7ea8e2c32e277e3cc862d561bd41 Mon Sep 17 00:00:00 2001
From: Gnome Ann <>
Date: Wed, 17 Nov 2021 15:36:36 -0500
Subject: [PATCH] Replace slashes in model name with underscores

---
 aiserver.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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