Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
S
stable-diffusion-webui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
stable-diffusion-webui
Commits
26522c7d
Unverified
Commit
26522c7d
authored
Dec 31, 2022
by
AUTOMATIC1111
Committed by
GitHub
Dec 31, 2022
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6015 from philpax/api-begin-end-in-queue
fix(api): only begin/end state in lock
parents
3d8256e4
5be9387b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
8 deletions
+4
-8
api.py
modules/api/api.py
+4
-8
No files found.
modules/api/api.py
View file @
26522c7d
...
@@ -130,14 +130,12 @@ class Api:
...
@@ -130,14 +130,12 @@ class Api:
if
populate
.
sampler_name
:
if
populate
.
sampler_name
:
populate
.
sampler_index
=
None
# prevent a warning later on
populate
.
sampler_index
=
None
# prevent a warning later on
p
=
StableDiffusionProcessingTxt2Img
(
**
vars
(
populate
))
p
=
StableDiffusionProcessingTxt2Img
(
**
vars
(
populate
))
# Override object param
shared
.
state
.
begin
()
with
self
.
queue_lock
:
with
self
.
queue_lock
:
shared
.
state
.
begin
()
processed
=
process_images
(
p
)
processed
=
process_images
(
p
)
shared
.
state
.
end
()
shared
.
state
.
end
()
b64images
=
list
(
map
(
encode_pil_to_base64
,
processed
.
images
))
b64images
=
list
(
map
(
encode_pil_to_base64
,
processed
.
images
))
...
@@ -169,12 +167,10 @@ class Api:
...
@@ -169,12 +167,10 @@ class Api:
p
.
init_images
=
[
decode_base64_to_image
(
x
)
for
x
in
init_images
]
p
.
init_images
=
[
decode_base64_to_image
(
x
)
for
x
in
init_images
]
shared
.
state
.
begin
()
with
self
.
queue_lock
:
with
self
.
queue_lock
:
shared
.
state
.
begin
()
processed
=
process_images
(
p
)
processed
=
process_images
(
p
)
shared
.
state
.
end
()
shared
.
state
.
end
()
b64images
=
list
(
map
(
encode_pil_to_base64
,
processed
.
images
))
b64images
=
list
(
map
(
encode_pil_to_base64
,
processed
.
images
))
...
...
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