Commit 835a7dbf authored by AUTOMATIC1111's avatar AUTOMATIC1111

simplify PostprocessBatchListArgs

parent 7c22bbd3
...@@ -807,21 +807,12 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: ...@@ -807,21 +807,12 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
if p.scripts is not None: if p.scripts is not None:
p.scripts.postprocess_batch(p, x_samples_ddim, batch_number=n) p.scripts.postprocess_batch(p, x_samples_ddim, batch_number=n)
batch_params = scripts.PostprocessBatchListArgs( p.prompts = p.all_prompts[n * p.batch_size:(n + 1) * p.batch_size]
list(x_samples_ddim), p.negative_prompts = p.all_negative_prompts[n * p.batch_size:(n + 1) * p.batch_size]
p.all_prompts[n * p.batch_size:(n + 1) * p.batch_size],
p.all_negative_prompts[n * p.batch_size:(n + 1) * p.batch_size],
p.seeds,
p.subseeds,
)
batch_params = scripts.PostprocessBatchListArgs(list(x_samples_ddim))
p.scripts.postprocess_batch_list(p, batch_params, batch_number=n) p.scripts.postprocess_batch_list(p, batch_params, batch_number=n)
x_samples_ddim = batch_params.images x_samples_ddim = batch_params.images
p.prompts = batch_params.prompts
p.negative_prompts = batch_params.negative_prompts
p.seeds = batch_params.seeds
p.subseeds = batch_params.subseeds
def infotext(index=0, use_main_prompt=False): def infotext(index=0, use_main_prompt=False):
return create_infotext(p, p.prompts, p.seeds, p.subseeds, use_main_prompt=use_main_prompt, index=index, all_negative_prompts=p.negative_prompts) return create_infotext(p, p.prompts, p.seeds, p.subseeds, use_main_prompt=use_main_prompt, index=index, all_negative_prompts=p.negative_prompts)
......
...@@ -17,12 +17,8 @@ class PostprocessImageArgs: ...@@ -17,12 +17,8 @@ class PostprocessImageArgs:
class PostprocessBatchListArgs: class PostprocessBatchListArgs:
def __init__(self, images, prompts, negative_prompts, seeds, subseeds): def __init__(self, images):
self.images = images self.images = images
self.prompts = prompts
self.negative_prompts = negative_prompts
self.seeds = seeds
self.subseeds = subseeds
class Script: class Script:
...@@ -172,11 +168,11 @@ class Script: ...@@ -172,11 +168,11 @@ class Script:
You can modify the postprocessing object (pp) to update the images in the batch, remove images, add images, etc. You can modify the postprocessing object (pp) to update the images in the batch, remove images, add images, etc.
If the number of images is different from the batch size when returning, If the number of images is different from the batch size when returning,
then the script has the responsibility to also update the following attributes in the processing object (pp): then the script has the responsibility to also update the following attributes in the processing object (p):
- pp.prompts - p.prompts
- pp.negative_prompts - p.negative_prompts
- pp.seeds - p.seeds
- pp.subseeds - p.subseeds
**kwargs will have same items as process_batch, and also: **kwargs will have same items as process_batch, and also:
- batch_number - index of current batch, from 0 to number of batches-1 - batch_number - index of current batch, from 0 to number of batches-1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment