Merge pull request #15141 from catboxanon/feat/emphasis-infotext-parse

Only override emphasis if actually used in prompt

modules/infotext_utils.py

@@ -8,7 +8,7 @@
 
 import gradio as gr
 from modules.paths import data_path
-from modules import shared, ui_tempdir, script_callbacks, processing, infotext_versions, images
+from modules import shared, ui_tempdir, script_callbacks, processing, infotext_versions, images, prompt_parser
 from PIL import Image
 
 sys.modules['modules.generation_parameters_copypaste'] = sys.modules[__name__]  # alias for old name
@@ -356,7 +356,10 @@ def parse_generation_parameters(x: str, skip_fields: list[str] | None = None):
     if "Cache FP16 weight for LoRA" not in res and res["FP8 weight"] != "Disable":
         res["Cache FP16 weight for LoRA"] = False
 
-    if "Emphasis" not in res:
+    prompt_attention = prompt_parser.parse_prompt_attention(prompt)
+    prompt_attention += prompt_parser.parse_prompt_attention(negative_prompt)
+    prompt_uses_emphasis = len(prompt_attention) != len([p for p in prompt_attention if p[1] == 1.0 or p[0] == 'BREAK'])
+    if "Emphasis" not in res and prompt_uses_emphasis:
         res["Emphasis"] = "Original"
 
     if "Refiner switch by sampling steps" not in res: