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
6247f21a
Commit
6247f21a
authored
Dec 24, 2022
by
Philpax
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(api): don't save extras output to disk
parent
ca162781
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
modules/api/api.py
modules/api/api.py
+3
-3
modules/extras.py
modules/extras.py
+9
-8
No files found.
modules/api/api.py
View file @
6247f21a
...
...
@@ -181,7 +181,7 @@ class Api:
reqDict
[
'image'
]
=
decode_base64_to_image
(
reqDict
[
'image'
])
with
self
.
queue_lock
:
result
=
run_extras
(
extras_mode
=
0
,
image_folder
=
""
,
input_dir
=
""
,
output_dir
=
""
,
**
reqDict
)
result
=
run_extras
(
extras_mode
=
0
,
image_folder
=
""
,
input_dir
=
""
,
output_dir
=
""
,
save_output
=
False
,
**
reqDict
)
return
ExtrasSingleImageResponse
(
image
=
encode_pil_to_base64
(
result
[
0
][
0
]),
html_info
=
result
[
1
])
...
...
@@ -197,7 +197,7 @@ class Api:
reqDict
.
pop
(
'imageList'
)
with
self
.
queue_lock
:
result
=
run_extras
(
extras_mode
=
1
,
image
=
""
,
input_dir
=
""
,
output_dir
=
""
,
**
reqDict
)
result
=
run_extras
(
extras_mode
=
1
,
image
=
""
,
input_dir
=
""
,
output_dir
=
""
,
save_output
=
False
,
**
reqDict
)
return
ExtrasBatchImagesResponse
(
images
=
list
(
map
(
encode_pil_to_base64
,
result
[
0
])),
html_info
=
result
[
1
])
...
...
@@ -322,7 +322,7 @@ class Api:
def
get_artists
(
self
):
return
[{
"name"
:
x
[
0
],
"score"
:
x
[
1
],
"category"
:
x
[
2
]}
for
x
in
shared
.
artist_db
.
artists
]
def
refresh_checkpoints
(
self
):
shared
.
refresh_checkpoints
()
...
...
modules/extras.py
View file @
6247f21a
...
...
@@ -55,7 +55,7 @@ class LruCache(OrderedDict):
cached_images
:
LruCache
=
LruCache
(
max_size
=
5
)
def
run_extras
(
extras_mode
,
resize_mode
,
image
,
image_folder
,
input_dir
,
output_dir
,
show_extras_results
,
gfpgan_visibility
,
codeformer_visibility
,
codeformer_weight
,
upscaling_resize
,
upscaling_resize_w
,
upscaling_resize_h
,
upscaling_crop
,
extras_upscaler_1
,
extras_upscaler_2
,
extras_upscaler_2_visibility
,
upscale_first
:
bool
):
def
run_extras
(
extras_mode
,
resize_mode
,
image
,
image_folder
,
input_dir
,
output_dir
,
show_extras_results
,
gfpgan_visibility
,
codeformer_visibility
,
codeformer_weight
,
upscaling_resize
,
upscaling_resize_w
,
upscaling_resize_h
,
upscaling_crop
,
extras_upscaler_1
,
extras_upscaler_2
,
extras_upscaler_2_visibility
,
upscale_first
:
bool
,
save_output
:
bool
=
True
):
devices
.
torch_gc
()
imageArr
=
[]
...
...
@@ -193,14 +193,15 @@ def run_extras(extras_mode, resize_mode, image, image_folder, input_dir, output_
else
:
basename
=
''
# Add upscaler name as a suffix.
suffix
=
f
"-{shared.sd_upscalers[extras_upscaler_1].name}"
if
shared
.
opts
.
use_upscaler_name_as_suffix
else
""
# Add second upscaler if applicable.
if
suffix
and
extras_upscaler_2
and
extras_upscaler_2_visibility
:
suffix
+=
f
"-{shared.sd_upscalers[extras_upscaler_2].name}"
if
save_output
:
# Add upscaler name as a suffix.
suffix
=
f
"-{shared.sd_upscalers[extras_upscaler_1].name}"
if
shared
.
opts
.
use_upscaler_name_as_suffix
else
""
# Add second upscaler if applicable.
if
suffix
and
extras_upscaler_2
and
extras_upscaler_2_visibility
:
suffix
+=
f
"-{shared.sd_upscalers[extras_upscaler_2].name}"
images
.
save_image
(
image
,
path
=
outpath
,
basename
=
basename
,
seed
=
None
,
prompt
=
None
,
extension
=
opts
.
samples_format
,
info
=
info
,
short_filename
=
True
,
no_prompt
=
True
,
grid
=
False
,
pnginfo_section_name
=
"extras"
,
existing_info
=
existing_pnginfo
,
forced_filename
=
None
,
suffix
=
suffix
)
images
.
save_image
(
image
,
path
=
outpath
,
basename
=
basename
,
seed
=
None
,
prompt
=
None
,
extension
=
opts
.
samples_format
,
info
=
info
,
short_filename
=
True
,
no_prompt
=
True
,
grid
=
False
,
pnginfo_section_name
=
"extras"
,
existing_info
=
existing_pnginfo
,
forced_filename
=
None
,
suffix
=
suffix
)
if
opts
.
enable_pnginfo
:
image
.
info
=
existing_pnginfo
...
...
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