aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorlanyeeee <1210347077@qq.com>2023-12-26 14:46:29 +0800
committerlanyeeee <1210347077@qq.com>2023-12-26 14:46:29 +0800
commit00d4a4d4ac75903d8224e9beb1136584dd66fcd8 (patch)
tree881019c5169c7c3eb3179adba6e1dc1a3dd5d5ba /modules
parentde03882d6ca56bc81058f5120f028678a6a54aaa (diff)
move thread-unsafe code to __init__
Diffstat (limited to 'modules')
-rw-r--r--modules/api/api.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/modules/api/api.py b/modules/api/api.py
index 7154c9d5..f0a68c67 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -251,6 +251,15 @@ class Api:
self.default_script_arg_txt2img = []
self.default_script_arg_img2img = []
+ script_runner = scripts.scripts_img2img
+ if not script_runner.scripts:
+ script_runner.initialize_scripts(True)
+ ui.create_ui()
+ if not self.default_script_arg_txt2img:
+ self.default_script_arg_txt2img = self.init_default_script_args(script_runner)
+ if not self.default_script_arg_img2img:
+ self.default_script_arg_img2img = self.init_default_script_args(script_runner)
+
def add_api_route(self, path: str, endpoint, **kwargs):
if shared.cmd_opts.api_auth:
return self.app.add_api_route(path, endpoint, dependencies=[Depends(self.auth)], **kwargs)
@@ -339,11 +348,6 @@ class Api:
task_id = txt2imgreq.force_task_id or create_task_id("txt2img")
script_runner = scripts.scripts_txt2img
- if not script_runner.scripts:
- script_runner.initialize_scripts(False)
- ui.create_ui()
- if not self.default_script_arg_txt2img:
- self.default_script_arg_txt2img = self.init_default_script_args(script_runner)
selectable_scripts, selectable_script_idx = self.get_selectable_script(txt2imgreq.script_name, script_runner)
populate = txt2imgreq.copy(update={ # Override __init__ params
@@ -403,11 +407,6 @@ class Api:
mask = decode_base64_to_image(mask)
script_runner = scripts.scripts_img2img
- if not script_runner.scripts:
- script_runner.initialize_scripts(True)
- ui.create_ui()
- if not self.default_script_arg_img2img:
- self.default_script_arg_img2img = self.init_default_script_args(script_runner)
selectable_scripts, selectable_script_idx = self.get_selectable_script(img2imgreq.script_name, script_runner)
populate = img2imgreq.copy(update={ # Override __init__ params