1580158
/
sd-model-organizer
mirror of https://github.com/alexandersokol/sd-model-organizer.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #90 from Learwin/fix-integration 

Fix integration
pull/92/head
Alexander Sokol 2024-02-21 21:04:34 +02:00 committed by GitHub
parent 6e71a85733 6d97a2da1b
commit e472f0e1a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
javascript/main.js
View File

@ -732,10 +732,11 @@ function fillPrompt(recordid) {
backstack: populateBackstack()
};
deliverNavObject(navObj)
var counter = 0;
var timer = setInterval(() => {
counter++;
record_data = gradioApp().querySelector('#mo_record_info_nav_box textarea');
if (counter > 10) clearInterval(timer);
if (record_data == null) return;
var terminate = false;
var jsdata = record_data.value;

11
scripts/mo/utils.py
View File

@ -290,12 +290,13 @@ def get_json_record_data(id):
pos = '' if record is None else record.positive_prompts
neg = '' if record is None else record.negative_prompts
isCheckPoint = False
if (record.model_type == ModelType.CHECKPOINT):
flname = os.path.basename(record.location)
if (record.model_type == ModelType.CHECKPOINT):
isCheckPoint = True
pos = record.name
pos = flname
elif(record.model_type == ModelType.LORA or record.model_type == ModelType.LYCORIS):
lora_on_disk = networks.available_networks.get(get_model_filename_without_extension(record.name))
lora_on_disk = networks.available_networks.get(get_model_filename_without_extension(flname))
if lora_on_disk is None:
return {}
alias = lora_on_disk.get_alias()
@ -315,12 +316,12 @@ def get_json_record_data(id):
elif(record.model_type == ModelType.HYPER_NETWORK):
preferred_weight = record.weight
pos = f'<hypernet:{get_model_filename_without_extension(record.name)}:{preferred_weight}>'
pos = f'<hypernet:{get_model_filename_without_extension(flname)}:{preferred_weight}>'
elif(record.model_type == ModelType.EMBEDDING):
embedding = sd_hijack.model_hijack.embedding_db.word_embeddings.get(get_model_filename_without_extension(record.name))
embedding = sd_hijack.model_hijack.embedding_db.word_embeddings.get(get_model_filename_without_extension(flname))
if embedding is None:
return {}
if pos: