Skip to content

Commit 4f4d23f

Browse files
committed
fix: use filename instead of download function call for lcm lora
do not require lcm lora to be downloaded for metadata parsing
1 parent 9c30961 commit 4f4d23f

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

modules/config.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -474,6 +474,7 @@ def add_ratio(x):
474474

475475
model_filenames = []
476476
lora_filenames = []
477+
sdxl_lcm_lora = 'sdxl_lcm_lora.safetensors'
477478

478479

479480
def get_model_filenames(folder_paths, name_filter=None):
@@ -533,9 +534,9 @@ def downloading_sdxl_lcm_lora():
533534
load_file_from_url(
534535
url='https://huggingface.co/lllyasviel/misc/resolve/main/sdxl_lcm_lora.safetensors',
535536
model_dir=paths_loras[0],
536-
file_name='sdxl_lcm_lora.safetensors'
537+
file_name=sdxl_lcm_lora
537538
)
538-
return 'sdxl_lcm_lora.safetensors'
539+
return sdxl_lcm_lora
539540

540541

541542
def downloading_controlnet_canny():

modules/meta_parser.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,8 @@ def parse_json(self, metadata: str) -> dict:
379379

380380
if 'lora_hashes' in data:
381381
lora_filenames = modules.config.lora_filenames.copy()
382-
lora_filenames.remove(modules.config.downloading_sdxl_lcm_lora())
382+
if modules.config.sdxl_lcm_lora in lora_filenames:
383+
lora_filenames.remove(modules.config.sdxl_lcm_lora)
383384
for li, lora in enumerate(data['lora_hashes'].split(', ')):
384385
lora_name, lora_hash, lora_weight = lora.split(': ')
385386
for filename in lora_filenames:
@@ -460,7 +461,8 @@ def get_scheme(self) -> MetadataScheme:
460461
def parse_json(self, metadata: dict) -> dict:
461462
model_filenames = modules.config.model_filenames.copy()
462463
lora_filenames = modules.config.lora_filenames.copy()
463-
lora_filenames.remove(modules.config.downloading_sdxl_lcm_lora())
464+
if modules.config.sdxl_lcm_lora in lora_filenames:
465+
lora_filenames.remove(modules.config.sdxl_lcm_lora)
464466

465467
for key, value in metadata.items():
466468
if value in ['', 'None']:

0 commit comments

Comments
 (0)