1580158
/
sdweb-merge-board
mirror of https://github.com/bbc-mc/sdweb-merge-board.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix KeyError about newly merged model (#15)

master
bbc_mc 2023-01-24 00:10:00 +09:00
parent 9c2a398be9
commit 2955b73584
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/multimerge/recipe.py
View File

@ -165,7 +165,7 @@ class MergeRecipe():
_model_info = sd_models.get_closet_checkpoint_match(model_title)
if hasattr(_model_info, "sha256") and _model_info.sha256 is None:
_model_info:CheckpointInfo = _model_info
_model_info.sha256 = hashes.sha256(_model_info.filename, "checkpoint/" + _model_info.title)
_model_info.calculate_shorthash()
_name = _model_info.name if hasattr(_model_info, "name") else _model_info.title
_hash = _model_info.hash
_sha256 = _model_info.sha256 if hasattr(_model_info, "sha256") else ""
@ -208,16 +208,10 @@ class MergeRecipe():
# Checkpoint saved to " + output_modelname
ckpt_name = " ".join(results.split(" ")[3:])
ckpt_name = os.path.basename(ckpt_name) # expect aaaa.ckpt
ckpt_name = sd_models.get_closet_checkpoint_match(ckpt_name).title
# why?
try:
ckpt_info = sd_models.checkpoints_list[ckpt_name]
except KeyError as ke:
print(ke)
target = [x for x in sd_models.checkpoints_list.keys() if ckpt_name in x]
if len(target) > 0:
ckpt_name = target[0]
print(ckpt_name)
ckpt_info = sd_models.get_closet_checkpoint_match(ckpt_name)
ckpt_info.calculate_shorthash()
ckpt_name = ckpt_info.title
# update
self.O = ckpt_name
print(f" __O{index}__: -> {ckpt_name}")