Merge branch 'master' into master

1 files changed, 9 insertions, 0 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index ac1ba7f4..c27826b6 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -1,5 +1,8 @@
+import os

 import re

 import gradio as gr

+from modules.shared import script_path

+from modules import shared

 

 re_param_code = r"\s*([\w ]+):\s*([^,]+)(?:,|$)"

 re_param = re.compile(re_param_code)

@@ -61,6 +64,12 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
 

 def connect_paste(button, paste_fields, input_comp, js=None):

     def paste_func(prompt):

+        if not prompt and not shared.cmd_opts.hide_ui_dir_config:

+            filename = os.path.join(script_path, "params.txt")

+            if os.path.exists(filename):

+                with open(filename, "r", encoding="utf8") as file:

+                    prompt = file.read()

+

         params = parse_generation_parameters(prompt)

         res = []