Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
Stable Diffusion Webui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
novelai-storage
Stable Diffusion Webui
Commits
f6514054
Commit
f6514054
authored
Dec 31, 2023
by
lanyeeee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove locks, move init code to __init__
parent
91560e98
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
18 deletions
+19
-18
modules/api/api.py
modules/api/api.py
+19
-18
No files found.
modules/api/api.py
View file @
f6514054
...
...
@@ -251,8 +251,21 @@ class Api:
self
.
default_script_arg_txt2img
=
[]
self
.
default_script_arg_img2img
=
[]
self
.
txt2img_script_arg_init_lock
=
Lock
()
self
.
img2img_script_arg_init_lock
=
Lock
()
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
)
...
...
@@ -418,16 +431,10 @@ class Api:
task_id
=
txt2imgreq
.
force_task_id
or
create_task_id
(
"txt2img"
)
script_runner
=
scripts
.
scripts_txt2img
with
self
.
txt2img_script_arg_init_lock
:
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
)
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
...
...
@@ -488,16 +495,10 @@ class Api:
mask
=
decode_base64_to_image
(
mask
)
script_runner
=
scripts
.
scripts_img2img
with
self
.
img2img_script_arg_init_lock
:
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
)
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment