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

Added model info to show model load progress in UI

Browse Source
This commit is contained in:
ebolam
2022-03-11 11:31:41 -05:00
parent 0943926f6a
commit 772ae2eb80
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
aiserver.py
View File

@ -1110,7 +1110,13 @@ def load_model(use_gpu=True, key='', gpu_layers=None, initial_load=False):
try: try:
last_storage_key = None last_storage_key = None
f = None f = None
for key in tqdm(sorted(device_map.keys(), key=lambda k: (model_dict[k].key, model_dict[k].seek_offset)), desc="Loading model tensors"): import time
class Send_to_socketio(object):
def write(self, bar):
print(bar, end="")
time.sleep(0.01)
emit('from_server', {'cmd': 'model_load_status', 'data': bar}, broadcast=True)
for key in tqdm(sorted(device_map.keys(), key=lambda k: (model_dict[k].key, model_dict[k].seek_offset)), desc="Loading model tensors", file=Send_to_socketio()):
storage_key = model_dict[key].key storage_key = model_dict[key].key
if storage_key != last_storage_key: if storage_key != last_storage_key:
last_storage_key = storage_key last_storage_key = storage_key
@ -1132,7 +1138,7 @@ def load_model(use_gpu=True, key='', gpu_layers=None, initial_load=False):
finally: finally:
if isinstance(f, zipfile.ZipExtFile): if isinstance(f, zipfile.ZipExtFile):
f.close() f.close()
emit('from_server', {'cmd': 'hide_model_name'}, broadcast=True)
return lazy_load_callback return lazy_load_callback
lazy_load_config_path = os.path.join(path.dirname(path.realpath(__file__)), "maps", vars.model_type + ".json") lazy_load_config_path = os.path.join(path.dirname(path.realpath(__file__)), "maps", vars.model_type + ".json")
@ -2573,7 +2579,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'):
if not os.path.exists("settings/" + vars.model.replace('/', '_') + ".breakmodel"): if not os.path.exists("settings/"):
os.mkdir("settings") os.mkdir("settings")
f = open("settings/" + vars.model.replace('/', '_') + ".breakmodel", "w") f = open("settings/" + vars.model.replace('/', '_') + ".breakmodel", "w")
f.write(msg['gpu_layers']) f.write(msg['gpu_layers'])
@ -2941,6 +2947,8 @@ def actionretry(data):
last_key = vars.actions.get_last_key() last_key = vars.actions.get_last_key()
vars.actions.pop() vars.actions.pop()
remove_story_chunk(last_key + 1) remove_story_chunk(last_key + 1)
#for the redo to not get out of whack, need to reset the max # in the actions sequence
vars.actions.set_next_id(last_key)
vars.recentback = False vars.recentback = False
vars.recentedit = False vars.recentedit = False
vars.lua_koboldbridge.feedback = None vars.lua_koboldbridge.feedback = None

5
static/application.js
View File

@ -2424,6 +2424,11 @@ $(document).ready(function(){
} else if(msg.cmd == 'show_model_name') { } else if(msg.cmd == 'show_model_name') {
$("#showmodelnamecontent").html("<div class=\"flex\"><div class=\"loadlistpadding\"></div><div class=\"loadlistitem\">" + msg.data + "</div></div>"); $("#showmodelnamecontent").html("<div class=\"flex\"><div class=\"loadlistpadding\"></div><div class=\"loadlistitem\">" + msg.data + "</div></div>");
$("#showmodelnamecontainer").removeClass("hidden"); $("#showmodelnamecontainer").removeClass("hidden");
} else if(msg.cmd == 'hide_model_name') {
$("#showmodelnamecontainer").addClass("hidden");
} else if(msg.cmd == 'model_load_status') {
$("#showmodelnamecontent").html("<div class=\"flex\"><div class=\"loadlistpadding\"></div><div class=\"loadlistitem\" style='align: left'>" + msg.data + "</div></div>");
$("#showmodelnamecontainer").removeClass("hidden");
console.log(msg.data); console.log(msg.data);
} }
}); });

8
templates/index.html
View File

@ -408,13 +408,13 @@
</div> </div>
<div class="popupcontainer hidden" id="showmodelnamecontainer" style="center;"> <div class="popupcontainer hidden" id="showmodelnamecontainer" style="center;">
<div> <div>
<div class="popuptitlebar"> <div class="popuptitlebar" style="width:50% center;">
<div class="popuptitletext">Model Name</div> <div class="popuptitletext">Model Info</div>
</div> </div>
<div class="aidgpopuplistheader" id=showmodelnamecontent> <div class="aidgpopuplistheader" id=showmodelnamecontent style="width:50% center;">
Read Only Read Only
</div> </div>
<div class="popupfooter"> <div class="popupfooter" style="width:50% center;">
<button type="button" class="btn btn-primary" onclick='$("#showmodelnamecontainer").addClass("hidden");'>OK</button> <button type="button" class="btn btn-primary" onclick='$("#showmodelnamecontainer").addClass("hidden");'>OK</button>
</div> </div>
</div> </div>