diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-26 07:49:57 +0300 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-26 07:49:57 +0300 |
| commit | 835a7dbf0e73c4cdf945b588d319a6c36652cbe5 (patch) | |
| tree | 222c42bd87dae038067625ccd071877a0559857e /modules | |
| parent | 7c22bbd3ad5a149e0cf29df887405188fb2d0471 (diff) | |
simplify PostprocessBatchListArgs
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/processing.py | 15 | ||||
| -rw-r--r-- | modules/scripts.py | 16 |
2 files changed, 9 insertions, 22 deletions
diff --git a/modules/processing.py b/modules/processing.py index e9108f11..b0992ee1 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -807,21 +807,12 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed: if p.scripts is not None:
p.scripts.postprocess_batch(p, x_samples_ddim, batch_number=n)
- batch_params = scripts.PostprocessBatchListArgs(
- list(x_samples_ddim),
- 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,
- )
+ p.prompts = p.all_prompts[n * p.batch_size:(n + 1) * p.batch_size]
+ p.negative_prompts = p.all_negative_prompts[n * p.batch_size:(n + 1) * p.batch_size]
+ batch_params = scripts.PostprocessBatchListArgs(list(x_samples_ddim))
p.scripts.postprocess_batch_list(p, batch_params, batch_number=n)
-
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):
return create_infotext(p, p.prompts, p.seeds, p.subseeds, use_main_prompt=use_main_prompt, index=index, all_negative_prompts=p.negative_prompts)
diff --git a/modules/scripts.py b/modules/scripts.py index 4317cbb6..5b4edcac 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -17,12 +17,8 @@ class PostprocessImageArgs: class PostprocessBatchListArgs:
- def __init__(self, images, prompts, negative_prompts, seeds, subseeds):
+ def __init__(self, images):
self.images = images
- self.prompts = prompts
- self.negative_prompts = negative_prompts
- self.seeds = seeds
- self.subseeds = subseeds
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.
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):
- - pp.prompts
- - pp.negative_prompts
- - pp.seeds
- - pp.subseeds
+ then the script has the responsibility to also update the following attributes in the processing object (p):
+ - p.prompts
+ - p.negative_prompts
+ - p.seeds
+ - p.subseeds
**kwargs will have same items as process_batch, and also:
- batch_number - index of current batch, from 0 to number of batches-1
|