diff options
author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-05-20 22:24:15 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-20 22:24:15 +0300 |
commit | cc6c0fc70a8fee1ea01a5e1a63d4edd645b26687 (patch) | |
tree | 04ec2afdaa48c04a0bf69fcf0b5ad7dcc999498f /modules/scripts.py | |
parent | db1ce5aa2654df2f6a2112b4e6cc6f88f9c519df (diff) | |
parent | 71f4a4afdfe2da8cbf23a74b82c32b4d113d996e (diff) | |
download | stable-diffusion-webui-gfx803-cc6c0fc70a8fee1ea01a5e1a63d4edd645b26687.tar.gz |
Merge pull request #10557 from akx/dedupe-webui-boot
Refactor & deduplicate web UI boot code
Diffstat (limited to 'modules/scripts.py')
-rw-r--r-- | modules/scripts.py | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/modules/scripts.py b/modules/scripts.py index e33d8c81..c902804b 100644 --- a/modules/scripts.py +++ b/modules/scripts.py @@ -271,6 +271,12 @@ def load_scripts(): sys.path = syspath
current_basedir = paths.script_path
+ global scripts_txt2img, scripts_img2img, scripts_postproc
+
+ scripts_txt2img = ScriptRunner()
+ scripts_img2img = ScriptRunner()
+ scripts_postproc = scripts_postprocessing.ScriptPostprocessingRunner()
+
def wrap_call(func, filename, funcname, *args, default=None, **kwargs):
try:
@@ -527,9 +533,9 @@ class ScriptRunner: self.scripts[si].args_to = args_to
-scripts_txt2img = ScriptRunner()
-scripts_img2img = ScriptRunner()
-scripts_postproc = scripts_postprocessing.ScriptPostprocessingRunner()
+scripts_txt2img: ScriptRunner = None
+scripts_img2img: ScriptRunner = None
+scripts_postproc: scripts_postprocessing.ScriptPostprocessingRunner = None
scripts_current: ScriptRunner = None
@@ -539,14 +545,7 @@ def reload_script_body_only(): scripts_img2img.reload_sources(cache)
-def reload_scripts():
- global scripts_txt2img, scripts_img2img, scripts_postproc
-
- load_scripts()
-
- scripts_txt2img = ScriptRunner()
- scripts_img2img = ScriptRunner()
- scripts_postproc = scripts_postprocessing.ScriptPostprocessingRunner()
+reload_scripts = load_scripts # compatibility alias
def add_classes_to_gradio_component(comp):
|