From f40617d6c4e366773677baa8d7f4114ba2893282 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 3 Sep 2022 17:21:15 +0300
Subject: support for scripts

---
 modules/txt2img.py | 27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

(limited to 'modules/txt2img.py')

diff --git a/modules/txt2img.py b/modules/txt2img.py
index d03a29f2..f5ac0540 100644
--- a/modules/txt2img.py
+++ b/modules/txt2img.py
@@ -1,4 +1,4 @@
-
+import modules.scripts
 from modules.processing import StableDiffusionProcessing, Processed, StableDiffusionProcessingTxt2Img, StableDiffusionProcessingImg2Img, process_images
 from modules.shared import opts, cmd_opts
 import modules.shared as shared
@@ -6,7 +6,7 @@ import modules.processing as processing
 from modules.ui import plaintext_to_html
 
 
-def txt2img(prompt: str, negative_prompt: str, steps: int, sampler_index: int, use_GFPGAN: bool, prompt_matrix: bool, n_iter: int, batch_size: int, cfg_scale: float, seed: int, height: int, width: int, code: str):
+def txt2img(prompt: str, negative_prompt: str, steps: int, sampler_index: int, use_GFPGAN: bool, n_iter: int, batch_size: int, cfg_scale: float, seed: int, height: int, width: int, *args):
     p = StableDiffusionProcessingTxt2Img(
         sd_model=shared.sd_model,
         outpath_samples=opts.outdir_samples or opts.outdir_txt2img_samples,
@@ -21,30 +21,13 @@ def txt2img(prompt: str, negative_prompt: str, steps: int, sampler_index: int, u
         cfg_scale=cfg_scale,
         width=width,
         height=height,
-        prompt_matrix=prompt_matrix,
         use_GFPGAN=use_GFPGAN
     )
 
-    if code != '' and cmd_opts.allow_code:
-        p.do_not_save_grid = True
-        p.do_not_save_samples = True
-
-        display_result_data = [[], -1, ""]
-
-        def display(imgs, s=display_result_data[1], i=display_result_data[2]):
-            display_result_data[0] = imgs
-            display_result_data[1] = s
-            display_result_data[2] = i
-
-        from types import ModuleType
-        compiled = compile(code, '', 'exec')
-        module = ModuleType("testmodule")
-        module.__dict__.update(globals())
-        module.p = p
-        module.display = display
-        exec(compiled, module.__dict__)
+    processed = modules.scripts.run(p, *args)
 
-        processed = Processed(p, *display_result_data)
+    if processed is not None:
+        pass
     else:
         processed = process_images(p)
 
-- 
cgit v1.2.1