update reforge
Browse files- modules/images.py +26 -6
- modules/launch_utils.py +1 -1
- modules/stealth_infotext.py +1 -1
- modules/ui.py +4 -4
modules/images.py
CHANGED
@@ -604,12 +604,32 @@ def save_image_with_geninfo(image, geninfo, filename, extension=None, existing_p
|
|
604 |
image.save(filename, format=image_format, quality=opts.jpeg_quality, pnginfo=pnginfo_data)
|
605 |
|
606 |
elif extension.lower() in (".jpg", ".jpeg", ".webp"):
|
607 |
-
|
608 |
-
|
609 |
-
|
610 |
-
|
611 |
-
|
612 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
613 |
|
614 |
if opts.enable_pnginfo and geninfo is not None:
|
615 |
exif_bytes = piexif.dump({
|
|
|
604 |
image.save(filename, format=image_format, quality=opts.jpeg_quality, pnginfo=pnginfo_data)
|
605 |
|
606 |
elif extension.lower() in (".jpg", ".jpeg", ".webp"):
|
607 |
+
img_to_save = image
|
608 |
+
save_options = {"quality": opts.jpeg_quality}
|
609 |
+
|
610 |
+
if img_to_save.mode == 'RGBA':
|
611 |
+
convertToRGB = True
|
612 |
+
if extension.lower() == ".webp":
|
613 |
+
stealth_pnginfo_opt = shared.opts.data.get('stealth_pnginfo_opt', 'Alpha')
|
614 |
+
if stealth_pnginfo_opt == 'Alpha':
|
615 |
+
convertToRGB = False # Keep RGBA for stealth info in alpha
|
616 |
+
if opts.webp_lossless:
|
617 |
+
save_options["lossless"] = True
|
618 |
+
else:
|
619 |
+
# For lossy WebP, try to make alpha lossless for LSB steganography
|
620 |
+
save_options["lossless"] = False
|
621 |
+
save_options["alpha_quality"] = 100 # Crucial for attempting LSB on lossy WebP alpha
|
622 |
+
|
623 |
+
if convertToRGB:
|
624 |
+
img_to_save = img_to_save.convert("RGB")
|
625 |
+
elif img_to_save.mode == 'I;16':
|
626 |
+
img_to_save = img_to_save.point(lambda p: p * 0.0038910505836576).convert("RGB" if extension.lower() == ".webp" else "L")
|
627 |
+
|
628 |
+
# Ensure lossless is explicitly set for webp if not already by stealth logic
|
629 |
+
if extension.lower() == ".webp" and "lossless" not in save_options:
|
630 |
+
save_options["lossless"] = opts.webp_lossless
|
631 |
+
|
632 |
+
img_to_save.save(filename, format=image_format, **save_options)
|
633 |
|
634 |
if opts.enable_pnginfo and geninfo is not None:
|
635 |
exif_bytes = piexif.dump({
|
modules/launch_utils.py
CHANGED
@@ -393,7 +393,7 @@ def prepare_environment():
|
|
393 |
requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
|
394 |
requirements_file_for_npu = os.environ.get('REQS_FILE_FOR_NPU', "requirements_npu.txt")
|
395 |
|
396 |
-
xformers_package = os.environ.get('XFORMERS_PACKAGE', '--index-url https://download.pytorch.org/whl/
|
397 |
clip_package = os.environ.get('CLIP_PACKAGE', "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip")
|
398 |
openclip_package = os.environ.get('OPENCLIP_PACKAGE', "https://github.com/mlfoundations/open_clip/archive/bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b.zip")
|
399 |
|
|
|
393 |
requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
|
394 |
requirements_file_for_npu = os.environ.get('REQS_FILE_FOR_NPU', "requirements_npu.txt")
|
395 |
|
396 |
+
xformers_package = os.environ.get('XFORMERS_PACKAGE', '--index-url https://download.pytorch.org/whl/cu128 xformers')
|
397 |
clip_package = os.environ.get('CLIP_PACKAGE', "https://github.com/openai/CLIP/archive/d50d76daa670286dd6cacf3bcd80b5e4823fc8e1.zip")
|
398 |
openclip_package = os.environ.get('OPENCLIP_PACKAGE', "https://github.com/mlfoundations/open_clip/archive/bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b.zip")
|
399 |
|
modules/stealth_infotext.py
CHANGED
@@ -8,7 +8,7 @@ def add_stealth_pnginfo(params: ImageSaveParams):
|
|
8 |
stealth_pnginfo_opt = shared.opts.data.get('stealth_pnginfo_opt', 'Alpha')
|
9 |
if not stealth_pnginfo_opt or stealth_pnginfo_opt == 'None':
|
10 |
return
|
11 |
-
if not params.filename.endswith('.png') or params.pnginfo is None:
|
12 |
return
|
13 |
if 'parameters' not in params.pnginfo:
|
14 |
return
|
|
|
8 |
stealth_pnginfo_opt = shared.opts.data.get('stealth_pnginfo_opt', 'Alpha')
|
9 |
if not stealth_pnginfo_opt or stealth_pnginfo_opt == 'None':
|
10 |
return
|
11 |
+
if not params.filename.endswith(('.png', '.webp')) or params.pnginfo is None:
|
12 |
return
|
13 |
if 'parameters' not in params.pnginfo:
|
14 |
return
|
modules/ui.py
CHANGED
@@ -305,7 +305,7 @@ def create_ui():
|
|
305 |
if opts.dimensions_and_batch_together:
|
306 |
with gr.Column(elem_id="txt2img_column_batch"):
|
307 |
batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="txt2img_batch_count")
|
308 |
-
batch_size = gr.Slider(minimum=1, maximum=
|
309 |
|
310 |
elif category == "cfg":
|
311 |
with gr.Row():
|
@@ -358,7 +358,7 @@ def create_ui():
|
|
358 |
if not opts.dimensions_and_batch_together:
|
359 |
with FormRow(elem_id="txt2img_column_batch"):
|
360 |
batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="txt2img_batch_count")
|
361 |
-
batch_size = gr.Slider(minimum=1, maximum=
|
362 |
|
363 |
elif category == "override_settings":
|
364 |
with FormRow(elem_id="txt2img_override_settings_row") as row:
|
@@ -666,7 +666,7 @@ def create_ui():
|
|
666 |
if opts.dimensions_and_batch_together:
|
667 |
with gr.Column(elem_id="img2img_column_batch"):
|
668 |
batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="img2img_batch_count")
|
669 |
-
batch_size = gr.Slider(minimum=1, maximum=
|
670 |
|
671 |
elif category == "denoising":
|
672 |
denoising_strength = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising strength', value=0.75, elem_id="img2img_denoising_strength")
|
@@ -688,7 +688,7 @@ def create_ui():
|
|
688 |
if not opts.dimensions_and_batch_together:
|
689 |
with FormRow(elem_id="img2img_column_batch"):
|
690 |
batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="img2img_batch_count")
|
691 |
-
batch_size = gr.Slider(minimum=1, maximum=
|
692 |
|
693 |
elif category == "override_settings":
|
694 |
with FormRow(elem_id="img2img_override_settings_row") as row:
|
|
|
305 |
if opts.dimensions_and_batch_together:
|
306 |
with gr.Column(elem_id="txt2img_column_batch"):
|
307 |
batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="txt2img_batch_count")
|
308 |
+
batch_size = gr.Slider(minimum=1, maximum=50, step=1, label='Batch size', value=1, elem_id="txt2img_batch_size")
|
309 |
|
310 |
elif category == "cfg":
|
311 |
with gr.Row():
|
|
|
358 |
if not opts.dimensions_and_batch_together:
|
359 |
with FormRow(elem_id="txt2img_column_batch"):
|
360 |
batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="txt2img_batch_count")
|
361 |
+
batch_size = gr.Slider(minimum=1, maximum=50, step=1, label='Batch size', value=1, elem_id="txt2img_batch_size")
|
362 |
|
363 |
elif category == "override_settings":
|
364 |
with FormRow(elem_id="txt2img_override_settings_row") as row:
|
|
|
666 |
if opts.dimensions_and_batch_together:
|
667 |
with gr.Column(elem_id="img2img_column_batch"):
|
668 |
batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="img2img_batch_count")
|
669 |
+
batch_size = gr.Slider(minimum=1, maximum=50, step=1, label='Batch size', value=1, elem_id="img2img_batch_size")
|
670 |
|
671 |
elif category == "denoising":
|
672 |
denoising_strength = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising strength', value=0.75, elem_id="img2img_denoising_strength")
|
|
|
688 |
if not opts.dimensions_and_batch_together:
|
689 |
with FormRow(elem_id="img2img_column_batch"):
|
690 |
batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="img2img_batch_count")
|
691 |
+
batch_size = gr.Slider(minimum=1, maximum=50, step=1, label='Batch size', value=1, elem_id="img2img_batch_size")
|
692 |
|
693 |
elif category == "override_settings":
|
694 |
with FormRow(elem_id="img2img_override_settings_row") as row:
|