fix modelloader from huggingface

modules/generation_parameters_copypaste.py

@@ -187,7 +187,7 @@ def send_image_and_dimensions(x):
 def parse_generation_parameters(infotext):
     if not isinstance(infotext, str):
         return {}
-
+    debug(f'Parse infotext: {infotext}')
     re_param = re.compile(r'\s*([\w ]+):\s*("(?:\\"[^,]|\\"|\\|[^\"])+"|[^,]*)(?:,|$)') # multi-word: value
     re_size = re.compile(r"^(\d+)x(\d+)$") # int x int
     sanitized = infotext.replace('prompt:', 'Prompt:').replace('negative prompt:', 'Negative prompt:').replace('Negative Prompt', 'Negative prompt') # cleanup everything in brackets so re_params can work
@@ -196,6 +196,7 @@ def parse_generation_parameters(infotext):
     sanitized = re.sub(r'\{[^}]*\}', lambda match: ' ' * len(match.group()), sanitized)
 
     params = dict(re_param.findall(sanitized))
+    debug(f"Parse params: {params}")
     params = { k.strip():params[k].strip() for k in params if k.lower() not in ['hashes', 'lora', 'embeddings', 'prompt', 'negative prompt']} # remove some keys
     first_param = next(iter(params)) if params else None
     params_idx = sanitized.find(f'{first_param}:') if first_param else -1
@@ -223,7 +224,7 @@ def parse_generation_parameters(infotext):
             params[k] = v
     params["Prompt"] = prompt.replace('Prompt:', '').strip()
     params["Negative prompt"] = negative.replace('Negative prompt:', '').strip()
-    debug(f"Paste params: {params}")
+    debug(f"Parse: {params}")
     return params
 
 

modules/modelloader.py

@@ -301,6 +301,8 @@ def load_reference(name: str):
     if len(found) > 0: # already downloaded
         model_opts = get_reference_opts(found[0]['name'])
         return True
+    else:
+        model_opts = get_reference_opts(name)
     if model_opts.get('skip', False):
         return True
     shared.log.debug(f'Reference: download="{name}"')

modules/styles.py

@@ -60,17 +60,15 @@ def apply_wildcards_to_prompt(prompt, all_wildcards):
 
 
 def apply_styles_to_extra(p, style: Style):
+    global reference_style # pylint: disable=global-statement
     if style is None:
         return
     name_map = {
         'sampler': 'sampler_name',
     }
     from modules.generation_parameters_copypaste import parse_generation_parameters
-    s = style.extra
-    s = 'Negative prompt: ' + s if 'Negative prompt:' not in s else s
-    s = 'Prompt: ' + s if 'Prompt:' not in s else s
     extra = parse_generation_parameters(reference_style) if shared.opts.extra_network_reference else {}
-    extra.update(parse_generation_parameters(s))
+    extra.update(parse_generation_parameters(style.extra))
     extra.pop('Prompt', None)
     extra.pop('Negative prompt', None)
     fields = []
@@ -88,7 +86,8 @@ def apply_styles_to_extra(p, style: Style):
             fields.append(f'{k}={v}')
         else:
             skipped.append(f'{k}={v}')
-    shared.log.debug(f'Applying style: name="{style.name}" extra={fields} skipped={skipped}')
+    shared.log.debug(f'Applying style: name="{style.name}" extra={fields} skipped={skipped} reference={True if reference_style else False}')
+    # reference_style = None
 
 
 class StyleDatabase: