Merge branch 'load-last-prompt' into moonride-main

Author: MoonRide303

modules/path.py

@@ -1,9 +1,9 @@
 import os
 import json
 
-from os.path import exists
 from modules.model_loader import load_file_from_url
 
+
 def load_paths(paths_filename):
     paths_dict = {
         'modelfile_path': '../models/checkpoints/',
@@ -20,7 +20,7 @@ def load_paths(paths_filename):
         'temp_outputs_path': '../outputs/'
     }
 
-    if exists(paths_filename):
+    if os.path.exists(paths_filename):
         with open(paths_filename, encoding='utf-8') as paths_file:
             try:
                 paths_obj = json.load(paths_file)
@@ -100,6 +100,7 @@ def get_config_or_set_default(key, default):
                                                    '../models/prompt_expansion/fooocus_expansion')
 
 temp_outputs_path = get_config_or_set_default('temp_outputs_path', '../outputs/')
+last_prompt_path = os.path.join(temp_outputs_path, 'last_prompt.json')
 
 with open(config_path, "w", encoding="utf-8") as json_file:
     json.dump(config_dict, json_file, indent=4)

modules/private_logger.py

@@ -4,6 +4,7 @@
 from PIL import Image
 from PIL.PngImagePlugin import PngInfo
 from modules.util import generate_temp_filename
+from shutil import copy
 
 
 def log(img, dic, single_line_number=3, metadata=None, save_metadata_json=False, save_metadata_image=False, keep_input_names=False, input_image_filename=None, output_format='png'):
@@ -15,7 +16,8 @@ def log(img, dic, single_line_number=3, metadata=None, save_metadata_json=False,
         with open(json_path, 'w', encoding='utf-8') as json_file:
             json_file.write(metadata)
             json_file.close()
-    
+        copy(json_path, modules.path.last_prompt_path)
+
     if output_format == 'png':
         if save_metadata_image:
             pnginfo = PngInfo()

update_log_mre.md

@@ -1,5 +1,6 @@
 ### 2.0.78.4 MRE
 
+* Added Load Last Prompt button (contribution from sngazm).
 * Fixed hangup in Upscale (Fast 2x).
 * Fixed problems with turning off FreeU in some scenarios.
 

webui.py

@@ -257,6 +257,20 @@ def load_prompt_handler(_file, *args):
     return ctrls
 
 
+def load_last_prompt_handler(*args):
+    ctrls = list(args)
+    if exists(modules.path.last_prompt_path):
+        with open(modules.path.last_prompt_path, encoding='utf-8') as json_file:
+            try:
+                json_obj = json.load(json_file)
+                metadata_to_ctrls(json_obj, ctrls)
+            except Exception as e:
+                print('load_last_prompt_handler, e: ' + str(e))
+            finally:
+                json_file.close()
+    return ctrls
+
+
 def load_input_images_handler(files):
     return list(map(lambda x: x.name, files)), gr.update(selected=GALLERY_ID_INPUT), gr.update(value=len(files))
 
@@ -377,7 +391,9 @@ def clear_default_image():
                    seed_random = gr.Checkbox(label='Random', value=settings['seed_random'])
                    same_seed_for_all = gr.Checkbox(label='Same seed for all images', value=settings['same_seed_for_all'])
                 image_seed = gr.Textbox(label='Seed', value=settings['seed'], max_lines=1, visible=not settings['seed_random'])
-                load_prompt_button = gr.UploadButton(label='Load Prompt', file_count='single', file_types=['.json', '.png', '.jpg'], elem_classes='type_small_row', min_width=0)
+                with gr.Row():
+                    load_prompt_button = gr.UploadButton(label='Load Prompt', file_count='single', file_types=['.json', '.png', '.jpg'], elem_classes='type_small_row', min_width=0)
+                    load_last_prompt_button = gr.Button(label='Load Last Prompt', value='Load Last Prompt', elem_classes='type_small_row', min_width=0)
 
                 def get_current_links():
                     return '<a href="https://github.com/lllyasviel/Fooocus/discussions/117">&#128212; Fooocus Advanced</a>' \
@@ -589,6 +605,8 @@ def verify_input(img2img, canny, depth, gallery_in, gallery_rev, gallery_out):
         ctrls += [save_metadata_json, save_metadata_image] + img2img_ctrls + [same_seed_for_all, output_format]
         ctrls += canny_ctrls + depth_ctrls + [prompt_expansion] + freeu_ctrls
         load_prompt_button.upload(fn=load_prompt_handler, inputs=[load_prompt_button] + ctrls + [seed_random], outputs=ctrls + [seed_random])
+        load_last_prompt_button.click(fn=load_last_prompt_handler, inputs=ctrls + [seed_random], outputs=ctrls + [seed_random])
+
         ctrls += [input_image_checkbox, current_tab]
         ctrls += [uov_method, uov_input_image]
         ctrls += [outpaint_selections, inpaint_input_image]