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
1fe2dcaa
Commit
1fe2dcaa
authored
Jul 22, 2023
by
AnyISalIn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[bug] If txt2img/img2img raises an exception, finally call state.end()
Signed-off-by:
AnyISalIn
<
anyisalin@gmail.com
>
parent
075934a9
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
16 deletions
+20
-16
modules/api/api.py
modules/api/api.py
+20
-16
No files found.
modules/api/api.py
View file @
1fe2dcaa
...
@@ -333,14 +333,16 @@ class Api:
...
@@ -333,14 +333,16 @@ class Api:
p
.
outpath_grids
=
opts
.
outdir_txt2img_grids
p
.
outpath_grids
=
opts
.
outdir_txt2img_grids
p
.
outpath_samples
=
opts
.
outdir_txt2img_samples
p
.
outpath_samples
=
opts
.
outdir_txt2img_samples
shared
.
state
.
begin
(
job
=
"scripts_txt2img"
)
try
:
if
selectable_scripts
is
not
None
:
shared
.
state
.
begin
(
job
=
"scripts_txt2img"
)
p
.
script_args
=
script_args
if
selectable_scripts
is
not
None
:
processed
=
scripts
.
scripts_txt2img
.
run
(
p
,
*
p
.
script_args
)
# Need to pass args as list here
p
.
script_args
=
script_args
else
:
processed
=
scripts
.
scripts_txt2img
.
run
(
p
,
*
p
.
script_args
)
# Need to pass args as list here
p
.
script_args
=
tuple
(
script_args
)
# Need to pass args as tuple here
else
:
processed
=
process_images
(
p
)
p
.
script_args
=
tuple
(
script_args
)
# Need to pass args as tuple here
shared
.
state
.
end
()
processed
=
process_images
(
p
)
finally
:
shared
.
state
.
end
()
b64images
=
list
(
map
(
encode_pil_to_base64
,
processed
.
images
))
if
send_images
else
[]
b64images
=
list
(
map
(
encode_pil_to_base64
,
processed
.
images
))
if
send_images
else
[]
...
@@ -390,14 +392,16 @@ class Api:
...
@@ -390,14 +392,16 @@ class Api:
p
.
outpath_grids
=
opts
.
outdir_img2img_grids
p
.
outpath_grids
=
opts
.
outdir_img2img_grids
p
.
outpath_samples
=
opts
.
outdir_img2img_samples
p
.
outpath_samples
=
opts
.
outdir_img2img_samples
shared
.
state
.
begin
(
job
=
"scripts_img2img"
)
try
:
if
selectable_scripts
is
not
None
:
shared
.
state
.
begin
(
job
=
"scripts_img2img"
)
p
.
script_args
=
script_args
if
selectable_scripts
is
not
None
:
processed
=
scripts
.
scripts_img2img
.
run
(
p
,
*
p
.
script_args
)
# Need to pass args as list here
p
.
script_args
=
script_args
else
:
processed
=
scripts
.
scripts_img2img
.
run
(
p
,
*
p
.
script_args
)
# Need to pass args as list here
p
.
script_args
=
tuple
(
script_args
)
# Need to pass args as tuple here
else
:
processed
=
process_images
(
p
)
p
.
script_args
=
tuple
(
script_args
)
# Need to pass args as tuple here
shared
.
state
.
end
()
processed
=
process_images
(
p
)
finally
:
shared
.
state
.
end
()
b64images
=
list
(
map
(
encode_pil_to_base64
,
processed
.
images
))
if
send_images
else
[]
b64images
=
list
(
map
(
encode_pil_to_base64
,
processed
.
images
))
if
send_images
else
[]
...
...
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