rixty/KoboldAI-Client
1
1
Fork 0
mirror of https://github.com/KoboldAI/KoboldAI-Client.git synced 2025-06-05 21:59:24 +02:00
Code Issues Projects Releases Wiki Activity

Moved Flask Startup into __main__

Browse Source 
This allows command line arguments to be parsed first
This commit is contained in:
Divided by Zer0
2022-09-12 16:56:09 +02:00
parent 6bc702854f
commit 9280102cb3
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
aiserver.py
View File

@@ -402,8 +402,6 @@ import logging
log = logging.getLogger('werkzeug') log = logging.getLogger('werkzeug')
log.setLevel(logging.ERROR) log.setLevel(logging.ERROR)
# Start flask & SocketIO
logger.init("Flask", status="Starting")
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
@@ -414,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")
logger.init_ok("Flask", status="OK")
old_socketio_on = socketio.on old_socketio_on = socketio.on
def new_socketio_on(*a, **k): def new_socketio_on(*a, **k):
@@ -9992,9 +9988,13 @@ for schema in config_endpoint_schemas:
# Final startup commands to launch Flask app # Final startup commands to launch Flask app
#==================================================================# #==================================================================#
if __name__ == "__main__": if __name__ == "__main__":
logger.init("Webserver", status="Starting")
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:
@@ -10067,6 +10067,10 @@ if __name__ == "__main__":
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: