mirror of
https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
synced 2025-04-04 03:29:00 +08:00
Merge 3f9efd532968f9083c129de193fedc5dfd9fd216 into 374bb6cc384d2a19422c0b07d69de0a41d1f3f4d
This commit is contained in:
MarcusNyne
GitHub
commit
fa9d1f8567
@ -2,38 +2,113 @@ import os
|
||||
import re
|
||||
import shutil
|
||||
import json
|
||||
|
||||
import html
|
||||
|
||||
import torch
|
||||
import tqdm
|
||||
|
||||
from modules import shared, images, sd_models, sd_vae, sd_models_config, errors
|
||||
from modules import shared, images, sd_models, sd_vae, sd_models_config, errors, infotext_utils
|
||||
from modules.ui_common import plaintext_to_html
|
||||
import gradio as gr
|
||||
import safetensors.torch
|
||||
|
||||
|
||||
def pnginfo_format_string(plain_text):
|
||||
content = "<br>\n".join(html.escape(x) for x in str(plain_text).split('\n'))
|
||||
return content
|
||||
|
||||
|
||||
def pnginfo_format_setting(name, value):
|
||||
cls_name = 'geninfo-setting-string' if value.startswith('"') else 'geninfo-setting-value'
|
||||
return f"<span class='geninfo-setting-name'>{html.escape(name)}:</span> <span class='{cls_name}' onclick='uiCopyElementText(this)'>{html.escape(value)}</span>"
|
||||
|
||||
|
||||
def pnginfo_format_quicklink(name):
|
||||
return f"<span class='geninfo-quick-link' onclick='uiCopyPngInfo(this, \"{name}\")'>[{html.escape(name)}]</span>"
|
||||
|
||||
|
||||
def pnginfo_html_v1(geninfo, items):
|
||||
items = {**{'parameters': geninfo}, **items}
|
||||
info_html = ''
|
||||
for key, text in items.items():
|
||||
info_html += f"""<div class="infotext">
|
||||
<p><b>{plaintext_to_html(str(key))}</b></p>
|
||||
<p>{plaintext_to_html(str(text))}</p>
|
||||
</div>""".strip() + "\n"
|
||||
|
||||
if len(info_html) == 0:
|
||||
message = "Nothing found in the image."
|
||||
info_html = f"<div><p>{message}<p></div>"
|
||||
|
||||
return info_html
|
||||
|
||||
|
||||
def pnginfo_html_v2(geninfo, items):
|
||||
|
||||
prompt, negative_prompt, last_line = infotext_utils.split_infotext(geninfo)
|
||||
res = infotext_utils.parameters_to_dict(last_line)
|
||||
if not any([prompt, res, items]):
|
||||
return pnginfo_html_v1(geninfo, items)
|
||||
|
||||
info_html = ''
|
||||
if prompt:
|
||||
info_html += f"""
|
||||
<div class='pnginfo-page'>
|
||||
<p><b>parameters</b><br>
|
||||
{pnginfo_format_quicklink("Copy")} {pnginfo_format_quicklink("Prompt")}"""
|
||||
if negative_prompt:
|
||||
info_html += f' {pnginfo_format_quicklink("Negative")}'
|
||||
info_html += f""" {pnginfo_format_quicklink("Settings")}
|
||||
</p>
|
||||
<p id='pnginfo-positive'>{pnginfo_format_string(prompt)}</p>"""
|
||||
if negative_prompt:
|
||||
info_html += f"""
|
||||
<p>
|
||||
<span class='geninfo-setting-name'>Negative prompt:</span><br><span id='pnginfo-negative'>{pnginfo_format_string(negative_prompt)}</span>
|
||||
</p>
|
||||
"""
|
||||
if res:
|
||||
info_html += "<p id='pnginfo-settings'>"
|
||||
first = True
|
||||
for key, value in res.items():
|
||||
if first:
|
||||
first = False
|
||||
else:
|
||||
info_html += ", "
|
||||
info_html += pnginfo_format_setting(key, value)
|
||||
info_html += "</p>"
|
||||
info_html += "</div>\n"
|
||||
|
||||
for key, text in items.items():
|
||||
info_html += f"""
|
||||
<div class="infotext">
|
||||
<p><b>{plaintext_to_html(str(key))}</b></p>
|
||||
<p>{plaintext_to_html(str(text))}</p>
|
||||
</div>
|
||||
""".strip()+"\n"
|
||||
|
||||
return info_html
|
||||
|
||||
|
||||
pnginfo_html_map = {
|
||||
'Default': pnginfo_html_v2,
|
||||
'Parsed': pnginfo_html_v2,
|
||||
'Raw': pnginfo_html_v1,
|
||||
}
|
||||
|
||||
|
||||
def run_pnginfo(image):
|
||||
if image is None:
|
||||
return '', '', ''
|
||||
|
||||
geninfo, items = images.read_info_from_image(image)
|
||||
items = {**{'parameters': geninfo}, **items}
|
||||
info_html = pnginfo_html_map.get(shared.opts.png_info_html_style, pnginfo_html_v2)(geninfo, items)
|
||||
|
||||
info = ''
|
||||
for key, text in items.items():
|
||||
info += f"""
|
||||
<div class="infotext">
|
||||
<p><b>{plaintext_to_html(str(key))}</b></p>
|
||||
<p>{plaintext_to_html(str(text))}</p>
|
||||
</div>
|
||||
""".strip()+"\n"
|
||||
|
||||
if len(info) == 0:
|
||||
if len(info_html) == 0:
|
||||
message = "Nothing found in the image."
|
||||
info = f"<div><p>{message}<p></div>"
|
||||
info_html = f"<div><p>{message}<p></div>"
|
||||
|
||||
return '', geninfo, info
|
||||
return '', geninfo, info_html
|
||||
|
||||
|
||||
def create_config(ckpt_result, config_source, a, b, c):
|
||||
@ -202,8 +277,8 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
|
||||
if a.shape[1] == 4 and b.shape[1] == 8:
|
||||
raise RuntimeError("When merging instruct-pix2pix model with a normal one, A must be the instruct-pix2pix model.")
|
||||
|
||||
if a.shape[1] == 8 and b.shape[1] == 4:#If we have an Instruct-Pix2Pix model...
|
||||
theta_0[key][:, 0:4, :, :] = theta_func2(a[:, 0:4, :, :], b, multiplier)#Merge only the vectors the models have in common. Otherwise we get an error due to dimension mismatch.
|
||||
if a.shape[1] == 8 and b.shape[1] == 4: # If we have an Instruct-Pix2Pix model...
|
||||
theta_0[key][:, 0:4, :, :] = theta_func2(a[:, 0:4, :, :], b, multiplier) # Merge only the vectors the models have in common. Otherwise we get an error due to dimension mismatch.
|
||||
result_is_instruct_pix2pix_model = True
|
||||
else:
|
||||
assert a.shape[1] == 9 and b.shape[1] == 4, f"Bad dimensions for merged layer {key}: A={a.shape}, B={b.shape}"
|
||||
@ -274,7 +349,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
|
||||
|
||||
if save_metadata and add_merge_recipe:
|
||||
merge_recipe = {
|
||||
"type": "webui", # indicate this model was merged with webui's built-in merger
|
||||
"type": "webui", # indicate this model was merged with webui's built-in merger
|
||||
"primary_model_hash": primary_model_info.sha256,
|
||||
"secondary_model_hash": secondary_model_info.sha256 if secondary_model_info else None,
|
||||
"tertiary_model_hash": tertiary_model_info.sha256 if tertiary_model_info else None,
|
||||
@ -312,7 +387,7 @@ def run_modelmerger(id_task, primary_model_name, secondary_model_name, tertiary_
|
||||
|
||||
_, extension = os.path.splitext(output_modelname)
|
||||
if extension.lower() == ".safetensors":
|
||||
safetensors.torch.save_file(theta_0, output_modelname, metadata=metadata if len(metadata)>0 else None)
|
||||
safetensors.torch.save_file(theta_0, output_modelname, metadata=metadata if len(metadata) > 0 else None)
|
||||
else:
|
||||
torch.save(theta_0, output_modelname)
|
||||
|
||||
|
||||
@ -231,6 +231,60 @@ def restore_old_hires_fix_params(res):
|
||||
res['Hires resize-2'] = height
|
||||
|
||||
|
||||
def split_infotext(x: str):
|
||||
"""splits infotext into prompt, negative prompt, parameters
|
||||
every line from the beginning to the first line starting with "Negative prompt:" is treated as prompt
|
||||
every line after that is treated as negative_prompt
|
||||
the last_line is only treated as parameters if it has contains at least 3 parameters
|
||||
"""
|
||||
if x is None:
|
||||
return '', '', ''
|
||||
prompt, negative_prompt, done_with_prompt = '', '', False
|
||||
*lines, last_line = x.strip().split('\n')
|
||||
|
||||
if len(re_param.findall(last_line)) < 3:
|
||||
lines.append(last_line)
|
||||
last_line = ''
|
||||
|
||||
for line in lines:
|
||||
line = line.strip()
|
||||
|
||||
if not done_with_prompt and line.startswith('Negative prompt:'):
|
||||
done_with_prompt = True
|
||||
line = line[16:].strip()
|
||||
if done_with_prompt:
|
||||
negative_prompt += '\n' + line
|
||||
else:
|
||||
prompt += '\n' + line
|
||||
|
||||
return prompt.strip(), negative_prompt.strip(), last_line
|
||||
|
||||
|
||||
def parameters_to_dict(parameters: str):
|
||||
"""convert parameters from string to dict"""
|
||||
return dict(re_param.findall(parameters))
|
||||
|
||||
|
||||
def parse_parameters(param_dict: dict):
|
||||
res = {}
|
||||
for k, v in param_dict.items():
|
||||
try:
|
||||
if v.startswith('"') and v.endswith('"'):
|
||||
v = unquote(v)
|
||||
|
||||
if (m := re_imagesize.match(v)) is not None:
|
||||
# values matching regex r"^(\d+)x(\d+)$" will be split into two keys
|
||||
# {size: 512x512} -> {'size-1': '512', 'size-2': '512'}
|
||||
res[f"{k}-1"] = m.group(1)
|
||||
res[f"{k}-2"] = m.group(2)
|
||||
else:
|
||||
res[k] = v
|
||||
|
||||
except Exception as e:
|
||||
print(f"Error parsing \"{k}: {v}\" : {e}")
|
||||
return res
|
||||
|
||||
|
||||
def parse_generation_parameters(x: str, skip_fields: list[str] | None = None):
|
||||
"""parses generation parameters string, the one you see in text field under the picture in UI:
|
||||
```
|
||||
@ -239,46 +293,21 @@ Negative prompt: ugly, fat, obese, chubby, (((deformed))), [blurry], bad anatomy
|
||||
Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model hash: 45dee52b
|
||||
```
|
||||
|
||||
returns a dict with field values
|
||||
Returns a dict with field values
|
||||
|
||||
Notes: issues with infotext syntax
|
||||
1. prompt can not contains a startng line with "Negative prompt:" as it will
|
||||
2. if the last_line contains less than 3 parameters it will be treated as part of the negative_prompt, even though it might actually be parameters
|
||||
|
||||
Changes:
|
||||
1.11.0 : if a user decides to use a literal "Negative prompt:" as a part of their negative prompt at the beginning of the a line after the first line, webui will remove it from the prompt as there are treated as markers. after the fix only the fisrt "Negative prompt:" will be removed
|
||||
"""
|
||||
if skip_fields is None:
|
||||
skip_fields = shared.opts.infotext_skip_pasting
|
||||
|
||||
res = {}
|
||||
|
||||
prompt = ""
|
||||
negative_prompt = ""
|
||||
|
||||
done_with_prompt = False
|
||||
|
||||
*lines, lastline = x.strip().split("\n")
|
||||
if len(re_param.findall(lastline)) < 3:
|
||||
lines.append(lastline)
|
||||
lastline = ''
|
||||
|
||||
for line in lines:
|
||||
line = line.strip()
|
||||
if line.startswith("Negative prompt:"):
|
||||
done_with_prompt = True
|
||||
line = line[16:].strip()
|
||||
if done_with_prompt:
|
||||
negative_prompt += ("" if negative_prompt == "" else "\n") + line
|
||||
else:
|
||||
prompt += ("" if prompt == "" else "\n") + line
|
||||
|
||||
for k, v in re_param.findall(lastline):
|
||||
try:
|
||||
if v[0] == '"' and v[-1] == '"':
|
||||
v = unquote(v)
|
||||
|
||||
m = re_imagesize.match(v)
|
||||
if m is not None:
|
||||
res[f"{k}-1"] = m.group(1)
|
||||
res[f"{k}-2"] = m.group(2)
|
||||
else:
|
||||
res[k] = v
|
||||
except Exception:
|
||||
print(f"Error parsing \"{k}: {v}\"")
|
||||
prompt, negative_prompt, last_line = split_infotext(x)
|
||||
res = parameters_to_dict(last_line)
|
||||
res = parse_parameters(res)
|
||||
|
||||
# Extract styles from prompt
|
||||
if shared.opts.infotext_styles != "Ignore":
|
||||
|
||||
@ -76,6 +76,11 @@ def reload_hypernetworks():
|
||||
shared.hypernetworks = hypernetwork.list_hypernetworks(cmd_opts.hypernetwork_dir)
|
||||
|
||||
|
||||
def list_pnginfo_html_methods():
|
||||
from modules.extras import pnginfo_html_map
|
||||
return list(pnginfo_html_map)
|
||||
|
||||
|
||||
def get_infotext_names():
|
||||
from modules import infotext_utils, shared
|
||||
res = {}
|
||||
|
||||
@ -368,7 +368,7 @@ It is displayed in UI below the image. To use infotext, paste it into the prompt
|
||||
<li>Discard: remove style text from prompt, keep styles dropdown as it is.</li>
|
||||
<li>Apply if any: remove style text from prompt; if any styles are found in prompt, put them into styles dropdown, otherwise keep it as it is.</li>
|
||||
</ul>"""),
|
||||
|
||||
"png_info_html_style": OptionInfo("Default", "PNG Info style", gr.Radio, lambda: {"choices": shared_items.list_pnginfo_html_methods()}).info("Default -> Parsed"),
|
||||
}))
|
||||
|
||||
options_templates.update(options_section(('ui', "Live previews", "ui"), {
|
||||
|
||||
63
script.js
63
script.js
@ -212,3 +212,66 @@ function uiElementInSight(el) {
|
||||
|
||||
return isOnScreen;
|
||||
}
|
||||
|
||||
function uiCopyElementAnimate(el) {
|
||||
el.classList.remove('animate');
|
||||
setTimeout(() => {
|
||||
el.classList.add('animate');
|
||||
}, 0);
|
||||
setTimeout(() => {
|
||||
el.classList.remove('animate');
|
||||
}, 1100);
|
||||
}
|
||||
|
||||
function uiCopyElementText(el) {
|
||||
var text = el.innerText;
|
||||
if (text.startsWith('"')) {
|
||||
text = text.substring(1, text.length - 1).replaceAll('\\n', '\n');
|
||||
}
|
||||
|
||||
navigator.clipboard.writeText(text);
|
||||
uiCopyElementAnimate(el);
|
||||
}
|
||||
|
||||
function uiCopyRawText(elid) {
|
||||
var el = document.getElementById(elid);
|
||||
if (el == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return el.innerText;
|
||||
}
|
||||
|
||||
function uiCopyPngInfo(el, mode) {
|
||||
var text = null;
|
||||
|
||||
if (mode == "Prompt") {
|
||||
text = uiCopyRawText("pnginfo-positive");
|
||||
} else if (mode == "Negative") {
|
||||
text = uiCopyRawText("pnginfo-negative");
|
||||
} else if (mode == "Settings") {
|
||||
text = uiCopyRawText("pnginfo-settings");
|
||||
} else if (mode == "Copy") {
|
||||
text = "";
|
||||
var t2 = uiCopyRawText("pnginfo-positive");
|
||||
if (t2 != null) {
|
||||
text += t2;
|
||||
}
|
||||
t2 = uiCopyRawText("pnginfo-negative");
|
||||
if (t2 != null) {
|
||||
text += "\nNegative prompt: " + t2;
|
||||
}
|
||||
t2 = uiCopyRawText("pnginfo-settings");
|
||||
if (t2 != null) {
|
||||
text += "\n" + t2;
|
||||
}
|
||||
if (text == "") {
|
||||
text = null;
|
||||
}
|
||||
}
|
||||
|
||||
if (text != null) {
|
||||
navigator.clipboard.writeText(text);
|
||||
uiCopyElementAnimate(el);
|
||||
}
|
||||
}
|
||||
|
||||
99
style.css
99
style.css
@ -1667,3 +1667,102 @@ body.resizing .resize-handle {
|
||||
visibility: visible;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
/* PngInfo colors */
|
||||
:root {
|
||||
--pnginfo-value-color:var(--secondary-600);
|
||||
--pnginfo-string-color:var(--primary-600);
|
||||
--pnginfo-value-hover:var(--secondary-100);
|
||||
--pnginfo-string-hover:var(--primary-100);
|
||||
--pnginfo-copy-color:#22c922;
|
||||
--pnginfo-copy-background:#a9cfa9;
|
||||
}
|
||||
|
||||
.dark {
|
||||
--pnginfo-value-color:var(--secondary-400);
|
||||
--pnginfo-string-color:var(--primary-400);
|
||||
--pnginfo-value-hover:var(--secondary-700);
|
||||
--pnginfo-string-hover:var(--primary-700);
|
||||
--pnginfo-copy-color:#a9cfa9;
|
||||
--pnginfo-copy-background:#22c922;
|
||||
}
|
||||
|
||||
.pnginfo-page {
|
||||
overflow-wrap: break-word;
|
||||
}
|
||||
|
||||
#pnginfo-positive,
|
||||
#pnginfo-negative,
|
||||
#pnginfo-settings {
|
||||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
/* PngInfo styles */
|
||||
.pnginfo-page p span.geninfo-setting-name {
|
||||
font-weight: var(--weight-semibold);
|
||||
}
|
||||
|
||||
.pnginfo-page p span.geninfo-setting-value {
|
||||
color: var(--pnginfo-value-color);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.pnginfo-page p span.geninfo-setting-value:hover {
|
||||
background-color: var(--pnginfo-value-hover);
|
||||
}
|
||||
|
||||
.pnginfo-page p span.geninfo-setting-string {
|
||||
color: var(--pnginfo-string-color);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.pnginfo-page p span.geninfo-setting-string:hover {
|
||||
background-color: var(--pnginfo-string-hover);
|
||||
}
|
||||
|
||||
.pnginfo-page p span.geninfo-quick-link {
|
||||
color: var(--pnginfo-string-color);
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.pnginfo-page p span.geninfo-quick-link:hover {
|
||||
background-color: var(--pnginfo-string-hover);
|
||||
}
|
||||
|
||||
/* PngInfo animations */
|
||||
@keyframes copyAnimationSettingValue {
|
||||
0% {
|
||||
color: var(--pnginfo-copy-color);
|
||||
background-color: var(--pnginfo-copy-background);
|
||||
}
|
||||
100% {
|
||||
color: var(--pnginfo-value-color);
|
||||
background-color: unset;
|
||||
}
|
||||
}
|
||||
|
||||
span.geninfo-setting-value.animate {
|
||||
-webkit-animation: copyAnimationSettingValue 1s 1;
|
||||
animation: copyAnimationSettingValue 1s 1;
|
||||
}
|
||||
|
||||
@keyframes copyAnimationSettingString {
|
||||
0% {
|
||||
color: var(--pnginfo-copy-color);
|
||||
background-color: var(--pnginfo-copy-background);
|
||||
}
|
||||
100% {
|
||||
color: var(--pnginfo-string-color);
|
||||
background-color: unset;
|
||||
}
|
||||
}
|
||||
|
||||
span.geninfo-setting-string.animate {
|
||||
-webkit-animation: copyAnimationSettingString 1s 1;
|
||||
animation: copyAnimationSettingString 1s 1;
|
||||
}
|
||||
|
||||
span.geninfo-quick-link.animate {
|
||||
-webkit-animation: copyAnimationSettingString 1s 1;
|
||||
animation: copyAnimationSettingString 1s 1;
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user