keep previous processed state

Signed-off-by: Vladimir Mandic <mandic00@live.com>

scripts/cogvideo.py

@@ -205,7 +205,7 @@ class Script(scripts_manager.Script):
         self.offload(offload)
         frames = self.generate(p, model)
         devices.torch_gc()
-        processed = processing.Processed(p, images_list=frames)
+        processed = processing.get_processed(p, images_list=frames)
         shared.state.end()
         return processed
 

scripts/consistory_ext.py

@@ -210,7 +210,7 @@ class Script(scripts_manager.Script):
                 images.append(image)
 
         shared.sd_model.disable_freeu()
-        processed = processing.Processed(p, images)
+        processed = processing.get_processed(p, images)
         return processed
 
     def after(self, p: processing.StableDiffusionProcessing, processed: processing.Processed, *args): # pylint: disable=arguments-differ, unused-argument

scripts/custom_code.py

@@ -2,7 +2,7 @@ import copy
 import ast
 import gradio as gr
 from modules import scripts_manager
-from modules.processing import Processed
+from modules.processing import Processed, get_processed
 from modules.shared import opts, cmd_opts, state # pylint: disable=unused-import
 
 
@@ -87,4 +87,4 @@ __webuitemp__()"""
         if isinstance(result, Processed):
             return result
 
-        return Processed(p, *display_result_data)
+        return get_processed(p, *display_result_data)

scripts/hdr.py

@@ -4,7 +4,7 @@ import numpy as np
 import gradio as gr
 from PIL import Image
 from modules import images, processing, shared, scripts_manager
-from modules.processing import Processed
+from modules.processing import get_processed
 from modules.shared import opts, state
 
 
@@ -95,5 +95,5 @@ class Script(scripts_manager.Script):
             grid = [images.image_grid(imgs, rows=1)] if opts.return_grid else []
             imgs = [img] + grid
 
-        processed = Processed(p, images_list=imgs, seed=p.seed, info=info)
+        processed = get_processed(p, images_list=imgs, seed=p.seed, info=info)
         return processed

scripts/ipinstruct.py

@@ -101,7 +101,7 @@ class Script(scripts_manager.Script):
             auto_scale = False,
             simple_cfg_mode = False,
         )
-        processed = processing.Processed(p, images_list=image_list, seed=p.seed, subseed=p.subseed, index_of_first_image=0) # manually created processed object
+        processed = processing.get_processed(p, images_list=image_list, seed=p.seed, subseed=p.subseed, index_of_first_image=0) # manually created processed object
         # p.extra_generation_params["IPInstruct"] = f''
         return processed
 

scripts/lbm_ext.py

@@ -131,6 +131,6 @@ class Script(scripts_manager.Script):
 
         if output_image is not None:
             output_image.resize((ori_h_bg, ori_w_bg))
-            return processing.Processed(p, [output_image])
+            return processing.get_processed(p, [output_image])
         else:
             return processing.Processed(p, [])

scripts/outpainting_mk_2.py

@@ -3,7 +3,7 @@ import numpy as np
 import gradio as gr
 from PIL import Image, ImageDraw
 from modules import images, scripts_manager
-from modules.processing import Processed, process_images
+from modules.processing import get_processed, process_images
 from modules.shared import opts, state
 
 
@@ -222,7 +222,7 @@ class Script(scripts_manager.Script):
         combined_grid_image = images.image_grid(all_processed_images)
         if opts.return_grid and len(all_processed_images) > 1:
             all_images = [combined_grid_image] + all_processed_images
-        res = Processed(p, all_images, initial_seed_and_info[0], initial_seed_and_info[1])
+        res = get_processed(p, all_images, initial_seed_and_info[0], initial_seed_and_info[1])
         if opts.samples_save:
             for img in all_processed_images:
                 images.save_image(img, p.outpath_samples, "", res.seed, p.prompt, opts.samples_format, info=res.info, p=p)

scripts/poor_mans_outpainting.py

@@ -2,7 +2,7 @@ import math
 import gradio as gr
 from PIL import Image, ImageDraw
 from modules import images, devices, scripts_manager
-from modules.processing import Processed, process_images
+from modules.processing import get_processed, process_images
 from modules.shared import opts, state, log
 
 
@@ -108,5 +108,5 @@ class Script(scripts_manager.Script):
         combined_image = images.combine_grid(grid)
         if opts.samples_save:
             images.save_image(combined_image, p.outpath_samples, "", initial_seed, p.prompt, opts.samples_format, info=initial_info, p=p)
-        processed = Processed(p, [combined_image], initial_seed, initial_info)
+        processed = get_processed(p, [combined_image], initial_seed, initial_info)
         return processed

scripts/prompts_from_file.py

@@ -3,7 +3,7 @@ import random
 import shlex
 import gradio as gr
 from modules import sd_samplers, errors, scripts_manager
-from modules.processing import Processed, process_images
+from modules.processing import get_processed, process_images
 from modules.shared import state, log
 
 
@@ -148,4 +148,4 @@ class Script(scripts_manager.Script):
             all_negative += proc.all_negative_prompts
             images += proc.images
             infotexts += proc.infotexts
-        return Processed(p, images, p.seed, "", all_prompts=all_prompts, all_seeds=all_seeds, all_negative_prompts=all_negative, infotexts=infotexts)
+        return get_processed(p, images, p.seed, "", all_prompts=all_prompts, all_seeds=all_seeds, all_negative_prompts=all_negative, infotexts=infotexts)

scripts/pulid_ext.py

@@ -273,7 +273,7 @@ class Script(scripts_manager.Script):
                     id_scale=strength,
                     )[0]
             info = processing.create_infotext(p)
-            processed = processing.Processed(p, [output], info=info)
+            processed = processing.get_processed(p, [output], info=info)
             shared.state.end()
         else: # let processing run the pipeline
             p.task_args['id_embedding'] = id_embedding

scripts/sd_upscale.py

@@ -2,7 +2,7 @@ import math
 import gradio as gr
 from PIL import Image
 from modules import processing, shared, images, devices, scripts_manager
-from modules.processing import Processed
+from modules.processing import get_processed
 from modules.shared import opts, state, log
 
 
@@ -89,6 +89,6 @@ class Script(scripts_manager.Script):
             if opts.samples_save:
                 images.save_image(combined_image, p.outpath_samples, "", start_seed, p.prompt, opts.samples_format, info=initial_info, p=p)
 
-        processed = Processed(p, result_images, seed, initial_info)
+        processed = get_processed(p, result_images, seed, initial_info)
         log.info(f"SD upscale: images={result_images}")
         return processed