Merge branch 'united' into dependency-fix

This commit is contained in:
vfbd
2022-09-15 17:41:34 -04:00
7 changed files with 217 additions and 101 deletions

View File

@ -17,7 +17,8 @@ os.environ['TOKENIZERS_PARALLELISM'] = 'false'
from eventlet import tpool from eventlet import tpool
import logging import logging
logging.basicConfig(format='%(levelname)s - %(module)s:%(lineno)d - %(message)s',level=logging.WARNING) from logger import logger, set_logger_verbosity, quiesce_logger
logging.getLogger("urllib3").setLevel(logging.ERROR) logging.getLogger("urllib3").setLevel(logging.ERROR)
from os import path, getcwd from os import path, getcwd
@ -66,11 +67,12 @@ try:
except: except:
pass pass
import transformers.generation_utils import transformers.generation_utils
global tpu_mtj_backend global tpu_mtj_backend
if lupa.LUA_VERSION[:2] != (5, 4): if lupa.LUA_VERSION[:2] != (5, 4):
print(f"Please install lupa==1.10. You have lupa {lupa.__version__}.", file=sys.stderr) logger.error(f"Please install lupa==1.10. You have lupa {lupa.__version__}.")
patch_causallm_patched = False patch_causallm_patched = False
@ -400,8 +402,6 @@ import logging
log = logging.getLogger('werkzeug') log = logging.getLogger('werkzeug')
log.setLevel(logging.ERROR) log.setLevel(logging.ERROR)
# Start flask & SocketIO
print("{0}Initializing Flask... {1}".format(colors.PURPLE, colors.END), end="")
from flask import Flask, render_template, Response, request, copy_current_request_context, send_from_directory, session, jsonify, abort, redirect from flask import Flask, render_template, Response, request, copy_current_request_context, send_from_directory, session, jsonify, abort, redirect
from flask_socketio import SocketIO from flask_socketio import SocketIO
from flask_socketio import emit as _emit from flask_socketio import emit as _emit
@ -412,9 +412,7 @@ app = Flask(__name__, root_path=os.getcwd())
app.secret_key = secrets.token_hex() app.secret_key = secrets.token_hex()
app.config['SESSION_TYPE'] = 'filesystem' app.config['SESSION_TYPE'] = 'filesystem'
app.config['TEMPLATES_AUTO_RELOAD'] = True app.config['TEMPLATES_AUTO_RELOAD'] = True
Session(app)
socketio = SocketIO(app, async_method="eventlet") socketio = SocketIO(app, async_method="eventlet")
print("{0}OK!{1}".format(colors.GREEN, colors.END))
old_socketio_on = socketio.on old_socketio_on = socketio.on
def new_socketio_on(*a, **k): def new_socketio_on(*a, **k):
@ -628,7 +626,7 @@ def get_config_filename(model_name = None):
elif vars.configname != '': elif vars.configname != '':
return(f"settings/{vars.configname.replace('/', '_')}.settings") return(f"settings/{vars.configname.replace('/', '_')}.settings")
else: else:
print(f"Empty configfile name sent back. Defaulting to ReadOnly") logger.warning(f"Empty configfile name sent back. Defaulting to ReadOnly")
return(f"settings/ReadOnly.settings") return(f"settings/ReadOnly.settings")
#==================================================================# #==================================================================#
# Function to get model selection at startup # Function to get model selection at startup
@ -796,14 +794,14 @@ def device_config(config):
breakmodel.disk_blocks = args.breakmodel_disklayers breakmodel.disk_blocks = args.breakmodel_disklayers
n_layers -= args.breakmodel_disklayers n_layers -= args.breakmodel_disklayers
except: except:
print("WARNING: --breakmodel_gpulayers is malformatted. Please use the --help option to see correct usage of --breakmodel_gpulayers. Defaulting to all layers on device 0.", file=sys.stderr) logger.warning("--breakmodel_gpulayers is malformatted. Please use the --help option to see correct usage of --breakmodel_gpulayers. Defaulting to all layers on device 0.")
breakmodel.gpu_blocks = [n_layers] breakmodel.gpu_blocks = [n_layers]
n_layers = 0 n_layers = 0
elif(args.breakmodel_layers is not None): elif(args.breakmodel_layers is not None):
breakmodel.gpu_blocks = [n_layers - max(0, min(n_layers, args.breakmodel_layers))] breakmodel.gpu_blocks = [n_layers - max(0, min(n_layers, args.breakmodel_layers))]
n_layers -= sum(breakmodel.gpu_blocks) n_layers -= sum(breakmodel.gpu_blocks)
elif(args.model is not None): elif(args.model is not None):
print("Breakmodel not specified, assuming GPU 0") logger.info("Breakmodel not specified, assuming GPU 0")
breakmodel.gpu_blocks = [n_layers] breakmodel.gpu_blocks = [n_layers]
n_layers = 0 n_layers = 0
else: else:
@ -862,7 +860,7 @@ def device_config(config):
else: else:
print(f"{colors.RED}Please enter an integer between -1 and {n_layers}.{colors.END}") print(f"{colors.RED}Please enter an integer between -1 and {n_layers}.{colors.END}")
print(colors.PURPLE + "\nFinal device configuration:") logger.init_ok("Final device configuration:", status="Info")
device_list(n_layers) device_list(n_layers)
# If all layers are on the same device, use the old GPU generation mode # If all layers are on the same device, use the old GPU generation mode
@ -875,7 +873,7 @@ def device_config(config):
return return
if(not breakmodel.gpu_blocks): if(not breakmodel.gpu_blocks):
print("Nothing assigned to a GPU, reverting to CPU only mode") logger.warning("Nothing assigned to a GPU, reverting to CPU only mode")
import breakmodel import breakmodel
breakmodel.primary_device = "cpu" breakmodel.primary_device = "cpu"
vars.breakmodel = False vars.breakmodel = False
@ -1083,7 +1081,7 @@ def savesettings():
#==================================================================# #==================================================================#
@debounce(2) @debounce(2)
def settingschanged(): def settingschanged():
print("{0}Saving settings!{1}".format(colors.GREEN, colors.END)) logger.info("Saving settings.")
savesettings() savesettings()
#==================================================================# #==================================================================#
@ -1323,6 +1321,9 @@ def general_startup(override_args=None):
parser.add_argument("--savemodel", action='store_true', help="Saves the model to the models folder even if --colab is used (Allows you to save models to Google Drive)") parser.add_argument("--savemodel", action='store_true', help="Saves the model to the models folder even if --colab is used (Allows you to save models to Google Drive)")
parser.add_argument("--customsettings", help="Preloads arguements from json file. You only need to provide the location of the json file. Use customsettings.json template file. It can be renamed if you wish so that you can store multiple configurations. Leave any settings you want as default as null. Any values you wish to set need to be in double quotation marks") parser.add_argument("--customsettings", help="Preloads arguements from json file. You only need to provide the location of the json file. Use customsettings.json template file. It can be renamed if you wish so that you can store multiple configurations. Leave any settings you want as default as null. Any values you wish to set need to be in double quotation marks")
parser.add_argument("--no_ui", action='store_true', default=False, help="Disables the GUI and Socket.IO server while leaving the API server running.") parser.add_argument("--no_ui", action='store_true', default=False, help="Disables the GUI and Socket.IO server while leaving the API server running.")
parser.add_argument('-v', '--verbosity', action='count', default=0, help="The default logging level is ERROR or higher. This value increases the amount of logging seen in your screen")
parser.add_argument('-q', '--quiesce', action='count', default=0, help="The default logging level is ERROR or higher. This value decreases the amount of logging seen in your screen")
#args: argparse.Namespace = None #args: argparse.Namespace = None
if "pytest" in sys.modules and override_args is None: if "pytest" in sys.modules and override_args is None:
args = parser.parse_args([]) args = parser.parse_args([])
@ -1336,6 +1337,8 @@ def general_startup(override_args=None):
else: else:
args = parser.parse_args() args = parser.parse_args()
set_logger_verbosity(args.verbosity)
quiesce_logger(args.quiesce)
if args.customsettings: if args.customsettings:
f = open (args.customsettings) f = open (args.customsettings)
importedsettings = json.load(f) importedsettings = json.load(f)
@ -1403,9 +1406,10 @@ def general_startup(override_args=None):
vars.model = "NeoCustom" vars.model = "NeoCustom"
vars.custmodpth = modpath vars.custmodpth = modpath
elif args.model: elif args.model:
print("Welcome to KoboldAI!\nYou have selected the following Model:", vars.model) logger.message(f"Welcome to KoboldAI!")
logger.message(f"You have selected the following Model: {vars.model}")
if args.path: if args.path:
print("You have selected the following path for your Model :", args.path) logger.message(f"You have selected the following path for your Model: {args.path}")
vars.custmodpth = args.path; vars.custmodpth = args.path;
vars.colaburl = args.path + "/request"; # Lets just use the same parameter to keep it simple vars.colaburl = args.path + "/request"; # Lets just use the same parameter to keep it simple
#==================================================================# #==================================================================#
@ -1552,7 +1556,7 @@ def get_oai_models(key):
return return
# Get list of models from OAI # Get list of models from OAI
print("{0}Retrieving engine list...{1}".format(colors.PURPLE, colors.END), end="") logger.init("OAI Engines", status="Retrieving")
req = requests.get( req = requests.get(
url, url,
headers = { headers = {
@ -1564,7 +1568,7 @@ def get_oai_models(key):
try: try:
engines = [[en["id"], "{} ({})".format(en['id'], "Ready" if en["ready"] == True else "Not Ready")] for en in engines] engines = [[en["id"], "{} ({})".format(en['id'], "Ready" if en["ready"] == True else "Not Ready")] for en in engines]
except: except:
print(engines) logger.error(engines)
raise raise
online_model = "" online_model = ""
@ -1591,11 +1595,12 @@ def get_oai_models(key):
js["apikey"] = key js["apikey"] = key
file.write(json.dumps(js, indent=3)) file.write(json.dumps(js, indent=3))
logger.init_ok("OAI Engines", status="OK")
emit('from_server', {'cmd': 'oai_engines', 'data': engines, 'online_model': online_model}, broadcast=True) emit('from_server', {'cmd': 'oai_engines', 'data': engines, 'online_model': online_model}, broadcast=True)
else: else:
# Something went wrong, print the message and quit since we can't initialize an engine # Something went wrong, print the message and quit since we can't initialize an engine
print("{0}ERROR!{1}".format(colors.RED, colors.END)) logger.init_err("OAI Engines", status="Failed")
print(req.json()) logger.error(req.json())
emit('from_server', {'cmd': 'errmsg', 'data': req.json()}) emit('from_server', {'cmd': 'errmsg', 'data': req.json()})
def get_cluster_models(msg): def get_cluster_models(msg):
@ -1605,17 +1610,16 @@ def get_cluster_models(msg):
# Get list of models from public cluster # Get list of models from public cluster
print("{0}Retrieving engine list...{1}".format(colors.PURPLE, colors.END), end="") logger.init("KAI Horde Models", status="Retrieving")
req = requests.get("{}/models".format(url)) req = requests.get("{}/models".format(url))
if(req.status_code == 200): if(req.status_code == 200):
engines = req.json() engines = req.json()
print(engines) logger.debug(engines)
try: try:
engines = [[en, en] for en in engines] engines = [[en, en] for en in engines]
except: except:
print(engines) logger.error(engines)
raise raise
print(engines)
online_model = "" online_model = ""
changed=False changed=False
@ -1641,11 +1645,12 @@ def get_cluster_models(msg):
js["apikey"] = vars.oaiapikey js["apikey"] = vars.oaiapikey
file.write(json.dumps(js, indent=3)) file.write(json.dumps(js, indent=3))
logger.init_ok("KAI Horde Models", status="OK")
emit('from_server', {'cmd': 'oai_engines', 'data': engines, 'online_model': online_model}, broadcast=True) emit('from_server', {'cmd': 'oai_engines', 'data': engines, 'online_model': online_model}, broadcast=True)
else: else:
# Something went wrong, print the message and quit since we can't initialize an engine # Something went wrong, print the message and quit since we can't initialize an engine
print("{0}ERROR!{1}".format(colors.RED, colors.END)) logger.init_err("KAI Horde Models", status="Failed")
print(req.json()) logger.error(req.json())
emit('from_server', {'cmd': 'errmsg', 'data': req.json()}) emit('from_server', {'cmd': 'errmsg', 'data': req.json()})
# Function to patch transformers to use our soft prompt # Function to patch transformers to use our soft prompt
@ -2180,29 +2185,28 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
elif(vars.model_type == "not_found" and vars.model == "GPT2Custom"): elif(vars.model_type == "not_found" and vars.model == "GPT2Custom"):
vars.model_type = "gpt2" vars.model_type = "gpt2"
elif(vars.model_type == "not_found"): elif(vars.model_type == "not_found"):
print("WARNING: No model type detected, assuming Neo (If this is a GPT2 model use the other menu option or --model GPT2Custom)") logger.warning("No model type detected, assuming Neo (If this is a GPT2 model use the other menu option or --model GPT2Custom)")
vars.model_type = "gpt_neo" vars.model_type = "gpt_neo"
if(not vars.use_colab_tpu and vars.model not in ["InferKit", "Colab", "API", "CLUSTER", "OAI", "GooseAI" , "ReadOnly", "TPUMeshTransformerGPTJ", "TPUMeshTransformerGPTNeoX"]): if(not vars.use_colab_tpu and vars.model not in ["InferKit", "Colab", "API", "CLUSTER", "OAI", "GooseAI" , "ReadOnly", "TPUMeshTransformerGPTJ", "TPUMeshTransformerGPTNeoX"]):
loadmodelsettings() loadmodelsettings()
loadsettings() loadsettings()
print(2) logger.init("GPU support", status="Searching")
print("{0}Looking for GPU support...{1}".format(colors.PURPLE, colors.END), end="")
vars.hascuda = torch.cuda.is_available() vars.hascuda = torch.cuda.is_available()
vars.bmsupported = (utils.HAS_ACCELERATE or vars.model_type in ("gpt_neo", "gptj", "xglm", "opt")) and not vars.nobreakmodel vars.bmsupported = (utils.HAS_ACCELERATE or vars.model_type in ("gpt_neo", "gptj", "xglm", "opt")) and not vars.nobreakmodel
if(args.breakmodel is not None and args.breakmodel): if(args.breakmodel is not None and args.breakmodel):
print("WARNING: --breakmodel is no longer supported. Breakmodel mode is now automatically enabled when --breakmodel_gpulayers is used (see --help for details).", file=sys.stderr) logger.warning("--breakmodel is no longer supported. Breakmodel mode is now automatically enabled when --breakmodel_gpulayers is used (see --help for details).")
if(args.breakmodel_layers is not None): if(args.breakmodel_layers is not None):
print("WARNING: --breakmodel_layers is deprecated. Use --breakmodel_gpulayers instead (see --help for details).", file=sys.stderr) logger.warning("--breakmodel_layers is deprecated. Use --breakmodel_gpulayers instead (see --help for details).")
if(args.model and vars.bmsupported and not args.breakmodel_gpulayers and not args.breakmodel_layers and (not utils.HAS_ACCELERATE or not args.breakmodel_disklayers)): if(args.model and vars.bmsupported and not args.breakmodel_gpulayers and not args.breakmodel_layers and (not utils.HAS_ACCELERATE or not args.breakmodel_disklayers)):
print("WARNING: Model launched without the --breakmodel_gpulayers argument, defaulting to GPU only mode.", file=sys.stderr) logger.warning("Model launched without the --breakmodel_gpulayers argument, defaulting to GPU only mode.")
vars.bmsupported = False vars.bmsupported = False
if(not vars.bmsupported and (args.breakmodel_gpulayers is not None or args.breakmodel_layers is not None or args.breakmodel_disklayers is not None)): if(not vars.bmsupported and (args.breakmodel_gpulayers is not None or args.breakmodel_layers is not None or args.breakmodel_disklayers is not None)):
print("WARNING: This model does not support hybrid generation. --breakmodel_gpulayers will be ignored.", file=sys.stderr) logger.warning("This model does not support hybrid generation. --breakmodel_gpulayers will be ignored.")
if(vars.hascuda): if(vars.hascuda):
print("{0}FOUND!{1}".format(colors.GREEN, colors.END)) logger.init_ok("GPU support", status="Found")
else: else:
print("{0}NOT FOUND!{1}".format(colors.YELLOW, colors.END)) logger.init_warn("GPU support", status="Not Found")
if args.cpu: if args.cpu:
vars.usegpu = False vars.usegpu = False
@ -2239,7 +2243,7 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
# Start transformers and create pipeline # Start transformers and create pipeline
if(not vars.use_colab_tpu and vars.model not in ["InferKit", "Colab", "API", "CLUSTER", "OAI", "GooseAI" , "ReadOnly", "TPUMeshTransformerGPTJ", "TPUMeshTransformerGPTNeoX"]): if(not vars.use_colab_tpu and vars.model not in ["InferKit", "Colab", "API", "CLUSTER", "OAI", "GooseAI" , "ReadOnly", "TPUMeshTransformerGPTJ", "TPUMeshTransformerGPTNeoX"]):
if(not vars.noai): if(not vars.noai):
print("{0}Initializing transformers, please wait...{1}".format(colors.PURPLE, colors.END)) logger.init("Transformers", status='Starting')
for m in ("GPTJModel", "XGLMModel"): for m in ("GPTJModel", "XGLMModel"):
try: try:
globals()[m] = getattr(__import__("transformers"), m) globals()[m] = getattr(__import__("transformers"), m)
@ -2304,8 +2308,7 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
num_tensors = len(utils.get_sharded_checkpoint_num_tensors(utils.from_pretrained_model_name, utils.from_pretrained_index_filename, **utils.from_pretrained_kwargs)) num_tensors = len(utils.get_sharded_checkpoint_num_tensors(utils.from_pretrained_model_name, utils.from_pretrained_index_filename, **utils.from_pretrained_kwargs))
else: else:
num_tensors = len(device_map) num_tensors = len(device_map)
print(flush=True) utils.bar = tqdm(total=num_tensors, desc=f"{colors.PURPLE}INIT{colors.END} | Loading model tensors", file=Send_to_socketio())
utils.bar = tqdm(total=num_tensors, desc="Loading model tensors", file=Send_to_socketio())
with zipfile.ZipFile(f, "r") as z: with zipfile.ZipFile(f, "r") as z:
try: try:
@ -2375,7 +2378,7 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
def maybe_low_cpu_mem_usage() -> Dict[str, Any]: def maybe_low_cpu_mem_usage() -> Dict[str, Any]:
if(packaging.version.parse(transformers_version) < packaging.version.parse("4.11.0")): if(packaging.version.parse(transformers_version) < packaging.version.parse("4.11.0")):
print(f"\nWARNING: Please upgrade to transformers 4.11.0 for lower RAM usage. You have transformers {transformers_version}.", file=sys.stderr) logger.warning(f"Please upgrade to transformers 4.11.0 for lower RAM usage. You have transformers {transformers_version}.")
return {} return {}
return {"low_cpu_mem_usage": True} return {"low_cpu_mem_usage": True}
@ -2432,7 +2435,6 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
if os.path.isdir(vars.model.replace('/', '_')): if os.path.isdir(vars.model.replace('/', '_')):
import shutil import shutil
shutil.move(vars.model.replace('/', '_'), "models/{}".format(vars.model.replace('/', '_'))) shutil.move(vars.model.replace('/', '_'), "models/{}".format(vars.model.replace('/', '_')))
print("\n", flush=True)
if(vars.lazy_load): # If we're using lazy loader, we need to figure out what the model's hidden layers are called if(vars.lazy_load): # If we're using lazy loader, we need to figure out what the model's hidden layers are called
with torch_lazy_loader.use_lazy_torch_load(dematerialized_modules=True, use_accelerate_init_empty_weights=True): with torch_lazy_loader.use_lazy_torch_load(dematerialized_modules=True, use_accelerate_init_empty_weights=True):
try: try:
@ -2556,7 +2558,6 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
elif(vars.breakmodel): # Use both RAM and VRAM (breakmodel) elif(vars.breakmodel): # Use both RAM and VRAM (breakmodel)
vars.modeldim = get_hidden_size_from_model(model) vars.modeldim = get_hidden_size_from_model(model)
if(not vars.lazy_load): if(not vars.lazy_load):
print(2)
device_config(model.config) device_config(model.config)
move_model_to_devices(model) move_model_to_devices(model)
elif(utils.HAS_ACCELERATE and __import__("breakmodel").disk_blocks > 0): elif(utils.HAS_ACCELERATE and __import__("breakmodel").disk_blocks > 0):
@ -2583,7 +2584,7 @@ def load_model(use_gpu=True, gpu_layers=None, disk_layers=None, initial_load=Fal
#for key in vars.badwords: #for key in vars.badwords:
# vars.badwordsids.append([vocab[key]]) # vars.badwordsids.append([vocab[key]])
print("{0}OK! {1} pipeline created!{2}".format(colors.GREEN, vars.model, colors.END)) logger.info(f"Pipeline created: {vars.model}")
else: else:
from transformers import GPT2TokenizerFast from transformers import GPT2TokenizerFast
@ -2829,7 +2830,7 @@ def lua_startup():
#==================================================================# #==================================================================#
print("", end="", flush=True) print("", end="", flush=True)
print(colors.PURPLE + "Initializing Lua Bridge... " + colors.END, end="", flush=True) logger.init("LUA bridge", status="Starting")
# Set up Lua state # Set up Lua state
vars.lua_state = lupa.LuaRuntime(unpack_returned_tuples=True) vars.lua_state = lupa.LuaRuntime(unpack_returned_tuples=True)
@ -2852,10 +2853,10 @@ def lua_startup():
except lupa.LuaError as e: except lupa.LuaError as e:
print(colors.RED + "ERROR!" + colors.END) print(colors.RED + "ERROR!" + colors.END)
vars.lua_koboldbridge.obliterate_multiverse() vars.lua_koboldbridge.obliterate_multiverse()
print("{0}{1}{2}".format(colors.RED, "***LUA ERROR***: ", colors.END), end="", file=sys.stderr) logger.debug('LUA ERROR: ' + str(e).replace("\033", ""))
print("{0}{1}{2}".format(colors.RED, str(e).replace("\033", ""), colors.END), file=sys.stderr) logger.warning("Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.")
exit(1) exit(1)
print(colors.GREEN + "OK!" + colors.END) logger.init_ok("LUA bridge", status="OK")
def lua_log_format_name(name): def lua_log_format_name(name):
@ -2879,7 +2880,7 @@ def load_callback(filename, modulename):
# Load all Lua scripts # Load all Lua scripts
#==================================================================# #==================================================================#
def load_lua_scripts(): def load_lua_scripts():
print(colors.GREEN + "Loading Core Script" + colors.END) logger.init("LUA Scripts", status="Starting")
filenames = [] filenames = []
modulenames = [] modulenames = []
@ -2911,11 +2912,11 @@ def load_lua_scripts():
if(vars.serverstarted): if(vars.serverstarted):
emit('from_server', {'cmd': 'errmsg', 'data': 'Lua script error; please check console.'}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': 'Lua script error; please check console.'}, broadcast=True)
sendUSStatItems() sendUSStatItems()
print("{0}{1}{2}".format(colors.RED, "***LUA ERROR***: ", colors.END), end="", file=sys.stderr) logger.debug('LUA ERROR: ' + str(e).replace("\033", ""))
print("{0}{1}{2}".format(colors.RED, str(e).replace("\033", ""), colors.END), file=sys.stderr) logger.warning("Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.")
print("{0}{1}{2}".format(colors.YELLOW, "Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.", colors.END), file=sys.stderr)
if(vars.serverstarted): if(vars.serverstarted):
set_aibusy(0) set_aibusy(0)
logger.init_ok("LUA Scripts", status="OK")
#==================================================================# #==================================================================#
# Print message that originates from the userscript with the given name # Print message that originates from the userscript with the given name
@ -3408,9 +3409,8 @@ def execute_inmod():
vars.lua_running = False vars.lua_running = False
emit('from_server', {'cmd': 'errmsg', 'data': 'Lua script error; please check console.'}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': 'Lua script error; please check console.'}, broadcast=True)
sendUSStatItems() sendUSStatItems()
print("{0}{1}{2}".format(colors.RED, "***LUA ERROR***: ", colors.END), end="", file=sys.stderr) logger.debug('LUA ERROR: ' + str(e).replace("\033", ""))
print("{0}{1}{2}".format(colors.RED, str(e).replace("\033", ""), colors.END), file=sys.stderr) logger.warning("Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.")
print("{0}{1}{2}".format(colors.YELLOW, "Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.", colors.END), file=sys.stderr)
set_aibusy(0) set_aibusy(0)
def execute_genmod(): def execute_genmod():
@ -3426,9 +3426,8 @@ def execute_outmod():
vars.lua_running = False vars.lua_running = False
emit('from_server', {'cmd': 'errmsg', 'data': 'Lua script error; please check console.'}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': 'Lua script error; please check console.'}, broadcast=True)
sendUSStatItems() sendUSStatItems()
print("{0}{1}{2}".format(colors.RED, "***LUA ERROR***: ", colors.END), end="", file=sys.stderr) logger.debug('LUA ERROR: ' + str(e).replace("\033", ""))
print("{0}{1}{2}".format(colors.RED, str(e).replace("\033", ""), colors.END), file=sys.stderr) logger.warning("Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.")
print("{0}{1}{2}".format(colors.YELLOW, "Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.", colors.END), file=sys.stderr)
set_aibusy(0) set_aibusy(0)
if(vars.lua_koboldbridge.resend_settings_required): if(vars.lua_koboldbridge.resend_settings_required):
vars.lua_koboldbridge.resend_settings_required = False vars.lua_koboldbridge.resend_settings_required = False
@ -3448,7 +3447,7 @@ def execute_outmod():
#==================================================================# #==================================================================#
@socketio.on('connect') @socketio.on('connect')
def do_connect(): def do_connect():
print("{0}Client connected!{1}".format(colors.GREEN, colors.END)) logger.info("Client connected!")
emit('from_server', {'cmd': 'setchatname', 'data': vars.chatname}) emit('from_server', {'cmd': 'setchatname', 'data': vars.chatname})
emit('from_server', {'cmd': 'setanotetemplate', 'data': vars.authornotetemplate}) emit('from_server', {'cmd': 'setanotetemplate', 'data': vars.authornotetemplate})
emit('from_server', {'cmd': 'connected', 'smandelete': vars.smandelete, 'smanrename': vars.smanrename, 'modelname': getmodelname()}) emit('from_server', {'cmd': 'connected', 'smandelete': vars.smandelete, 'smanrename': vars.smanrename, 'modelname': getmodelname()})
@ -3501,7 +3500,7 @@ def do_connect():
@socketio.on('message') @socketio.on('message')
def get_message(msg): def get_message(msg):
if not vars.quiet: if not vars.quiet:
print("{0}Data received:{1}{2}".format(colors.GREEN, msg, colors.END)) logger.debug(f"Data received: {msg}")
# Submit action # Submit action
if(msg['cmd'] == 'submit'): if(msg['cmd'] == 'submit'):
if(vars.mode == "play"): if(vars.mode == "play"):
@ -3791,8 +3790,7 @@ def get_message(msg):
elif(msg['cmd'] == 'list_model'): elif(msg['cmd'] == 'list_model'):
sendModelSelection(menu=msg['data']) sendModelSelection(menu=msg['data'])
elif(msg['cmd'] == 'load_model'): elif(msg['cmd'] == 'load_model'):
print(msg) logger.debug(vars.model_selected)
print(vars.model_selected)
if not os.path.exists("settings/"): if not os.path.exists("settings/"):
os.mkdir("settings") os.mkdir("settings")
changed = True changed = True
@ -3826,7 +3824,7 @@ def get_message(msg):
vars.cluster_requested_models = msg['online_model'] vars.cluster_requested_models = msg['online_model']
load_model(use_gpu=msg['use_gpu'], gpu_layers=msg['gpu_layers'], disk_layers=msg['disk_layers'], online_model=msg['online_model']) load_model(use_gpu=msg['use_gpu'], gpu_layers=msg['gpu_layers'], disk_layers=msg['disk_layers'], online_model=msg['online_model'])
elif(msg['cmd'] == 'show_model'): elif(msg['cmd'] == 'show_model'):
print("Model Name: {}".format(getmodelname())) logger.info(f"Model Name: {getmodelname()}")
emit('from_server', {'cmd': 'show_model_name', 'data': getmodelname()}, broadcast=True) emit('from_server', {'cmd': 'show_model_name', 'data': getmodelname()}, broadcast=True)
elif(msg['cmd'] == 'selectmodel'): elif(msg['cmd'] == 'selectmodel'):
# This is run when a model line is selected from the UI (line from the model_menu variable) that is tagged as not a menu # This is run when a model line is selected from the UI (line from the model_menu variable) that is tagged as not a menu
@ -3877,14 +3875,14 @@ def get_message(msg):
elif(msg['cmd'] == 'delete_model'): elif(msg['cmd'] == 'delete_model'):
if "{}/models".format(os.getcwd()) in os.path.abspath(msg['data']) or "{}\\models".format(os.getcwd()) in os.path.abspath(msg['data']): if "{}/models".format(os.getcwd()) in os.path.abspath(msg['data']) or "{}\\models".format(os.getcwd()) in os.path.abspath(msg['data']):
if check_if_dir_is_model(msg['data']): if check_if_dir_is_model(msg['data']):
print(colors.YELLOW + "WARNING: Someone deleted " + msg['data']) logger.warning(f"Someone deleted {msg['data']}")
import shutil import shutil
shutil.rmtree(msg['data']) shutil.rmtree(msg['data'])
sendModelSelection(menu=msg['menu']) sendModelSelection(menu=msg['menu'])
else: else:
print(colors.RED + "ERROR: Someone attempted to delete " + msg['data'] + " but this is not a valid model") logger.error(f"Someone attempted to delete {msg['data']} but this is not a valid model")
else: else:
print(colors.RED + "WARNING!!: Someone maliciously attempted to delete " + msg['data'] + " the attempt has been blocked.") logger.critical(f"Someone maliciously attempted to delete {msg['data']}. The attempt has been blocked.")
elif(msg['cmd'] == 'OAI_Key_Update'): elif(msg['cmd'] == 'OAI_Key_Update'):
get_oai_models(msg['key']) get_oai_models(msg['key'])
elif(msg['cmd'] == 'Cluster_Key_Update'): elif(msg['cmd'] == 'Cluster_Key_Update'):
@ -4121,7 +4119,7 @@ def actionsubmit(data, actionmode=0, force_submit=False, force_prompt_gen=False,
except: except:
tokenizer = AutoTokenizer.from_pretrained(tokenizer_id, revision=vars.revision, cache_dir="cache", use_fast=False) tokenizer = AutoTokenizer.from_pretrained(tokenizer_id, revision=vars.revision, cache_dir="cache", use_fast=False)
except: except:
print(f"WARNING: Unknown tokenizer {repr(tokenizer_id)}") logger.warning(f"Unknown tokenizer {repr(tokenizer_id)}")
vars.api_tokenizer_id = tokenizer_id vars.api_tokenizer_id = tokenizer_id
if(disable_recentrng): if(disable_recentrng):
@ -4232,8 +4230,8 @@ def actionsubmit(data, actionmode=0, force_submit=False, force_prompt_gen=False,
try: try:
alternatives = [item['Text'] for item in vars.actions_metadata[len(vars.actions)-1]["Alternative Text"]] alternatives = [item['Text'] for item in vars.actions_metadata[len(vars.actions)-1]["Alternative Text"]]
except: except:
print(len(vars.actions)) logger.debug(len(vars.actions))
print(vars.actions_metadata) logger.debug(vars.actions_metadata)
raise raise
if data in alternatives: if data in alternatives:
alternatives = [item for item in vars.actions_metadata[vars.actions.get_last_key() ]["Alternative Text"] if item['Text'] != data] alternatives = [item for item in vars.actions_metadata[vars.actions.get_last_key() ]["Alternative Text"] if item['Text'] != data]
@ -4285,7 +4283,8 @@ def apiactionsubmit_generate(txt, minimum, maximum):
vars.generated_tkns = 0 vars.generated_tkns = 0
if not vars.quiet: if not vars.quiet:
print("{0}Min:{1}, Max:{2}, Txt:{3}{4}".format(colors.YELLOW, minimum, maximum, utils.decodenewlines(tokenizer.decode(txt)), colors.END)) logger.debug(f"Prompt Min:{minimum}, Max:{maximum}")
logger.prompt(utils.decodenewlines(tokenizer.decode(txt)).encode("unicode_escape").decode("utf-8"))
# Clear CUDA cache if using GPU # Clear CUDA cache if using GPU
if(vars.hascuda and (vars.usegpu or vars.breakmodel)): if(vars.hascuda and (vars.usegpu or vars.breakmodel)):
@ -4312,7 +4311,8 @@ def apiactionsubmit_tpumtjgenerate(txt, minimum, maximum):
tpu_mtj_backend.set_rng_seed(vars.seed) tpu_mtj_backend.set_rng_seed(vars.seed)
if not vars.quiet: if not vars.quiet:
print("{0}Min:{1}, Max:{2}, Txt:{3}{4}".format(colors.YELLOW, minimum, maximum, utils.decodenewlines(tokenizer.decode(txt)), colors.END)) logger.debug(f"Prompt Min:{minimum}, Max:{maximum}")
logger.prompt(utils.decodenewlines(tokenizer.decode(txt)).encode("unicode_escape").decode("utf-8"))
vars._actions = vars.actions vars._actions = vars.actions
vars._prompt = vars.prompt vars._prompt = vars.prompt
@ -4824,7 +4824,8 @@ def generate(txt, minimum, maximum, found_entries=None):
found_entries = tuple(found_entries.copy() for _ in range(vars.numseqs)) found_entries = tuple(found_entries.copy() for _ in range(vars.numseqs))
if not vars.quiet: if not vars.quiet:
print("{0}Min:{1}, Max:{2}, Txt:{3}{4}".format(colors.YELLOW, minimum, maximum, utils.decodenewlines(tokenizer.decode(txt)), colors.END)) logger.debug(f"Prompt Min:{minimum}, Max:{maximum}")
logger.prompt(utils.decodenewlines(tokenizer.decode(txt)).encode("unicode_escape").decode("utf-8"))
# Store context in memory to use it for comparison with generated content # Store context in memory to use it for comparison with generated content
vars.lastctx = utils.decodenewlines(tokenizer.decode(txt)) vars.lastctx = utils.decodenewlines(tokenizer.decode(txt))
@ -4843,12 +4844,11 @@ def generate(txt, minimum, maximum, found_entries=None):
vars.lua_running = False vars.lua_running = False
emit('from_server', {'cmd': 'errmsg', 'data': 'Lua script error; please check console.'}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': 'Lua script error; please check console.'}, broadcast=True)
sendUSStatItems() sendUSStatItems()
print("{0}{1}{2}".format(colors.RED, "***LUA ERROR***: ", colors.END), end="", file=sys.stderr) logger.debug('LUA ERROR: ' + str(e).replace("\033", ""))
print("{0}{1}{2}".format(colors.RED, str(e).replace("\033", ""), colors.END), file=sys.stderr) logger.warning("Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.")
print("{0}{1}{2}".format(colors.YELLOW, "Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.", colors.END), file=sys.stderr)
else: else:
emit('from_server', {'cmd': 'errmsg', 'data': 'Error occurred during generator call; please check console.'}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': 'Error occurred during generator call; please check console.'}, broadcast=True)
print("{0}{1}{2}".format(colors.RED, traceback.format_exc().replace("\033", ""), colors.END), file=sys.stderr) logger.error(traceback.format_exc().replace("\033", ""))
set_aibusy(0) set_aibusy(0)
return return
@ -4887,7 +4887,7 @@ def generate(txt, minimum, maximum, found_entries=None):
#==================================================================# #==================================================================#
def genresult(genout, flash=True, ignore_formatting=False): def genresult(genout, flash=True, ignore_formatting=False):
if not vars.quiet: if not vars.quiet:
print("{0}{1}{2}".format(colors.CYAN, genout, colors.END)) logger.generation(genout.encode("unicode_escape").decode("utf-8"))
# Format output before continuing # Format output before continuing
if not ignore_formatting: if not ignore_formatting:
@ -4921,7 +4921,8 @@ def genselect(genout):
# Apply output formatting rules to sequences # Apply output formatting rules to sequences
result["generated_text"] = applyoutputformatting(result["generated_text"]) result["generated_text"] = applyoutputformatting(result["generated_text"])
if not vars.quiet: if not vars.quiet:
print("{0}[Result {1}]\n{2}{3}".format(colors.CYAN, i, result["generated_text"], colors.END)) logger.info(f"Generation Result {i}")
logger.generation(result["generated_text"].encode("unicode_escape").decode("utf-8"))
i += 1 i += 1
# Add the options to the actions metadata # Add the options to the actions metadata
@ -5152,7 +5153,8 @@ def sendtoapi(txt, min, max):
def sendtocluster(txt, min, max): def sendtocluster(txt, min, max):
# Log request to console # Log request to console
if not vars.quiet: if not vars.quiet:
print("{0}Tokens:{1}, Txt:{2}{3}".format(colors.YELLOW, min-1, txt, colors.END)) logger.debug(f"Tokens Min:{min-1}")
logger.prompt(txt.encode("unicode_escape").decode("utf-8"))
# Store context in memory to use it for comparison with generated content # Store context in memory to use it for comparison with generated content
vars.lastctx = txt vars.lastctx = txt
@ -5187,30 +5189,30 @@ def sendtocluster(txt, min, max):
js = req.json() js = req.json()
except requests.exceptions.ConnectionError: except requests.exceptions.ConnectionError:
errmsg = f"Horde unavailable. Please try again later" errmsg = f"Horde unavailable. Please try again later"
print("{0}{1}{2}".format(colors.RED, errmsg, colors.END)) logger.error(errmsg)
emit('from_server', {'cmd': 'errmsg', 'data': errmsg}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': errmsg}, broadcast=True)
set_aibusy(0) set_aibusy(0)
return return
except requests.exceptions.JSONDecodeError: except requests.exceptions.JSONDecodeError:
errmsg = f"Unexpected message received from the Horde: '{req.text}'" errmsg = f"Unexpected message received from the Horde: '{req.text}'"
print("{0}{1}{2}".format(colors.RED, errmsg, colors.END)) logger.error(errmsg)
emit('from_server', {'cmd': 'errmsg', 'data': errmsg}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': errmsg}, broadcast=True)
set_aibusy(0) set_aibusy(0)
return return
if(req.status_code == 503): if(req.status_code == 503):
errmsg = f"KoboldAI API Error: No available KoboldAI servers found in Horde to fulfil this request using the selected models or other properties." errmsg = f"KoboldAI API Error: No available KoboldAI servers found in Horde to fulfil this request using the selected models or other properties."
print("{0}{1}{2}".format(colors.RED, json.dumps(js, indent=2), colors.END)) logger.error(json.dumps(js))
emit('from_server', {'cmd': 'errmsg', 'data': errmsg}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': errmsg}, broadcast=True)
set_aibusy(0) set_aibusy(0)
return return
if(req.status_code != 200): if(req.status_code != 200):
errmsg = f"KoboldAI API Error: Failed to get a standard reply from the Horde. Please check the console." errmsg = f"KoboldAI API Error: Failed to get a standard reply from the Horde. Please check the console."
print("{0}{1}{2}".format(colors.RED, json.dumps(js, indent=2), colors.END)) logger.error(json.dumps(js))
emit('from_server', {'cmd': 'errmsg', 'data': errmsg}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': errmsg}, broadcast=True)
set_aibusy(0) set_aibusy(0)
return return
gen_servers = [(cgen['server_name'],cgen['server_id']) for cgen in js] gen_servers = [(cgen['server_name'],cgen['server_id']) for cgen in js]
print(f"{colors.GREEN}Generations by: {gen_servers}{colors.END}") logger.info(f"Generations by: {gen_servers}")
# Just in case we want to announce it to the user # Just in case we want to announce it to the user
if len(js) == 1: if len(js) == 1:
warnmsg = f"Text generated by {js[0]['server_name']}" warnmsg = f"Text generated by {js[0]['server_name']}"
@ -5260,7 +5262,8 @@ def tpumtjgenerate(txt, minimum, maximum, found_entries=None):
found_entries = tuple(found_entries.copy() for _ in range(vars.numseqs)) found_entries = tuple(found_entries.copy() for _ in range(vars.numseqs))
if not vars.quiet: if not vars.quiet:
print("{0}Min:{1}, Max:{2}, Txt:{3}{4}".format(colors.YELLOW, minimum, maximum, utils.decodenewlines(tokenizer.decode(txt)), colors.END)) logger.debug(f"Prompt Min:{minimum}, Max:{maximum}")
logger.prompt(utils.decodenewlines(tokenizer.decode(txt)).encode("unicode_escape").decode("utf-8"))
vars._actions = vars.actions vars._actions = vars.actions
vars._prompt = vars.prompt vars._prompt = vars.prompt
@ -5348,9 +5351,8 @@ def tpumtjgenerate(txt, minimum, maximum, found_entries=None):
vars.lua_running = False vars.lua_running = False
emit('from_server', {'cmd': 'errmsg', 'data': 'Lua script error; please check console.'}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': 'Lua script error; please check console.'}, broadcast=True)
sendUSStatItems() sendUSStatItems()
print("{0}{1}{2}".format(colors.RED, "***LUA ERROR***: ", colors.END), end="", file=sys.stderr) logger.debug('LUA ERROR: ' + str(e).replace("\033", ""))
print("{0}{1}{2}".format(colors.RED, str(e).replace("\033", ""), colors.END), file=sys.stderr) logger.warning("Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.")
print("{0}{1}{2}".format(colors.YELLOW, "Lua engine stopped; please open 'Userscripts' and press Load to reinitialize scripts.", colors.END), file=sys.stderr)
else: else:
emit('from_server', {'cmd': 'errmsg', 'data': 'Error occurred during generator call; please check console.'}, broadcast=True) emit('from_server', {'cmd': 'errmsg', 'data': 'Error occurred during generator call; please check console.'}, broadcast=True)
print("{0}{1}{2}".format(colors.RED, traceback.format_exc().replace("\033", ""), colors.END), file=sys.stderr) print("{0}{1}{2}".format(colors.RED, traceback.format_exc().replace("\033", ""), colors.END), file=sys.stderr)
@ -5634,7 +5636,7 @@ def inlineedit(chunk, data):
vars.actions_metadata[chunk-1]['Selected Text'] = data vars.actions_metadata[chunk-1]['Selected Text'] = data
vars.actions[chunk-1] = data vars.actions[chunk-1] = data
else: else:
print(f"WARNING: Attempted to edit non-existent chunk {chunk}") logger.warning(f"Attempted to edit non-existent chunk {chunk}")
setgamesaved(False) setgamesaved(False)
update_story_chunk(chunk) update_story_chunk(chunk)
@ -5662,7 +5664,7 @@ def inlinedelete(chunk):
vars.actions_metadata[chunk-1]['Selected Text'] = '' vars.actions_metadata[chunk-1]['Selected Text'] = ''
del vars.actions[chunk-1] del vars.actions[chunk-1]
else: else:
print(f"WARNING: Attempted to delete non-existent chunk {chunk}") logger.warning(f"Attempted to delete non-existent chunk {chunk}")
setgamesaved(False) setgamesaved(False)
remove_story_chunk(chunk) remove_story_chunk(chunk)
emit('from_server', {'cmd': 'editmode', 'data': 'false'}, broadcast=True) emit('from_server', {'cmd': 'editmode', 'data': 'false'}, broadcast=True)
@ -9989,11 +9991,14 @@ for schema in config_endpoint_schemas:
#==================================================================# #==================================================================#
# Final startup commands to launch Flask app # Final startup commands to launch Flask app
#==================================================================# #==================================================================#
print("", end="", flush=True)
if __name__ == "__main__": if __name__ == "__main__":
print("{0}\nStarting webserver...{1}".format(colors.GREEN, colors.END), flush=True)
general_startup() general_startup()
# Start flask & SocketIO
logger.init("Flask", status="Starting")
Session(app)
logger.init_ok("Flask", status="OK")
logger.init("Webserver", status="Starting")
patch_transformers() patch_transformers()
#show_select_model_list() #show_select_model_list()
if vars.model == "" or vars.model is None: if vars.model == "" or vars.model is None:
@ -10031,10 +10036,11 @@ if __name__ == "__main__":
if(args.localtunnel or args.ngrok or args.remote): if(args.localtunnel or args.ngrok or args.remote):
with open('cloudflare.log', 'w') as cloudflarelog: with open('cloudflare.log', 'w') as cloudflarelog:
cloudflarelog.write("KoboldAI has finished loading and is available at the following link : " + cloudflare) cloudflarelog.write("KoboldAI has finished loading and is available at the following link : " + cloudflare)
print(format(colors.GREEN) + "KoboldAI has finished loading and is available at the following link : " + cloudflare + format(colors.END)) logger.init_ok("Webserver", status="OK")
logger.message(f"KoboldAI has finished loading and is available at the following link: {cloudflare}")
else: else:
print("{0}Webserver has started, you can now connect to this machine at port {1}{2}" logger.init_ok("Webserver", status="OK")
.format(colors.GREEN, port, colors.END)) logger.message(f"Webserver has started, you can now connect to this machine at port: {port}")
vars.serverstarted = True vars.serverstarted = True
socketio.run(app, host='0.0.0.0', port=port) socketio.run(app, host='0.0.0.0', port=port)
else: else:
@ -10042,8 +10048,8 @@ if __name__ == "__main__":
if not args.no_ui: if not args.no_ui:
import webbrowser import webbrowser
webbrowser.open_new('http://localhost:{0}'.format(port)) webbrowser.open_new('http://localhost:{0}'.format(port))
print("{0}Server started!\nYou may now connect with a browser at http://127.0.0.1:{1}/{2}" logger.init_ok("Webserver", status="OK")
.format(colors.GREEN, port, colors.END)) logger.message(f"Webserver started! You may now connect with a browser at http://127.0.0.1:{port}")
vars.serverstarted = True vars.serverstarted = True
socketio.run(app, port=port, host='0.0.0.0') socketio.run(app, port=port, host='0.0.0.0')
else: else:
@ -10056,13 +10062,19 @@ if __name__ == "__main__":
if not args.no_ui: if not args.no_ui:
import webbrowser import webbrowser
webbrowser.open_new('http://localhost:{0}'.format(port)) webbrowser.open_new('http://localhost:{0}'.format(port))
print("{0}Server started!\nYou may now connect with a browser at http://127.0.0.1:{1}/{2}" logger.init_ok("Webserver", status="OK")
.format(colors.GREEN, port, colors.END)) logger.message(f"Webserver started! You may now connect with a browser at http://127.0.0.1:{port}")
vars.serverstarted = True vars.serverstarted = True
socketio.run(app, port=port) socketio.run(app, port=port)
logger.init("Webserver", status="Closed")
else: else:
general_startup() general_startup()
# Start flask & SocketIO
logger.init("Flask", status="Starting")
Session(app)
logger.init_ok("Flask", status="OK")
patch_transformers() patch_transformers()
#show_select_model_list() #show_select_model_list()
if vars.model == "" or vars.model is None: if vars.model == "" or vars.model is None:

View File

@ -18,6 +18,7 @@ dependencies:
- git=2.35.1 - git=2.35.1
- marshmallow>=3.13 - marshmallow>=3.13
- apispec-webframeworks - apispec-webframeworks
- loguru
- pip: - pip:
- git+https://github.com/finetuneanon/transformers@gpt-neo-localattention3-rp-b - git+https://github.com/finetuneanon/transformers@gpt-neo-localattention3-rp-b
- flask-cloudflared - flask-cloudflared

View File

@ -25,3 +25,4 @@ dependencies:
- lupa==1.10 - lupa==1.10
- transformers>=4.20.1 - transformers>=4.20.1
- accelerate - accelerate
- loguru

View File

@ -3,6 +3,7 @@ from typing import Tuple, Union, Optional
import os import os
import json import json
import zipfile import zipfile
from logger import logger
#==================================================================# #==================================================================#
# Generic Method for prompting for file path # Generic Method for prompting for file path
@ -149,16 +150,16 @@ def getspfiles(model_dimension: int):
continue continue
z, version, shape, fortran_order, dtype = checksp(file, model_dimension) z, version, shape, fortran_order, dtype = checksp(file, model_dimension)
if z == 1: if z == 1:
print(f"Browser SP loading error: {file} is malformed or not a soft prompt ZIP file.") logger.warning(f"Softprompt {file} is malformed or not a soft prompt ZIP file.")
continue continue
if z == 2: if z == 2:
print(f"Browser SP loading error: {file} tensor.npy has unsupported dtype '{dtype.name}'.") logger.warning(f"Softprompt {file} tensor.npy has unsupported dtype '{dtype.name}'.")
continue continue
if z == 3: if z == 3:
print(f"Browser SP loading error: {file} tensor.npy has model dimension {shape[1]} which does not match your model's model dimension of {model_dimension}. This usually means this soft prompt is not compatible with your model.") logger.debug(f"Softprompt {file} tensor.npy has model dimension {shape[1]} which does not match your model's model dimension of {model_dimension}. This usually means this soft prompt is not compatible with your model.")
continue continue
if z == 4: if z == 4:
print(f"Browser SP loading error: {file} tensor.npy has {shape[0]} tokens but it is supposed to have less than 2048 tokens.") logger.warning(f"Softprompt {file} tensor.npy has {shape[0]} tokens but it is supposed to have less than 2048 tokens.")
continue continue
assert isinstance(z, zipfile.ZipFile) assert isinstance(z, zipfile.ZipFile)
try: try:

99
logger.py Normal file
View File

@ -0,0 +1,99 @@
import sys
from functools import partialmethod
from loguru import logger
STDOUT_LEVELS = ["GENERATION", "PROMPT"]
INIT_LEVELS = ["INIT", "INIT_OK", "INIT_WARN", "INIT_ERR"]
MESSAGE_LEVELS = ["MESSAGE"]
# By default we're at error level or higher
verbosity = 20
quiet = 0
def set_logger_verbosity(count):
global verbosity
# The count comes reversed. So count = 0 means minimum verbosity
# While count 5 means maximum verbosity
# So the more count we have, the lowe we drop the versbosity maximum
verbosity = 20 - (count * 10)
def quiesce_logger(count):
global quiet
# The bigger the count, the more silent we want our logger
quiet = count * 10
def is_stdout_log(record):
if record["level"].name not in STDOUT_LEVELS:
return(False)
if record["level"].no < verbosity + quiet:
return(False)
return(True)
def is_init_log(record):
if record["level"].name not in INIT_LEVELS:
return(False)
if record["level"].no < verbosity + quiet:
return(False)
return(True)
def is_msg_log(record):
if record["level"].name not in MESSAGE_LEVELS:
return(False)
if record["level"].no < verbosity + quiet:
return(False)
return(True)
def is_stderr_log(record):
if record["level"].name in STDOUT_LEVELS + INIT_LEVELS + MESSAGE_LEVELS:
return(False)
if record["level"].no < verbosity + quiet:
return(False)
return(True)
def test_logger():
logger.generation("This is a generation message\nIt is typically multiline\nThee Lines".encode("unicode_escape").decode("utf-8"))
logger.prompt("This is a prompt message")
logger.debug("Debug Message")
logger.info("Info Message")
logger.warning("Info Warning")
logger.error("Error Message")
logger.critical("Critical Message")
logger.init("This is an init message", status="Starting")
logger.init_ok("This is an init message", status="OK")
logger.init_warn("This is an init message", status="Warning")
logger.init_err("This is an init message", status="Error")
logger.message("This is user message")
sys.exit()
logfmt = "<level>{level: <10}</level> | <green>{name}</green>:<green>{function}</green>:<green>{line}</green> - <level>{message}</level>"
genfmt = "<level>{level: <10}</level> @ <green>{time:YYYY-MM-DD HH:mm:ss}</green> | <level>{message}</level>"
initfmt = "<magenta>INIT </magenta> | <level>{extra[status]: <10}</level> | <magenta>{message}</magenta>"
msgfmt = "<level>{level: <10}</level> | <level>{message}</level>"
logger.level("GENERATION", no=24, color="<cyan>")
logger.level("PROMPT", no=23, color="<yellow>")
logger.level("INIT", no=31, color="<white>")
logger.level("INIT_OK", no=31, color="<green>")
logger.level("INIT_WARN", no=31, color="<yellow>")
logger.level("INIT_ERR", no=31, color="<red>")
# Messages contain important information without which this application might not be able to be used
# As such, they have the highest priority
logger.level("MESSAGE", no=61, color="<green>")
logger.__class__.generation = partialmethod(logger.__class__.log, "GENERATION")
logger.__class__.prompt = partialmethod(logger.__class__.log, "PROMPT")
logger.__class__.init = partialmethod(logger.__class__.log, "INIT")
logger.__class__.init_ok = partialmethod(logger.__class__.log, "INIT_OK")
logger.__class__.init_warn = partialmethod(logger.__class__.log, "INIT_WARN")
logger.__class__.init_err = partialmethod(logger.__class__.log, "INIT_ERR")
logger.__class__.message = partialmethod(logger.__class__.log, "MESSAGE")
config = {
"handlers": [
{"sink": sys.stderr, "format": logfmt, "colorize":True, "filter": is_stderr_log},
{"sink": sys.stdout, "format": genfmt, "level": "PROMPT", "colorize":True, "filter": is_stdout_log},
{"sink": sys.stdout, "format": initfmt, "level": "INIT", "colorize":True, "filter": is_init_log},
{"sink": sys.stdout, "format": msgfmt, "level": "MESSAGE", "colorize":True, "filter": is_msg_log}
],
}
logger.configure(**config)

View File

@ -15,3 +15,4 @@ accelerate
flask-session flask-session
marshmallow>=3.13 marshmallow>=3.13
apispec-webframeworks apispec-webframeworks
loguru

View File

@ -19,3 +19,4 @@ bleach==4.1.0
flask-session flask-session
marshmallow>=3.13 marshmallow>=3.13
apispec-webframeworks apispec-webframeworks
loguru