Merge branch 'release_candidate'

1 files changed, 22 insertions, 2 deletions

diff --git a/modules/processing.py b/modules/processing.py
index e8808beb..1a76e552 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -458,6 +458,16 @@ def fix_seed(p):
     p.subseed = get_fixed_seed(p.subseed)

 

 

+def program_version():

+    import launch

+

+    res = launch.git_tag()

+    if res == "<none>":

+        res = None

+

+    return res

+

+

 def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iteration=0, position_in_batch=0):

     index = position_in_batch + iteration * p.batch_size

 

@@ -483,13 +493,14 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments=None, iter
         "Init image hash": getattr(p, 'init_img_hash', None),

         "RNG": opts.randn_source if opts.randn_source != "GPU" else None,

         "NGMS": None if p.s_min_uncond == 0 else p.s_min_uncond,

+        "Version": program_version() if opts.add_version_to_infotext else None,

     }

 

     generation_params.update(p.extra_generation_params)

 

     generation_params_text = ", ".join([k if k == v else f'{k}: {generation_parameters_copypaste.quote(v)}' for k, v in generation_params.items() if v is not None])

 

-    negative_prompt_text = "\nNegative prompt: " + p.all_negative_prompts[index] if p.all_negative_prompts[index] else ""

+    negative_prompt_text = f"\nNegative prompt: {p.all_negative_prompts[index]}" if p.all_negative_prompts[index] else ""

 

     return f"{all_prompts[index]}{negative_prompt_text}\n{generation_params_text}".strip()

 

@@ -769,7 +780,16 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
 

     devices.torch_gc()

 

-    res = Processed(p, output_images, p.all_seeds[0], infotext(), comments="".join(["\n\n" + x for x in comments]), subseed=p.all_subseeds[0], index_of_first_image=index_of_first_image, infotexts=infotexts)

+    res = Processed(

+        p,

+        images_list=output_images,

+        seed=p.all_seeds[0],

+        info=infotext(),

+        comments="".join(f"\n\n{comment}" for comment in comments),

+        subseed=p.all_subseeds[0],

+        index_of_first_image=index_of_first_image,

+        infotexts=infotexts,

+    )

 

     if p.scripts is not None:

         p.scripts.postprocess(p, res)