Skip to content

Commit da8444d

Browse files
committed
Auto2222 plugin trim pass #1
1 parent e47e623 commit da8444d

24 files changed

Lines changed: 306 additions & 946 deletions

launch.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,11 @@ def sigint_handler(sig, frame):
124124
# ))
125125

126126
# plugins.get("stable_diffusion_auto1111").txt2img()
127-
# plugins.get("stable_diffusion_auto2222").load()
128-
plugins.get("stable_diffusion_auto1111").load()
127+
plugins.get("stable_diffusion_auto2222").load()
128+
# plugins.get("stable_diffusion_auto1111").load()
129129

130-
# plugins.get("stable_diffusion_auto2222").txt2img("Beautiful painting of an ultra contorted landscape by Greg Ruktowsky and Salvador Dali. airbrushed, 70s prog rock album cover, psychedelic, elaborate, complex")
131-
plugins.get("stable_diffusion_auto1111").txt2img(SDJob_txt2img(prompt="Beautiful painting of an ultra contorted landscape by Greg Ruktowsky and Salvador Dali. airbrushed, 70s prog rock album cover, psychedelic, elaborate, complex"))
130+
plugins.get("stable_diffusion_auto2222").txt2img("Beautiful painting of an ultra contorted landscape by Greg Ruktowsky and Salvador Dali. airbrushed, 70s prog rock album cover, psychedelic, elaborate, complex")
131+
# plugins.get("stable_diffusion_auto1111").txt2img(SDJob_txt2img(prompt="Beautiful painting of an ultra contorted landscape by Greg Ruktowsky and Salvador Dali. airbrushed, 70s prog rock album cover, psychedelic, elaborate, complex"))
132132

133133
if cargs.dry:
134134
print("Exiting because of --dry argument")

modules/stable_diffusion_auto2222/artists.py

Lines changed: 0 additions & 25 deletions
This file was deleted.

modules/stable_diffusion_auto2222/devices.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def get_optimal_device():
1818
import shared
1919

2020
device_id = shared.cmd_opts.device_id
21-
2221
if device_id is not None:
2322
cuda_device = f"cuda:{device_id}"
2423
return torch.device(cuda_device)

modules/stable_diffusion_auto2222/generation_parameters_copypaste.py

Lines changed: 0 additions & 112 deletions
This file was deleted.

modules/stable_diffusion_auto2222/hypernetworks/hypernetwork.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ def train_hypernetwork(hypernetwork_name, learn_rate, batch_size, data_root, log
432432
p.negative_prompt = preview_negative_prompt
433433
p.steps = preview_steps
434434
p.sampler_index = preview_sampler_index
435-
p.cfg_scale = preview_cfg_scale
435+
p.cfg = preview_cfg_scale
436436
p.seed = preview_seed
437437
p.width = preview_width
438438
p.height = preview_height

modules/stable_diffusion_auto2222/hypernetworks/ui.py

Lines changed: 0 additions & 61 deletions
This file was deleted.

modules/stable_diffusion_auto2222/images.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def apply_filename_pattern(x, p, seed, prompt):
294294

295295
if p is not None:
296296
x = x.replace("[steps]", str(p.steps))
297-
x = x.replace("[cfg]", str(p.cfg_scale))
297+
x = x.replace("[cfg]", str(p.cfg))
298298
x = x.replace("[width]", str(p.width))
299299
x = x.replace("[height]", str(p.height))
300300
x = x.replace("[styles]", sanitize_filename_part(", ".join([x for x in p.styles if not x == "None"]) or "None", replace_spaces=False))
@@ -353,7 +353,7 @@ def get_next_sequence_number(path, basename):
353353
return result + 1
354354

355355

356-
def save_image(image, path, basename, seed=None, prompt=None, extension='png', info=None, short_filename=False, no_prompt=False, grid=False, pnginfo_section_name='parameters', p=None, existing_info=None, forced_filename=None, suffix="", save_to_dirs=None):
356+
def save_image(image, path, basename, seed=None, prompt=None, extension='png', metadata=None, short_filename=False, no_prompt=False, grid=False, pnginfo_section_name='parameters', p=None, existing_info=None, forced_filename=None, suffix="", save_to_dirs=None):
357357
'''Save an image.
358358
359359
Args:
@@ -368,7 +368,7 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
368368
Image file extension, default is `png`.
369369
pngsectionname (`str`):
370370
Specify the name of the section which `info` will be saved in.
371-
info (`str` or `PngImagePlugin.iTXt`):
371+
metadata (`str` or `PngImagePlugin.iTXt`):
372372
PNG info chunks.
373373
existing_info (`dict`):
374374
Additional PNG info. `existing_info == {pngsectionname: info, ...}`
@@ -398,14 +398,14 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
398398

399399
file_decoration = apply_filename_pattern(file_decoration, p, seed, prompt) + suffix
400400

401-
if extension == 'png' and opts.enable_pnginfo and info is not None:
401+
if extension == 'png' and opts.enable_pnginfo and metadata is not None:
402402
pnginfo = PngImagePlugin.PngInfo()
403403

404404
if existing_info is not None:
405405
for k, v in existing_info.items():
406406
pnginfo.add_text(k, str(v))
407407

408-
pnginfo.add_text(pnginfo_section_name, info)
408+
pnginfo.add_text(pnginfo_section_name, metadata)
409409
else:
410410
pnginfo = None
411411

@@ -435,13 +435,13 @@ def save_image(image, path, basename, seed=None, prompt=None, extension='png', i
435435
def exif_bytes():
436436
return piexif.dump({
437437
"Exif": {
438-
piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(info or "", encoding="unicode")
438+
piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(metadata or "", encoding="unicode")
439439
},
440440
})
441441

442442
if extension.lower() in ("jpg", "jpeg", "webp"):
443443
image.save(fullfn, quality=opts.jpeg_quality)
444-
if opts.enable_pnginfo and info is not None:
444+
if opts.enable_pnginfo and metadata is not None:
445445
piexif.insert(exif_bytes(), fullfn)
446446
else:
447447
image.save(fullfn, quality=opts.jpeg_quality, pnginfo=pnginfo)
@@ -457,13 +457,13 @@ def exif_bytes():
457457
image = image.resize((image.width * target_side_length // image.height, target_side_length), LANCZOS)
458458

459459
image.save(fullfn_without_extension + ".jpg", quality=opts.jpeg_quality)
460-
if opts.enable_pnginfo and info is not None:
460+
if opts.enable_pnginfo and metadata is not None:
461461
piexif.insert(exif_bytes(), fullfn_without_extension + ".jpg")
462462

463-
if opts.save_txt and info is not None:
463+
if opts.save_txt and metadata is not None:
464464
txt_fullfn = f"{fullfn_without_extension}.txt"
465465
with open(txt_fullfn, "w", encoding="utf8") as file:
466-
file.write(info + "\n")
466+
file.write(metadata + "\n")
467467
else:
468468
txt_fullfn = None
469469

0 commit comments

Comments
 (0)