Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-20 09:38:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix xyz with batch count

Browse Source 
Signed-off-by: Vladimir Mandic <mandic00@live.com>
This commit is contained in:
Vladimir Mandic
2024-10-31 15:02:55 -04:00
parent c6bb92c723
commit ac26ba5cf1
2 changed files with 43 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/xyz_grid.py
+5 -6
View File
@@ -317,16 +317,15 @@ class Script(scripts.Script):
)
if not processed.images:
return processed # It broke, no further handling needed.
return processed # something broke, no further handling needed.
z_count = len(zs)
processed.infotexts[:1+z_count] = grid_infotext[:1+z_count] # Set the grid infotexts to the real ones with extra_generation_params (1 main grid + z_count sub-grids)
if not include_images:
# Don't need sub-images anymore, drop from list:
processed.infotexts[:1+z_count] = grid_infotext[:1+z_count] # set the grid infotexts to the real ones with extra_generation_params (1 main grid + z_count sub-grids)
if not include_images: # dont need sub-images anymore, drop from list:
if not include_grid and include_subgrids:
processed.images = processed.images[:z_count] # we don't have the main grid image, and need zero additional sub-images
else:
processed.images = processed.images[:z_count+1] # we either have the main grid image, or need one sub-images
if shared.opts.grid_save: # Auto-save main and sub-grids:
if shared.opts.grid_save: # auto-save main and sub-grids:
grid_count = z_count + ( 1 if include_grid and z_count > 1 else 0 )
for g in range(grid_count):
adj_g = g-1 if g > 0 else g
@@ -334,7 +333,7 @@ class Script(scripts.Script):
prompt = processed.all_prompts[adj_g]
seed = processed.all_seeds[adj_g]
images.save_image(processed.images[g], p.outpath_grids, "grid", info=info, extension=shared.opts.grid_format, prompt=prompt, seed=seed, grid=True, p=processed)
if not include_subgrids: # Done with sub-grids, drop all related information:
if not include_subgrids: # done with sub-grids, drop all related information:
for _sg in range(z_count):
del processed.images[1]
del processed.all_prompts[1]
scripts/xyz_grid_on.py
+38
View File
@@ -331,6 +331,7 @@ class Script(scripts.Script):
include_time=include_time,
)
"""
if not processed.images:
active = False
return processed # It broke, no further handling needed.
@@ -356,6 +357,43 @@ class Script(scripts.Script):
active = False
cache = processed
return processed
"""
if not processed.images:
return processed # It broke, no further handling needed.
z_count = len(zs)
processed.infotexts[:1+z_count] = grid_infotext[:1+z_count] # set the grid infotexts to the real ones with extra_generation_params (1 main grid + z_count sub-grids)
if not include_images: # dont need sub-images anymore, drop from list:
if not include_grid and include_subgrids:
processed.images = processed.images[:z_count] # we don't have the main grid image, and need zero additional sub-images
else:
processed.images = processed.images[:z_count+1] # we either have the main grid image, or need one sub-images
if shared.opts.grid_save: # auto-save main and sub-grids:
grid_count = z_count + ( 1 if include_grid and z_count > 1 else 0 )
for g in range(grid_count):
adj_g = g-1 if g > 0 else g
info = processed.infotexts[g]
prompt = processed.all_prompts[adj_g]
seed = processed.all_seeds[adj_g]
images.save_image(processed.images[g], p.outpath_grids, "grid", info=info, extension=shared.opts.grid_format, prompt=prompt, seed=seed, grid=True, p=processed)
if not include_subgrids: # done with sub-grids, drop all related information:
for _sg in range(z_count):
del processed.images[1]
del processed.all_prompts[1]
del processed.all_seeds[1]
del processed.infotexts[1]
elif include_grid:
del processed.infotexts[0]
p.do_not_save_grid = True
p.do_not_save_samples = True
active = False
cache = processed
return processed
def process_images(self, p, *args): # pylint: disable=W0221, W0613
if p.iteration > 0 and cache is not None and len(cache.images) > 0:
cache.images = [] # avoid returning same images multiple items
return cache