Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix API thread safe issues of txt2img and img2img #14421

Merged
merged 5 commits into from
Dec 30, 2023
Merged

fix API thread safe issues of txt2img and img2img #14421

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00d4a4d
move thread-unsafe code to __init__
lanyeeee Dec 26, 2023
c069c2c
add locks to ensure init args are thread-safe
lanyeeee Dec 30, 2023
d05f9e8
Merge branch 'dev' into api_thread_safe
lanyeeee Dec 30, 2023
91560e9
fix format issue
lanyeeee Dec 30, 2023
f651405
remove locks, move init code to __init__
lanyeeee Dec 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 18 additions & 10 deletions modules/api/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,24 @@ def __init__(self, app: FastAPI, queue_lock: Lock):
self.default_script_arg_txt2img = []
self.default_script_arg_img2img = []

txt2img_script_runner = scripts.scripts_txt2img
img2img_script_runner = scripts.scripts_img2img

if not txt2img_script_runner.scripts or not img2img_script_runner.scripts:
ui.create_ui()

if not txt2img_script_runner.scripts:
txt2img_script_runner.initialize_scripts(False)
if not self.default_script_arg_txt2img:
self.default_script_arg_txt2img = self.init_default_script_args(txt2img_script_runner)

if not img2img_script_runner.scripts:
img2img_script_runner.initialize_scripts(True)
if not self.default_script_arg_img2img:
self.default_script_arg_img2img = self.init_default_script_args(img2img_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)
Expand Down Expand Up @@ -413,15 +431,10 @@ def text2imgapi(self, txt2imgreq: models.StableDiffusionTxt2ImgProcessingAPI):
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()

infotext_script_args = {}
self.apply_infotext(txt2imgreq, "txt2img", script_runner=script_runner, mentioned_script_args=infotext_script_args)

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
Expand Down Expand Up @@ -482,15 +495,10 @@ def img2imgapi(self, img2imgreq: models.StableDiffusionImg2ImgProcessingAPI):
mask = decode_base64_to_image(mask)

script_runner = scripts.scripts_img2img
if not script_runner.scripts:
script_runner.initialize_scripts(True)
ui.create_ui()

infotext_script_args = {}
self.apply_infotext(img2imgreq, "img2img", script_runner=script_runner, mentioned_script_args=infotext_script_args)

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
Expand Down