mirrors/Fooocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: correctly handle empty lora array in a1111 metadata log scheme

Browse Source
This commit is contained in:
Manuel Schmid 2024-03-17 13:58:13 +01:00
parent 0da614f7e1
commit 4cef9070d4
No known key found for this signature in database
GPG Key ID: 32C4F7569B40B84B
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/meta_parser.py
View File

@ -377,7 +377,7 @@ class A1111MetadataParser(MetadataParser):
data[key] = filename data[key] = filename
break break
if 'lora_hashes' in data: if 'lora_hashes' in data and data['lora_hashes'] != '':
lora_filenames = modules.config.lora_filenames.copy() lora_filenames = modules.config.lora_filenames.copy()
if modules.config.sdxl_lcm_lora in lora_filenames: if modules.config.sdxl_lcm_lora in lora_filenames:
lora_filenames.remove(modules.config.sdxl_lcm_lora) lora_filenames.remove(modules.config.sdxl_lcm_lora)
@ -431,16 +431,15 @@ class A1111MetadataParser(MetadataParser):
if key in data: if key in data:
generation_params[self.fooocus_to_a1111[key]] = data[key] generation_params[self.fooocus_to_a1111[key]] = data[key]
lora_hashes = [] if len(self.loras) > 0:
for index, (lora_name, lora_weight, lora_hash) in enumerate(self.loras): lora_hashes = []
# workaround for Fooocus not knowing LoRA name in LoRA metadata for index, (lora_name, lora_weight, lora_hash) in enumerate(self.loras):
lora_hashes.append(f'{lora_name}: {lora_hash}: {lora_weight}') # workaround for Fooocus not knowing LoRA name in LoRA metadata
lora_hashes_string = ', '.join(lora_hashes) lora_hashes.append(f'{lora_name}: {lora_hash}: {lora_weight}')
lora_hashes_string = ', '.join(lora_hashes)
generation_params[self.fooocus_to_a1111['lora_hashes']] = lora_hashes_string
generation_params |= { generation_params[self.fooocus_to_a1111['version']] = data['version']
self.fooocus_to_a1111['lora_hashes']: lora_hashes_string,
self.fooocus_to_a1111['version']: data['version']
}
if modules.config.metadata_created_by != '': if modules.config.metadata_created_by != '':
generation_params[self.fooocus_to_a1111['created_by']] = modules.config.metadata_created_by generation_params[self.fooocus_to_a1111['created_by']] = modules.config.metadata_created_by