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

Added GPU name to the UI when using break models. 

Added total layers to the UI
Added favicon
This commit is contained in:
ebolam 2022-06-09 08:42:35 -04:00
parent c565978fff
commit db9a94ca2a
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
aiserver.py
View File

@ -349,7 +349,7 @@ log.setLevel(logging.ERROR)
# Start flask & SocketIO # Start flask & SocketIO
print("{0}Initializing Flask... {1}".format(colors.PURPLE, colors.END), end="") print("{0}Initializing Flask... {1}".format(colors.PURPLE, colors.END), end="")
from flask import Flask, render_template, Response, request, copy_current_request_context from flask import Flask, render_template, Response, request, copy_current_request_context, send_from_directory
from flask_socketio import SocketIO, emit from flask_socketio import SocketIO, emit
app = Flask(__name__, root_path=os.getcwd()) app = Flask(__name__, root_path=os.getcwd())
app.config['SECRET KEY'] = 'secret!' app.config['SECRET KEY'] = 'secret!'
@ -1032,6 +1032,9 @@ def get_model_info(model, directory=""):
break_values = [] break_values = []
url = False url = False
gpu_count = torch.cuda.device_count() gpu_count = torch.cuda.device_count()
gpu_names = []
for i in range(gpu_count):
gpu_names.append(torch.cuda.get_device_name(i))
if model in [x[1] for x in model_menu['apilist']]: if model in [x[1] for x in model_menu['apilist']]:
if path.exists("settings/{}.settings".format(model)): if path.exists("settings/{}.settings".format(model)):
with open("settings/{}.settings".format(model), "r") as file: with open("settings/{}.settings".format(model), "r") as file:
@ -1064,7 +1067,7 @@ def get_model_info(model, directory=""):
emit('from_server', {'cmd': 'selected_model_info', 'key_value': key_value, 'key':key, emit('from_server', {'cmd': 'selected_model_info', 'key_value': key_value, 'key':key,
'gpu':gpu, 'layer_count':layer_count, 'breakmodel':breakmodel, 'gpu':gpu, 'layer_count':layer_count, 'breakmodel':breakmodel,
'break_values': break_values, 'gpu_count': gpu_count, 'break_values': break_values, 'gpu_count': gpu_count,
'url': url}, broadcast=True) 'url': url, 'gpu_names': gpu_names}, broadcast=True)
if key_value != "": if key_value != "":
get_oai_models(key_value) get_oai_models(key_value)
@ -2006,6 +2009,10 @@ def load_model(use_gpu=True, gpu_layers=None, initial_load=False, online_model="
@app.route('/index') @app.route('/index')
def index(): def index():
return render_template('index.html', hide_ai_menu=args.noaimenu) return render_template('index.html', hide_ai_menu=args.noaimenu)
@app.route('/favicon.ico')
def favicon():
return send_from_directory(app.root_path,
'koboldai.ico', mimetype='image/vnd.microsoft.icon')
@app.route('/download') @app.route('/download')
def download(): def download():
save_format = request.args.get("format", "json").strip().lower() save_format = request.args.get("format", "json").strip().lower()

10
static/application.js
View File

@ -1911,7 +1911,7 @@ function update_gpu_layers() {
} }
if (gpu_layers > parseInt(document.getElementById("gpu_layers_max").innerHTML)) { if (gpu_layers > parseInt(document.getElementById("gpu_layers_max").innerHTML)) {
disableButtons([load_model_accept]); disableButtons([load_model_accept]);
$("#gpu_layers_current").html("<span style='color: red'>"+gpu_layers+"</span>"); $("#gpu_layers_current").html("<span style='color: red'>"+gpu_layers+"/"+ document.getElementById("gpu_layers_max").innerHTML +"</span>");
} else { } else {
enableButtons([load_model_accept]); enableButtons([load_model_accept]);
$("#gpu_layers_current").html(gpu_layers); $("#gpu_layers_current").html(gpu_layers);
@ -2494,7 +2494,7 @@ $(document).ready(function(){
debug_area.addClass("hidden"); debug_area.addClass("hidden");
} }
} else if(msg.cmd == 'show_model_menu') { } else if(msg.cmd == 'show_model_menu') {
console.log(msg) //console.log(msg)
$("#use_gpu_div").addClass("hidden"); $("#use_gpu_div").addClass("hidden");
$("#modelkey").addClass("hidden"); $("#modelkey").addClass("hidden");
$("#modellayers").addClass("hidden"); $("#modellayers").addClass("hidden");
@ -2525,9 +2525,9 @@ $(document).ready(function(){
var html; var html;
$("#modellayers").removeClass("hidden"); $("#modellayers").removeClass("hidden");
html = ""; html = "";
msg.break_values.forEach(function (item, index) { for (let i = 0; i < msg.gpu_names.length; i++) {
html += "GPU " + index + ": <input type='range' class='form-range airange' min='0' max='"+msg.layer_count+"' step='1' value='"+item+"' id='gpu_layers"+index+"' onchange='update_gpu_layers();'>"; html += "GPU " + i + " " + msg.gpu_names[i] + ": <input type='range' class='form-range airange' min='0' max='"+msg.layer_count+"' step='1' value='"+msg.break_values[i]+"' id='gpu_layers"+i+"' onchange='update_gpu_layers();'>";
}) }
$("#model_layer_bars").html(html); $("#model_layer_bars").html(html);
$("#gpu_layers_max").html(msg.layer_count); $("#gpu_layers_max").html(msg.layer_count);
$("#gpu_count")[0].value = msg.gpu_count; $("#gpu_count")[0].value = msg.gpu_count;